This commit was manufactured by cvs2svn to create tag 'ACE-5_4_6'.ACE-5_4_6

1871 files changed, 0 insertions, 379723 deletions

diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
deleted file mode 100644
index adc1b27ec4a..00000000000
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#include "tao/Abstract_Servant_Base.h"
-
-ACE_RCSID (tao,
-           Abstract_Servant_Base,
-           "$Id$")
-
-TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void)
-{
-  // No-Op.
-}
-
-TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
-{
-  // No-Op.
-}
-
-TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &)
-{
-  // No-Op
-}
-
-TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&)
-{
-  return *this;
-}
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
deleted file mode 100644
index cc90e58c7c7..00000000000
--- a/TAO/tao/Abstract_Servant_Base.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Abstract_Servant_Base.h
- *
- *  $Id$
- *
- *  This files contains the TAO_Abstract_ServantBase, which is used
- *  as a way to decuple the PortableServer from the TAO Core,
- *  and make it possible to keep the reference to the servant in
- *  the CORBA::Object class.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ABSTRACT_SERVANT_BASE_H_
-#define TAO_ABSTRACT_SERVANT_BASE_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/Collocation_Strategy.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-class TAO_ServerRequest;
-class TAO_Stub;
-class TAO_Abstract_ServantBase;
-
-namespace CORBA
-{
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-
-  class Environment;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-namespace TAO
-{
-  class Argument;
-}
-
-typedef void (*TAO_Skeleton)(
-    TAO_ServerRequest &,
-    void *,
-    void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-  );
-
-typedef void (*TAO_Collocated_Skeleton)(
-    TAO_Abstract_ServantBase *,
-    TAO::Argument **,
-    int
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-  );
-
-class TAO_Export TAO_Abstract_ServantBase
-{
-public:
-  /// Destructor
-  virtual ~TAO_Abstract_ServantBase (void);
-
-  /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char* logical_type_id
-                                ACE_ENV_ARG_DECL) = 0;
-
-  /// Default @c _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Query the Interface Repository.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL
-    ) = 0;
-
-  /// Default @c_get_component: always returns nil.
-  virtual CORBA::Object_ptr _get_component (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  //@{
-  /**
-   * @name Reference Counting Operations
-   */
-  /// Increase reference count by one.
-  virtual void _add_ref (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /**
-   * Decreases reference count by one; if the resulting reference
-   * count equals zero, _remove_ref invokes delete on its this pointer
-   * in order to destroy the servant.
-   */
-  virtual void _remove_ref (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Returns the current reference count value.
-  virtual CORBA::ULong _refcount_value (
-    ACE_ENV_SINGLE_ARG_DECL) const = 0;
-  //@}
-
-  /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-    /// Find an operation in the operation table and return a
-  /// TAO_Skeleton which can be used to make upcalls
-  virtual int _find (const char *opname,
-                     TAO_Skeleton &skelfunc,
-                     const unsigned int length = 0) = 0;
-
-  /// Find an operation in the operation table and return a
-  /// TAO_Collocated_Skeleton which can be used to make upcalls onto
-  /// collocated servants.
-  virtual int _find (const char *opname,
-                     TAO_Collocated_Skeleton &skelfunc,
-                     TAO::Collocation_Strategy s,
-                     const unsigned int length = 0) = 0;
-
-protected:
-
-  /// Default constructor, only derived classes can be created.
-  TAO_Abstract_ServantBase (void);
-
-  /// Copy constructor, protected so no instances can be created.
-  TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &);
-
-  /// Assignment operator.
-  TAO_Abstract_ServantBase &operator= (const TAO_Abstract_ServantBase &);
-
-  /// Dispatches a request to the object
-  /**
-   * Find the operation, cast the type to the most derived type,
-   * demarshall all the parameters from the request and finally
-   * invokes the operation, storing the results and out parameters (if
-   * any) or the exceptions thrown into @a request.
-   */
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall
-                          ACE_ENV_ARG_DECL) = 0;
-
-  virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
-                                            void *servant_upcall,
-                                            void *derived_this
-                                            ACE_ENV_ARG_DECL) = 0;
-
-  /// Get this interface's repository id (TAO specific).
-  virtual const char *_interface_repository_id (void) const = 0;
-
-};
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ABSTRACT_SERVANT_BASE_H_ */
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
deleted file mode 100644
index 2a7ca91f360..00000000000
--- a/TAO/tao/Acceptor_Filter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#include "tao/Acceptor_Filter.h"
-
-ACE_RCSID(tao, Acceptor_Filter, "$Id$")
-
-TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
-{
-}
-
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
deleted file mode 100644
index aab2bad47fb..00000000000
--- a/TAO/tao/Acceptor_Filter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Acceptor_Filter.h
- *
- *  $Id$
- *
- *  @author Marina Spivak (marina@cs.wustl.edu)
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-#ifndef TAO_ACCEPTOR_FILTER_H
-#define TAO_ACCEPTOR_FILTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  class ObjectKey;
-}
-
-class TAO_MProfile;
-class TAO_Acceptor;
-
-/**
- * @class TAO_Acceptor_Filter
- *
- * @brief Interface for mprofile creation strategies.
- *
- * Concrete Acceptor_Filter encapsulates a strategy for populating
- * mprofile with profiles: it decides which endpoints are included
- * into mprofile and which ones are not.
- */
-class TAO_Export TAO_Acceptor_Filter
-{
-public:
-  virtual ~TAO_Acceptor_Filter (void);
-
-  /**
-   * Populate <mprofile> with profiles. Profiles are created for
-   * selected acceptors (endpoints) from the array delimited by
-   * <acceptors_begin> and <acceptors_end>.
-   */
-  virtual int fill_profile (const TAO::ObjectKey &object_key,
-                            TAO_MProfile &mprofile,
-                            TAO_Acceptor **acceptors_begin,
-                            TAO_Acceptor **acceptors_end,
-                            CORBA::Short priority = TAO_INVALID_PRIORITY) = 0;
-
-  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
-  /// tag component of profiles.
-  virtual int encode_endpoints (TAO_MProfile &mprofile) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
deleted file mode 100644
index 2286ae6c4fd..00000000000
--- a/TAO/tao/Acceptor_Impl.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     Acceptor_Impl.cpp
-//
-// = AUTHOR
-//     Carlos O'Ryan <coryan@uci.edu>
-//     Ossama Othman <ossama@dre.vanderbilt.edu>
-//
-// ============================================================================
-
-#ifndef TAO_ACCEPTOR_IMPL_CPP
-#define TAO_ACCEPTOR_IMPL_CPP
-
-#include "tao/Acceptor_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Thread_Per_Connection_Handler.h"
-#include "Server_Strategy_Factory.h"
-#include "ORB_Core.h"
-#include "Transport_Cache_Manager.h"
-#include "Thread_Lane_Resources.h"
-#include "Transport.h"
-#include "debug.h"
-
-ACE_RCSID (tao,
-           Acceptor_Impl,
-           "$Id$")
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER>
-TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
-                                                           CORBA::Boolean flag)
-  : ACE_Creation_Strategy<SVC_HANDLER> (0, orb_core->reactor()),
-    orb_core_ (orb_core),
-    lite_flag_ (flag)
-{
-}
-
-template <class SVC_HANDLER> int
-TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
-{
-  if (sh == 0)
-    {
-      // Purge connections (if necessary)
-      this->orb_core_->lane_resources ().transport_cache ().purge ();
-
-      ACE_NEW_RETURN (sh,
-                      SVC_HANDLER (this->orb_core_,
-                                   this->lite_flag_),
-                      -1);
-    }
-
-  return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER>
-TAO_Concurrency_Strategy<SVC_HANDLER>::TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-template <class SVC_HANDLER> int
-TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
-                                                             void *arg)
-{
-  sh->transport ()->opened_as (TAO::TAO_SERVER_ROLE);
-
-  // Indicate that this transport was opened in the server role
-  if (TAO_debug_level > 6)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, "
-                "opened as TAO_SERVER_ROLE\n"));
-
-  // Here the service handler has been created and the new connection
-  // has been accepted.  #REFCOUNT# is one at this point.
-
-  if (this->ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (sh,
-                                                                         arg) == -1)
-    return -1;
-
-  // The service handler has been activated. Now cache the handler.
-  if (sh->add_transport_to_cache () == -1)
-    {
-      // Adding to the cache fails, close the handler.
-      sh->close ();
-
-      // #REFCOUNT# is zero at this point.
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, ")
-                      ACE_TEXT ("could not add the handler to cache \n")));
-        }
-
-      return -1;
-    }
-
-  // Registration with cache is successful, #REFCOUNT# is two at this
-  // point.
-
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
-
-  int result = 0;
-
-  // Do we need to create threads?
-  if (f->activate_server_connections ())
-    {
-      // Thread-per-connection concurrency model
-      TAO_Thread_Per_Connection_Handler *tpch = 0;
-
-      ACE_NEW_RETURN (tpch,
-                      TAO_Thread_Per_Connection_Handler (sh,
-                                                         this->orb_core_),
-                      -1);
-
-      result =
-        tpch->activate (f->server_connection_thread_flags (),
-                        f->server_connection_thread_count ());
-    }
-  else
-    {
-      // Otherwise, it is the reactive concurrency model. We may want
-      // to register ourselves with the reactor. Call the register
-      // handler on the transport.
-      result =
-        sh->transport ()->register_handler ();
-    }
-
-  if (result != -1)
-    {
-      // Activation/registration successful: the handler has been
-      // registered with either the Reactor or the
-      // Thread-per-Connection_Handler, and the Transport Cache.
-      // #REFCOUNT# is three at this point.
-
-      // We can let go of our reference.
-      sh->transport ()->remove_reference ();
-    }
-  else
-    {
-      // Activation/registration failure. #REFCOUNT# is two at this
-      // point.
-
-      // Remove from cache.
-      sh->transport ()->purge_entry ();
-
-      // #REFCOUNT# is one at this point.
-
-      // Close handler.
-      sh->close ();
-
-      // #REFCOUNT# is zero at this point.
-
-      if (TAO_debug_level > 0)
-         {
-           const ACE_TCHAR *error = 0;
-           if (f->activate_server_connections ())
-             error = ACE_TEXT("could not activate new connection");
-           else
-             error = ACE_TEXT("could not register new connection in the reactor");
-
-           ACE_ERROR ((LM_ERROR,
-                       "TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, "
-                       "%s\n", error));
-         }
-
-      return -1;
-    }
-
-  // Success: #REFCOUNT# is two at this point.
-  return result;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-                                                             int restart)
-{
-
-  return ACCEPT_STRATEGY_BASE::open (local_addr,
-                                     restart);
-}
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
-TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDLER *svc_handler)
-{
-  return ACCEPT_STRATEGY_BASE::accept_svc_handler (svc_handler);
-}
-
-
-/////////////////////////////////////////////////////////////////////
-
-#endif /* TAO_ACCEPTOR_IMPL_CPP */
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
deleted file mode 100644
index ac978b8167d..00000000000
--- a/TAO/tao/Acceptor_Impl.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Acceptor_Impl.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
- *  @author Ossama Othman <othman@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ACCEPTOR_IMPL_H
-#define TAO_ACCEPTOR_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Strategies_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-// Forward declarations.
-class TAO_ORB_Core;
-
-/**
- * @class TAO_Creation_Strategy
- *
- * @brief Creates a Svc_Handler and set the ORB_Core pointer on it.
- */
-template <class SVC_HANDLER>
-class TAO_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
-{
-public:
-  /**
-   * Constructor.
-   */
-  TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
-                         CORBA::Boolean flag = 0);
-
-  /// Create a SVC_HANDLER  and set the ORB_Core pointer on it.
-  int make_svc_handler (SVC_HANDLER *&sh);
-
-protected:
-  /// Pointer to the ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// Should we use the Lite version for any protocol?
-  CORBA::Boolean lite_flag_;
-};
-
-/**
- * @class TAO_Concurrency_Strategy
- *
- * @brief Activates the Svc_Handler, and then if specified by the
- * TAO_Server_Strategy_Factory, it activates the Svc_Handler to
- * run in its own thread.
- */
-template <class SVC_HANDLER>
-class TAO_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER>
-{
-public:
-  /// Constructor.
-  TAO_Concurrency_Strategy (TAO_ORB_Core *orb_core);
-
-  /**
-   * Activates the Svc_Handler, and then if specified by the
-   * TAO_Server_Strategy_Factory, it activates the Svc_Handler to run
-   * in its own thread.
-   */
-  int activate_svc_handler (SVC_HANDLER *svc_handler,
-                            void *arg);
-
-protected:
-  /// Pointer to the ORB Core.
-  TAO_ORB_Core *orb_core_;
-};
-
-template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
-class TAO_Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
-{
-public:
-
-  /// Constructor.
-  TAO_Accept_Strategy (TAO_ORB_Core *orb_core);
-
-  /// Initialize the <peer_acceptor_> with <local_addr>.  If the
-  /// process runs out of handles, purge some "old" connections.
-  int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
-            int restart = 0);
-
-  /// Delegates to the <accept> method of the PEER_ACCEPTOR. If the
-  /// process runs out of handles, purge some "old" connections.
-  int accept_svc_handler (SVC_HANDLER *svc_handler);
-
-protected:
-  /// Base class.
-  typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY_BASE;
-
-  /// Pointer to the ORB Core.
-  TAO_ORB_Core *orb_core_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Acceptor_Impl.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Acceptor_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ACCEPTOR_IMPL_H */
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
deleted file mode 100644
index df425a921c5..00000000000
--- a/TAO/tao/Acceptor_Registry.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-// $Id$
-
-#include "tao/Acceptor_Registry.h"
-#include "tao/Profile.h"
-#include "tao/Transport_Acceptor.h"
-#include "tao/Protocol_Factory.h"
-#include "tao/Environment.h"
-#include "tao/ORB_Core.h"
-#include "tao/params.h"
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-#include "tao/Acceptor_Filter.h"
-#include "tao/Endpoint.h"
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Acceptor_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Acceptor_Registry,
-           "$Id$")
-
-
-TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
-  : acceptors_ (0),
-    size_ (0)
-{
-}
-
-TAO_Acceptor_Registry::~TAO_Acceptor_Registry (void)
-{
-  this->close_all ();
-
-  delete [] this->acceptors_;
-}
-
-size_t
-TAO_Acceptor_Registry::endpoint_count (void)
-{
-  int count = 0;
-  const TAO_AcceptorSetIterator end = this->end ();
-
-  for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
-    {
-      count += (*i)->endpoint_count ();
-    }
-
-  return count;
-}
-
-int
-TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
-{
-  const TAO_AcceptorSetIterator end = this->end ();
-
-  const CORBA::ULong count = mprofile.profile_count ();
-
-  // If at least one endpoint in one of the profiles matches one of
-  // the acceptors, we are collocated.
-  for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
-    {
-      for (TAO_PHandle j = 0; j != count; ++j)
-        {
-          const TAO_Profile *profile = mprofile.get_profile (j);
-
-          // @@ We need to invoke a nonconst <endpoint> method on
-          //    <profile>.  The content of profile/endpoint will not
-          //    be modified.
-          TAO_Profile *pf = const_cast<TAO_Profile *> (profile);
-
-          // Check all endpoints for address equality.
-          if ((*i)->tag () == pf->tag ())
-            {
-              // @note This can be a potentially expensive (O(n^2))
-              //       operation if the below is_collocated() call
-              //       also executes a loop.
-              for (TAO_Endpoint *endp = pf->endpoint ();
-                   endp != 0;
-                   endp = endp->next ())
-                {
-                  if ((*i)->is_collocated (endp))
-                    {
-                      return 1;
-                    }
-                }
-            }
-        }
-    }
-
-  return 0;
-}
-
-TAO_Acceptor*
-TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
-{
-  TAO_AcceptorSetIterator end = this->end ();
-  TAO_AcceptorSetIterator acceptor = this->begin ();
-
-  for (; acceptor != end; ++acceptor)
-    {
-      if ((*acceptor)->tag () == tag)
-        {
-          return *acceptor;
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
-                             ACE_Reactor *reactor,
-                             const TAO_EndpointSet &endpoint_set,
-                             bool ignore_address
-                             ACE_ENV_ARG_DECL)
-{
-  if (endpoint_set.is_empty ()
-      // No endpoints were specified, we let each protocol pick its
-      // own default.
-
-      // All TAO pluggable protocols are expected to have the ability
-      // to create a default endpoint.
-      && this->open_default (orb_core, reactor, 0) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  // Count the maximum number of endpoints in the set.  This will be
-  // the maximum number of acceptors that need to be created.
-  size_t acceptor_count = 0;
-  TAO_EndpointSetIterator endpts (endpoint_set);
-
-  for (ACE_CString *ep = 0;
-       endpts.next (ep) != 0;
-       endpts.advance ())
-    {
-      const ACE_CString &iop = (*ep);
-
-      // IOP://address1,address2
-      //    ^ slot
-      const int slot = iop.find ("://", 0);
-
-      if (slot == iop.npos)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) Invalid endpoint ")
-                          ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
-        }
-
-      ++acceptor_count;  // We've got at least one acceptor so far.
-
-      // Now count the number of commas.  That number will be the
-      // remaining number of endpoints in the current endpoint
-      // specification.
-      const char *ep_end =
-        ep->c_str () + ACE_OS::strlen (ep->c_str ());
-
-      for (const char *e = ACE_OS::strchr (ep->c_str (), ',');
-           e != 0 && e != ep_end;
-           e = ACE_OS::strchr (e, ','))
-        {
-          ++acceptor_count;
-          ++e;
-        }
-    }
-
-  // The array containing the TAO_Acceptors will never contain more
-  // than the number of endpoints stored in TAO_ORB_Parameters.
-  if (this->acceptors_ == 0)
-    {
-      ACE_NEW_THROW_EX (this->acceptors_,
-                        TAO_Acceptor *[acceptor_count],
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (-1);
-    }
-
-  TAO_EndpointSetIterator endpoints (endpoint_set);
-
-  for (ACE_CString *endpoint = 0;
-       endpoints.next (endpoint) != 0;
-       endpoints.advance ())
-    {
-      const ACE_CString &iop = (*endpoint);
-
-      // IOP://address1,address2
-      //    ^ slot
-      const int slot = iop.find ("://", 0);
-
-      if (slot == iop.npos)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) Invalid endpoint ")
-                          ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
-        }
-
-      const ACE_CString prefix (iop.substring (0, slot));
-
-      // @@ We could move the protocol factory loop to the outermost
-      //    level but for now we leave it inside the endpoint loop
-      //    under the assumption that there will be more endpoints
-      //    than protocols.
-
-      // Now get the list of available protocol factories.
-      const TAO_ProtocolFactorySetItor end =
-        orb_core->protocol_factories ()->end ();
-
-      bool found = false;
-      // If usable protocol (factory) is found then this will be
-      // set equal to true.
-
-      for (TAO_ProtocolFactorySetItor factory =
-             orb_core->protocol_factories ()->begin ();
-           factory != end;
-           ++factory)
-        {
-          if ((*factory)->factory ()->match_prefix (prefix))
-            {
-              // increment slot past the "://" (i.e. add 3)
-              ACE_CString addrs = iop.substring (slot + 3);
-
-              const int result = this->open_i (orb_core,
-                                               reactor,
-                                               addrs,
-                                               factory,
-                                               ignore_address
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
-
-              if (result != 0)
-                {
-                  return -1;
-                }
-
-              found = true;  // A usable protocol was found.
-            }
-          else
-            {
-              continue;
-            }
-        }
-
-      if (found == false)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) ")
-                      ACE_TEXT ("no usable transport protocol ")
-                      ACE_TEXT ("was found.\n")));
-
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO),
-            -1);
-        }
-    }
-
-  return 0;
-}
-
-// Iterate through the loaded transport protocols and create a default
-// server for each protocol.
-int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
-                                         ACE_Reactor *reactor,
-                                         const char *options)
-{
-  TAO_ProtocolFactorySet *pfs = orb_core->protocol_factories ();
-
-  // If the TAO_Acceptor array is zero by the time we get here then no
-  // endpoints were specified by the user, meaning that the number of
-  // acceptors will never be more than the number of loaded protocols
-  // in the ORB core.
-  if (this->acceptors_ == 0)
-    {
-      ACE_NEW_RETURN (this->acceptors_,
-                      TAO_Acceptor *[pfs->size ()],
-                      -1);
-    }
-
-  const TAO_ProtocolFactorySetItor end = pfs->end ();
-
-  // Flag that indicates at least one endpoint was opened.  If one
-  // wasn't opened then there is a problem.
-  bool opened_endpoint = false;
-
-  // Loop through all the loaded protocols...
-  for (TAO_ProtocolFactorySetItor i = pfs->begin (); i != end; ++i)
-    {
-      // If the protocol requires an explicit -ORBEndpoint option then
-      // don't use it, otherwise open a default endpoint for that
-      // protocol, this solves the problem with persistent endpoints
-      // (such as UNIX domain rendesvouz points) that are not cleaned
-      // up if the server crashes.
-      if (!(*i)->factory ()->requires_explicit_endpoint ())
-        {
-          if (this->open_default (orb_core,
-                                  reactor,
-                                  TAO_DEF_GIOP_MAJOR,  // default major
-                                  TAO_DEF_GIOP_MINOR,  // default minor
-                                  i,
-                                  options) != 0)
-            {
-              return -1;
-            }
-
-          opened_endpoint = true;
-        }
-    }
-
-  if (!opened_endpoint)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) No default endpoints ")
-                      ACE_TEXT ("opened.\n")
-                      ACE_TEXT ("Please specify one or more using ")
-                      ACE_TEXT ("the \"-ORBListenEndpoints\" ")
-                      ACE_TEXT ("option.\n")));
-        }
-
-      return -1;
-    }
-
-  return 0;
-}
-
-// Used when no endpoints were specified.  Open a default server for
-// the indicated protocol.
-int
-TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
-                                     ACE_Reactor *reactor,
-                                     int major,
-                                     int minor,
-                                     TAO_ProtocolFactorySetItor &factory,
-                                     const char *options)
-{
-  // No endpoints were specified, we let each protocol pick its own
-  // default endpoint.
-
-  // Make an acceptor
-  TAO_Acceptor *acceptor =
-    (*factory)->factory ()->make_acceptor ();
-
-  if (acceptor == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((
-              LM_ERROR,
-              ACE_TEXT ("TAO (%P|%t) unable to create ")
-              ACE_TEXT ("an acceptor for <%s>\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ())
-            ));
-        }
-
-      return -1;
-    }
-
-  // Initialize the acceptor to listen on a default endpoint.
-  if (acceptor->open_default (orb_core,
-                              reactor,
-                              major,
-                              minor,
-                              options) == -1)
-    {
-      delete acceptor;
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((
-              LM_ERROR,
-              ACE_TEXT ("TAO (%P|%t) unable to open ")
-              ACE_TEXT ("default acceptor for <%s>%p\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()),
-              ACE_TEXT ("")
-            ));
-        }
-
-      return -1;
-    }
-
-  this->acceptors_[this->size_++] = acceptor;
-
-  return 0;
-}
-
-int
-TAO_Acceptor_Registry::close_all (void)
-{
-  const TAO_AcceptorSetIterator end = this->end ();
-
-  for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
-    {
-      if (*i == 0)
-        {
-          continue;
-        }
-
-      (*i)->close ();
-
-      delete *i;
-    }
-
-  this->size_ = 0;
-  return 0;
-}
-
-void
-TAO_Acceptor_Registry::extract_endpoint_options (ACE_CString &addrs,
-                                                 ACE_CString &options,
-                                                 TAO_Protocol_Factory *factory)
-{
-  const int options_index =
-    addrs.find (factory->options_delimiter ());
-
-  if (options_index == static_cast<int> (addrs.length () - 1))
-    {
-      // Get rid of trailing option delimiter.
-      addrs = addrs.substring (0, addrs.length () - 1);
-    }
-  else if (options_index != ACE_CString::npos)
-    {
-      options = addrs.substring (options_index + 1);
-      addrs = addrs.substring (0, options_index);
-    }
-}
-
-void
-TAO_Acceptor_Registry::extract_endpoint_version (ACE_CString &address,
-                                                 int &major,
-                                                 int &minor)
-{
-  // Check if an "N.n@" version prefix was
-  // specified.
-  major = TAO_DEF_GIOP_MAJOR;
-  minor = TAO_DEF_GIOP_MINOR;
-
-  if (isdigit (address[0])
-      && address[1] == '.'
-      && isdigit (address[2])
-      && address[3] == '@')
-    {
-      major = address[0] - '0';
-      minor = address[2] - '0';
-      address = address.substring (4);
-    }
-}
-
-int
-TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
-                               ACE_Reactor *reactor,
-                               ACE_CString &addrs,
-                               TAO_ProtocolFactorySetItor &factory,
-                               bool ignore_address
-                               ACE_ENV_ARG_DECL)
-{
-  ACE_CString options_tmp;
-  this->extract_endpoint_options (addrs,
-                                  options_tmp,
-                                  (*factory)->factory ());
-
-  const char *options = 0;
-
-  if (options_tmp.length () > 0)
-    options = options_tmp.c_str ();
-
-  char *last_addr = 0;
-  ACE_Auto_Basic_Array_Ptr<char> addr_str (addrs.rep ());
-
-  const char *astr = ACE_OS::strtok_r (addr_str.get (),
-                                       ",",
-                                       &last_addr);
-
-  // Iterate over the addrs specified in the endpoint.
-
-  do
-    {
-      // For the first time only through the loop, it is
-      // possible for astr to be 0.  This indicates that
-      // the user is requesting the default endpoint for
-      // the specified protocol.
-      ACE_CString address (astr == 0 ? "" : astr);
-
-      TAO_Acceptor *acceptor =
-        (*factory)->factory ()->make_acceptor ();
-
-      if (acceptor != 0)
-        {
-          // Extract the desired endpoint/protocol version if one
-          // exists.
-          int major = TAO_DEF_GIOP_MAJOR;
-          int minor = TAO_DEF_GIOP_MINOR;
-          this->extract_endpoint_version (address,
-                                          major,
-                                          minor);
-
-          // Check for existence of endpoint.
-          if (ignore_address || address.length () == 0)
-            {
-              // Protocol prefix was specified without any endpoints.
-              // All TAO pluggable protocols are expected to have the
-              // ability to create a default endpoint.
-              if (this->open_default (orb_core,
-                                      reactor,
-                                      major,
-                                      minor,
-                                      factory,
-                                      options) == 0)
-                continue;
-
-              // Could not open a default endpoint, nor an explicit
-              // one.
-              else
-                {
-                  ACE_THROW_RETURN (CORBA::INTERNAL (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                        0),
-                      CORBA::COMPLETED_NO),
-                    -1);
-                }
-            }
-          // An explicit endpoint was provided.
-          else if (acceptor->open (orb_core,
-                                   reactor,
-                                   major,
-                                   minor,
-                                   address.c_str (),
-                                   options) == -1)
-            {
-              /* Need to save the errno value from the acceptor->open(),
-               * because errno will get reset when we delete acceptor */
-              const int errno_value = errno;
-              delete acceptor;
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) ")
-                              ACE_TEXT ("unable to open acceptor ")
-                              ACE_TEXT ("for <%s>%p\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()),
-                              ACE_TEXT ("")));
-                }
-
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                  CORBA::SystemException::_tao_minor_code (
-                    TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                    errno_value),
-                  CORBA::COMPLETED_NO),
-                -1);
-            }
-
-          // add acceptor to list
-          this->acceptors_[this->size_++] = acceptor;
-        }
-      else
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) unable to create ")
-                          ACE_TEXT ("an acceptor for <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (address.c_str ())));
-            }
-
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                ENOMEM),
-              CORBA::COMPLETED_NO),
-            -1);
-        }
-    }
-  while (astr != 0 && (astr = ACE_OS::strtok_r (0, ",", &last_addr)) != 0);
-
-  return 0;
-}
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
deleted file mode 100644
index 3ee4358174b..00000000000
--- a/TAO/tao/Acceptor_Registry.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Acceptor_Registry.h
- *
- *  $Id$
- *
- *  Interface for the TAO pluggable protocol framework.
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ACCEPTOR_REGISTRY_H
-#define TAO_ACCEPTOR_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Unbounded_Set.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Exception.h"
-#include "tao/params.h"
-
-// Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-class TAO_ORB_Core;
-class TAO_Acceptor;
-class TAO_Acceptor_Filter;
-class TAO_Stub;
-class TAO_Profile;
-class TAO_MProfile;
-class TAO_Protocol_Factory;
-class TAO_Protocol_Item;
-
-typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item *>
-        TAO_ProtocolFactorySetItor;
-
-typedef TAO_Acceptor** TAO_AcceptorSetIterator;
-
-/**
- * @class TAO_Acceptor_Registry
- *
- * @brief Acceptor Registry and Generic Acceptor interface definitions.
- * All loaded ESIOP or GIOP acceptor bridges must register with
- * this object.
- *
- * This class maintains a list os acceptor factories
- * for all loaded ORB protocols.
- * There is one Acceptor_Registry per ORB_Core.
- */
-class TAO_Export TAO_Acceptor_Registry
-{
-public:
-  // = Initialization and termination methods.
-  ///  Default constructor.
-  TAO_Acceptor_Registry (void);
-
-  ///  Default destructor.
-  ~TAO_Acceptor_Registry (void);
-
-  /// Initialize all registered acceptors.  Return -1 on error.
-  int open (TAO_ORB_Core *orb_core,
-            ACE_Reactor *reactor,
-            const TAO_EndpointSet &endpoint_set,
-            bool ignore_address
-            ACE_ENV_ARG_DECL);
-
-  /// Close all open acceptors.
-  int close_all (void);
-
-  /// Returns the total number of endpoints in all of its acceptors.
-  size_t endpoint_count (void);
-
-  /// Check if there is at least one profile in <mprofile> that
-  /// corresponds to a collocated object.
-  int is_collocated (const TAO_MProfile& mprofile);
-
-  /// Return the acceptor bridges
-  TAO_Acceptor *get_acceptor (CORBA::ULong tag);
-
-  // = Iterator.
-  TAO_AcceptorSetIterator begin (void);
-  TAO_AcceptorSetIterator end (void);
-
-private:
-
-  /// Create a default acceptor for all loaded protocols.
-  int open_default (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    const char *options);
-
-  /// Create a default acceptor using the specified protocol factory.
-  int open_default (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int major,
-                    int minor,
-                    TAO_ProtocolFactorySetItor &factory,
-                    const char *options);
-
-  /// Extract endpoint-specific options from the endpoint string.
-  void extract_endpoint_options (ACE_CString &addrs,
-                                 ACE_CString &options,
-                                 TAO_Protocol_Factory *factory);
-
-  /// Extract endpoint/address specific version from the endpoint
-  /// string.
-  void extract_endpoint_version (ACE_CString &address,
-                                 int &major,
-                                 int &minor);
-
-  /// Iterator through addrs in the string <iop>, and create an
-  /// acceptor for each one.
-  int open_i (TAO_ORB_Core *orb_core,
-              ACE_Reactor *reactor,
-              ACE_CString &address,
-              TAO_ProtocolFactorySetItor &factory,
-              bool ignore_address
-              ACE_ENV_ARG_DECL);
-
-private:
-  // The acceptor registry should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Acceptor_Registry&))
-
-private:
-  /// List of acceptors that are currently open.
-  TAO_Acceptor **acceptors_;
-
-  /// Number of acceptors that are currently open.
-  size_t size_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/Acceptor_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ACCEPTOR_REGISTRY_H */
diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i
deleted file mode 100644
index 4a98e902fc1..00000000000
--- a/TAO/tao/Acceptor_Registry.i
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE TAO_AcceptorSetIterator
-TAO_Acceptor_Registry::begin (void)
-{
-  return this->acceptors_;
-}
-
-ACE_INLINE TAO_AcceptorSetIterator
-TAO_Acceptor_Registry::end (void)
-{
-  return this->acceptors_ + this->size_;
-}
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
deleted file mode 100644
index f7eabbc56c0..00000000000
--- a/TAO/tao/Adapter.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "Adapter.h"
-
-ACE_RCSID (tao,
-           Adapter,
-           "$Id$")
-
-TAO_Adapter::~TAO_Adapter (void)
-{
-}
-
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
deleted file mode 100644
index 5740575de0c..00000000000
--- a/TAO/tao/Adapter.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Adapter.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-#ifndef TAO_ADAPTER_H
-#define TAO_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/SystemException.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-namespace TAO
-{
-  class ObjectKey;
-}
-
-class TAO_ORB_Core;
-class TAO_Stub;
-class TAO_MProfile;
-class TAO_ServerRequest;
-
-class TAO_Export TAO_Adapter
-{
-public:
-  virtual ~TAO_Adapter (void);
-
-  /// Initialize the Adapter
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// The ORB is shutting down, destroy any resources attached to this
-  /// adapter.
-  virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL) = 0;
-
-  /// Check if the adapter can be closed in the current context, raise
-  /// an exception if not.
-  virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL) = 0;
-
-  /**
-   * Return the priority assigned to this adapter.
-   * Adapters at higher priority are used first, the first adapter
-   * that matches a key is used to dispatch a request.
-   */
-  virtual int priority (void) const = 0;
-
-  /// Return the status....
-  virtual int dispatch (TAO::ObjectKey &key,
-                        TAO_ServerRequest &request,
-                        CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL) = 0;
-
-  enum {
-    /// The operation was successfully dispatched, an exception may
-    /// have been raised, but that is a correct execution too.
-    DS_OK,
-
-    /// There was a problem in dispatching the operation.
-    DS_FAILED,
-
-    /// The key is not in the right format for this Adapter, try the
-    /// next one.
-    DS_MISMATCHED_KEY,
-
-    /// Forward the request to another object reference, this decouples
-    /// the ORB from the PortableServer::ForwardRequest exception
-    DS_FORWARD
-  };
-
-  /// Return the name, i.e. the object id used to resolve it in the
-  /// ORB.
-  virtual const char *name (void) const = 0;
-
-  /**
-   * Return the root of the Object Adapter.
-   * Each adapter defines its own IDL interface accessed through the
-   * method above.
-   */
-  virtual CORBA::Object_ptr root (void) = 0;
-
-  /// Create a collocated object using the given profile and stub.
-  virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
-                                                      const TAO_MProfile &) = 0;
-  /// Initialize a collocated object using the given stub and object
-  /// pointer for lazily evaluated object references.
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ADAPTER_H */
diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp
deleted file mode 100644
index f28a7604336..00000000000
--- a/TAO/tao/Adapter_Factory.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "Adapter_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-// ****************************************************************
-
-TAO_Adapter_Factory::~TAO_Adapter_Factory (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Adapter_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Adapter_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h
deleted file mode 100644
index fc4d8d13b82..00000000000
--- a/TAO/tao/Adapter_Factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-#ifndef TAO_ADAPTER_FACTORY_H
-#define TAO_ADAPTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Adapter;
-class TAO_ORB_Core;
-
-class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object
-{
-public:
-  /// Destructor
-  virtual ~TAO_Adapter_Factory (void);
-
-  /// Create a new adapter
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
deleted file mode 100644
index 0f154f49f01..00000000000
--- a/TAO/tao/Adapter_Registry.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-// $Id$
-
-#include "Object.h"
-#include "Adapter_Registry.h"
-#include "Adapter.h"
-#include "SystemException.h"
-#include "debug.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Adapter_Registry,
-           "$Id$")
-
-TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
-  : orb_core_ (oc),
-    adapters_capacity_ (16), // @@ Make it configurable
-    adapters_count_ (0),
-    adapters_ (0)
-{
-  ACE_NEW (this->adapters_,
-           TAO_Adapter*[this->adapters_capacity_]);
-}
-
-TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    delete this->adapters_[i];
-
-  delete[] this->adapters_;
-}
-
-void
-TAO_Adapter_Registry::close (int wait_for_completion
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  ACE_TRY
-    {
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        {
-          this->adapters_[i]->close (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 3)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO_Adapter_Registry::close () \n");
-        }
-      return;
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-
-void
-TAO_Adapter_Registry::check_close (int wait_for_completion
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  ACE_TRY
-    {
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        {
-          this->adapters_[i]->check_close (wait_for_completion
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) Exception in TAO_Adapter_Registry::check_close () \n")));
-        }
-      return;
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-void
-TAO_Adapter_Registry::insert (TAO_Adapter *adapter
-                              ACE_ENV_ARG_DECL)
-{
-  if (this->adapters_capacity_ == this->adapters_count_)
-    {
-      this->adapters_capacity_ *= 2;
-      TAO_Adapter **tmp;
-      ACE_NEW_THROW_EX (tmp,
-                        TAO_Adapter*[this->adapters_capacity_],
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      for (size_t i = 0; i != this->adapters_count_; ++i)
-        tmp[i] = this->adapters_[i];
-      delete[] this->adapters_;
-      this->adapters_ = tmp;
-    }
-
-  int priority = adapter->priority ();
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      if (this->adapters_[i]->priority () >= priority)
-        {
-          for (size_t j = this->adapters_count_ + 1;
-               j > i;
-               --j)
-            {
-              this->adapters_[j] = this->adapters_[j - 1];
-            }
-          this->adapters_[i] = adapter;
-          this->adapters_count_++;
-          return;
-        }
-    }
-  this->adapters_[this->adapters_count_++] = adapter;
-}
-
-void
-TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
-                                TAO_ServerRequest &request,
-                                CORBA::Object_out forward_to
-                                ACE_ENV_ARG_DECL)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      int r = this->adapters_[i]->dispatch (key,
-                                            request,
-                                            forward_to
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (r != TAO_Adapter::DS_MISMATCHED_KEY)
-        {
-          return;
-        }
-    }
-
-  if (CORBA::is_nil (forward_to))
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-}
-
-CORBA::Object_ptr
-TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
-                                                const TAO_MProfile &mprofile)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      CORBA::Object_ptr x =
-        this->adapters_[i]->create_collocated_object (stub,
-                                                      mprofile);
-      if (x != 0)
-        return x;
-    }
-  return 0;
-}
-
-CORBA::Long
-TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub,
-                                                    CORBA::Object_ptr obj)
-{
-  for (size_t i = 0; i != this->adapters_count_; ++i)
-    {
-      int retval =
-        this->adapters_[i]->initialize_collocated_object (stub,
-                                                          obj);
-      if (retval != 0)
-        return retval;
-    }
-  return 0;
-}
-
-TAO_Adapter *
-TAO_Adapter_Registry::find_adapter (const char *name) const
-{
-  for (TAO_Adapter **i = this->adapters_;
-       i != this->adapters_ + this->adapters_count_;
-       ++i)
-    if (ACE_OS::strcmp ((*i)->name (), name) == 0)
-      return *i;
-
-  return 0;
-
-}
-
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
deleted file mode 100644
index e184f1a81ca..00000000000
--- a/TAO/tao/Adapter_Registry.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Adapter_Registry.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-#ifndef TAO_ADAPTER_REGISTRY_H
-#define TAO_ADAPTER_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-namespace TAO
-{
-  class ObjectKey;
-}
-
-class TAO_ORB_Core;
-class TAO_Stub;
-class TAO_MProfile;
-class TAO_ServerRequest;
-class TAO_Adapter;
-
-class TAO_Export TAO_Adapter_Registry
-{
-public:
-  TAO_Adapter_Registry (TAO_ORB_Core *orb_core);
-
-  /// Close the
-  ~TAO_Adapter_Registry (void);
-
-  /**
-   * Close each of of the Adapters and then cleanup the Registry.
-   * It is possible that an Adapter will reject a close() call if it
-   * is invoked in an innapropriate context (think shutting down the
-   * POA while performing an upcall).
-   */
-  void close (int wait_for_completion
-              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /**
-   * Verify if the close() call can be invoked in the current
-   * context for *all* adapters.
-   * Raise the right exception if not.
-   */
-  void check_close (int wait_for_completion
-                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /// Insert a new adapter into the registry.
-  void insert (TAO_Adapter *adapter
-               ACE_ENV_ARG_DECL);
-
-  /**
-   * Dispatch the request to all the adapters.
-   * It tries the adapters ordered by priority, stopping when the
-   * adapter returns a status different from DS_MISMATCHED_KEY
-   */
-  void dispatch (TAO::ObjectKey &key,
-                 TAO_ServerRequest &request,
-                 CORBA::Object_out forward_to
-                 ACE_ENV_ARG_DECL);
-
-  /// Create a collocated object using the given profile and stub.
-  CORBA::Object_ptr create_collocated_object (TAO_Stub *,
-                                              const TAO_MProfile &);
-
-  /// Initialize a collocated object using the given stub and object
-  /// pointer for lazily evaluated object references.
-  CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                            CORBA::Object_ptr o);
-
-  /// Fetch the adapter named @a name
-  TAO_Adapter *find_adapter (const char *name) const;
-
-private:
-  /// The ORB Core
-  TAO_ORB_Core *orb_core_;
-
-  /**
-   * @name A simple array of adapters.
-   */
-  //@{
-  size_t adapters_capacity_;
-  size_t adapters_count_;
-  TAO_Adapter **adapters_;
-  //@}
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ADAPTER_REGISTRY_H */
diff --git a/TAO/tao/Alias_TypeCode.cpp b/TAO/tao/Alias_TypeCode.cpp
deleted file mode 100644
index 1968f944047..00000000000
--- a/TAO/tao/Alias_TypeCode.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-// $Id$
-
-#ifndef TAO_ALIAS_TYPECODE_CPP
-#define TAO_ALIAS_TYPECODE_CPP
-
-#include "tao/Alias_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<StringType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<StringType>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<StringType>::get_typecode (this->content_type_));
-}
-
-#endif  /*  TAO_ALIAS_TYPECODE_CPP */
diff --git a/TAO/tao/Alias_TypeCode.h b/TAO/tao/Alias_TypeCode.h
deleted file mode 100644
index db2a74f3827..00000000000
--- a/TAO/tao/Alias_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_H
-#define TAO_ALIAS_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy>
-    class Alias
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType tc);
-#else
-             TypeCodeType const & tc);
-#endif
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<StringType> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      TypeCodeType const content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Alias_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Alias_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_H */
diff --git a/TAO/tao/Alias_TypeCode.inl b/TAO/tao/Alias_TypeCode.inl
deleted file mode 100644
index fb692130538..00000000000
--- a/TAO/tao/Alias_TypeCode.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType tc)
-#else
-  TypeCodeType const & tc)
-#endif
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.cpp b/TAO/tao/Alias_TypeCode_Static.cpp
deleted file mode 100644
index 1c6e43bbe5f..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-#include "tao/Alias_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Alias_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<char const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<char const *>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<char const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.h b/TAO/tao/Alias_TypeCode_Static.h
deleted file mode 100644
index 8f933096297..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_STATIC_H
-#define TAO_ALIAS_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy> class Alias;
-
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template<>
-    class TAO_Export Alias<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * tc);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<char const *> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      CORBA::TypeCode_ptr const * content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Alias_TypeCode_Static.inl b/TAO/tao/Alias_TypeCode_Static.inl
deleted file mode 100644
index a2665f5e461..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * tc)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h
deleted file mode 100644
index 65d0465d4fe..00000000000
--- a/TAO/tao/Allocator.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Allocator.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen (jwillemsen@remedy.nl)
- */
-//=============================================================================
-
-#ifndef TAO_ALLOCATOR_H
-#define TAO_ALLOCATOR_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class TAO_Allocator
-   *
-   * @brief Abstract class for TAO allocators. This will be used for derived
-   * allocator templates that are capable of allocating a specific type of
-   * objects
-   */
-  template <typename handler_type>
-  class TAO_Allocator
-  {
-  public:
-
-    virtual ~TAO_Allocator (void) {}
-
-    virtual handler_type *allocate () = 0;
-    virtual void release (handler_type *ptr) = 0;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ALLOCATOR_H */
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
deleted file mode 100644
index f2b95db1eb7..00000000000
--- a/TAO/tao/Any.cpp
+++ /dev/null
@@ -1,887 +0,0 @@
-// $Id$
-
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_Memory.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-    || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "Var_Size_Argument_T.h"
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any,
-           "$Id$")
-
-using namespace TAO;
-
-CORBA::Any::Any (void)
-  : impl_ (0)
-{
-}
-
-CORBA::Any::Any (const CORBA::Any &rhs)
-  : impl_ (rhs.impl_)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_add_ref ();
-    }
-}
-
-CORBA::Any::~Any (void)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-}
-
-CORBA::Any &
-CORBA::Any::operator= (const CORBA::Any &rhs)
-{
-  if (this->impl_ != rhs.impl_)
-    {
-      if (this->impl_ != 0)
-        {
-          this->impl_->_remove_ref ();
-        }
-
-      this->impl_ = rhs.impl_;
-
-      if (this->impl_ != 0)
-        {
-          this->impl_->_add_ref ();
-        }
-    }
-
-  return *this;
-}
-
-void
-CORBA::Any::replace (TAO::Any_Impl *new_impl)
-{
-  ACE_ASSERT (new_impl != 0);
-
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-
-  this->impl_ = new_impl;
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->type ();
-    }
-
-  return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::_tao_get_typecode (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_get_typecode ();
-    }
-
-  return CORBA::_tc_null;
-}
-
-void
-CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
-{
-  if (this->impl_ == 0)
-    {
-      ACE_NEW (this->impl_,
-               TAO::Unknown_IDL_Type (tc));
-    }
-  else
-    {
-      this->impl_->type (tc);
-    }
-}
-
-int
-CORBA::Any::_tao_byte_order (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_byte_order ();
-    }
-
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-CORBA::Any::type (CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean equiv = 0;
-
-  if (this->impl_ != 0)
-    {
-      equiv =
-        this->impl_->_tao_get_typecode ()->equivalent (tc
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (equiv)
-    {
-      this->impl_->type (tc);
-    }
-  else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
-    }
-}
-
-void
-CORBA::Any::_tao_any_destructor (void *x)
-{
-  CORBA::Any *tmp = static_cast<CORBA::Any *> (x);
-  delete tmp;
-}
-
-// Deprecated by the OMG.
-const void *
-CORBA::Any::value (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->value ();
-    }
-
-  return 0;
-}
-
-CORBA::Any::to_object::to_object (CORBA::Object_out obj)
-  : ref_ (obj.ptr ())
-{
-}
-
-CORBA::Any::to_abstract_base::to_abstract_base (CORBA::AbstractBase_ptr &obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Any::to_value::to_value (CORBA::ValueBase *& obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_object (_tao_elem);
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_value (_tao_elem);
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_abstract_base (
-    CORBA::AbstractBase_ptr &_tao_elem
-  ) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_abstract_base (_tao_elem);
-}
-
-// ****************************************************************
-
-CORBA::Any_var::Any_var (const CORBA::Any_var &r)
-  : ptr_ (0)
-{
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW (this->ptr_,
-               CORBA::Any (*r.ptr_));
-    }
-}
-
-CORBA::Any_var &
-CORBA::Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
-    {
-      delete this->ptr_;
-      this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-CORBA::Any_var &
-CORBA::Any_var::operator= (const CORBA::Any_var &r)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW_RETURN (this->ptr_,
-                      CORBA::Any (*r.ptr_),
-                      *this);
-    }
-
-  return *this;
-}
-
-// ***********************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &cdr, const CORBA::Any &any)
-{
-  TAO::Any_Impl *impl = any.impl ();
-
-  if (impl != 0)
-    {
-      return impl->marshal (cdr);
-    }
-
-  return (cdr << CORBA::_tc_null);
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
-{
-  CORBA::TypeCode_var tc;
-
-  if ((cdr >> tc.out ()) == 0)
-    {
-      return 0;
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      TAO::Unknown_IDL_Type *impl = 0;
-      ACE_NEW_RETURN (impl,
-                      TAO::Unknown_IDL_Type (tc.in ()),
-                      0);
-
-      any.replace (impl);
-      impl->_tao_decode (cdr
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-// =======================================================================
-
-// Insertion of the special basic types.
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_boolean b)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_boolean,
-                               &b.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_octet o)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_octet,
-                               &o.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_char c)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_char,
-                               &c.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_wchar,
-                               &wc.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_string s)
-{
-  if (s.bound_ > 0 && s.val_ != 0 && ACE_OS::strlen (s.val_) > s.bound_)
-    {
-      return;
-    }
-
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (*this,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               s.nocopy_ ? s.val_ : CORBA::string_dup (s.val_),
-               s.bound_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
-{
-  if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_)
-    {
-      return;
-    }
-
-  TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >::insert (*this,
-               TAO::Any_Impl::_tao_any_wstring_destructor,
-               CORBA::_tc_wstring,
-               ws.nocopy_ ? ws.val_ : CORBA::wstring_dup (ws.val_),
-               ws.bound_);
-}
-
-// Insertion of the other basic types.
-
-void
-operator<<= (CORBA::Any &any, CORBA::Short s)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_short,
-                               &s);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::UShort us)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ushort,
-                               &us);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Long l)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_long,
-                               &l);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULong ul)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulong,
-                               &ul);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongLong ll)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longlong,
-                               &ll);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULongLong ull)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulonglong,
-                               &ull);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Float f)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_float,
-                               &f);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Double d)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_double,
-                               &d);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongDouble ld)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longdouble,
-                               &ld);
-}
-
-// Insertion of Any - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Any &a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert_copy (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-// Insertion of Any - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Any *a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert (any,
-                                            CORBA::Any::_tao_any_destructor,
-                                            CORBA::_tc_any,
-                                            a);
-}
-
-// Insertion of TypeCode - copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr tc)
-{
-  CORBA::TypeCode_ptr dup = CORBA::TypeCode::_duplicate (tc);
-  any <<= &dup;
-}
-
-// Insertion of TypeCode - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr * tc)
-{
-  TAO::Any_Impl_T<CORBA::TypeCode>::insert (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      *tc
-    );
-}
-
-// Insertion of CORBA object - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Object_ptr obj)
-{
-  CORBA::Object_ptr dup = CORBA::Object::_duplicate (obj);
-  any <<= &dup;
-}
-
-// Insertion of CORBA object - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Object_ptr *objptr)
-{
-  TAO::Any_Impl_T<CORBA::Object>::insert (any,
-                                          CORBA::Object::_tao_any_destructor,
-                                          CORBA::_tc_Object,
-                                          *objptr);
-}
-
-// These are copying versions for unbounded (w)strings. They are not inlined,
-// to avoid use in Any.i before definition in ORB.i.
-
-void
-operator<<= (CORBA::Any &any, const char *s)
-{
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               CORBA::string_dup (s),
-               0);
-}
-
-void
-operator<<= (CORBA::Any &any, const CORBA::WChar *ws)
-{
-  TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_wstring_destructor,
-               CORBA::_tc_wstring,
-               CORBA::wstring_dup (ws),
-               0);
-}
-
-// Extraction: these are safe and hence we have to check that the
-// typecode of the Any is equal to the one we are trying to extract
-// into.
-
-// Extraction into the special basic types.
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_boolean b) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_boolean,
-                                       &b.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_octet,
-                                       &o.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_char c) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_char,
-                                       &c.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_wchar,
-                                       &wc.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_string s) const
-{
-  return
-    TAO::Any_Special_Impl_T<
-        char,
-        CORBA::Any::from_string,
-        CORBA::Any::to_string
-      >::extract (*this,
-                  TAO::Any_Impl::_tao_any_string_destructor,
-                  CORBA::_tc_string,
-                  s.val_,
-                  s.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wstring ws) const
-{
-  return
-    TAO::Any_Special_Impl_T<
-        CORBA::WChar,
-        CORBA::Any::from_wstring,
-        CORBA::Any::to_wstring
-      >::extract (*this,
-                  TAO::Any_Impl::_tao_any_wstring_destructor,
-                  CORBA::_tc_wstring,
-                  ws.val_,
-                  ws.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_object obj) const
-{
-  return this->checked_to_object (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_abstract_base obj) const
-{
-  return this->checked_to_abstract_base (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
-{
-  return this->checked_to_value (obj.ref_);
-}
-
-// Extraction into the other basic types.
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Short &s)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_short,
-                                       &s);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::UShort &us)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ushort,
-                                       &us);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Long &l)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_long,
-                                       &l);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ulong,
-                                       &ul);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longlong,
-                                  &ll);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_ulonglong,
-                                  &ull);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Float &f)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_float,
-                                       &f);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Double &d)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_double,
-                                       &d);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longdouble,
-                                  &ld);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Any *&a)
-{
-  return TAO::Any_Dual_Impl_T<CORBA::Any>::extract (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Char *&s)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        char,
-        CORBA::Any::from_string,
-        CORBA::Any::to_string
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_string_destructor,
-                  CORBA::_tc_string,
-                  s,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::WChar *&ws)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        CORBA::WChar,
-        CORBA::Any::from_wstring,
-        CORBA::Any::to_wstring
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_wstring_destructor,
-                  CORBA::_tc_wstring,
-                  ws,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
-{
-  return TAO::Any_Impl_T<CORBA::TypeCode>::extract (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      tc
-    );
-}
-
-// ================================================================
-// Any_Impl_T template specializations.
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Object>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return 1;
-  }
-}
-
-// ================================================================
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >;
-
-template class TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >;
-
-template class TAO::Any_Dual_Impl_T<CORBA::Any>;
-template class TAO::Any_Impl_T<CORBA::TypeCode>;
-
-template class TAO::Any_Impl_T<char>;
-template class TAO::Any_Impl_T<CORBA::WChar>;
-template class TAO::Any_Impl_T<CORBA::Object>;
-
-template class TAO::Arg_Traits<CORBA::Any>;
-template class TAO::Var_Size_Arg_Traits_T<CORBA::Any,
-                                          CORBA::Any_var,
-                                          CORBA::Any_out>;
-
-template class TAO::In_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_Argument_T<CORBA::Any, CORBA::Any_out>;
-template class TAO::Inout_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Ret_Var_Size_Argument_T<CORBA::Any, CORBA::Any_var>;
-
-#if 0
-// Needed in the future..
-template class TAO::SArg_Traits<CORBA::Any>;
-template class TAO::Var_Size_SArg_Traits_T<CORBA::Any,
-                                           CORBA::Any_var,
-                                           CORBA::Any_out>;
-template class TAO::In_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Inout_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-template class TAO::Ret_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-#endif /*if 0*/
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Special_Impl_T< \
-      char, \
-      CORBA::Any::from_string, \
-      CORBA::Any::to_string \
-    >
-
-#pragma instantiate TAO::Any_Special_Impl_T< \
-      CORBA::WChar, \
-      CORBA::Any::from_wstring, \
-      CORBA::Any::to_wstring \
-    >
-
-#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Any>
-#pragma instantiate TAO::Any_Impl_T<CORBA::TypeCode>
-
-#pragma instantiate TAO::Any_Impl_T<char>
-#pragma instantiate TAO::Any_Impl_T<CORBA::WChar>
-#pragma instantiate TAO::Any_Impl_T<CORBA::Object>
-
-#pragma instantiate TAO::Arg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                               CORBA::Any_var, \
-                                               CORBA::Any_out>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                          CORBA::Any_var, \
-                                          CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_out>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_var>
-
-#pragma instantiate TAO::SArg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_SArg_Traits_T<CORBA::Any, \
-                                           CORBA::Any_var, \
-                                           CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-#pragma instantiate TAO::Ret_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any,  \
-                                                 CORBA::Any_out>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                                 CORBA::Any_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
deleted file mode 100644
index 8d4b1fcb181..00000000000
--- a/TAO/tao/Any.h
+++ /dev/null
@@ -1,404 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_H
-#define TAO_ANY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#include "ace/CDR_Stream.h"
-#include "ace/CORBA_macros.h"
-
-namespace TAO
-{
-  class Any_Impl;
-}
-
-namespace CORBA
-{
-  class Any;
-  typedef Any *Any_ptr;
-  class Any_var;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class ValueBase;
-  class Exception;
-
-  /**
-   * @class Any
-   *
-   * @brief Generic container for IDL types.
-   *
-   * This is the top-level class of the Any implementation. It exposes the
-   * spec-required functionality, but is mostly a wrapper for one of the
-   * template classes below.
-   */
-  class TAO_Export Any
-  {
-  public:
-    typedef Any_ptr _ptr_type;
-    typedef Any_var _var_type;
-
-    Any (void);
-    Any (const Any &);
-
-    ~Any (void);
-
-    Any &operator= (const Any &);
-    TAO::Any_Impl *impl (void) const;
-
-    /// Used in our destruction if we ourselves are stored in an Any.
-    static void _tao_any_destructor (void *);
-
-    /// These are needed for insertion and extraction of booleans,
-    /// octets, chars, and bounded strings. CORBA spec requires
-    /// that they be here, we just typedef to the already-defined
-    /// ACE_OutputCDR types.
-
-    typedef ACE_OutputCDR::from_boolean from_boolean;
-    typedef ACE_OutputCDR::from_octet from_octet;
-    typedef ACE_OutputCDR::from_char from_char;
-    typedef ACE_OutputCDR::from_wchar from_wchar;
-    typedef ACE_OutputCDR::from_string from_string;
-    typedef ACE_OutputCDR::from_wstring from_wstring;
-
-    /// Insertion of the special types.
-
-    void operator<<= (from_boolean);
-    void operator<<= (from_char);
-    void operator<<= (from_wchar);
-    void operator<<= (from_octet);
-    void operator<<= (from_string);
-    void operator<<= (from_wstring);
-
-    /// These extract octets, chars, booleans, bounded strings, and
-    /// object references. All these are defined in ACE_InputCDR.
-
-    typedef ACE_InputCDR::to_boolean to_boolean;
-    typedef ACE_InputCDR::to_char to_char;
-    typedef ACE_InputCDR::to_wchar to_wchar;
-    typedef ACE_InputCDR::to_octet to_octet;
-    typedef ACE_InputCDR::to_string to_string;
-    typedef ACE_InputCDR::to_wstring to_wstring;
-
-    /// These are not in ACE.
-
-    struct TAO_Export to_object
-    {
-      // This signature reflects the change set out in
-      // issue 154 of the 1.3 RTF.
-      explicit to_object (Object_out obj);
-      Object_ptr &ref_;
-    };
-
-    struct TAO_Export to_abstract_base
-    {
-      explicit to_abstract_base (AbstractBase_ptr &obj);
-      AbstractBase_ptr &ref_;
-    };
-
-    struct TAO_Export to_value
-    {
-      explicit to_value (ValueBase *&base);
-      ValueBase *&ref_;
-    };
-
-    /// Extraction of the special types.
-
-    Boolean operator>>= (to_boolean) const;
-    Boolean operator>>= (to_octet) const;
-    Boolean operator>>= (to_char) const;
-    Boolean operator>>= (to_wchar) const;
-    Boolean operator>>= (to_string) const;
-    Boolean operator>>= (to_wstring) const;
-    Boolean operator>>= (to_object) const;
-    Boolean operator>>= (to_abstract_base) const;
-    Boolean operator>>= (to_value) const;
-
-    /// TAO-specific signature.
-    void replace (TAO::Any_Impl *);
-
-    /// Return TypeCode of the element stored in the Any.
-    TypeCode_ptr type (void) const;
-
-    /// For use along with <<= of a value of aliased type when the alias must
-    /// be preserved.
-    void type (TypeCode_ptr
-               ACE_ENV_ARG_DECL);
-
-    /// TAO extension, does not return a duplicate.
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-
-    /// TAO extension.
-    void _tao_set_typecode (const CORBA::TypeCode_ptr);
-
-    int _tao_byte_order (void) const;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    const void *value (void) const;
-
-  private:
-    CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const;
-    CORBA::Boolean checked_to_value (CORBA::ValueBase *&) const;
-    CORBA::Boolean checked_to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    // Unimplemented - hides unsigned char insert/extract.
-    void operator<<= (unsigned char);
-    CORBA::Boolean operator>>= (unsigned char&) const;
-
-  private:
-    TAO::Any_Impl *impl_;
-
-    friend class CORBA_NVList;
-    friend class TAO_Marshal_Any;
-  };
-
-  /**
-   * @class CORBA::Any_var
-   *
-   * @brief Provide for automatic storage deallocation on going out of
-   * scope.
-   */
-  class TAO_Export Any_var
-  {
-  public:
-    Any_var (void);
-    Any_var (Any *a);
-    Any_var (const Any_var &);
-    ~Any_var (void);
-
-    Any_var &operator= (Any *);
-
-    /**
-     * Assignment from an Any_var
-     * This operation requires memory allocation.
-     * If the allocation fails, *this is returned
-     * unmodified.
-     */
-    Any_var &operator= (const Any_var &);
-
-    /// Arrow operator (smart pointer).
-    Any *operator-> (void);
-
-    /// Cast.
-    operator const Any *() const;
-
-    /// Cast.
-    operator Any *&();
-
-    /// For in Any parameter.
-    const Any &in (void) const;
-
-    /// For inout Any parameter.
-    Any &inout (void);
-
-    /// For out Any parameter.
-    Any *&out (void);
-
-    /// For Any return type.
-    Any *_retn (void);
-
-    /// TAO specific extension
-    Any *ptr (void) const;
-  private:
-    /// Holds the Any.
-    Any *ptr_;
-  };
-
-  /**
-   * @class CORBA::Any_out
-   *
-   * @brief CORBA::Any_out
-   *
-   * The _out class for CORBA::Any. This is used to help in
-   * managing the out parameters.
-   */
-  class TAO_Export Any_out
-  {
-  public:
-    Any_out (Any *&);
-    Any_out (Any_var &);
-    Any_out (const Any_out &);
-
-    /// Assignment from a Any_out.
-    Any_out &operator= (const Any_out &s);
-
-    /// Assignment from a Any.
-    Any_out &operator= (Any *);
-
-    /// Cast.
-    operator Any *&();
-
-    /// Return underlying instance.
-    Any *& ptr (void);
-
-    Any *operator-> (void);
-
-  private:
-    /// Assignment from _var disallowed.
-    void operator= (const Any_var &);
-
-  private:
-    /// Instance.
-    Any *&ptr_;
-  };
-}
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Any &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Any &);
-
-/// Typesafe insertion.
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Short);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::UShort);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Long);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Float);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Double);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDouble);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Any &);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Any *);
-TAO_Export void operator<<= (CORBA::Any &, const char *);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WChar *);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr *);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *);
-
-/// Typesafe extraction.
-
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Short &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::UShort &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Long &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::ULong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::LongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::ULongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Float &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Double &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::LongDouble &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::Any *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::TypeCode_ptr &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::Char *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::WChar *&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#else
-
-/// Copying versions of insertion operators for basic types
-/// must also be defined for CORBA::Any_var.
-
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Short);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::UShort);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Long);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::LongLong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULongLong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Float);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Double);
-TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Any *&);
-TAO_Export void operator<<= (CORBA::Any_var &, const char *);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::TypeCode_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_boolean);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_char);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wchar);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_octet);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_string);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wstring);
-
-/// These are not required by the spec, but will make users
-/// of other ORBs that are used to them more comfortable.
-
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Short &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::UShort &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Long &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::ULong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::LongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::ULongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Float &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Double &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::TypeCode_ptr &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       const char *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       const CORBA::WChar *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_boolean);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_octet);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_char);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wchar);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_string);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wstring);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_object);
-
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
deleted file mode 100644
index 3e700c0bca1..00000000000
--- a/TAO/tao/Any.i
+++ /dev/null
@@ -1,368 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO::Any_Impl *
-CORBA::Any::impl (void) const
-{
-  return this->impl_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_var::Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::Any_var (CORBA::Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::~Any_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator const CORBA::Any *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::Any &
-CORBA::Any_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Any_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::_retn (void)
-{
-  CORBA::Any *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// CORBA::Any_var insertion operators
-// *************************************************************
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Short rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::UShort rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Long rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::LongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Float rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Double rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Any& rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const char* rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::TypeCode_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Object_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_boolean rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_char rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wchar rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_octet rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_string rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wstring rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-// *************************************************************
-// CORBA::Any_var extraction operators
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Short &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::UShort &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Long &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::LongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Float &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Double &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::Any *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::TypeCode_ptr &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const char *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::WChar *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_boolean rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_octet rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_char rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wchar rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_string rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wstring rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (const CORBA::Any_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (const CORBA::Any_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (CORBA::Any *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Any_out::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl
deleted file mode 100644
index fb3a570b657..00000000000
--- a/TAO/tao/AnySeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in AnySeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          AnySeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_ANY_SEQ_IDL
-#define TAO_CORBA_ANY_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<any> AnySeq;
-};
-
-#endif  /* TAO_CORBA_ANY_SEQ_IDL */
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
deleted file mode 100644
index 59bb0eafd60..00000000000
--- a/TAO/tao/AnySeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "AnySeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_AnySeq_GUARD
-#define _TAO_TYPECODE_CORBA_AnySeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AnySeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_any,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AnySeq_0 =
-      &CORBA_AnySeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AnySeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AnySeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AnySeq:1.0",
-    "AnySeq",
-    &TAO::TypeCode::tc_CORBA_AnySeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AnySeq =
-    &_tao_tc_CORBA_AnySeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AnySeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert_copy (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AnySeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AnySeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AnySeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AnySeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AnySeq>::extract (
-        _tao_any,
-        CORBA::AnySeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AnySeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
deleted file mode 100644
index 7dfce1e6ca3..00000000000
--- a/TAO/tao/AnySeqC.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "AnySeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ANYSEQ_CS_)
-#define _CORBA_ANYSEQ_CS_
-
-CORBA::AnySeq::AnySeq (void)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::AnySeq::AnySeq (
-    const AnySeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (seq)
-{}
-
-CORBA::AnySeq::~AnySeq (void)
-{}
-
-void CORBA::AnySeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  AnySeq * _tao_tmp_pointer =
-    static_cast<AnySeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_CPP_
-#define _TAO_CDR_OP_CORBA_AnySeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AnySeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AnySeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h
deleted file mode 100644
index 47c5165c278..00000000000
--- a/TAO/tao/AnySeqC.h
+++ /dev/null
@@ -1,178 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ANYSEQC_H_
-#define _TAO_IDL_ORIG_ANYSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ANYSEQ_CH_)
-#define _CORBA_ANYSEQ_CH_
-  
-  class AnySeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
-      >
-    AnySeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
-      >
-    AnySeq_out;
-  
-  class TAO_Export AnySeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Any
-          >
-  {
-  public:
-    AnySeq (void);
-    AnySeq (CORBA::ULong max);
-    AnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AnySeq (const AnySeq &);
-    ~AnySeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AnySeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::AnySeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::AnySeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AnySeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AnySeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_H_
-#define _TAO_CDR_OP_CORBA_AnySeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AnySeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AnySeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/AnySeqS.h b/TAO/tao/AnySeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/AnySeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Any_Arg_Traits.h b/TAO/tao/Any_Arg_Traits.h
deleted file mode 100644
index 5cbf50e0558..00000000000
--- a/TAO/tao/Any_Arg_Traits.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Arg_Traits.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARG_TRAITS_H
-#define TAO_ANY_ARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Var_Size_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-namespace CORBA
-{
-  class Any;
-  class Any_var;
-  class Any_out;
-}
-
-namespace TAO
-{
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
deleted file mode 100644
index de648b9cd5e..00000000000
--- a/TAO/tao/Any_Array_Impl_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_C
-#define TAO_ANY_ARRAY_IMPL_T_C
-
-#include "tao/Any_Array_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Array_Impl_T,
-           "$Id$")
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T_slice * const val
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
-{
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T_slice * const value)
-{
-  TAO::Any_Array_Impl_T<T_slice, T_forany> *new_impl = 0;
-  typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-  ACE_NEW (new_impl,
-           ARRAY_ANY_IMPL (destructor,
-                           tc,
-                           value));
-  any.replace (new_impl);
-}
-
-template<typename T_slice, typename T_forany>
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   T_slice *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      const CORBA::Boolean _tao_equiv =
-        any_tc->equivalent (tc
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
-            dynamic_cast <TAO::Any_Array_Impl_T <T_slice, T_forany> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_);
-          return 1;
-        }
-
-      TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
-      typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-      ACE_NEW_RETURN (replacement,
-                      ARRAY_ANY_IMPL (destructor,
-                                      any_tc,
-                                      T_forany::tao_alloc ()),
-                      0);
-
-      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = reinterpret_cast <T_slice*> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-  CORBA::release (this->type_);
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_C */
diff --git a/TAO/tao/Any_Array_Impl_T.h b/TAO/tao/Any_Array_Impl_T.h
deleted file mode 100644
index e594b6c2142..00000000000
--- a/TAO/tao/Any_Array_Impl_T.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Array_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_H
-#define TAO_ANY_ARRAY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Array_Impl_T
-   *
-   * @brief Template Any class for array types.
-   *
-   * Used for arrays
-   */
-  template<typename T_slice, typename T_forany>
-  class Any_Array_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Array_Impl_T (_tao_destructor destructor,
-                      CORBA::TypeCode_ptr,
-                      T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T_slice * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T_slice *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T_slice * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Array_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Array_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Array_Impl_T.inl b/TAO/tao/Any_Array_Impl_T.inl
deleted file mode 100644
index 876b658d0ae..00000000000
--- a/TAO/tao/Any_Array_Impl_T.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << T_forany (this->value_));
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::demarshal_value (TAO_InputCDR &cdr)
-{
-  T_forany tmp (this->value_);
-  return (cdr >> tmp);
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-const void *
-TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
-{
-  return this->value_;
-}
diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp
deleted file mode 100644
index 3d333d66b8e..00000000000
--- a/TAO/tao/Any_Basic_Impl.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-// $Id$
-
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Any_Basic_Impl,
-           "$Id$")
-
-namespace TAO
-{
-  Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc,
-                                  void *value)
-    : Any_Impl (0, tc),
-      kind_ (CORBA::tk_null)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    this->kind_ = TAO::unaliased_kind (tc
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    switch (this->kind_)
-    {
-      case CORBA::tk_short:
-        this->u_.s = *static_cast<CORBA::Short *> (value);
-        break;
-      case CORBA::tk_ushort:
-        this->u_.us = *static_cast<CORBA::UShort *> (value);
-        break;
-      case CORBA::tk_long:
-        this->u_.l = *static_cast<CORBA::Long *> (value);
-        break;
-      case CORBA::tk_ulong:
-         this->u_.ul = *static_cast<CORBA::ULong *> (value);
-        break;
-      case CORBA::tk_float:
-        this->u_.f = *static_cast<CORBA::Float *> (value);
-        break;
-      case CORBA::tk_double:
-        this->u_.d = *static_cast<CORBA::Double *> (value);
-        break;
-      case CORBA::tk_boolean:
-        this->u_.b = *static_cast<CORBA::Boolean *> (value);
-        break;
-      case CORBA::tk_char:
-        this->u_.c = *static_cast<CORBA::Char *> (value);
-        break;
-      case CORBA::tk_octet:
-        this->u_.o = *static_cast<CORBA::Octet *> (value);
-        break;
-      case CORBA::tk_longlong:
-        this->u_.ll = *static_cast<CORBA::LongLong *> (value);
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        this->u_.ull = *static_cast<CORBA::ULongLong *> (value);
-  #else
-        this->u_.ull = *static_cast<CORBA::LongLong *> (value);
-  #endif
-        break;
-#endif
-      case CORBA::tk_longdouble:
-        this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
-        break;
-      case CORBA::tk_wchar:
-        this->u_.wc = *static_cast<CORBA::WChar *> (value);
-        break;
-      default:
-        break;
-    }
-  }
-
-  Any_Basic_Impl::~Any_Basic_Impl (void)
-  {
-  }
-
-  void
-  Any_Basic_Impl::insert (CORBA::Any &any,
-                          CORBA::TypeCode_ptr tc,
-                          const void *value)
-  {
-    Any_Basic_Impl *new_impl = 0;
-    ACE_NEW (new_impl,
-             Any_Basic_Impl (tc,
-                             const_cast<void *> (value)));
-    any.replace (new_impl);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::extract (const CORBA::Any &any,
-                           CORBA::TypeCode_ptr tc,
-                           void *_tao_elem)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-        CORBA::Boolean _tao_equiv =
-          any_tc->equivalent (tc
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (_tao_equiv == 0)
-          {
-            return 0;
-          }
-
-        TAO::Any_Impl *impl = any.impl ();
-
-        if (!impl->encoded ())
-          {
-            TAO::Any_Basic_Impl *narrow_impl =
-              dynamic_cast<TAO::Any_Basic_Impl *> (impl);
-
-            if (narrow_impl == 0)
-              {
-                return 0;
-              }
-
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          narrow_impl);
-            return 1;
-          }
-
-        TAO::Any_Basic_Impl *replacement =
-          TAO::Any_Basic_Impl::create_empty (any_tc);
-
-        auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
-
-        // We know this will work since the unencoded case is covered above.
-        TAO::Unknown_IDL_Type *unk =
-          dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-        // Get the kind of the type where we are extracting in ie. the
-        // aliased  type if there are any. Passing the aliased kind
-        // will not help.
-        CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // We don't want the rd_ptr of unk to move, in case it is
-        // shared by another Any. This copies the state, not the buffer.
-        TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-        CORBA::Boolean good_decode =
-          replacement->demarshal_value (for_reading,
-                                        static_cast<CORBA::Long> (tck));
-
-        if (good_decode)
-          {
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          replacement,
-                                          tck);
-            const_cast<CORBA::Any &> (any).replace (replacement);
-            replacement_safety.release ();
-            return 1;
-          }
-
-        // Duplicated by Any_Impl base class constructor.
-        CORBA::release (any_tc);
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr)
-  {
-    CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_);
-
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr << this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr << this->u_.us;
-      case CORBA::tk_long:
-        return cdr << this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr << this->u_.ul;
-      case CORBA::tk_float:
-        return cdr << this->u_.f;
-      case CORBA::tk_double:
-        return cdr << this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr << CORBA::Any::from_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr << CORBA::Any::from_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr << CORBA::Any::from_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr << this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr << this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr << this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr << CORBA::Any::from_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr)
-  {
-    return this->demarshal_value (cdr,
-                                  this->kind_);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr,
-                                   CORBA::Long tck)
-  {
-    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck);
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr >> this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr >> this->u_.us;
-      case CORBA::tk_long:
-        return cdr >> this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr >> this->u_.ul;
-      case CORBA::tk_float:
-        return cdr >> this->u_.f;
-      case CORBA::tk_double:
-        return cdr >> this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr >> CORBA::Any::to_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr >> CORBA::Any::to_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr >> CORBA::Any::to_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr >> this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr >> this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr >> this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr >> CORBA::Any::to_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  void
-  Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr
-                               ACE_ENV_ARG_DECL)
-  {
-    if (! this->demarshal_value (cdr))
-      {
-        ACE_THROW (CORBA::MARSHAL ());
-      }
-  }
-
-  Any_Basic_Impl *
-  Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    TAO::Any_Basic_Impl * retval = 0;
-
-    switch (kind)
-    {
-      case CORBA::tk_longlong:
-        {
-          CORBA::LongLong tmp = ACE_CDR_LONGLONG_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      case CORBA::tk_longdouble:
-        {
-          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      default:
-        {
-          CORBA::ULongLong tmp = 0;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-    }
-
-    return retval;
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest, Any_Basic_Impl *src)
-  {
-    Any_Basic_Impl::assign_value (dest,
-                                  src,
-                                  src->kind_);
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest,
-                                Any_Basic_Impl *src,
-                                CORBA::Long tck)
-  {
-    CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck);
-
-    switch (kind)
-      {
-      case CORBA::tk_short:
-        *static_cast<CORBA::Short *> (dest) = src->u_.s;
-        break;
-      case CORBA::tk_ushort:
-        *static_cast<CORBA::UShort *> (dest) = src->u_.us;
-        break;
-      case CORBA::tk_long:
-        *static_cast<CORBA::Long *> (dest) = src->u_.l;
-        break;
-      case CORBA::tk_ulong:
-        *static_cast<CORBA::ULong *> (dest) = src->u_.ul;
-        break;
-      case CORBA::tk_float:
-        *static_cast<CORBA::Float *> (dest) = src->u_.f;
-        break;
-      case CORBA::tk_double:
-        *static_cast<CORBA::Double *> (dest) = src->u_.d;
-        break;
-      case CORBA::tk_boolean:
-        *static_cast<CORBA::Boolean *> (dest) = src->u_.b;
-        break;
-      case CORBA::tk_char:
-        *static_cast<CORBA::Char *> (dest) = src->u_.c;
-        break;
-      case CORBA::tk_octet:
-        *static_cast<CORBA::Octet *> (dest) = src->u_.o;
-        break;
-      case CORBA::tk_longlong:
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ll;
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull;
-        break;
-  #else
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ull;
-  #endif
-#endif
-      case CORBA::tk_longdouble:
-        *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
-        break;
-      case CORBA::tk_wchar:
-        *static_cast<CORBA::WChar *> (dest) = src->u_.wc;
-        break;
-      default:
-        break;
-      }
-  }
-}
diff --git a/TAO/tao/Any_Basic_Impl.h b/TAO/tao/Any_Basic_Impl.h
deleted file mode 100644
index 600b11ef69a..00000000000
--- a/TAO/tao/Any_Basic_Impl.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_BASIC_IMPL_H
-#define TAO_ANY_BASIC_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Basic_Impl
-   *
-   * @brief Non-template class for all the basic types.
-   *
-   */
-  class TAO_Export Any_Basic_Impl : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl (CORBA::TypeCode_ptr,
-                    void *value);
-
-    virtual ~Any_Basic_Impl (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const void *);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   CORBA::TypeCode_ptr,
-                                   void *);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &,
-                                    CORBA::Long);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    static void assign_value (void *, Any_Basic_Impl *);
-
-    static void assign_value (void *,
-                              Any_Basic_Impl *,
-                              CORBA::Long tck);
-  private:
-    CORBA::Long kind_;
-    union
-    {
-      CORBA::Short s;
-      CORBA::UShort us;
-      CORBA::Long l;
-      CORBA::ULong ul;
-      CORBA::Float f;
-      CORBA::Double d;
-      CORBA::Boolean b;
-      CORBA::Char c;
-      CORBA::Octet o;
-      CORBA::LongLong ll;
-#if !defined (ACE_LACKS_LONGLONG_T) && !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      CORBA::ULongLong ull;
-#elif defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      // Platform has signed long long but not unsigned long long.
-      // Use signed long long as the container.
-      CORBA::LongLong ull;
-#endif
-      CORBA::LongDouble ld;
-      CORBA::WChar wc;
-    }u_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_H */
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
deleted file mode 100644
index 79bb6a1896b..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_BASIC_IMPL_T_C
-#define TAO_ANY_BASIC_IMPL_T_C
-
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Basic_Impl_T,
-           "$Id$")
-
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
-                                            const T & val)
-  : Any_Impl (0,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T & value)
-{
-  Any_Basic_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Basic_Impl_T (tc,
-                             value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
-                                   CORBA::TypeCode_ptr tc,
-                                   T & _tao_elem)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Basic_Impl_T<T> *replacement =
-        TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
-
-      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T> *
-TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
-{
-  TAO::Any_Basic_Impl_T<T> * retval = 0;
-  ACE_NEW_RETURN (retval,
-                  TAO::Any_Basic_Impl_T<T> (tc,
-                                            static_cast<T> (0)),
-                  0);
-  return retval;
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_BASIC_IMPL_T_C */
diff --git a/TAO/tao/Any_Basic_Impl_T.h b/TAO/tao/Any_Basic_Impl_T.h
deleted file mode 100644
index 7c9c3f697c1..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_BASIC_IMPL_T_H
-#define TAO_ANY_BASIC_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Basic_Impl_T
-   *
-   * @brief Template Any class for basic types.
-   *
-   * Used for all basic IDL types except bounded (w)strings.
-   */
-  template<typename T>
-  class Any_Basic_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl_T (CORBA::TypeCode_ptr,
-                      const T & val);
-    virtual ~Any_Basic_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const T &);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   CORBA::TypeCode_ptr,
-                                   T &);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    T value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Basic_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Basic_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Basic_Impl_T.inl b/TAO/tao/Any_Basic_Impl_T.inl
deleted file mode 100644
index 4250b5f4f88..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Basic_Impl_T<T>::value (void) const
-{
-  return &this->value_;
-}
-
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
deleted file mode 100644
index 30bc144035c..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_DUAL_IMPL_T_CPP
-#define TAO_ANY_DUAL_IMPL_T_CPP
-
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Dual_Impl_T,
-           "$Id$")
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T> void
-TAO::Any_Dual_Impl_T<T>::value (const T & val)
-{
-  ACE_NEW (this->value_,
-           T (val));
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          const T & val)
-  : Any_Impl (destructor,
-              tc)
-{
-  this->value (val);
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
-                                 _tao_destructor destructor,
-                                 CORBA::TypeCode_ptr tc,
-                                 T * const value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
-                                      _tao_destructor destructor,
-                                      CORBA::TypeCode_ptr tc,
-                                      const T & value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Dual_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      T *empty_value = 0;
-      ACE_NEW_RETURN (empty_value,
-                      T,
-                      0);
-      TAO::Any_Dual_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Dual_Impl_T<T> (destructor,
-                                               any_tc,
-                                               empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                      ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_DUAL_IMPL_T_CPP */
diff --git a/TAO/tao/Any_Dual_Impl_T.h b/TAO/tao/Any_Dual_Impl_T.h
deleted file mode 100644
index 18cec8ec7b6..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Dual_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_DUAL_IMPL_T_H
-#define TAO_ANY_DUAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Dual_Impl_T
-   *
-   * @brief Template Any class for IDL types with 2 modes of insertion
-   *
-   * Used for the IDL types that have copying and non-copying insertion,
-   * but which are not (de)marshaled as pointers - struct, union, sequence,
-   * and exception.
-   */
-  template<typename T>
-  class Any_Dual_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     T * const);
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     const T &);
-    Any_Dual_Impl_T (CORBA::TypeCode_ptr);
-    virtual ~Any_Dual_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static void insert_copy (CORBA::Any &,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const T &);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    void value (const T &);
-
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Dual_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Dual_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_DUAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Dual_Impl_T.inl b/TAO/tao/Any_Dual_Impl_T.inl
deleted file mode 100644
index bf3ecd90e33..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Dual_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp
deleted file mode 100644
index 90315638c32..00000000000
--- a/TAO/tao/Any_Impl.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-#include "Any_Impl.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-
-#include "ace/Guard_T.h"
-
-
-ACE_RCSID (tao,
-           Any_Impl,
-           "$Id$")
-
-
-TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr tc,
-                         bool encoded)
-  : value_destructor_ (destructor)
-  , type_ (CORBA::TypeCode::_duplicate (tc))
-  , encoded_ (encoded)
-  , mutex_ ()
-  , refcount_ (1)
-{
-}
-
-TAO::Any_Impl::~Any_Impl (void)
-{
-}
-
-CORBA::Boolean
-TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
-{
-  if ((cdr << this->type_) == 0)
-    {
-      return 0;
-    }
-
-  return this->marshal_value (cdr);
-}
-
-// Deprecated by the OMG.
-const void *
-TAO::Any_Impl::value (void) const
-{
-  return 0;
-}
-
-void
-TAO::Any_Impl::free_value (void)
-{
-  // We always have to do this.
-  CORBA::release (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::type (void) const
-{
-  return CORBA::TypeCode::_duplicate (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::_tao_get_typecode (void) const
-{
-  return this->type_;
-}
-
-void
-TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
-{
-  CORBA::release (this->type_);
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
-
-int
-TAO::Any_Impl::_tao_byte_order (void) const
-{
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-TAO::Any_Impl::_tao_any_string_destructor (void *x)
-{
-  char *tmp = static_cast<char *> (x);
-  CORBA::string_free (tmp);
-}
-
-void
-TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
-{
-  CORBA::WChar *tmp = static_cast<CORBA::WChar *> (x);
-  CORBA::wstring_free (tmp);
-}
-
-void
-TAO::Any_Impl::_add_ref (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX,
-             guard,
-             this->mutex_);
-
-  ++this->refcount_;
-}
-
-void
-TAO::Any_Impl::_remove_ref (void)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX,
-               guard,
-               this->mutex_);
-
-    if (--this->refcount_ != 0)
-      {
-        return;
-      }
-
-    this->free_value ();
-  }
-
-  delete this;
-}
-
-void
-TAO::Any_Impl::_tao_decode (TAO_InputCDR &
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-bool
-TAO::Any_Impl::encoded (void) const
-{
-  return this->encoded_;
-}
-
diff --git a/TAO/tao/Any_Impl.h b/TAO/tao/Any_Impl.h
deleted file mode 100644
index 4802a25e6aa..00000000000
--- a/TAO/tao/Any_Impl.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_IMPL_H
-#define TAO_ANY_IMPL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Thread_Mutex.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-class ACE_Message_Block;
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ValueBase;
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl
-   *
-   * @brief Base class for the Any template subclasses.
-   *
-   * Contains common functionality and some pure virtual methods.
-   */
-  class TAO_Export Any_Impl
-  {
-  public:
-    /// Generated data types define a 'destructor' function that
-    /// correctly destroys an object stored in an Any.
-    typedef void (*_tao_destructor)(void *);
-
-    CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    virtual const void *value (void) const;
-
-    virtual void free_value (void);
-
-    CORBA::TypeCode_ptr type (void) const;
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-    void type (CORBA::TypeCode_ptr);
-
-    virtual int _tao_byte_order (void) const;
-
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-
-    /// Used to release these CORBA basic types.
-    static void _tao_any_string_destructor (void *);
-    static void _tao_any_wstring_destructor (void *);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-    
-    bool encoded (void) const;
-
-  protected:
-    Any_Impl (_tao_destructor,
-              CORBA::TypeCode_ptr,
-              bool encoded = false);
-    virtual ~Any_Impl (void);
-
-    TAO::Any_Impl::_tao_destructor value_destructor_;
-    CORBA::TypeCode_ptr type_;
-    bool encoded_;
-
-  private:
-    /// Lock for the refcount
-    ACE_SYNCH_MUTEX mutex_;
-
-    /// Number of outstanding references to this object.
-    CORBA::ULong refcount_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_H */
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
deleted file mode 100644
index 5a06163cfa5..00000000000
--- a/TAO/tao/Any_Impl_T.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_IMPL_T_C
-#define TAO_ANY_IMPL_T_C
-
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Impl_T,
-           "$Id$")
-
-template<typename T>
-TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
-                                CORBA::TypeCode_ptr tc,
-                                T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Impl_T<T>::~Any_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
-                            _tao_destructor destructor,
-                            CORBA::TypeCode_ptr tc,
-                            T * const value)
-{
-  TAO::Any_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           TAO::Any_Impl_T<T> (destructor,
-                               tc,
-                               value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr tc,
-                             T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Impl_T<T> (destructor,
-                                          any_tc,
-                                          0),
-                      0);
-
-      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = const_cast<T *> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                 ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_IMPL_T_C */
diff --git a/TAO/tao/Any_Impl_T.h b/TAO/tao/Any_Impl_T.h
deleted file mode 100644
index ab715e94303..00000000000
--- a/TAO/tao/Any_Impl_T.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_IMPL_T_H
-#define TAO_ANY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl_T
-   *
-   * @brief Template Any class for pointer types.
-   *
-   * Used for interfaces and typecodes
-   */
-  template<typename T>
-  class Any_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Impl_T (_tao_destructor destructor,
-                CORBA::TypeCode_ptr,
-                T * const);
-    virtual ~Any_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T *&);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &  ACE_ENV_ARG_DECL);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_T_H */
diff --git a/TAO/tao/Any_Impl_T.inl b/TAO/tao/Any_Impl_T.inl
deleted file mode 100644
index 1bbeebeea78..00000000000
--- a/TAO/tao/Any_Impl_T.inl
+++ /dev/null
@@ -1,53 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// These three are overridden in generated code where appropriate.
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
deleted file mode 100644
index 949300f4f12..00000000000
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_C
-#define TAO_ANY_SPECIAL_IMPL_T_C
-
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/String_TypeCode_Traits.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Special_Impl_T,
-           "$Id$")
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T * const val,
-    CORBA::ULong bound
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val),
-    bound_ (bound)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T * const value,
-                                                  CORBA::ULong bound
-  )
-{
-  CORBA::TypeCode_var bounded_tc;
-
-  if (bound > 0)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      bounded_tc =
-        TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind,
-                                                                      bound);
-    }
-  else
-    {
-      bounded_tc = CORBA::TypeCode::_duplicate (tc);
-    }
-
-  if (CORBA::is_nil (bounded_tc.in ()))
-    return;
-
-  Any_Special_Impl_T<T, from_T, to_T> * new_impl;
-  ACE_NEW (new_impl,
-           Any_Special_Impl_T (destructor,
-                               bounded_tc.in (),
-                               value,
-                               bound));
-
-  any.replace (new_impl);
-}
-
-template<typename T, typename from_T, typename to_T>
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   const T *& _tao_elem,
-                                                   CORBA::ULong bound
-  )
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type =
-        TAO::unaliased_typecode (any_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind any_kind =
-        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (any_kind != try_kind)
-        {
-          return 0;
-        }
-
-      CORBA::ULong length =
-        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (length != bound)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
-        BOUNDED_TSTRING_ANY_IMPL;
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
-            dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      BOUNDED_TSTRING_ANY_IMPL (destructor,
-                                                tc,
-                                                0,
-                                                bound),
-                      0);
-
-      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_T_C */
diff --git a/TAO/tao/Any_Special_Impl_T.h b/TAO/tao/Any_Special_Impl_T.h
deleted file mode 100644
index 3760521a480..00000000000
--- a/TAO/tao/Any_Special_Impl_T.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Special_Impl_T.h
- *
- *  $Id$
- *
- *  @author  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_H
-#define TAO_ANY_SPECIAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Special_Impl_T
-   *
-   * @brief Template Any class for bounded IDL (w)strings.
-   */
-  template<typename T, typename from_T, typename to_T>
-  class Any_Special_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Special_Impl_T (_tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    virtual ~Any_Special_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&,
-                                   CORBA::ULong bound);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-    CORBA::ULong bound_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Special_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Special_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_SPECIAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Special_Impl_T.inl b/TAO/tao/Any_Special_Impl_T.inl
deleted file mode 100644
index bc8715b083f..00000000000
--- a/TAO/tao/Any_Special_Impl_T.inl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (
-    TAO_OutputCDR &cdr
-  )
-{
-  return (cdr << from_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (
-    TAO_InputCDR &cdr
-  )
-{
-  return (cdr >> to_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-const void *
-TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp
deleted file mode 100644
index 84d3444f252..00000000000
--- a/TAO/tao/Any_SystemException.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// $Id$
-
-#include "Any_SystemException.h"
-#include "Any.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "CDR.h"
-#include "Exception.h"
-#include "Environment.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Any_SystemException,
-           "$Id$")
-
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               CORBA::SystemException * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               const CORBA::SystemException & val)
-  : Any_Impl (destructor,
-              tc)
-{
- this->value_ =
-   dynamic_cast <CORBA::SystemException *> (val._tao_duplicate ());
-}
-
-TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-TAO::Any_SystemException::~Any_SystemException (void)
-{
-}
-
-void
-TAO::Any_SystemException::insert (CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  CORBA::SystemException * const value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-void
-TAO::Any_SystemException::insert_copy (CORBA::Any & any,
-                                       _tao_destructor destructor,
-                                       CORBA::TypeCode_ptr tc,
-                                       const CORBA::SystemException & value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::extract (const CORBA::Any & any,
-                                   _tao_destructor destructor,
-                                   CORBA::TypeCode_ptr tc,
-                                   const CORBA::SystemException *& _tao_elem,
-                                   TAO::excp_factory f)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_SystemException *narrow_impl =
-            dynamic_cast <TAO::Any_SystemException *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      CORBA::SystemException *empty_value =  (*f) ();
-
-      TAO::Any_SystemException *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_SystemException (destructor,
-                                                any_tc,
-                                                empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-TAO::Any_SystemException::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-const void *
-TAO::Any_SystemException::value (void) const
-{
-  return this->value_;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_encode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/Any_SystemException.h b/TAO/tao/Any_SystemException.h
deleted file mode 100644
index 971e22d6a5f..00000000000
--- a/TAO/tao/Any_SystemException.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_SystemException.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-#ifndef TAO_ANY_SYSTEMEXCEPTION_H
-#define TAO_ANY_SYSTEMEXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class SystemException;
-  class Any;
-}
-
-namespace TAO
-{
-  typedef CORBA::SystemException* (*excp_factory)(void);
-
-  /**
-   * @class Any_Exception
-   *
-   * @brief Template Any class for IDL types with 2 modes of insertion
-   *
-   * Used for the IDL types that have copying and non-copying insertion,
-   * but which are not (de)marshaled as pointers - struct, union, sequence,
-   * and exception.
-   */
-  class Any_SystemException : public Any_Impl
-  {
-  public:
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         CORBA::SystemException* const);
-
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         const CORBA::SystemException &);
-
-    Any_SystemException (CORBA::TypeCode_ptr);
-
-    virtual ~Any_SystemException (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        CORBA::SystemException * const);
-
-    static void insert_copy (CORBA::Any &,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const CORBA::SystemException &);
-
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const CORBA::SystemException *&,
-                                   excp_factory f);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    CORBA::SystemException *value_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_ANY_SYSTEMEXCEPTION_H*/
diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp
deleted file mode 100644
index b7b78214719..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// $Id$
-
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Any_Unknown_IDL_Type,
-           "$Id$")
-           
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc,
-    TAO_InputCDR &cdr
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-}
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-}
-
-TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
-{
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // We don't want the rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (this->cdr_);
-    
-      TAO::traverse_status status =
-        TAO_Marshal_Object::perform_append (this->type_,
-                                            &for_reading,
-                                            &cdr
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (status != TAO::TRAVERSE_CONTINUE)
-        {
-          return 0;
-        }
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-const void *
-TAO::Unknown_IDL_Type::value (void) const
-{
-  return this->cdr_.start ();
-}
-
-void
-TAO::Unknown_IDL_Type::free_value (void)
-{
-  CORBA::release (this->type_);
-}
-
-TAO_InputCDR &
-TAO::Unknown_IDL_Type::_tao_get_cdr (void)
-{
-  return this->cdr_;
-}
-
-int
-TAO::Unknown_IDL_Type::_tao_byte_order (void) const
-{
-  return this->cdr_.byte_order ();
-}
-void
-TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
-                                    ACE_ENV_ARG_DECL)
-{
-  // @@ (JP) The following code depends on the fact that
-  //         TAO_InputCDR does not contain chained message blocks,
-  //         otherwise <begin> and <end> could be part of
-  //         different buffers!
-
-  // This will be the start of a new message block.
-  char *begin = cdr.rd_ptr ();
-
-  // Skip over the next argument.
-  TAO::traverse_status status =
-    TAO_Marshal_Object::perform_skip (this->type_,
-                                      &cdr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (status != TAO::TRAVERSE_CONTINUE)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-
-  // This will be the end of the new message block.
-  char *end = cdr.rd_ptr ();
-
-  // The ACE_CDR::mb_align() call can shift the rd_ptr by up to
-  // ACE_CDR::MAX_ALIGNMENT - 1 bytes. Similarly, the offset adjustment
-  // can move the rd_ptr by up to the same amount. We accommodate
-  // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
-  // space in the message block.
-  size_t size = end - begin;
-
-  ACE_Message_Block new_mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-
-  ACE_CDR::mb_align (&new_mb);
-  ptrdiff_t offset = ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (offset < 0)
-    {
-      offset += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  new_mb.rd_ptr (offset);
-  new_mb.wr_ptr (offset + size);
-
-  ACE_OS::memcpy (new_mb.rd_ptr (),
-                  begin,
-                  size);
-
-  this->cdr_.reset (&new_mb, cdr.byte_order ());
-  this->cdr_.char_translator (cdr.char_translator ());
-  this->cdr_.wchar_translator (cdr.wchar_translator ());
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_objref)
-        {
-          return 0;
-        }
-
-      return this->cdr_ >> obj;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_value)
-        {
-          return 0;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_value (this->cdr_, val);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_value)
-        {
-          return 0;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_abstract_base (this->cdr_,
-                                               obj);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Any_Unknown_IDL_Type.h b/TAO/tao/Any_Unknown_IDL_Type.h
deleted file mode 100644
index c764dc367e0..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Unknown_IDL_Type.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_UNKNOWN_IDL_TYPE_H
-#define TAO_ANY_UNKNOWN_IDL_TYPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
-
-namespace TAO
-{
-  /**
-   * @class Unknown_IDL_Type
-   *
-   * @brief CDR-based Any impl class.
-   *
-   * Used when demarshaling an Any, and with DII/DSI, and Dynamic Anys.
-   */
-  class TAO_Export Unknown_IDL_Type : public Any_Impl
-  {
-  public:
-    Unknown_IDL_Type (CORBA::TypeCode_ptr,
-                      TAO_InputCDR &cdr);
-                  
-    Unknown_IDL_Type (CORBA::TypeCode_ptr);
-                      
-    virtual ~Unknown_IDL_Type (void);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-    virtual TAO_InputCDR &_tao_get_cdr (void);
-    virtual int _tao_byte_order (void) const;
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-  private:
-    mutable TAO_InputCDR cdr_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */
diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h
deleted file mode 100644
index b4a86c197c3..00000000000
--- a/TAO/tao/Arg_Traits_T.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Arg_Traits_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_ARG_TRAITS_T_H
-#define TAO_ARG_TRAITS_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Base class for all stub arg traits specializations.
-   *
-   */
-  template<typename T>
-  class Arg_Traits
-  {
-  };
-
-  /**
-   *
-   * @brief Base class for all skeleton arg traits specializations.
-   *
-   */
-  template<typename T>
-  class SArg_Traits
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ARG_TRAITS_T_H */
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
deleted file mode 100644
index e038eeec2d7..00000000000
--- a/TAO/tao/Argument.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-// $Id$
-
-#include "tao/Argument.h"
-
-TAO::Argument::~Argument (void)
-{
-}
-
-CORBA::Boolean
-TAO::Argument::marshal (TAO_OutputCDR &)
-{
-  return 1;
-}
-
-CORBA::Boolean
-TAO::Argument::demarshal (TAO_InputCDR &)
-{
-  return 1;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-void
-TAO::Argument::interceptor_param (Dynamic::Parameter &)
-{
-}
-
-void
-TAO::Argument::interceptor_result (CORBA::Any *)
-{
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
deleted file mode 100644
index 0a42a2a7064..00000000000
--- a/TAO/tao/Argument.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Argument.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_ARGUMENT_H
-#define TAO_ARGUMENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-#include "tao/TAO_Export.h"
-
-namespace Dynamic
-{
-  struct Parameter;
-}
-
-namespace CORBA
-{
-  class Any;
-}
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-namespace TAO
-{
-  /**
-   * @class Argument
-   *
-   * @brief Base class for argument class templates.
-   *
-   * @c Argument subclasses override the virtual methods
-   *    appropriately.  For example, a stub "IN" argument class
-   *    template would override the @c marshal() method, but wouldn't
-   *    need to override the @c demarshal() method.
-   */
-  class TAO_Export Argument
-  {
-  public:
-
-    /// Destructor.
-    virtual ~Argument (void);
-
-    /// Marshal the argument into the given CDR output stream.
-    /**
-     * @note The default implementation simply returns @c true.
-     */
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-
-    /// Demarshal the argument from the given CDR input stream.
-    /**
-     * @note The default implementation simply returns @c true.
-     */
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-    /**
-     * @name Portable Interceptor Related Methods
-     *
-     * These methods are only used when setting up
-     * @c PortableInterceptor::RequestInfo instances with the
-     * appropriate operation-specific parameter list and return
-     * value, if either or both exist.
-     */
-    //@{
-    /// Populate the given @a Dynamic::Parameter argument.
-    /**
-     * @note The default implementation is a no-op.
-     */
-    virtual void interceptor_param (Dynamic::Parameter &);
-
-    /// Populate the given @a CORBA::Any result argument.
-    /**
-     * @note The default implementation is a no-op.
-     */
-    virtual void interceptor_result (CORBA::Any *);
-    //@}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-  };
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ARGUMENT_H */
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
deleted file mode 100644
index 63093981053..00000000000
--- a/TAO/tao/Array_VarOut_T.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-
-#ifndef TAO_ARRAY_VAROUT_T_C
-#define TAO_ARRAY_VAROUT_T_C
-
-#include "tao/Array_VarOut_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Array_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Array_VarOut_T,
-           "$Id$")
-
-template<typename T, typename T_slice, typename TAG>
-TAO_FixedArray_Var_T<T,T_slice,TAG> &
-TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
-{
-  // Is what we own the same that is being assigned to us?
-  if (this->ptr_ != p)
-    {
-      // Delete our stuff and assume ownership of p.
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-      this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template<typename T, typename T_slice, typename TAG>
-TAO_FixedArray_Var_T<T,T_slice,TAG> &
-TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (
-    const TAO_FixedArray_Var_T<T,T_slice,TAG> & p
-  )
-{
-  if (this != &p)
-    {
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-
-      // Deep copy.
-      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
-    }
-
-  return *this;
-}
-
-// *************************************************************
-
-template<typename T, typename T_slice, typename TAG>
-TAO_VarArray_Var_T<T,T_slice,TAG> &
-TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p)
-{
-  // Is what we own the same that is being assigned to us?
-  if (this->ptr_ != p)
-    {
-      // Delete our stuff and assume ownership of p.
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-      this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template<typename T, typename T_slice, typename TAG>
-TAO_VarArray_Var_T<T,T_slice,TAG> &
-TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (
-    const TAO_VarArray_Var_T<T,T_slice,TAG> & p
-  )
-{
-  if (this != &p)
-    {
-      TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-
-      // Deep copy.
-      this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
-    }
-
-  return *this;
-}
-
-// *************************************************************
-
-template<typename T, typename T_slice, typename TAG>
-void
-TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer);
-  TAO::Array_Traits<T,T_slice,TAG>::free (tmp);
-}
-
-#endif /* TAO_ARRAY_VAROUT_T_C */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
deleted file mode 100644
index e036dd6bb79..00000000000
--- a/TAO/tao/Array_VarOut_T.h
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Array_VarOut_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ARRAY_VAROUT_T_H
-#define TAO_ARRAY_VAROUT_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * struct Array_Traits
-   *
-   * @brief Specialized for each array in generated code.
-   *
-   */
-  template<typename T, typename T_slice, typename TAG>
-  struct Array_Traits
-  {
-    static T_slice * alloc (void);
-    static void free (T_slice * _tao_slice);
-    static T_slice * dup (const T_slice * _tao_slice);
-    static void copy (T_slice * _tao_to,
-                      const T_slice * _tao_from);
-  };
-}
-
-/**
- * @class TAO_Array_Var_Base_T
- *
- * @brief Parametrized implementation of _var base class for arrays.
- *
- */
-template<typename T, typename T_slice, typename TAG>
-class TAO_Array_Var_Base_T
-{
-public:
-  TAO_Array_Var_Base_T (void);
-  TAO_Array_Var_Base_T (T_slice *);
-  TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T,T_slice,TAG> &);
-  ~TAO_Array_Var_Base_T (void);
-
-  T_slice & operator[] (CORBA::ULong index);
-  T_slice const & operator[] (CORBA::ULong index) const;
-  operator T_slice * const & () const;
-
-  typedef const T_slice *   _in_type;
-  typedef       T_slice *   _inout_type;
-  typedef       T_slice *&  _out_type;
-  typedef       T_slice *   _retn_type;
-
-  // in, inout, out, _retn
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
-
-  // TAO extension.
-  _retn_type    ptr (void) const;
-
-protected:
-  T_slice * ptr_;
-};
-
-/**
- * @class TAO_FixedArray_Var_T
- *
- * @brief Parametrized implementation of _var class for arrays with
- * elements of fixed size.
- *
- */
-template<typename T, typename T_slice, typename TAG>
-class TAO_FixedArray_Var_T: public TAO_Array_Var_Base_T<T,T_slice,TAG>
-{
-public:
-  TAO_FixedArray_Var_T (void);
-  TAO_FixedArray_Var_T (T_slice *);
-  TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T,T_slice,TAG> &);
-
-  TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= (T_slice *);
-  TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= (
-      const TAO_FixedArray_Var_T<T,T_slice,TAG> &
-    );
-};
-
-/**
- * @class TAO_VarArray_Var_T
- *
- * @brief Parametrized implementation of _var class for arrays with
- * elements of variable size.
- *
- */
-template<typename T, typename T_slice, typename TAG>
-class TAO_VarArray_Var_T : public TAO_Array_Var_Base_T<T,T_slice,TAG>
-{
-public:
-  TAO_VarArray_Var_T (void);
-  TAO_VarArray_Var_T (T_slice *);
-  TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T,T_slice,TAG> &);
-
-  TAO_VarArray_Var_T<T,T_slice,TAG> &operator= (T_slice *);
-  TAO_VarArray_Var_T<T,T_slice,TAG> &operator= (
-      const TAO_VarArray_Var_T<T,T_slice,TAG> &
-    );
-
-  operator T_slice *& ();
-};
-
-/**
- * @class TAO_Array_Out_T
- *
- * @brief Parametrized implementation of _out class for arrays.
- *
- */
-template<typename T, typename T_var, typename T_slice, typename TAG>
-class TAO_Array_Out_T
-{
-public:
-  TAO_Array_Out_T (T_slice *&);
-  TAO_Array_Out_T (T_var &);
-  TAO_Array_Out_T (const TAO_Array_Out_T<T,T_var,T_slice,TAG> &);
-
-  TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (
-      const TAO_Array_Out_T<T,T_var,T_slice,TAG> &
-    );
-  TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (T_slice *);
-
-  operator T_slice *& ();
-  T_slice *& ptr (void);
-
-  T_slice & operator[] (CORBA::ULong index);
-  const T_slice & operator[] (CORBA::ULong index) const;
-private:
-  typedef TAO_Array_Out_T<T,T_var,T_slice,TAG> THIS_OUT_TYPE;
-  T_slice *& ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const T_var &);
-};
-
-/**
- * @class TAO_Array_Forany_T
- *
- * @brief Parametrized implementation of _forany class for arrays.
- *
- */
-template<typename T, typename T_slice, typename TAG>
-class TAO_Array_Forany_T
-{
-public:
-  TAO_Array_Forany_T (void);
-  TAO_Array_Forany_T (T_slice *,
-                      CORBA::Boolean nocopy = 0);
-  TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
-  ~TAO_Array_Forany_T (void);
-
-  static void _tao_any_destructor (void *);
-
-  TAO_Array_Forany_T & operator= (T_slice *);
-  TAO_Array_Forany_T & operator= (
-      const TAO_Array_Forany_T<T,T_slice,TAG> &
-    );
-
-  T_slice & operator[] (CORBA::ULong index);
-  const T_slice & operator[] (CORBA::ULong index) const;
-
-  operator T_slice * const & () const;
-  operator T_slice *& ();
-
-  // in, inout, out, _retn
-  const T_slice * in (void) const;
-  T_slice * inout (void);
-  T_slice * &out (void);
-  T_slice * _retn (void);
-  T_slice * ptr (void) const;
-  CORBA::Boolean nocopy (void) const;
-
-  static T_slice * tao_alloc (void);
-private:
-  T_slice * ptr_;
-  const CORBA::Boolean nocopy_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Array_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Array_VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Array_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ARRAY_VAROUT_T_H */
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
deleted file mode 100644
index 27d70d8fff1..00000000000
--- a/TAO/tao/Array_VarOut_T.inl
+++ /dev/null
@@ -1,390 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (void)
-  : ptr_ (0)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (T_slice * p)
-  : ptr_ (p)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (
-    const TAO_Array_Var_Base_T & p
-  )
-{
-  this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ());
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T (void)
-{
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Var_Base_T<T,T_slice,TAG>::operator T_slice * const & () const
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice const &
-TAO_Array_Var_Base_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) const
-{
-  return this->ptr_[index];
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice &
-TAO_Array_Var_Base_T<T,T_slice,TAG>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_[index];
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-const T_slice *
-TAO_Array_Var_Base_T<T,T_slice,TAG>::in (void) const
-{
-  return (const T_slice *) this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Var_Base_T<T,T_slice,TAG>::inout (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *&
-TAO_Array_Var_Base_T<T,T_slice,TAG>::out (void)
-{
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Var_Base_T<T,T_slice,TAG>::_retn (void)
-{
-  T_slice * tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Var_Base_T<T,T_slice,TAG>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T (void)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T (T_slice * p)
-  : TAO_Array_Var_Base_T<T,T_slice,TAG> (p)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T (
-    const TAO_FixedArray_Var_T & p
-  )
-  : TAO_Array_Var_Base_T<T,T_slice,TAG> (p)
-{}
-
-// *************************************************************
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T (void)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T (T_slice * p)
-  : TAO_Array_Var_Base_T<T,T_slice,TAG> (p)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T (
-    const TAO_VarArray_Var_T & p
-  )
-  : TAO_Array_Var_Base_T<T,T_slice,TAG> (p)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_VarArray_Var_T<T,T_slice,TAG>::operator T_slice *& ()
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_slice *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (
-    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p
-  )
-  : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_)
-{}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG> &
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator= (
-    const TAO_Array_Out_T<T,T_var,T_slice,TAG> & p
-  )
-{
-  this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG> &
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator= (T_slice *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator T_slice *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *&
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice &
-TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_[index];
-}
-
-// *************************************************************
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void)
-  : ptr_ (0),
-    nocopy_ (0)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
-    T_slice * p,
-    CORBA::Boolean nocopy
-  )
-  : ptr_ (p),
-    nocopy_ (nocopy)
-{}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
-    const TAO_Array_Forany_T<T,T_slice,TAG> & p
-  )
-  : ptr_ (p.ptr_),
-    nocopy_ (p.nocopy_)
-{
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::~TAO_Array_Forany_T (void)
-{
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG> &
-TAO_Array_Forany_T<T,T_slice,TAG>::operator= (T_slice * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG> &
-TAO_Array_Forany_T<T,T_slice,TAG>::operator= (
-    const TAO_Array_Forany_T<T,T_slice,TAG> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  this->nocopy_ = p.nocopy_;
-  return *this;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::operator T_slice * const & () const
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Array_Forany_T<T,T_slice,TAG>::operator T_slice *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-const T_slice &
-TAO_Array_Forany_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) const
-{
-#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST)
-# if defined (_MSC_VER) && _MSC_VER <= 1200
-  // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
-  //         multi-dimensional array case so reinterpret_cast<> cast
-  //         instead.  It's not clear if this is really the right
-  //         thing to do but the code won't compile with MSVC++ 6
-  //         without it.  We use a reinterpret_cast<> instead of a
-  //         C-style "sledgehammer" cast to make it obvious that this
-  //         code may have unresolved issues, and also to make it
-  //         easier for others to find this code.
-  return reinterpret_cast<const T_slice &> (this->ptr_[index]);
-# else
-  return const_cast<const T_slice &> (this->ptr_[index]);
-# endif  /* _MSC_VER <= 1200 */
-#else
-  const T_slice & tmp = this->ptr_[index];
-  return tmp;
-#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice &
-TAO_Array_Forany_T<T,T_slice,TAG>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_[index];
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-const T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const
-{
-  // @@@ (JP) This looks scary I know but it helps MSVC understand
-  // things better when the array is multi-dimensional.
-#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
-  // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
-  //         multi-dimensional array case so reinterpret_cast<> cast
-  //         instead.  It's not clear if this is really the right
-  //         thing to do but the code won't compile with MSVC++ 6
-  //         without it.  We use a reinterpret_cast<> instead of a
-  //         C-style "sledgehammer" cast to make it obvious that this
-  //         code may have unresolved issues, and also to make it
-  //         easier for others to find this code.
-  return reinterpret_cast<const T_slice *> (this->ptr_);
-#else
-  return const_cast<const T_slice *> (this->ptr_);
-#endif  /* _MSC_VER <= 1200 */
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::inout (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *&
-TAO_Array_Forany_T<T,T_slice,TAG>::out (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::_retn (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-CORBA::Boolean
-TAO_Array_Forany_T<T,T_slice,TAG>::nocopy (void) const
-{
-  return this->nocopy_;
-}
-
-template<typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T_slice *
-TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void)
-{
-  return TAO::Array_Traits<T,T_slice,TAG>::alloc ();
-}
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
deleted file mode 100644
index daf6c0fd264..00000000000
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-#include "Asynch_Queued_Message.h"
-#include "debug.h"
-
-#include "ace/OS_Memory.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/sys/os_uio.h"
-#include "ace/Log_Msg.h"
-#include "ace/Message_Block.h"
-#include "ace/Malloc_Base.h"
-
-
-ACE_RCSID (tao,
-           Asynch_Queued_Message,
-           "$Id$")
-
-
-TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (
-  const ACE_Message_Block *contents,
-  ACE_Allocator *alloc,
-  int is_heap_allocated)
-  : TAO_Queued_Message (alloc, is_heap_allocated)
-  , size_ (contents->total_length ())
-  , offset_ (0)
-{
-  // @@ Use a pool for these guys!!
-  ACE_NEW (this->buffer_, char[this->size_]);
-
-  size_t copy_offset = 0;
-  for (const ACE_Message_Block *i = contents;
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (this->buffer_ + copy_offset,
-                      i->rd_ptr (),
-                      i->length ());
-      copy_offset += i->length ();
-    }
-}
-
-TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message (char *buf,
-                                                      size_t size,
-                                                      ACE_Allocator *alloc)
-  : TAO_Queued_Message (alloc)
-  , size_ (size)
-  , offset_ (0)
-  , buffer_ (buf)
-{
-}
-
-TAO_Asynch_Queued_Message::~TAO_Asynch_Queued_Message (void)
-{
-  // @@ Use a pool for these guys!
-  delete [] this->buffer_;
-}
-
-size_t
-TAO_Asynch_Queued_Message::message_length (void) const
-{
-  return this->size_ - this->offset_;
-}
-
-int
-TAO_Asynch_Queued_Message::all_data_sent (void) const
-{
-  return this->size_ == this->offset_;
-}
-
-void
-TAO_Asynch_Queued_Message::fill_iov (int iovcnt_max,
-                                     int &iovcnt,
-                                     iovec iov[]) const
-{
-  ACE_ASSERT (iovcnt_max > iovcnt);
-  ACE_UNUSED_ARG (iovcnt_max); // not used if ACE_ASSERT() is empty
-
-  iov[iovcnt].iov_base = this->buffer_ + this->offset_;
-  iov[iovcnt].iov_len  = static_cast<u_long> (this->size_ - this->offset_);
-  ++iovcnt;
-}
-
-void
-TAO_Asynch_Queued_Message::bytes_transferred (size_t &byte_count)
-{
-  this->state_changed_i (TAO_LF_Event::LFS_ACTIVE);
-
-  size_t remaining_bytes = this->size_ - this->offset_;
-  if (byte_count > remaining_bytes)
-    {
-      this->offset_ = this->size_;
-      byte_count -= remaining_bytes;
-      return;
-    }
-  this->offset_ += byte_count;
-  byte_count = 0;
-
-  if (this->all_data_sent ())
-    this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-}
-
-
-TAO_Queued_Message *
-TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc)
-{
-  char *buf = 0;
-
-  // @@todo: Need to use a memory pool. But certain things need to
-  // change a bit in this class for that. Till then.
-
-  // Just allocate and copy data that needs to be sent, no point
-  // copying the whole buffer.
-  const size_t sz = this->size_ - this->offset_;
-
-  ACE_NEW_RETURN (buf,
-                  char[sz],
-                  0);
-
-  ACE_OS::memcpy (buf,
-                  this->buffer_ + this->offset_,
-                  sz);
-
-  TAO_Asynch_Queued_Message *qm = 0;
-
-  if (alloc)
-    {
-      ACE_NEW_MALLOC_RETURN (qm,
-                             static_cast<TAO_Asynch_Queued_Message *> (
-                                 alloc->malloc (sizeof (TAO_Asynch_Queued_Message))),
-                             TAO_Asynch_Queued_Message (buf,
-                                                        sz,
-                                                        alloc),
-                             0);
-    }
-  else
-    {
-      // No allocator, so use the common heap!
-      if (TAO_debug_level == 4)
-        {
-          // This debug is for testing purposes!
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Asynch_Queued_Message::clone\n"
-                      "Using global pool for allocation \n"));
-        }
-
-      ACE_NEW_RETURN (qm,
-                      TAO_Asynch_Queued_Message (buf,
-                                                 sz),
-                      0);
-    }
-
-  // Set the flag to indicate that <qm> is created on the heap.
-  if (qm)
-    qm->is_heap_created_ = 1;
-
-  return qm;
-}
-
-void
-TAO_Asynch_Queued_Message::destroy (void)
-{
-  if (this->is_heap_created_)
-    {
-      // If we have an allocator release the memory to the allocator
-      // pool.
-      if (this->allocator_)
-        {
-          ACE_DES_FREE (this,
-                        this->allocator_->free,
-                        TAO_Asynch_Queued_Message);
-
-        }
-      else // global release..
-        {
-          delete this;
-        }
-    }
-
-}
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
deleted file mode 100644
index 7319edacba1..00000000000
--- a/TAO/tao/Asynch_Queued_Message.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Asynch_Queued_Message.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ASYNCH_QUEUED_MESSAGE_H
-#define TAO_ASYNCH_QUEUED_MESSAGE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Queued_Message.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Asynch_Queued_Message
- *
- * @brief Specialize TAO_Queued_Message for asynch requests,
- *        i.e. oneways sent with SYNC_NONE policy.
- *
- */
-class TAO_Export TAO_Asynch_Queued_Message : public TAO_Queued_Message
-{
-public:
-  /// Constructor
-  /**
-   * @param contents The message block chain that must be sent.
-   *
-   * @param alloc Allocator used for creating <this> object.
-   *
-   * @todo I'm almost sure this class will require a callback
-   *       interface for AMIs sent with SYNC_NONE policy.  Those guys
-   *       need to hear when the connection timeouts or closes, but
-   *       cannot block waiting for the message to be delivered.
-   */
-  TAO_Asynch_Queued_Message (const ACE_Message_Block *contents,
-                             ACE_Allocator *alloc = 0,
-                             int is_heap_allocated = 0);
-
-
-  /// Destructor
-  virtual ~TAO_Asynch_Queued_Message (void);
-
-  /** Implement the Template Methods from TAO_Queued_Message
-   */
-  //@{
-  virtual size_t message_length (void) const;
-  virtual int all_data_sent (void) const;
-  virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const;
-  virtual void bytes_transferred (size_t &byte_count);
-  /// @note No reason to believe why this would be called. But have
-  /// it here for the sake of uniformity.
-  virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
-  //@}
-
-protected:
-  /// Constructor
-  /**
-   * @param buf The buffer that needs to be sent on the wire. The
-   *            buffer will be owned by this class. The buffer will be
-   *            deleted when the destructor is called and hence the
-   *            buffer should always come off the heap!
-   *
-   * @param size The size of the buffer <buf> that is being handed
-   *             over.
-   *
-   * @param alloc Allocator used for creating <this> object.
-   */
-  TAO_Asynch_Queued_Message (char *buf,
-                             size_t size,
-                             ACE_Allocator *alloc = 0);
-private:
-  /// The number of bytes in the buffer
-  const size_t size_;
-
-  /// The offset in the buffer
-  /**
-   * Data up to @c offset has been sent already, only the
-   * [offset_,size_) range remains to be sent.
-   */
-  size_t offset_;
-
-  /// The buffer containing the complete message.
-  char *buffer_;
-};
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_ASYNCH_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
deleted file mode 100644
index 3fdcb0239aa..00000000000
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Transport.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Asynch_Reply_Dispatcher_Base.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Asynch_Reply_Dispatcher_Base,
-           "$Id$")
-
-// Constructor.
-TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (
-    TAO_ORB_Core *orb_core,
-    ACE_Allocator *allocator
-  )
-  : db_ (sizeof buf_,
-         ACE_Message_Block::MB_DATA,
-         this->buf_,
-         orb_core->input_cdr_buffer_allocator (),
-         orb_core->locking_strategy (),
-         ACE_Message_Block::DONT_DELETE,
-         orb_core->input_cdr_dblock_allocator ()),
-    reply_cdr_ (&db_,
-                ACE_Message_Block::MB_DATA,
-                TAO_ENCAP_BYTE_ORDER,
-                TAO_DEF_GIOP_MAJOR,
-                TAO_DEF_GIOP_MINOR,
-                orb_core)
-  , transport_ (0)
-  , lock_ (0)
-  , refcount_ (1)
-  , is_reply_dispatched_ (false)
-  , allocator_ (allocator)
-{
-  // @@ NOTE: Need a seperate option for this..
-  this->lock_ =
-    orb_core->resource_factory ()->create_cached_connection_lock ();
-}
-
-// Destructor.
-TAO_Asynch_Reply_Dispatcher_Base::~TAO_Asynch_Reply_Dispatcher_Base (void)
-{
-  // Release the transport that we own
-  if (this->transport_ != 0)
-    this->transport_->remove_reference ();
-
-  if (this->lock_)
-    delete this->lock_;
-}
-
-void
-TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
-{
-  if (this->transport_ != 0)
-    this->transport_->remove_reference ();
-
-  this->transport_ = t;
-
-  this->transport_->add_reference ();
-}
-
-// Must override pure virtual method in TAO_Reply_Dispatcher.
-int
-TAO_Asynch_Reply_Dispatcher_Base::dispatch_reply (
-    TAO_Pluggable_Reply_Params & /*params*/
-  )
-{
-  return 0;
-}
-
-void
-TAO_Asynch_Reply_Dispatcher_Base::connection_closed (void)
-{
-}
-
-void
-TAO_Asynch_Reply_Dispatcher_Base::reply_timed_out (void)
-{
-}
-
-long
-TAO_Asynch_Reply_Dispatcher_Base::incr_refcount (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    mutex,
-                    *this->lock_,
-                    -1);
-  return ++this->refcount_;
-}
-
-long
-TAO_Asynch_Reply_Dispatcher_Base::decr_refcount (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      mutex,
-                      *this->lock_,
-                      -1);
-    --this->refcount_;
-
-    if (this->refcount_ > 0)
-      return this->refcount_;
-  }
-
-  if (this->allocator_)
-    {
-      ACE_DES_FREE (this,
-                    this->allocator_->free,
-                    TAO_Asynch_Reply_Dispatcher_Base);
-    }
-  else
-    {
-      delete this;
-    }
-
-  return 0;
-}
-
-bool
-TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void)
-{
-  if (this->is_reply_dispatched_)
-    return false;
-
-  if (!this->is_reply_dispatched_)
-    {
-      ACE_GUARD_RETURN (ACE_Lock,
-                        mutex,
-                        *this->lock_,
-                        false);
-
-      if (!this->is_reply_dispatched_)
-        {
-          this->is_reply_dispatched_ = true;
-          return true;
-        }
-    }
-
-  return false;
-}
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
deleted file mode 100644
index ea4c156ba22..00000000000
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//=============================================================================
-/**
- *  @file Asynch_Reply_Dispatcher_Base.h
- *
- *  $Id$
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ASYNCH_REPLY_DISPATCHER_BASE_H
-#define TAO_ASYNCH_REPLY_DISPATCHER_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Reply_Dispatcher.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOP_IORC.h"
-
-class TAO_Pluggable_Reply_Params;
-class TAO_ORB_Core ;
-class ACE_Time_Value;
-class TAO_Transport;
-class ACE_Lock;
-class ACE_Allocator;
-
-/**
- * @class TAO_Asynch_Reply_Dispatcher_Base
- *
- * @brief Base class for TAO_Asynch_Reply_Dispatcher and
- *  TAO_DII_Deferred_Reply_Dispatcher
- */
-class TAO_Export TAO_Asynch_Reply_Dispatcher_Base
-  : public TAO_Reply_Dispatcher
-{
-public:
-  /// Default constructor.
-  TAO_Asynch_Reply_Dispatcher_Base (TAO_ORB_Core *orb_core,
-                                    ACE_Allocator *allocator = 0);
-
-  /// Sets the transport for this invocation.
-  void transport (TAO_Transport *t);
-
-  /// @name The Reply Dispatcher methods
-  //@{
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &) = 0;
-
-  virtual void connection_closed (void) = 0;
-  //@}
-
-  /// Inform that the reply timed out
-  virtual void reply_timed_out (void) = 0;
-
-  /// Install the timeout handler
-  virtual long schedule_timer (CORBA::ULong ,
-                               const ACE_Time_Value &
-                               ACE_ENV_ARG_DECL) = 0;
-
-  /// @name Mutators for refcount
-  //@{
-  long incr_refcount (void);
-  long decr_refcount (void);
-  //@}
-
-  /// A helper method that can be used by the subclasses
-  /**
-   * The semantics of this helper method needs careful attention. A
-   * call to this method will do the following
-   *
-   *   - If the reply has already been dispatched, the return value
-   *     will be false to signify not to try.
-   *
-   *   - If the reply has not been dispatched, this method will set
-   *     the flag to be true and return a true value to signify that
-   *     the caller thread can go ahead and dispatch reply.
-   *
-   * Why are we clumping everything in one method. Answer is we need
-   * atomicity?
-   */
-  bool try_dispatch_reply (void);
-
-protected:
-
-  /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher_Base (void);
-
-protected:
-  /// The service context list.
-  /**
-   * Note, that this is not a reference as in
-   * the synchronous case. We own the reply_service_info
-   * because our TAO_Asynch_Invocation or TAO_DII_Deferred_Invocation
-   * will go out of scope before we are done.
-   */
-  IOP::ServiceContextList reply_service_info_;
-
-  /// The buffer that is used to initialise the data block
-  char buf_[ACE_CDR::DEFAULT_BUFSIZE];
-
-  /// Datablock that is created on the stack to initialise the CDR
-  /// stream underneath.
-  ACE_Data_Block db_;
-
-  /// CDR stream which has the reply information that needs to be
-  /// demarshalled by the stubs
-  TAO_InputCDR reply_cdr_;
-
-  /// This invocation is using this transport, may change...
-  TAO_Transport *transport_;
-
-private:
-  /// Lock to protect refcount and @c is_reply_dispatched_ flag.
-  ACE_Lock *lock_;
-
-  /// Refcount paraphernalia for this class
-  long refcount_;
-
-  /// Has the reply been dispatched?
-  bool is_reply_dispatched_;
-
-  /// Allocator that was used to allocate this reply dispatcher. In case of
-  /// zero we come from the heap.
-  ACE_Allocator *allocator_;
-};
-
-namespace TAO
-{
-  /**
-   * @class ARDB_Refcount_Functor
-   *
-   * @brief Functor for refcounting of Asynch_Reply_Dispatcher_Base
-   *
-   * This is used to safely handle the destruction of
-   * Asynch_Reply_Dispatcher_Base objects which are created on the
-   * heap. We cannot use auto_ptr <> since it calls delete on the
-   * pointer, and calling delete on Asynch_Reply_Dispatcher_Base *
-   * will not work. Hence this functor will be used with Auto_Functor
-   * class to handle the memory safely.
-   *
-   * @todo Ideally, this class can be a generic class. But that
-   * requires quite a bit of cleanup within TAO to be more useful.
-   */
-  class TAO_Export ARDB_Refcount_Functor
-  {
-  public:
-    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb)
-      ACE_THROW_SPEC (());
-  };
-
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Asynch_Reply_Dispatcher_Base.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ASYNCH_REPLY_DISPATCHER_BASE_H */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.i b/TAO/tao/Asynch_Reply_Dispatcher_Base.i
deleted file mode 100644
index af9c34d4242..00000000000
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-namespace TAO
-{
-  ACE_INLINE void
-  ARDB_Refcount_Functor::operator () (
-      TAO_Asynch_Reply_Dispatcher_Base *ardb)
-    ACE_THROW_SPEC (())
-  {
-    (void) ardb->decr_refcount ();
-  }
-}
diff --git a/TAO/tao/Auto_Functor.h b/TAO/tao/Auto_Functor.h
deleted file mode 100644
index 3fc7a857e5a..00000000000
--- a/TAO/tao/Auto_Functor.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Auto_Functor.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_AUTO_FUNCTOR_H
-#define TAO_AUTO_FUNCTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Functor.h"
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-  using namespace ACE_Utils;
-
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_AUTO_FUNCTOR_H*/
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
deleted file mode 100644
index cd1625d1ced..00000000000
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#ifndef TAO_BD_STRING_ARGUMENT_T_C
-#define TAO_BD_STRING_ARGUMENT_T_C
-
-#include "tao/BD_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/BD_String_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           BD_String_Argument_T,
-           "$Id$")
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_, BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-void
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_, BOUND);
-}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  delete [] this->x_;
-  return cdr >> to_S (this->x_, BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-void
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_, BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-void
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-CORBA::Boolean
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_.out (), BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-void
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= from_S (this->x_.in (), BOUND);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_BD_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
deleted file mode 100644
index 20a8e86e45b..00000000000
--- a/TAO/tao/BD_String_Argument_T.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BD_String_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_BD_STRING_ARGUMENT_T_H
-#define TAO_BD_STRING_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CDR_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Argument.h"
-
-namespace TAO
-{
-  /**
-   * @class In_BD_String_Argument_T
-   *
-   * @brief Template class for IN bounded (w)string argument.
-   *
-   */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class In_BD_String_Argument_T : public Argument
-  {
-  public:
-    In_BD_String_Argument_T (const S * x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-    S const * arg (void) const;
-
-  private:
-
-    S const * x_;
-
-  };
-
-  /**
-   * @class Inout_BD_String_Argument_T
-   *
-   * @brief Template class for INOUT bounded (w)string argument.
-   *
-   */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class Inout_BD_String_Argument_T : public Argument
-  {
-  public:
-    Inout_BD_String_Argument_T (S *& x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S *& x_;
-  };
-
-  /**
-   * @class Out_BD_String_Argument_T
-   *
-   * @brief Template class for INOUT bounded (w)string argument.
-   *
-   */
-  template<typename S,
-           typename S_out,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class Out_BD_String_Argument_T : public Argument
-  {
-  public:
-    Out_BD_String_Argument_T (S_out x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S *& x_;
-  };
-
-  /**
-   * @class Ret_BD_String_Argument_T
-   *
-   * @brief Template class for return stub value of bd (w)string argument.
-   *
-   */
-  template<typename S,
-           typename S_var,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_Argument_T : public Argument
-  {
-  public:
-    Ret_BD_String_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-    S * excp (void);
-    S * retn (void);
-
-  private:
-
-    S_var x_;
-
-  };
-
-  /**
-   * @struct BD_String_Tag
-   *
-   * @brief Struct for bounded (w)string arguments id tag.
-   *
-   */
-  struct TAO_Export BD_String_Tag {};
-
-  /**
-   * @struct BD_String_Arg_Traits_T
-   *
-   * @brief Template class for stub argument traits of bounded (w)strings.
-   *
-   */
-  template<typename T,
-           typename T_var,
-           typename T_out,
-           typename to_T,
-           typename from_T,
-           size_t BOUND>
-  struct BD_String_Arg_Traits_T
-  {
-    typedef T *                                   ret_type;
-    typedef T const *                             in_type;
-    typedef T *&                                  inout_type;
-    typedef T_out                                 out_type;
-
-    typedef In_BD_String_Argument_T<T,
-                                    to_T,
-                                    from_T,
-                                    BOUND>        in_arg_val;
-    typedef Inout_BD_String_Argument_T<T,
-                                       to_T,
-                                       from_T,
-                                       BOUND>     inout_arg_val;
-    typedef Out_BD_String_Argument_T<T,
-                                     T_out,
-                                     to_T,
-                                     from_T,
-                                     BOUND>       out_arg_val;
-    typedef Ret_BD_String_Argument_T<T,
-                                     T_var,
-                                     to_T,
-                                     from_T,
-                                     BOUND>       ret_val;
-
-    typedef BD_String_Tag                         idl_tag;
-  };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::Char,
-                                    CORBA::String_var,
-                                    CORBA::String_out,
-                                    ACE_InputCDR::to_string,
-                                    ACE_OutputCDR::from_string,
-                                    BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::WChar,
-                                    CORBA::WString_var,
-                                    CORBA::WString_out,
-                                    ACE_InputCDR::to_wstring,
-                                    ACE_OutputCDR::from_wstring,
-                                    BOUND>
-  {
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/BD_String_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/BD_String_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BD_String_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BD_STRING_ARGUMENT_T_H */
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
deleted file mode 100644
index c75c60911fc..00000000000
--- a/TAO/tao/BD_String_Argument_T.inl
+++ /dev/null
@@ -1,109 +0,0 @@
-// $Id$
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-ACE_INLINE
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::In_BD_String_Argument_T (
-    const S * x
-  )
-  : x_ (x)
-{}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-ACE_INLINE
-const S *
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void) const
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-ACE_INLINE
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::
-Inout_BD_String_Argument_T (S *& x)
-  : x_ (x)
-{}
-
-template<typename S, typename to_S, typename from_S, size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::
-Out_BD_String_Argument_T (S_out x)
-  : x_ (x.ptr ())
-{}
-
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::
-Ret_BD_String_Argument_T (void)
-{
-}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::retn (void)
-{
-  return this->x_._retn ();
-}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_.out ();
-}
-
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
deleted file mode 100644
index 75b3d08349c..00000000000
--- a/TAO/tao/Base_Transport_Property.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//$Id$
-
-#include "tao/Base_Transport_Property.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Base_Transport_Property.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Base_Transport_Property,
-           "$Id$")
-
-TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void)
-{
-}
-
-
-TAO_Transport_Descriptor_Interface *
-TAO_Base_Transport_Property::duplicate (void)
-{
-  // Get a copy of the underlying endpoint
-  TAO_Endpoint *endpt = this->endpoint_->duplicate ();
-  if (endpt == 0)
-    return 0;
-
-  // Construct a copy of our class
-  TAO_Base_Transport_Property *prop = 0;
-  ACE_NEW_RETURN (prop,
-                  TAO_Base_Transport_Property (endpt,
-                                               1),
-                  0);
-  return prop;
-}
-
-
-CORBA::Boolean
-TAO_Base_Transport_Property::is_equivalent (
-    const TAO_Transport_Descriptor_Interface *rhs)
-{
-  const TAO_Base_Transport_Property *other_desc =
-    dynamic_cast<const TAO_Base_Transport_Property *> (rhs);
-
-  if (other_desc == 0)
-    return 0;
-
-  return this->endpoint_->is_equivalent (other_desc->endpoint_);
-}
-
-
-u_long
-TAO_Base_Transport_Property::hash (void) const
-{
-  return this->endpoint_->hash ();
-}
diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h
deleted file mode 100644
index b781ac40232..00000000000
--- a/TAO/tao/Base_Transport_Property.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-/**
- *  @file  Base_Transport_Property.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_BASE_CONNECTION_PROPERTY_H
-#define TAO_BASE_CONNECTION_PROPERTY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Transport_Descriptor_Interface.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Endpoint.h"
-
-/**
- * @class TAO_Base_Transport_Property
- *
- * @brief A concrete implementation for connnection property
- *
- * This class is a concrete implementation of a simple connection
- * property class. This provides an implementation for the virtual
- * functions declared in TAO_Transport_Descriptor_Interface.
- */
-class TAO_Export TAO_Base_Transport_Property
-  : public TAO_Transport_Descriptor_Interface
-{
-public:
-
-  /// Default constructor
-  TAO_Base_Transport_Property (void);
-
-  /// Constructor
-  TAO_Base_Transport_Property (TAO_Endpoint *endpoint,
-                               CORBA::Boolean flag = 0);
-
-  /// Destructor
-  virtual ~TAO_Base_Transport_Property (void);
-
-  /// The copy constructor.
-  TAO_Base_Transport_Property (const TAO_Base_Transport_Property &rhs);
-
-  /// This call allocates and copies the contents of this class and
-  /// returns the pointer
-  virtual  TAO_Transport_Descriptor_Interface *duplicate (void);
-
-  /// Try to determine if this object is same as the @a other_prop.
-  virtual CORBA::Boolean is_equivalent (
-      const TAO_Transport_Descriptor_Interface *other_prop);
-
-  /// Generate hash value for our class
-  virtual u_long hash (void) const;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Base_Transport_Property.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_BASE_CONNECTION_PROPERTY_H*/
diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl
deleted file mode 100644
index fa4bd7f6b19..00000000000
--- a/TAO/tao/Base_Transport_Property.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-TAO_Base_Transport_Property::TAO_Base_Transport_Property (void)
-{
-
-}
-
-ACE_INLINE
-TAO_Base_Transport_Property::
-    TAO_Base_Transport_Property (TAO_Endpoint *endpoint,
-                                 CORBA::Boolean flag)
-  : TAO_Transport_Descriptor_Interface (endpoint,
-                                         flag)
-{
-}
-
-ACE_INLINE
-TAO_Base_Transport_Property::TAO_Base_Transport_Property (
-    const TAO_Base_Transport_Property &rhs)
-  : TAO_Transport_Descriptor_Interface (rhs.endpoint_->duplicate (),
-                                        1)
-{
-
-}
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
deleted file mode 100644
index 353d125e7a8..00000000000
--- a/TAO/tao/Basic_Argument_T.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-
-#ifndef TAO_BASIC_ARGUMENT_T_C
-#define TAO_BASIC_ARGUMENT_T_C
-
-#include "tao/Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Basic_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Basic_Argument_T,
-           "$Id$")
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_BASIC_ARGUMENT_T_C */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
deleted file mode 100644
index e1586de690a..00000000000
--- a/TAO/tao/Basic_Argument_T.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_BASIC_ARGUMENT_T_H
-#define TAO_BASIC_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Basic_Argument_T
-   *
-   * @brief Template class for IN stub argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class In_Basic_Argument_T : public Argument
-  {
-  public:
-    In_Basic_Argument_T (S const & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S arg (void) const;
-
-  private:
-    S const & x_;
-  };
-
-  /**
-   * @class Inout_Basic_Argument_T
-   *
-   * @brief Template class for INOUT stub argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Basic_Argument_T : public Argument
-  {
-  public:
-    Inout_Basic_Argument_T (S & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S & x_;
-  };
-
-  /**
-   * @class Out_Basic_Argument_T
-   *
-   * @brief Template class for OUT stub argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Out_Basic_Argument_T : public Argument
-  {
-  public:
-    Out_Basic_Argument_T (S & x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S & x_;
-  };
-
-  /**
-   * @class Ret_Basic_Argument_T
-   *
-   * @brief Template class for return stub value of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Ret_Basic_Argument_T : public Argument
-  {
-  public:
-    Ret_Basic_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-    S excp (void);
-    S retn (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @struct Basic_Tag
-   *
-   * @brief Struct for basic IDL type arguments id tag.
-   *
-   */
-  struct TAO_Export Basic_Tag {};
-
-  /**
-   * @struct Basic_Arg_Traits_T
-   *
-   * @brief Template class for stub argument traits of basic IDL types.
-   *
-   */
-  template<typename T>
-  struct Basic_Arg_Traits_T
-  {
-    typedef T                           ret_type;
-    typedef T                           in_type;
-    typedef T &                         inout_type;
-    typedef T &                         out_type;
-
-    typedef In_Basic_Argument_T<T>      in_arg_val;
-    typedef Inout_Basic_Argument_T<T>   inout_arg_val;
-    typedef Out_Basic_Argument_T<T>     out_arg_val;
-    typedef Ret_Basic_Argument_T<T>     ret_val;
-
-    typedef Basic_Tag                   idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Basic_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Basic_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Basic_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASIC_ARGUMENT_T_H */
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
deleted file mode 100644
index 423792367a6..00000000000
--- a/TAO/tao/Basic_Argument_T.inl
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-template<typename S>
-ACE_INLINE
-TAO::In_Basic_Argument_T<S>::In_Basic_Argument_T (S const & x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-S 
-TAO::In_Basic_Argument_T<S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Basic_Argument_T<S>::Inout_Basic_Argument_T (S & x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Inout_Basic_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Out_Basic_Argument_T<S>::Out_Basic_Argument_T (S & x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Out_Basic_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Ret_Basic_Argument_T<S>::Ret_Basic_Argument_T (void)
-{
-}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Ret_Basic_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-template<typename S>
-ACE_INLINE
-S
-TAO::Ret_Basic_Argument_T<S>::excp (void)
-{
-  return this->x_;
-}
-
-template<typename S>
-ACE_INLINE
-S
-TAO::Ret_Basic_Argument_T<S>::retn (void)
-{
-  return this->x_;
-}
-
diff --git a/TAO/tao/Basic_Arguments.cpp b/TAO/tao/Basic_Arguments.cpp
deleted file mode 100644
index 7a8a0537939..00000000000
--- a/TAO/tao/Basic_Arguments.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "tao/Basic_Arguments.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// Inclusions only if explicit templates are enabled.
-#include "Basic_Types.h"
-#include "CDR.h"
-#endif /*ACE_HAS_TEMPLATE_INSTANTIATION ||
-         ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-
-ACE_RCSID (tao,
-           Basic_Arguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Arg_Traits<void>;
-template class TAO::Arg_Traits<CORBA::Short>;
-template class TAO::Arg_Traits<CORBA::Long>;
-template class TAO::Arg_Traits<CORBA::UShort>;
-template class TAO::Arg_Traits<CORBA::ULong>;
-template class TAO::Arg_Traits<CORBA::Float>;
-template class TAO::Arg_Traits<CORBA::Double>;
-template class TAO::Arg_Traits<CORBA::LongLong>;
-template class TAO::Arg_Traits<CORBA::ULongLong>;
-template class TAO::Arg_Traits<CORBA::LongDouble>;
-
-template class TAO::Basic_Arg_Traits_T<CORBA::Short>;
-template class TAO::Basic_Arg_Traits_T<CORBA::Long>;
-template class TAO::Basic_Arg_Traits_T<CORBA::UShort>;
-template class TAO::Basic_Arg_Traits_T<CORBA::ULong>;
-template class TAO::Basic_Arg_Traits_T<CORBA::Float>;
-template class TAO::Basic_Arg_Traits_T<CORBA::Double>;
-template class TAO::Basic_Arg_Traits_T<CORBA::LongLong>;
-template class TAO::Basic_Arg_Traits_T<CORBA::ULongLong>;
-template class TAO::Basic_Arg_Traits_T<CORBA::LongDouble>;
-
-template class TAO::In_Basic_Argument_T<CORBA::Short>;
-template class TAO::Inout_Basic_Argument_T<CORBA::Short>;
-template class TAO::Out_Basic_Argument_T<CORBA::Short>;
-template class TAO::Ret_Basic_Argument_T<CORBA::Short>;
-
-template class TAO::In_Basic_Argument_T<CORBA::Long>;
-template class TAO::Inout_Basic_Argument_T<CORBA::Long>;
-template class TAO::Out_Basic_Argument_T<CORBA::Long>;
-template class TAO::Ret_Basic_Argument_T<CORBA::Long>;
-
-template class TAO::In_Basic_Argument_T<CORBA::UShort>;
-template class TAO::Inout_Basic_Argument_T<CORBA::UShort>;
-template class TAO::Out_Basic_Argument_T<CORBA::UShort>;
-template class TAO::Ret_Basic_Argument_T<CORBA::UShort>;
-
-template class TAO::In_Basic_Argument_T<CORBA::ULong>;
-template class TAO::Inout_Basic_Argument_T<CORBA::ULong>;
-template class TAO::Out_Basic_Argument_T<CORBA::ULong>;
-template class TAO::Ret_Basic_Argument_T<CORBA::ULong>;
-
-template class TAO::In_Basic_Argument_T<CORBA::Float>;
-template class TAO::Inout_Basic_Argument_T<CORBA::Float>;
-template class TAO::Out_Basic_Argument_T<CORBA::Float>;
-template class TAO::Ret_Basic_Argument_T<CORBA::Float>;
-
-template class TAO::In_Basic_Argument_T<CORBA::Double>;
-template class TAO::Inout_Basic_Argument_T<CORBA::Double>;
-template class TAO::Out_Basic_Argument_T<CORBA::Double>;
-template class TAO::Ret_Basic_Argument_T<CORBA::Double>;
-
-template class TAO::In_Basic_Argument_T<CORBA::LongLong>;
-template class TAO::Inout_Basic_Argument_T<CORBA::LongLong>;
-template class TAO::Out_Basic_Argument_T<CORBA::LongLong>;
-template class TAO::Ret_Basic_Argument_T<CORBA::LongLong>;
-
-template class TAO::In_Basic_Argument_T<CORBA::ULongLong>;
-template class TAO::Inout_Basic_Argument_T<CORBA::ULongLong>;
-template class TAO::Out_Basic_Argument_T<CORBA::ULongLong>;
-template class TAO::Ret_Basic_Argument_T<CORBA::ULongLong>;
-
-template class TAO::In_Basic_Argument_T<CORBA::LongDouble>;
-template class TAO::Inout_Basic_Argument_T<CORBA::LongDouble>;
-template class TAO::Out_Basic_Argument_T<CORBA::LongDouble>;
-template class TAO::Ret_Basic_Argument_T<CORBA::LongDouble>;
-
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Arg_Traits_T<void>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::Short>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::Long>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::UShort>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::ULong>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::Float>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::Double>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::LongLong>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::ULongLong>
-#pragma instantiate TAO::Arg_Traits_T<CORBA::LongDouble>
-
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Short>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Long>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::UShort>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULong>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Float>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Double>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongLong>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULongLong>
-#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongDouble>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Short>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Short>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Short>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Short>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Long>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Long>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Long>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Long>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::UShort>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::UShort>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::UShort>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::UShort>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::ULong>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::ULong>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::ULong>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::ULong>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Float>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Float>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Float>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Float>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Double>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Double>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Double>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Double>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::LongLong>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::LongLong>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::LongLong>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::LongLong>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::ULongLong>
-
-#pragma instantiate TAO::In_Basic_Argument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::LongDouble>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
deleted file mode 100644
index 7b7a65cb305..00000000000
--- a/TAO/tao/Basic_Arguments.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_Arguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_BASIC_ARGUMENTS_H
-#define TAO_BASIC_ARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Argument_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Arg_Traits_T.h"
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specialization for void return type.
-   *
-   */
-  template<>
-  class TAO_Export Arg_Traits<void>
-  {
-    public:
-    typedef void        ret_type;
-
-    typedef Argument    ret_val;
-
-    typedef Basic_Tag   idl_tag;
-  };
-
-  /**
-   *
-   * @brief Specializations for basic stub arg types,
-   *  except (w)char/boolean/octet.
-   *
-   */
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Short>
-    : public Basic_Arg_Traits_T<CORBA::Short>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Long>
-    : public Basic_Arg_Traits_T<CORBA::Long>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::UShort>
-    : public Basic_Arg_Traits_T<CORBA::UShort>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::ULong>
-    : public Basic_Arg_Traits_T<CORBA::ULong>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Float>
-    : public Basic_Arg_Traits_T<CORBA::Float>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Double>
-    : public Basic_Arg_Traits_T<CORBA::Double>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::LongLong>
-    : public Basic_Arg_Traits_T<CORBA::LongLong>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::ULongLong>
-    : public Basic_Arg_Traits_T<CORBA::ULongLong>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::LongDouble>
-    : public Basic_Arg_Traits_T<CORBA::LongDouble>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASIC_ARGUMENTS_H */
diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h
deleted file mode 100644
index b2d8d652926..00000000000
--- a/TAO/tao/Basic_Types.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_Types.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_BASIC_TYPES_H
-#define TAO_BASIC_TYPES_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CDR_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  /**
-   * @name CORBA Primitive Types
-   *
-   * Declarations of all CORBA primitive types.
-   */
-  //@{
-  typedef ACE_CDR::Boolean Boolean;
-  typedef Boolean &Boolean_out;
-
-  typedef ACE_CDR::Octet Octet;
-  typedef Octet  &Octet_out;
-
-  typedef ACE_CDR::Short Short;
-  typedef Short &Short_out;
-
-  typedef ACE_CDR::UShort UShort;
-  typedef UShort &UShort_out;
-
-  typedef ACE_CDR::Long Long;
-  typedef Long &Long_out;
-
-  typedef ACE_CDR::ULong ULong;
-  typedef ULong &ULong_out;
-
-  typedef ACE_CDR::LongLong LongLong;
-  typedef LongLong &LongLong_out;
-
-  typedef ACE_CDR::ULongLong ULongLong;
-  typedef ULongLong &ULongLong_out;
-
-  typedef ACE_CDR::Float Float;
-  typedef Float &Float_out;
-
-  typedef ACE_CDR::Double Double;
-  typedef Double &Double_out;
-
-  typedef ACE_CDR::LongDouble LongDouble;
-  typedef LongDouble &LongDouble_out;
-
-  typedef ACE_CDR::Char Char;
-  typedef Char &Char_out;
-
-  typedef ACE_CDR::WChar WChar;
-  typedef WChar &WChar_out;
-  //@}
-
-  class String_var;
-  class String_out;
-
-  class WString_var;
-  class WString_out;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Any;
-}
-
-class TAO_InputCDR;
-class TAO_OutputCDR;
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASIC_TYPES_H */
diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp
deleted file mode 100644
index 81c93de5724..00000000000
--- a/TAO/tao/BiDir_Adapter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// @(#) $Id$
-
-#include "tao/BiDir_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, BiDir_Adapter, "$Id$")
-
-
-TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_BiDir_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_BiDir_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
deleted file mode 100644
index 53cdcaafd96..00000000000
--- a/TAO/tao/BiDir_Adapter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BiDir_Adapter.h
- *
- *  $Id$
- *
- *  @author  Balachandran Natarajan <parsons@cs.wustl.edu>
- */
-//=============================================================================
-#ifndef TAO_BIDIR_ADAPTER_H
-#define TAO_BIDIR_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-class TAO_ORB_Core;
-class TAO_Policy_Validator;
-
-namespace CORBA
-{
-  class ORB;
-  typedef ORB *ORB_ptr;
-}
-
-/**
- * @class TAO_BiDir_Adapter
- *
- * @brief TAO_BiDir_Adapter.
- *
- * Class that offers an interface to the ORB to load and manipulate
- * BiDirGIOP library.
- */
-class TAO_Export TAO_BiDir_Adapter : public ACE_Service_Object
-{
-public:
-
-  /// The virtual destructor
-  virtual ~TAO_BiDir_Adapter (void);
-
-  /// Activate the BiDirGIOP library
-  virtual int activate (CORBA::ORB_ptr,
-                        int argc,
-                        ACE_TCHAR* argv[]
-                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void load_policy_validators (TAO_Policy_Validator &validator ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_ADAPTER_H */
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
deleted file mode 100644
index 54b3d07fe05..00000000000
--- a/TAO/tao/BiDir_GIOP.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_BiDirGIOP
-  dynamicflags = TAO_BIDIRGIOP_BUILD_DLL
-
-  Source_Files {
-    BiDir_GIOP
-  }
-
-  Header_Files {
-    BiDir_GIOP
-  }
-
-  Inline_Files {
-    BiDir_GIOP
-  }
-
-  Template_Files {
-    BiDir_GIOP
-  }
-
-  Resource_Files {
-    BiDir_GIOP
-  }
-
-  PIDL_Files {
-    BiDir_GIOP
-  }
-
-  Pkgconfig_Files {
-    BiDir_GIOP/TAO_BiDirGIOP.pc.in
-  }
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
deleted file mode 100644
index 8de1abb5487..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "BiDirGIOP.h"
-#include "BiDir_ORBInitializer.h"
-#include "BiDirPolicy_Validator.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-
-
-ACE_RCSID (BiDir_GIOP,
-           BiDirGIOP,
-           "$Id$")
-
-
-// Set the flag to zero to start with
-int TAO_BiDirGIOP_Loader::is_activated_ = 0;
-
-TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
-{
-}
-
-TAO_BiDirGIOP_Loader::~TAO_BiDirGIOP_Loader (void)
-{
-}
-
-int
-TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
-                                int,
-                                ACE_TCHAR *[]
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG (orb);
-
-  if (TAO_BiDirGIOP_Loader::is_activated_ == 0 && TAO_DEF_GIOP_MINOR >= 2)
-    {
-      PortableInterceptor::ORBInitializer_ptr tmp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-      PortableInterceptor::ORBInitializer_var bidir_orb_initializer;
-
-      /// Register the BiDir ORBInitializer.
-      ACE_NEW_THROW_EX (tmp_orb_initializer,
-                        TAO_BiDir_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                                TAO::VMCID,
-                                ENOMEM),
-                            CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (-1);
-
-      bidir_orb_initializer = tmp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (
-        bidir_orb_initializer.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      TAO_BiDirGIOP_Loader::is_activated_ = 1;
-    }
-
-  return 0;
-}
-
-void
-TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Is this true? Does the GIOP protocol version matter here?
-  if (TAO_DEF_GIOP_MINOR < 2)
-    return;
-
-  TAO_BiDirPolicy_Validator *validator = 0;
-  ACE_NEW_THROW_EX (validator,
-                    TAO_BiDirPolicy_Validator (val.orb_core ()),
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                        CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  // We may be adding another TAO_BiDirPolicy_Validator instance for the
-  // same ORB (different POA). In cases where huge numbers of bi-directional POA instances
-  // are created, having a validator instance per POA may introduce additional delays in
-  // policy validation and hence, the overal policy creation time. Since this is out of the
-  // critical invocation processing path, I plan to keep the design simple and not try to
-  // avoid an ineficiency of such small proportions.
-  val.add_validator (validator);
-}
-
-int
-TAO_BiDirGIOP_Loader::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader);
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader,
-                       ACE_TEXT ("BiDirGIOP_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_BiDirGIOP_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
deleted file mode 100644
index 2d5fff19ff7..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file BiDirGIOP.h
- *
- *  $Id$
- *
- *  Dynamic loader object for BiDir GIOP
- *
- *
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_BIDIR_GIOP_H
-#define TAO_BIDIR_GIOP_H
-#include /**/ "ace/pre.h"
-
-#include "bidirgiop_export.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/BiDir_Adapter.h"
-#include "ace/Service_Config.h"
-
-class TAO_BiDirPolicy_Validator;
-
-/**
- * @class TAO_BiDirGIOP_Loader
- *
- * @brief Class that loads the BiDir library.
- */
-
-class TAO_BiDirGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter
-{
-public:
-
-  /// Constructor
-  TAO_BiDirGIOP_Loader (void);
-
-  /// Destructor
-  ~TAO_BiDirGIOP_Loader (void);
-
-  /// Creates a  factory and returns it.
-  virtual int activate (CORBA::ORB_ptr,
-                        int argc,
-                        ACE_TCHAR *argv []
-                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void load_policy_validators (TAO_Policy_Validator &validator
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-
-private:
-
-  /// Flag to indicate whether the BiDirGIOP library has been
-  /// activated.
-  static int is_activated_;
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader)
-ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_BiDirGIOP_Initializer = &TAO_BiDirGIOP_Loader::Initializer;
-
-#else
-
-static int
-TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_BIDIRGIOP_SAFE_INCLUDE
-#include "BiDirPolicyC.h"
-#undef TAO_BIDIRGIOP_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_GIOP_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
deleted file mode 100644
index 6659b56951d..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-//
-//   This file was used to generate the code in
-//   BiDirPolicy*.* The command used to generate code
-//   is:
-//
-//     tao_idl -o orig -Ge 1 -Sa -St -Sci \
-//          -Wb,export_macro=TAO_BiDirGIOP_Export \
-//          -Wb,export_include="bidirgiop_export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          BiDirPolicy.pidl
-//
-//   This is from the GIOP 1.2 spec for Bi Dir IIOP.
-
-#ifndef TAO_BIDIR_POLICY_PIDL
-#define TAO_BIDIR_POLICY_PIDL
-
-#pragma prefix "omg.org"
-
-#include <Policy.pidl>
-
-// Self contained module for Bi-directional GIOP policy
-module BiDirPolicy
-{
-  typedef unsigned short BidirectionalPolicyValue;
-  const BidirectionalPolicyValue NORMAL = 0;
-  const BidirectionalPolicyValue BOTH = 1;
-  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37;
-
-  // @@ This has been made local. It was not so in the spec. Any reason
-  //    why this shouldn't be a local interface ?
-  local interface BidirectionalPolicy : CORBA::Policy
-  {
-    readonly attribute BidirectionalPolicyValue value;
-  };
-};
-
-#endif  /* TAO_BIDIR_POLICY_PIDL*/
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
deleted file mode 100644
index 93db9790b38..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "BiDirGIOP.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for BiDirPolicy::BidirectionalPolicy.
-
-BiDirPolicy::BidirectionalPolicy_ptr
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate (
-    BiDirPolicy::BidirectionalPolicy_ptr p
-  )
-{
-  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release (
-    BiDirPolicy::BidirectionalPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-BiDirPolicy::BidirectionalPolicy_ptr
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::nil (void)
-{
-  return BiDirPolicy::BidirectionalPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal (
-    BiDirPolicy::BidirectionalPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy (void)
-{}
-
-BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void)
-{}
-
-BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BidirectionalPolicy::_nil ();
-    }
-  
-  BidirectionalPolicy_ptr proxy =
-    dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
-  return BidirectionalPolicy::_duplicate (proxy);
-}
-
-BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BidirectionalPolicy::_nil ();
-    }
-  
-  BidirectionalPolicy_ptr proxy =
-    dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
-  return BidirectionalPolicy::_duplicate (proxy);
-}
-
-BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-BiDirPolicy::BidirectionalPolicy::_tao_release (BidirectionalPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-BiDirPolicy::BidirectionalPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0";
-}
-
-CORBA::Boolean
-BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
deleted file mode 100644
index 0baa3c73cee..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
-#define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
-#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
-#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "bidirgiop_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_BiDirGIOP_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace BiDirPolicy
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::UShort BidirectionalPolicyValue;
-  typedef CORBA::UShort_out BidirectionalPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_
-  
-  class BidirectionalPolicy;
-  typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        BidirectionalPolicy
-      >
-    BidirectionalPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        BidirectionalPolicy
-      >
-    BidirectionalPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
-  
-  class TAO_BiDirGIOP_Export BidirectionalPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef BidirectionalPolicy_ptr _ptr_type;
-    typedef BidirectionalPolicy_var _var_type;
-    
-    // The static operations.
-    static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
-    
-    static void _tao_release (BidirectionalPolicy_ptr obj);
-    
-    static BidirectionalPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static BidirectionalPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static BidirectionalPolicy_ptr _nil (void)
-    {
-      return static_cast<BidirectionalPolicy_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual BiDirPolicy::BidirectionalPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    BidirectionalPolicy (void);
-    
-    virtual ~BidirectionalPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    BidirectionalPolicy (const BidirectionalPolicy &);
-    
-    void operator= (const BidirectionalPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module BiDirPolicy
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_BiDirGIOP_Export Objref_Traits< ::BiDirPolicy::BidirectionalPolicy>
-  {
-    static ::BiDirPolicy::BidirectionalPolicy_ptr duplicate (
-        ::BiDirPolicy::BidirectionalPolicy_ptr
-      );
-    static void release (
-        ::BiDirPolicy::BidirectionalPolicy_ptr
-      );
-    static ::BiDirPolicy::BidirectionalPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::BiDirPolicy::BidirectionalPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
deleted file mode 100644
index 8dcdeb2b341..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "BiDirPolicy_Validator.h"
-#include "BiDir_Policy_i.h"
-#include "tao/Policy_Set.h"
-#include "tao/ORB_Core.h"
-
-ACE_RCSID (TAO, 
-           BiDirPolicy_Validator, 
-           "$Id$")
-
-TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
-  : TAO_Policy_Validator (orb_core)
-{
-}
-
-
-void
-TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
-                                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (policy.in () == 0)
-    return;
-
-  BiDirPolicy::BidirectionalPolicy_var srp =
-    BiDirPolicy::BidirectionalPolicy::_narrow (policy.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (srp.in () == 0)
-    return;
-
-  BiDirPolicy::BidirectionalPolicyValue val =
-    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Set the flag in the ORB_Core
-  if (val == BiDirPolicy::BOTH)
-    orb_core_.bidir_giop_policy (1);
-}
-
-void
-TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set & /*policies*/
-                                                ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return ;
-}
-
-CORBA::Boolean
-TAO_BiDirPolicy_Validator::legal_policy_impl (CORBA::PolicyType type)
-{
-  return (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE);
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
deleted file mode 100644
index a91220671d8..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//=============================================================================
-/**
- *  @file    BiDirPolicy_Validator.h
- *
- *  $Id$
- *
- *  This file contains the declaration for the BiDir policy validator
- *  interface.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth  <fhuntleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_BIDIR_POLICY_VALIDATOR_H_
-#define TAO_BIDIR_POLICY_VALIDATOR_H_
-
-#include /**/ "ace/pre.h"
-#include "bidirgiop_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Policy_Validator.h"
-
-
-class TAO_Policy_Set;
-class TAO_ORB_Core;
-
-/**
- * @class TAO_BiDirPolicy_Validator
- *
- * @brief Policy Validator for BiDir GIOP class
- *
- */
-
-class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator
-{
-public:
-
-  TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core);
-
-  virtual void validate_impl (TAO_Policy_Set &policies
-                              ACE_ENV_ARG_DECL);
-
-  virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    ACE_ENV_ARG_DECL);
-
-  virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
-
-private:
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
deleted file mode 100644
index 328d9fb86da..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "BiDir_ORBInitializer.h"
-#include "BiDir_PolicyFactory.h"
-#include "BiDirGIOP.h"
-
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID (BiDir_GIOP,
-           BiDir_ORBInitializer,
-           "$Id$")
-
-void
-TAO_BiDir_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //
-}
-
-void
-TAO_BiDir_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_BiDir_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  /// Register the BiDir policy factories.
-  PortableInterceptor::PolicyFactory_ptr temp_factory =
-    PortableInterceptor::PolicyFactory::_nil ();
-  PortableInterceptor::PolicyFactory_var policy_factory;
-
-  /// This policy factory is used for all BiDir related policies.
-  ACE_NEW_THROW_EX (temp_factory,
-                    TAO_BiDir_PolicyFactory,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                         TAO::VMCID,
-                         ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  policy_factory = temp_factory;
-
-  /// Bind the same policy factory to all BiDir related policy
-  /// types since a single policy factory is used to create each of
-  /// the different types of BiDir policies.
-
-  CORBA::PolicyType type;
-
-  type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE;
-  info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
deleted file mode 100644
index 0671cf2bbd1..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-//
-// ===================================================================
-/**
- *  @file BiDir_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-#ifndef TAO_BIDIR_ORB_INITIALIZER_H
-#define TAO_BIDIR_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "bidirgiop_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Messaging ORB initializer.
-class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  ///< Register Messaging policy factories.
-  void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL);
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BIDIR_ORB_INITIALIZER_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
deleted file mode 100644
index 65e88904bba..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "BiDir_PolicyFactory.h"
-#include "BiDirGIOP.h"
-#include "BiDir_Policy_i.h"
-
-#include "tao/ORB_Constants.h"
-#include "tao/Any.h"
-
-ACE_RCSID (BiDir_GIOP,
-           BiDir_PolicyFactory,
-           "$Id$")
-
-CORBA::Policy_ptr
-TAO_BiDir_PolicyFactory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
-
-  if (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE)
-    {
-      BiDirPolicy::BidirectionalPolicyValue val;
-
-      // Extract the value from the any.
-      value >>= val;
-      if ((value >>= val) == 0)
-        {
-          ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                            CORBA::Policy::_nil ());
-        }
-
-      ACE_NEW_THROW_EX (policy,
-                        TAO_BidirectionalPolicy (val),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return policy;
-    }
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
deleted file mode 100644
index 4f2dcc637d2..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-//
-// ===================================================================
-/**
- *  @file BiDir_PolicyFactory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-#ifndef TAO_BIDIR_POLICY_FACTORY_H
-#define TAO_BIDIR_POLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "bidirgiop_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Policy factory for all Messaging related policies.
-class TAO_BiDirGIOP_Export TAO_BiDir_PolicyFactory :
-  public PortableInterceptor::PolicyFactory,
-  public TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-};
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BIDIR_POLICY_FACTORY_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
deleted file mode 100644
index c301a8a7b53..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-
-#include "BiDir_Policy_i.h"
-
-#include "tao/Stub.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID (TAO,
-           BiDir_Policy_i,
-           "$Id$")
-
-TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (
-    const BiDirPolicy::BidirectionalPolicyValue  val)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
-  , value_ (val)
-{
-}
-
-TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
-  , value_ (rhs.value_)
-{
-}
-
-
-CORBA::PolicyType
-TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how this minimizes the
-  // footprint of the class.
-  return BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE;
-}
-
-
-TAO_BidirectionalPolicy *
-TAO_BidirectionalPolicy::clone (void) const
-{
-  TAO_BidirectionalPolicy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_BidirectionalPolicy (*this),
-                  0);
-  return copy;
-}
-
-CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TAO_BidirectionalPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-
-BiDirPolicy::BidirectionalPolicyValue
-TAO_BidirectionalPolicy::value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException))
-{
-  return this->value_;
-}
-
-
-TAO_Cached_Policy_Type
-TAO_BidirectionalPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP;
-}
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
deleted file mode 100644
index 1555b96dc9d..00000000000
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-
-// ===================================================================
-/**
- *  @file BiDir_Policy_i.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_BIDIR_POLICY_I_H
-#define TAO_BIDIR_POLICY_I_H
-#include /**/ "ace/pre.h"
-#include "bidirgiop_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "BiDirGIOP.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_BidirectionalPolicy
- *
- * @brief  Implementation of the BiDirPolicy::BidirectionalPolicy
- *
- * This policy controls the whether the connections established  by the
- * clients can be made bi-directional or not. Further, this policy
- * also needs to be set by the server to use the connections
- * established by the clients to send requests.
- *
- */
-
-class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy
-  : public virtual BiDirPolicy::BidirectionalPolicy,
-    public virtual TAO_Local_RefCounted_Object
-{
-
-public:
-
-  /// Constructor.
-  TAO_BidirectionalPolicy (const BiDirPolicy::BidirectionalPolicyValue val);
-
-  /// Copy constructor.
-  TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs);
-
-  /// Returns a copy of <this>.
-  virtual TAO_BidirectionalPolicy *clone (void) const;
-
-  /// = The BiDir::BidirectionalPolicy methods
-  virtual BiDirPolicy::BidirectionalPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-private:
-
-  /// The attribute
-  BiDirPolicy::BidirectionalPolicyValue value_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BIDIR_POLICY_I_H */
diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDirGIOP.pc.in b/TAO/tao/BiDir_GIOP/TAO_BiDirGIOP.pc.in
deleted file mode 100644
index 79977431ea0..00000000000
--- a/TAO/tao/BiDir_GIOP/TAO_BiDirGIOP.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_BiDirGIOP
-Description: TAO Bidirection GIOP Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_BiDirGIOP
-Cflags: -I${includedir}
diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc
deleted file mode 100644
index 13c255b63ad..00000000000
--- a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "BiDir_GIOP\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_BiDirGIOPDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_BiDirGIOP.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/BiDir_GIOP/bidirgiop_export.h b/TAO/tao/BiDir_GIOP/bidirgiop_export.h
deleted file mode 100644
index 664fba705b7..00000000000
--- a/TAO/tao/BiDir_GIOP/bidirgiop_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_BIDIRGIOP_EXPORT_H
-#define TAO_BIDIRGIOP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_BIDIRGIOP_HAS_DLL)
-#    define TAO_BIDIRGIOP_HAS_DLL 0
-#  endif /* ! TAO_BIDIRGIOP_HAS_DLL */
-#else
-#  if !defined (TAO_BIDIRGIOP_HAS_DLL)
-#    define TAO_BIDIRGIOP_HAS_DLL 1
-#  endif /* ! TAO_BIDIRGIOP_HAS_DLL */
-#endif
-
-#if defined (TAO_BIDIRGIOP_HAS_DLL) && (TAO_BIDIRGIOP_HAS_DLL == 1)
-#  if defined (TAO_BIDIRGIOP_BUILD_DLL)
-#    define TAO_BiDirGIOP_Export ACE_Proper_Export_Flag
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_BIDIRGIOP_BUILD_DLL */
-#    define TAO_BiDirGIOP_Export ACE_Proper_Import_Flag
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_BIDIRGIOP_BUILD_DLL */
-#else /* TAO_BIDIRGIOP_HAS_DLL == 1 */
-#  define TAO_BiDirGIOP_Export
-#  define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T)
-#  define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_BIDIRGIOP_HAS_DLL == 1 */
-
-#endif /* TAO_BIDIRGIOP_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
deleted file mode 100644
index 625ccc8ea8b..00000000000
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- orig/BiDirPolicyC.h	2005-02-18 12:27:27.078513600 +0100
-+++ BiDirPolicyC.h	2005-02-18 12:27:27.278801600 +0100
-@@ -33,6 +33,9 @@
- 
- #include /**/ "ace/pre.h"
- 
-+#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
-+#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
-+#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
- 
- #include "ace/config-all.h"
- 
-@@ -47,6 +50,8 @@
- #include "tao/Object.h"
- #include "tao/Objref_VarOut_T.h"
- 
-+#include "tao/PolicyC.h"
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
---- orig/BiDirPolicyC.cpp	2005-02-18 12:27:27.078513600 +0100
-+++ BiDirPolicyC.cpp	2005-02-18 12:27:27.288816000 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "BiDirPolicyC.h"
-+#include "BiDirGIOP.h"
- #include "tao/CDR.h"
- #include "ace/OS_NS_string.h"
- 
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
deleted file mode 100644
index 9466a58fe3e..00000000000
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/Bind_Dispatcher_Guard.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Bind_Dispatcher_Guard.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Bind_Dispatcher_Guard,
-           "$Id$")
-
-TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard (
-                                         CORBA::ULong request_id,
-                                         TAO_Reply_Dispatcher* rd,
-                                         TAO_Transport_Mux_Strategy* tms)
- : status_(TAO_Bind_Dispatcher_Guard::UNBIND),
-   request_id_(request_id),
-   rd_(rd),
-   tms_(tms)
-{
-  int retval =
-    this->tms_->bind_dispatcher (this->request_id_,
-                                 this->rd_);
-
-  if (retval == -1 )
-    this->status_ =
-      TAO_Bind_Dispatcher_Guard::NO_UNBIND;
-}
-
-TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void)
-{
-  // We try unbinding. If it works it works, else cant do much about
-  // it..
-  if (this->status_ == TAO_Bind_Dispatcher_Guard::UNBIND)
-    (void) this->tms_->unbind_dispatcher (this->request_id_);
-}
diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h
deleted file mode 100644
index 6873503f737..00000000000
--- a/TAO/tao/Bind_Dispatcher_Guard.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//=============================================================================
-/**
- *  @file     Bind_Dispatcher_Guard.h
- *
- *  $Id$
- *
- *  @author  Carlos O'Ryan <coryan@uci.edu>
- *  @author  Chad Elliott <elliott_c@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_BIND_DISPATCHER_GUARD_H
-#define TAO_BIND_DISPATCHER_GUARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
-
-class TAO_Reply_Dispatcher;
-class TAO_Transport_Mux_Strategy;
-
-class TAO_Export TAO_Bind_Dispatcher_Guard
-{
-public:
-  TAO_Bind_Dispatcher_Guard (CORBA::ULong request_id,
-                             TAO_Reply_Dispatcher* rd,
-                             TAO_Transport_Mux_Strategy* tms);
-
-  ~TAO_Bind_Dispatcher_Guard (void);
-
-  /// Returns 0 if succesful and non-zero otherwise.
-  int unbind_dispatcher (void);
-
-  /// State information
-  enum
-    {
-      /// Unbind the dispatcher
-      UNBIND = 0,
-      /// Do not unbind dispatcher
-      NO_UNBIND
-    };
-
-  /// Set and get status
-  int status (void) const;
-  void status (int status);
-
-private:
-  int                         status_;
-  CORBA::ULong                request_id_;
-  TAO_Reply_Dispatcher*       rd_;
-  TAO_Transport_Mux_Strategy* tms_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Bind_Dispatcher_Guard.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif
diff --git a/TAO/tao/Bind_Dispatcher_Guard.i b/TAO/tao/Bind_Dispatcher_Guard.i
deleted file mode 100644
index 64bce7bf6f6..00000000000
--- a/TAO/tao/Bind_Dispatcher_Guard.i
+++ /dev/null
@@ -1,42 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ===========================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = AUTHOR
-//     Carlos O'Ryan <coryan@uci.edu>,
-//     Chad Elliott <elliott_c@ociweb.com>
-//
-// ===========================================================================
-
-#include "tao/Reply_Dispatcher.h"
-#include "tao/Transport_Mux_Strategy.h"
-
-
-ACE_INLINE void
-TAO_Bind_Dispatcher_Guard::status (int s)
-{
-  this->status_ = s;
-}
-
-ACE_INLINE int
-TAO_Bind_Dispatcher_Guard::status (void) const
-{
-  return this->status_;
-}
-
-ACE_INLINE int
-TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void)
-{
-  int retval =
-    this->tms_->unbind_dispatcher (this->request_id_);
-
-  // Already unbound and so do not try again during destruction.
-  this->status_ =
-    TAO_Bind_Dispatcher_Guard::NO_UNBIND;
-
-  return retval;
-}
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
deleted file mode 100644
index 96a6b3f12d1..00000000000
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Block_Flushing_Strategy.h"
-#include "Transport.h"
-#include "Queued_Message.h"
-
-ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$")
-
-int
-TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *transport)
-{
-  while (!transport->queue_is_empty_i ())
-    {
-      int result = transport->drain_queue_i ();
-      if (result == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_Block_Flushing_Strategy::cancel_output (TAO_Transport *)
-{
-  return 0;
-}
-
-int
-TAO_Block_Flushing_Strategy::flush_message (TAO_Transport *transport,
-                                            TAO_Queued_Message *msg,
-                                            ACE_Time_Value *)
-{
-  while (!msg->all_data_sent ())
-    {
-      int result = transport->handle_output ();
-      if (result == -1)
-        return -1;
-    }
-  return 0;
-}
-
-int
-TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport)
-{
-  while (!transport->queue_is_empty ())
-    {
-      int result = transport->handle_output ();
-      if (result == -1)
-        return -1;
-    }
-  return 0;
-}
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
deleted file mode 100644
index dac5ac3f781..00000000000
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Block_Flushing_Strategy.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_BLOCK_FLUSHING_STRATEGY_H
-#define TAO_BLOCK_FLUSHING_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "Flushing_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Block_Flushing_Strategy
- *
- * @brief Implement a flushing strategy that blocks on write to flush
- */
-class TAO_Export TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
-{
-public:
-  virtual int schedule_output (TAO_Transport *transport);
-  virtual int cancel_output (TAO_Transport *transport);
-  virtual int flush_message (TAO_Transport *transport,
-                             TAO_Queued_Message *msg,
-                             ACE_Time_Value *max_wait_time);
-  virtual int flush_transport (TAO_Transport *transport);
-};
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_BLOCK_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
deleted file mode 100644
index a7d50c3d307..00000000000
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "Blocked_Connect_Strategy.h"
-#include "Connection_Handler.h"
-
-#include "ace/Synch_Options.h"
-
-ACE_RCSID(tao,
-          Blocked_Connect_Strategy,
-          "$Id$")
-
-
-TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy (
-    TAO_ORB_Core *orb_core)
-  : TAO_Connect_Strategy (orb_core)
-{
-}
-
-TAO_Blocked_Connect_Strategy::~TAO_Blocked_Connect_Strategy (void)
-{
-}
-
-
-void
-TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
-                                             ACE_Synch_Options &options)
-{
-  if (timeout != 0)
-    {
-      // Blocking with a timeout
-      options.set (ACE_Synch_Options::USE_TIMEOUT,
-                   *timeout);
-    }
-  else
-    {
-      // Making it sure it is blocking.
-      options.set (0,
-                   ACE_Time_Value::zero);
-    }
-}
-
-
-int
-TAO_Blocked_Connect_Strategy::wait (TAO_Connection_Handler *,
-                                    ACE_Time_Value * )
-{
-  // We cannot wait for connection completion
-  return -1;
-}
-
-int
-TAO_Blocked_Connect_Strategy::wait (TAO_Transport *,
-                                    ACE_Time_Value *)
-{
-  // We cannot wait for connection completion
-  return -1;
-}
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h
deleted file mode 100644
index 87016f0470f..00000000000
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Blocked_Connect_Strategy.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_BLOCKED_CONNECT_STRATEGY_H
-#define TAO_BLOCKED_CONNECT_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "Connect_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Blocked_Connect_Strategy
- *
- * @brief Concrete implementation of a connect strategy that blocks
- *  during connects
- *
- */
-
-class TAO_Export TAO_Blocked_Connect_Strategy : public TAO_Connect_Strategy
-{
-public:
-  /// Contructor
-  TAO_Blocked_Connect_Strategy (TAO_ORB_Core *orb);
-
-  /// Destructor
-  ~TAO_Blocked_Connect_Strategy (void);
-
-  /*
-   * Concrete implementation for this class. Please see
-   * Connect_Strategy.h for details
-   */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
-
-  virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val);
-
-  virtual int wait (TAO_Transport *t,
-                     ACE_Time_Value *val);
-};
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_BLOCKED_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl
deleted file mode 100644
index 2429bd692fc..00000000000
--- a/TAO/tao/BooleanSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in BooleanSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          BooleanSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_BOOLEAN_SEQ_IDL
-#define TAO_CORBA_BOOLEAN_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<boolean> BooleanSeq;
-};
-
-#endif  /* TAO_CORBA_BOOLEAN_SEQ_IDL */
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
deleted file mode 100644
index b7f1ec4ce00..00000000000
--- a/TAO/tao/BooleanSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BooleanSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-#define _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_BooleanSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_boolean,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_BooleanSeq_0 =
-      &CORBA_BooleanSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_BooleanSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_BooleanSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/BooleanSeq:1.0",
-    "BooleanSeq",
-    &TAO::TypeCode::tc_CORBA_BooleanSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_BooleanSeq =
-    &_tao_tc_CORBA_BooleanSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert_copy (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::BooleanSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::extract (
-        _tao_any,
-        CORBA::BooleanSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
deleted file mode 100644
index a1af732ef20..00000000000
--- a/TAO/tao/BooleanSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "BooleanSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_BOOLEANSEQ_CS_)
-#define _CORBA_BOOLEANSEQ_CS_
-
-CORBA::BooleanSeq::BooleanSeq (void)
-{}
-
-CORBA::BooleanSeq::BooleanSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Boolean
-      >
-    (max)
-{}
-
-CORBA::BooleanSeq::BooleanSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Boolean * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Boolean
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::BooleanSeq::BooleanSeq (
-    const BooleanSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Boolean
-      >
-    (seq)
-{}
-
-CORBA::BooleanSeq::~BooleanSeq (void)
-{}
-
-void CORBA::BooleanSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  BooleanSeq * _tao_tmp_pointer =
-    static_cast<BooleanSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_BooleanSeq_CPP_
-#define _TAO_CDR_OP_CORBA_BooleanSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::BooleanSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::BooleanSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
deleted file mode 100644
index 138394c2bf4..00000000000
--- a/TAO/tao/BooleanSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_BOOLEANSEQC_H_
-#define _TAO_IDL_ORIG_BOOLEANSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_BOOLEANSEQ_CH_)
-#define _CORBA_BOOLEANSEQ_CH_
-  
-  class BooleanSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        BooleanSeq,
-        CORBA::Boolean
-      >
-    BooleanSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        BooleanSeq,
-        BooleanSeq_var,
-        CORBA::Boolean
-      >
-    BooleanSeq_out;
-  
-  class TAO_Export BooleanSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Boolean
-          >
-  {
-  public:
-    BooleanSeq (void);
-    BooleanSeq (CORBA::ULong max);
-    BooleanSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Boolean* buffer, 
-        CORBA::Boolean release = 0
-      );
-    BooleanSeq (const BooleanSeq &);
-    ~BooleanSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef BooleanSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BooleanSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::BooleanSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::BooleanSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::BooleanSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::BooleanSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_BooleanSeq_H_
-#define _TAO_CDR_OP_CORBA_BooleanSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::BooleanSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::BooleanSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/BooleanSeqS.h b/TAO/tao/BooleanSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/BooleanSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
deleted file mode 100644
index c639e285fe5..00000000000
--- a/TAO/tao/Bounds.pidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file Bounds.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::Bounds
- * exception.
- *
- * This file is used to generate BoundsC.{h,inl,cpp}, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Bounds.pidl
- *
- * and then:
- *
- * cp orig/BoundsC.{h,cpp} .
- *
- */
-#ifndef TAO_CORBA_BOUNDS_PIDL
-#define TAO_CORBA_BOUNDS_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  /**
-   * @exception Bounds
-   *
-   * @brief UserException for NVList::item()
-   *
-   * This exception is thrown on attempts to access 'out of bounds'
-   * items in an NVList.
-   */
-  exception Bounds {};
-};
-
-#endif /* TAO_CORBA_BOUNDS_PIDL */
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
deleted file mode 100644
index 6dbe977a16d..00000000000
--- a/TAO/tao/BoundsA.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BoundsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_Bounds = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Bounds (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/Bounds:1.0",
-    "Bounds",
-    _tao_fields_CORBA_Bounds,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Bounds =
-    &_tao_tc_CORBA_Bounds;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Bounds &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert_copy (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Bounds *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Bounds *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Bounds *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Bounds *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Bounds>::extract (
-        _tao_any,
-        CORBA::Bounds::_tao_any_destructor,
-        CORBA::_tc_Bounds,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
deleted file mode 100644
index 9c6636f790b..00000000000
--- a/TAO/tao/BoundsC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "BoundsC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::Bounds::Bounds (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/Bounds:1.0",
-        "Bounds"
-      )
-{
-}
-
-CORBA::Bounds::~Bounds (void)
-{
-}
-
-CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::Bounds&
-CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Bounds *_tao_tmp_pointer =
-    static_cast<Bounds *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<Bounds *> (_tao_excp);
-}
-
-const CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const Bounds *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::Bounds::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::Bounds, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::Bounds::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::Bounds (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::Bounds::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::Bounds::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::Bounds::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_tao_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Bounds &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::Bounds&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
deleted file mode 100644
index a2b773b10cd..00000000000
--- a/TAO/tao/BoundsC.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_BOUNDSC_H_
-#define _TAO_IDL_ORIG_BOUNDSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_BOUNDS_CH_)
-#define _CORBA_BOUNDS_CH_
-  
-  class TAO_Export Bounds : public CORBA::UserException
-  {
-  public:
-    
-    Bounds (void);
-    Bounds (const Bounds &);
-    ~Bounds (void);
-
-    Bounds &operator= (const Bounds &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static Bounds *_downcast (CORBA::Exception *);
-    static const Bounds *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Bounds;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Bounds *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
deleted file mode 100644
index 34a0aa19550..00000000000
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#ifndef TAO_BUFFER_ALLOCATOR_T_CPP
-#define TAO_BUFFER_ALLOCATOR_T_CPP
-
-#include "tao/Buffer_Allocator_T.h"
-#include "ace/Global_Macros.h"
-
-namespace TAO
-{
-  template <typename handler_type, typename alloc_type>
-  TAO_Buffer_Allocator<handler_type, alloc_type>::TAO_Buffer_Allocator (alloc_type *allocator) :
-    allocator_(allocator)
-  {
-  }
-
-  template <typename handler_type, typename alloc_type>
-  handler_type*
-  TAO_Buffer_Allocator<handler_type, alloc_type>::allocate (void)
-  {
-    handler_type* myvalue = 0;
-    ACE_NEW_MALLOC_RETURN (myvalue,
-                           static_cast <handler_type*>(
-                               allocator_->malloc (sizeof (handler_type))),
-                           handler_type (), 0);
-
-    return myvalue;
-  }
-
-  template <typename handler_type, typename alloc_type>
-  void
-  TAO_Buffer_Allocator<handler_type, alloc_type>::release (handler_type *ptr)
-  {
-      ACE_DES_FREE (ptr,
-                    allocator_->free,
-                    handler_type);
-  }
-}
-
-#endif /* TAO_BUFFER_ALLOCATOR_T_CPP */
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
deleted file mode 100644
index 59684723965..00000000000
--- a/TAO/tao/Buffer_Allocator_T.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Buffer_Allocator_T.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen (jwillemsen@remedy.nl)
- */
-//=============================================================================
-
-#ifndef TAO_BUFFER_ALLOCATOR_T_H
-#define TAO_BUFFER_ALLOCATOR_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Allocator.h"
-
-namespace TAO
-{
-  /**
-   * @class TAO_Buffer_Allocator
-   *
-   * @brief Generic buffer allocator for TAO
-   *
-   * handler_type is the type of object to allocator, alloc_type is the type
-   * of allocator to be used to allocate the object.
-   */
-  template <typename handler_type, typename alloc_type>
-  class TAO_Buffer_Allocator : public TAO_Allocator<handler_type>
-  {
-    public:
-      typedef handler_type HANDLER_TYPE;
-      typedef alloc_type ALLOC_TYPE;
-      TAO_Buffer_Allocator (alloc_type *allocator);
-
-      virtual handler_type *allocate (void);
-      virtual void release (handler_type *ptr);
-    private:
-      alloc_type* allocator_;
-  };
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Buffer_Allocator_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Buffer_Allocator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BUFFER_ALLOCATOR_T_H */
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
deleted file mode 100644
index dc11eeedd16..00000000000
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-
-
-#include "tao/Buffering_Constraint_Policy.h"
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-#include "TAOC.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           Buffering_Constraint_Policy,
-           "$Id$")
-
-
-#if ! defined (__ACE_INLINE__)
-#include "tao/Buffering_Constraint_Policy.i"
-#endif /* __ACE_INLINE__ */
-
-TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO::BufferingConstraintPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , buffering_constraint_ (buffering_constraint)
-{
-}
-
-TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs)
-
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO::BufferingConstraintPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , buffering_constraint_ (rhs.buffering_constraint_)
-{
-}
-
-CORBA::PolicyType
-TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val
-                                         ACE_ENV_ARG_DECL)
-{
-  TAO::BufferingConstraint *buffering_constraint;
-  if ((val >>= buffering_constraint) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Buffering_Constraint_Policy *servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Buffering_Constraint_Policy (*buffering_constraint),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
-TAO_Buffering_Constraint_Policy *
-TAO_Buffering_Constraint_Policy::clone (void) const
-{
-  TAO_Buffering_Constraint_Policy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_Buffering_Constraint_Policy (*this),
-                  0);
-  return copy;
-}
-
-TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->buffering_constraint_;
-}
-
-CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Buffering_Constraint_Policy* servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Buffering_Constraint_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
-void
-TAO_Buffering_Constraint_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
deleted file mode 100644
index 3dd23fc37a2..00000000000
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   Buffering_Constraint_Policy.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali (irfan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_BUFFERING_CONSTRAINT_POLICY_H
-#define TAO_BUFFERING_CONSTRAINT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAOC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_Buffering_Constraint_Policy
- *
- * @brief Implementation class for TAO-specific Buffering Constraint Policy.
- *
- * This policy is used to control the buffering of requests by the ORB.
- */
-class TAO_Export TAO_Buffering_Constraint_Policy
-  : public TAO::BufferingConstraintPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint);
-
-  /// Copy constructor.
-  TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs);
-
-  /// Helper method for the implementation of CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Returns a copy of <this>.
-  virtual TAO_Buffering_Constraint_Policy *clone (void) const;
-
-  // = The TAO::Buffering_Constraint_Policy methods
-
-  virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void get_buffering_constraint (TAO::BufferingConstraint &) const;
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-private:
-  /// The attribute
-  TAO::BufferingConstraint buffering_constraint_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-#include "tao/Buffering_Constraint_Policy.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_BUFFERING_CONSTRAINT_POLICY_H */
diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i
deleted file mode 100644
index aa5203cb743..00000000000
--- a/TAO/tao/Buffering_Constraint_Policy.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE void
-TAO_Buffering_Constraint_Policy::get_buffering_constraint (TAO::BufferingConstraint &bc) const
-{
-  bc = this->buffering_constraint_;
-}
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
deleted file mode 100644
index ccc993ff3b0..00000000000
--- a/TAO/tao/CDR.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// $Id$
-
-#include "tao/CDR.h"
-#include "tao/Timeprobe.h"
-#include "tao/ORB_Core.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CDR.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           CDR,
-           "$Id$")
-
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_CDR_Timeprobe_Description[] =
-{
-  "OutputCDR::ctor[1] - enter",
-  "OutputCDR::ctor[1] - leave",
-  "OutputCDR::ctor[2] - enter",
-  "OutputCDR::ctor[2] - leave",
-  "OutputCDR::ctor[3] - enter",
-  "OutputCDR::ctor[3] - leave"
-};
-
-enum
-{
-  TAO_OUTPUT_CDR_CTOR1_ENTER = 2000,
-  TAO_OUTPUT_CDR_CTOR1_LEAVE,
-  TAO_OUTPUT_CDR_CTOR2_ENTER,
-  TAO_OUTPUT_CDR_CTOR2_LEAVE,
-  TAO_OUTPUT_CDR_CTOR3_ENTER,
-  TAO_OUTPUT_CDR_CTOR3_LEAVE
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description,
-                                  TAO_OUTPUT_CDR_CTOR1_ENTER);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_OutputCDR::TAO_OutputCDR (size_t size,
-                              int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
-                              ACE_Allocator* message_block_allocator,
-                              size_t memcpy_tradeoff,
-                              ACE_CDR::Octet major_version,
-                              ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    message_block_allocator,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
-}
-
-TAO_OutputCDR::TAO_OutputCDR (char *data,
-                              size_t size,
-                              int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
-                              ACE_Allocator* message_block_allocator,
-                              size_t memcpy_tradeoff,
-                              ACE_CDR::Octet major_version,
-                              ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (data,
-                    size,
-                    byte_order,
-                    buffer_allocator,
-                    data_block_allocator,
-                    message_block_allocator,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
-}
-
-TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
-                              int byte_order,
-                              size_t memcpy_tradeoff,
-                              ACE_CDR::Octet major_version,
-                              ACE_CDR::Octet minor_version)
-  :  ACE_OutputCDR (data,
-                    byte_order,
-                    memcpy_tradeoff,
-                    major_version,
-                    minor_version)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
-}
-
-
-void
-TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
-{
-  switch (error_num)
-    {
-    case 0 :
-      break;
-    case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-#endif
-    case EACCES : // wchar but no codeset
-      ACE_THROW(CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-    default :
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-void
-TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
-{
-  switch (error_num)
-    {
-    case 0 :
-      break;
-
-    case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-
-    case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 23,
-                                   CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                         CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-#endif
-
-    default :
-      ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
-
-    }
-}
-
-
-
-// ****************************************************************
-
-TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
-                            ACE_Allocator* buffer_allocator,
-                            ACE_Allocator* data_block_allocator,
-                            ACE_Allocator* message_block_allocator,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (rhs,
-                  buffer_allocator
-                  ? buffer_allocator
-                  : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0),
-                  data_block_allocator
-                  ? data_block_allocator
-                  : (orb_core ? orb_core->output_cdr_dblock_allocator () :
-                     0),
-                  message_block_allocator
-                  ? message_block_allocator
-                  : (orb_core ?
-                     orb_core->output_cdr_msgblock_allocator () : 0)),
-  orb_core_ (orb_core)
-{
-}
-
-
-void
-TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
-{
-  switch (error_num)
-    {
-    case 0 :
-      break;
-    case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-#endif
-    case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES));
-      ACE_NOTREACHED(break);
-    default :
-      ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
-    }
-}
-
-void
-TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
-{
-  switch (error_num)
-    {
-    case 0 :
-      break;
-    case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-
-    case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
-      ACE_NOTREACHED(break);
-#endif
-
-    default :
-      ACE_THROW (CORBA::MARSHAL());
-
-    }
-}
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
deleted file mode 100644
index c1392e383a1..00000000000
--- a/TAO/tao/CDR.h
+++ /dev/null
@@ -1,333 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//=============================================================================
-/**
- *  @file    CDR.h
- *
- *  $Id$
- *
- *   Common Data Representation (CDR) marshaling streams.
- *
- *   This implementation assumes that the native numeric
- *   representation is two's complement for integers, IEEE
- *   single/double for floats.  Also that characters are in ISO
- *   Latin/1.
- *
- *   Note that CDR itself makes no such assumptions, but this
- *   implementation makes such assumptions for reasons of
- *   efficiency.  Careful enhancements could preserve that
- *   efficiency where the assumptions are true, yet still allow the
- *   code to work when they aren't true.
- *
- *   The implementation expects that buffers are aligned according
- *   to the strongest CDR alignment restriction.
- *
- *   NOTE: this does everything "CDR 1.1" does ... that is, it
- *   supports the five extended OMG-IDL data types in UNO Appendix
- *   A, which provide richer arithmetic types (64 bit integers,
- *   "quad precision" FP) and UNICODE-based characters and strings.
- *   Those types are not standard parts of OMG-IDL at this time.
- *
- *   THREADING NOTE: CDR data structures must be protected against
- *   concurrent access by their owning thread.
- *
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Aniruddha Gokhale
- *  @author  Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_CDR_H
-#define TAO_CDR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CDR_Stream.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-class TAO_ORB_Core;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-/**
- * @class TAO_OutputCDR
- *
- * @brief A CDR stream for writing, i.e. for marshalling.
- *
- * This class is based on the the CORBA spec for Java (98-02-29),
- * java class omg.org.CORBA.portable.OutputStream.
- * It diverts in a few ways:
- * + Operations taking arrays don't have offsets, because in C++
- * it is easier to describe an array starting from x+offset.
- * + Operations return an error status, because exceptions are
- * not widely available in C++ (yet).
- * A particularly useful static member function for this buffer is
- * an interpretive encoding routine, usable as a typecode
- * interpreter callback.  Ditto for decoding.  These are used to
- * support all OMG-IDL datatypes, even those not supported
- * directly by put/get primitives.
- */
-class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
-{
-public:
-  /// For reading from a output CDR stream.
-  friend class TAO_InputCDR;
-
-  // The default values for the allocators and memcpy_tradeoff
-  // in these constructors are not 0, but are generated by the
-  // ORB. Refer to the constructor bodies in CDR.cpp for the
-  // code that supplies these values to the base class constructor.
-
-  /// Default constructor, allocates <size> bytes in the internal
-  /// buffer, if <size> == 0 it allocates the default size.
-  TAO_OutputCDR (size_t size = 0,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 ACE_Allocator* message_block_allocator = 0,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_CDR::Octet major_version =
-                   TAO_DEF_GIOP_MAJOR,
-                 ACE_CDR::Octet minor_version =
-                   TAO_DEF_GIOP_MINOR);
-
-  /// Build a CDR stream with an initial buffer, it will *not* remove
-  /// <data>, since it did not allocated it.
-  TAO_OutputCDR (char *data,
-                 size_t size,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 ACE_Allocator* message_block_allocator = 0,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_CDR::Octet major_version =
-                   TAO_DEF_GIOP_MAJOR,
-                 ACE_CDR::Octet minor_version =
-                   TAO_DEF_GIOP_MINOR);
-
-  /// Build a CDR stream with an initial Message_Block chain, it will *not*
-  /// remove <data>, since it did not allocate it.
-  TAO_OutputCDR (ACE_Message_Block *data,
-                 int byte_order = ACE_CDR_BYTE_ORDER,
-                 size_t memcpy_tradeoff = 0,
-                 ACE_CDR::Octet major_version =
-                   TAO_DEF_GIOP_MAJOR,
-                 ACE_CDR::Octet minor_version =
-                   TAO_DEF_GIOP_MINOR);
-
-  /// Destructor.
-  ~TAO_OutputCDR (void);
-
-  // @todo do we want a special method to write an array of
-  // strings and wstrings?
-
-  // = TAO specific methods.
-  static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
-  static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL);
-
-private:
-  /// disallow copying...
-  TAO_OutputCDR (const TAO_OutputCDR& rhs);
-  TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
-};
-
-/**
- * @class TAO_InputCDR
- *
- * @brief A CDR stream for reading, i.e. for demarshalling.
- *
- * This class is based on the the CORBA spec for Java (98-02-29),
- * java class omg.org.CORBA.portable.InputStream.
- * It diverts in a few ways:
- * + Operations to retrieve basic types take parameters by
- * reference.
- * + Operations taking arrays don't have offsets, because in C++
- * it is easier to describe an array starting from x+offset.
- * + Operations return an error status, because exceptions are
- * not widely available in C++ (yet).
- * A particularly useful static member function for this buffer is
- * an interpretive encoding routine, usable as a typecode
- * interpreter callback.  Ditto for decoding.  These are used to
- * support all OMG-IDL datatypes, even those not supported
- * directly by put/get primitives.
- */
-class TAO_Export TAO_InputCDR : public ACE_InputCDR
-{
-public:
-  /**
-   * Create an input stream from an arbitrary buffer, care must be
-   * exercised wrt alignment, because this contructor will *not* work
-   * if the buffer is unproperly aligned.
-   */
-  TAO_InputCDR (const char* buf,
-                size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                  TAO_DEF_GIOP_MAJOR,
-                ACE_CDR::Octet minor_version =
-                  TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// Create an empty input stream. The caller is responsible for
-  /// putting the right data and providing the right alignment.
-  TAO_InputCDR (size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                  TAO_DEF_GIOP_MAJOR,
-                ACE_CDR::Octet minor_version =
-                  TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// Create an input stream from an ACE_Message_Block
-  TAO_InputCDR (const ACE_Message_Block *data,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                  TAO_DEF_GIOP_MAJOR,
-                ACE_CDR::Octet minor_version =
-                  TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// Create an input stream from an ACE_Data_Block
-  TAO_InputCDR (ACE_Data_Block *data,
-                ACE_Message_Block::Message_Flags flag = 0,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                  TAO_DEF_GIOP_MAJOR,
-                ACE_CDR::Octet minor_version =
-                  TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// Create an input stream from an ACE_Data_Block
-  TAO_InputCDR (ACE_Data_Block *data,
-                ACE_Message_Block::Message_Flags flag,
-                size_t read_pointer_position,
-                size_t write_pointer_position,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                  TAO_DEF_GIOP_MAJOR,
-                ACE_CDR::Octet minor_version =
-                  TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
-
-  /**
-   * Make a copy of the current stream state, but does not copy the
-   * internal buffer; so the same stream can be read multiple times
-   * efficiently.
-   */
-  TAO_InputCDR (const TAO_InputCDR& rhs);
-
-  /// When interpreting indirected TypeCodes it is useful to make a
-  /// "copy" of the stream starting in the new position.
-  TAO_InputCDR (const TAO_InputCDR& rhs,
-                size_t size,
-                ACE_CDR::Long offset);
-  /**
-   * This creates an encapsulated stream, the first byte must be (per
-   * the spec) the byte order of the encapsulation.  The default
-   * values for the allocators in this constructor are not 0, but are
-   * generated by the ORB. Refer to the constructor body in CDR.cpp
-   * for the code that supplies these values to the base class
-   * constructor.
-   */
-  TAO_InputCDR (const TAO_InputCDR& rhs,
-                size_t size);
-
-  /// Create an input CDR from an output CDR.
-  TAO_InputCDR (const TAO_OutputCDR& rhs,
-                ACE_Allocator* buffer_allocator = 0,
-                ACE_Allocator* data_block_allocator = 0,
-                ACE_Allocator* message_block_allocator = 0,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// Initialize the contents of one CDR from another, without data
-  /// copying and with minimimum locking overhead.
-  TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs,
-                TAO_ORB_Core* orb_core = 0);
-
-  /// destructor
-  ~TAO_InputCDR (void);
-
-  // = TAO specific methods.
-
-  /// Accessor
-  TAO_ORB_Core *orb_core (void) const;
-
-
-  // = TAO specific methods.
-  static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
-  static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL);
-
-private:
-  /// The ORB_Core, required to extract object references.
-  TAO_ORB_Core* orb_core_;
-};
-
-#if defined(__ACE_INLINE__)
-# include "tao/CDR.i"
-#else
-
-// CDR output operators for CORBA types
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Short x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::UShort x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Long x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULong x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::LongLong x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULongLong x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& os,
-                                      CORBA::LongDouble x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Float x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Double x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::Char* x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::WChar* x);
-
-// CDR input operators for CORBA types
-
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Short &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::UShort &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Long &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULong &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongLong &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULongLong &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongDouble &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Float &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Double &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Char* &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::WChar* &x);
-#endif /* __ACE_INLINE */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CDR_H */
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
deleted file mode 100644
index 1d14f037f1d..00000000000
--- a/TAO/tao/CDR.i
+++ /dev/null
@@ -1,272 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO_OutputCDR::~TAO_OutputCDR (void)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const char *buf,
-                            size_t bufsiz,
-                            int byte_order,
-                            ACE_CDR::Octet major_version,
-                            ACE_CDR::Octet minor_version,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (buf,
-                  bufsiz,
-                  byte_order,
-                  major_version,
-                  minor_version),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
-                            int byte_order,
-                            ACE_CDR::Octet major_version,
-                            ACE_CDR::Octet minor_version,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (bufsiz,
-                  byte_order,
-                  major_version,
-                  minor_version),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const ACE_Message_Block *data,
-                            int byte_order,
-                            ACE_CDR::Octet major_version,
-                            ACE_CDR::Octet minor_version,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  byte_order,
-                  major_version,
-                  minor_version),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
-                            ACE_Message_Block::Message_Flags flag,
-                            int byte_order,
-                            ACE_CDR::Octet major_version,
-                            ACE_CDR::Octet minor_version,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  flag,
-                  byte_order,
-                  major_version,
-                  minor_version),
-    orb_core_ (orb_core)
-{
-}
-
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
-                            ACE_Message_Block::Message_Flags flag,
-                            size_t rd_pos,
-                            size_t wr_pos,
-                            int byte_order,
-                            ACE_CDR::Octet major_version,
-                            ACE_CDR::Octet minor_version,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  flag,
-                  rd_pos,
-                  wr_pos,
-                  byte_order,
-                  major_version,
-                  minor_version),
-    orb_core_ (orb_core)
-{
-}
-
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size,
-                            ACE_CDR::Long offset)
-  : ACE_InputCDR (rhs,
-                  size,
-                  offset),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size)
-  : ACE_InputCDR (rhs,
-                  size),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs)
-  : ACE_InputCDR (rhs),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (rhs),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::~TAO_InputCDR (void)
-{
-}
-
-ACE_INLINE TAO_ORB_Core*
-TAO_InputCDR::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Short x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::UShort x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Long x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULong x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::LongLong x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::ULongLong x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR& os,
-                                      CORBA::LongDouble x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Float x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      CORBA::Double x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::Char* x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
-                                      const CORBA::WChar* x)
-{
-  return static_cast<ACE_OutputCDR &> (os) << x;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Short &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::UShort &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Long &x)
-{
-  return static_cast<ACE_InputCDR&> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULong &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongLong &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::ULongLong &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::LongDouble &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Float &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Double &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::Char* &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
-                                      CORBA::WChar* &x)
-{
-  return static_cast<ACE_InputCDR &> (is) >> x;
-}
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
deleted file mode 100644
index 1d844f1c80d..00000000000
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CDR_Encaps_Codec.h"
-
-#include "CDR.h"
-#include "OctetSeqC.h"
-#include "Any.h"
-#include "Any_Impl.h"
-#include "TypeCode.h"
-#include "Marshal.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "SystemException.h"
-#include "ORB_Constants.h"
-#include "TypeCode_Constants.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           CDR_Encaps_Codec,
-           "$Id$")
-
-
-TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
-                                            CORBA::Octet minor,
-                                            TAO_ORB_Core * orb_core)
-  : major_ (major),
-    minor_ (minor),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
-{
-}
-
-CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::InvalidTypeForEncoding))
-{
-  this->check_type_for_encoding (data
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // ----------------------------------------------------------------
-
-  TAO_OutputCDR cdr ((size_t) 0,            // size
-                     (int) TAO_ENCAP_BYTE_ORDER,
-                     (ACE_Allocator *) 0,   // buffer_allocator
-                     (ACE_Allocator *) 0,   // data_block_allocator
-                     (ACE_Allocator *) 0,   // message_block_allocator
-                     0,                     // memcpy_tradeoff
-                     this->major_,
-                     this->minor_);
-
-  if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-      && (cdr << data))
-    {
-      CORBA::OctetSeq * octet_seq = 0;
-
-      ACE_NEW_THROW_EX (octet_seq,
-                        CORBA::OctetSeq,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::OctetSeq_var safe_octet_seq = octet_seq;
-
-      octet_seq->length (static_cast<CORBA::ULong> (cdr.total_length ()));
-      CORBA::Octet *buf = octet_seq->get_buffer ();
-
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
-        {
-          size_t len = i->length ();
-          ACE_OS::memcpy (buf, i->rd_ptr (), len);
-          buf += len;
-        }
-
-      return safe_octet_seq._retn ();
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-}
-
-CORBA::Any *
-TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::FormatMismatch))
-{
-  // @todo How do we check for a format mismatch so that we can throw
-  //       a IOP::Codec::FormatMismatch exception?
-  // @todo Is this the best way to extract the Any from the OctetSeq?
-
-  // Notice that we need to extract the TypeCode and the value from
-  // the octet sequence, and place them into the Any.  We can't just
-  // insert the octet sequence into the Any.
-
-  ACE_Message_Block mb (data.length () + 2 * ACE_CDR::MAX_ALIGNMENT);
-  ACE_CDR::mb_align (&mb);
-
-  ACE_OS::memcpy (mb.rd_ptr (), data.get_buffer (), data.length ());
-
-  size_t rd_pos = mb.rd_ptr () - mb.base ();
-  size_t wr_pos = mb.wr_ptr () - mb.base () + data.length ();
-
-  TAO_InputCDR cdr (mb.data_block (),
-                    ACE_Message_Block::DONT_DELETE,
-                    rd_pos,
-                    wr_pos,
-                    ACE_CDR_BYTE_ORDER,
-                    this->major_,
-                    this->minor_,
-                    this->orb_core_);
-
-  CORBA::Boolean byte_order;
-  if (cdr >> TAO_InputCDR::to_boolean (byte_order))
-    {
-      cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      CORBA::Any * any = 0;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any = any;
-
-      if (cdr >> (*any))
-        return safe_any._retn ();
-    }
-
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
-                    0);
-}
-
-CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::InvalidTypeForEncoding))
-{
-  this->check_type_for_encoding (data
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // ----------------------------------------------------------------
-  TAO_OutputCDR cdr ((size_t) 0,            // size
-                     (int) TAO_ENCAP_BYTE_ORDER,
-                     (ACE_Allocator *) 0,   // buffer_allocator
-                     (ACE_Allocator *) 0,   // data_block_allocator
-                     (ACE_Allocator *) 0,   // message_block_allocator
-                     0,                     // memcpy_tradeoff
-                     this->major_,
-                     this->minor_);
-
-  if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-    {
-      TAO::Any_Impl *impl = data.impl ();
-
-      if (impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-          // We don't want unk's rd_ptr to move, in case we are shared by
-          // another Any, so we use this to copy the state, not the buffer.
-          TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-          TAO_Marshal_Object::perform_append (data._tao_get_typecode (),
-                                              &for_reading,
-                                              &cdr
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-        }
-      else
-        {
-          impl->marshal_value (cdr);
-        }
-
-      // TAO extension: replace the contents of the octet sequence with
-      // the CDR stream.
-      CORBA::OctetSeq * octet_seq = 0;
-
-      ACE_NEW_THROW_EX (octet_seq,
-                        CORBA::OctetSeq,
-                        CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                                0,
-                                ENOMEM
-                              ),
-                            CORBA::COMPLETED_NO
-                          ));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::OctetSeq_var safe_octet_seq = octet_seq;
-
-      octet_seq->length (static_cast<CORBA::ULong> (cdr.total_length ()));
-      CORBA::Octet *buf = octet_seq->get_buffer ();
-
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
-        {
-          size_t len = i->length ();
-          ACE_OS::memcpy (buf,
-                          i->rd_ptr (),
-                          len);
-          buf += len;
-        }
-
-      return safe_octet_seq._retn ();
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    0);
-}
-
-CORBA::Any *
-TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
-                                    CORBA::TypeCode_ptr tc
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::Codec::FormatMismatch,
-                   IOP::Codec::TypeMismatch))
-{
-  // The ACE_CDR::mb_align() call can shift the rd_ptr by up
-  // to ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset
-  // adjustment can move the rd_ptr by up to the same amount.
-  // We accommodate this by including
-  // 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional space in
-  // the message block.
-  ACE_Message_Block mb (data.length () + 2 * ACE_CDR::MAX_ALIGNMENT);
-  ACE_CDR::mb_align (&mb);
-
-  ACE_OS::memcpy (mb.rd_ptr (),
-                  data.get_buffer (),
-                  data.length ());
-
-  // @todo How do we check for a type mismatch so that we can
-  //       throw a IOP::Codec::TypeMismatch exception?
-  //       @@ I added a check below.  See the comment.  I'm not sure
-  //          if it is a valid check.
-  //             -Ossama
-
-  // @todo Most of this code was copied from
-  //         operator>> (TAO_InputCDR &cdr, CORBA::Any &x)
-  //       in Any.cpp.  Rather than copy the code, the code should be
-  //       refactored to make it possible to use the given TypeCode
-  //       rather than attempt to extract it from the CDR
-  //       encapsulation.
-
-  size_t rd_pos = mb.rd_ptr () - mb.base ();
-  size_t wr_pos = mb.wr_ptr () - mb.base () + data.length ();
-
-  TAO_InputCDR cdr (mb.data_block (),
-                    ACE_Message_Block::DONT_DELETE,
-                    rd_pos,
-                    wr_pos,
-                    ACE_CDR_BYTE_ORDER,
-                    this->major_,
-                    this->minor_,
-                    this->orb_core_);
-
-  CORBA::Boolean byte_order;
-
-  if (cdr >> TAO_InputCDR::to_boolean (byte_order))
-    {
-      cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      CORBA::Any * any = 0;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                                0,
-                                ENOMEM
-                              ),
-                            CORBA::COMPLETED_NO
-                          ));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any = any;
-
-      // Stick it into the Any.
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW_RETURN (unk,
-                      TAO::Unknown_IDL_Type (tc, cdr),
-                      0);
-      any->replace (unk);
-      return safe_any._retn ();
-    }
-
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (),
-                    0);
-}
-
-void
-TAO_CDR_Encaps_Codec::check_type_for_encoding (
-    const CORBA::Any & data
-    ACE_ENV_ARG_DECL
-  )
-{
-  // @@ TODO: Are there any other conditions we need to check?
-
-  CORBA::TypeCode_var typecode = data.type ();
-  if (this->major_ == 1
-      && this->minor_ == 0
-      && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER))
-    ACE_THROW (IOP::Codec::InvalidTypeForEncoding ());
-}
diff --git a/TAO/tao/CDR_Encaps_Codec.h b/TAO/tao/CDR_Encaps_Codec.h
deleted file mode 100644
index dd80b6eaba2..00000000000
--- a/TAO/tao/CDR_Encaps_Codec.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file CDR_Encaps_Codec.h
- *
- * $Id$
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CDR_ENCAPS_CODEC_H
-#define TAO_CDR_ENCAPS_CODEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "IOP_CodecC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LocalObject.h"
-
-/**
- * @class TAO_CDR_Encaps_Codec
- *
- * @brief Implementation of a CDR encapsulation coder/decoder
- * (Codec).
- *
- * This coder/decoder (Codec) class encodes and decodes data to and
- * from a CDR encapsulation, respectively.  It is useful for creation
- * of octet sequences that contain CDR encapsulations.  Those octet
- * sequences can then be placed in a IOP::ServiceContext or an
- * IOP::TaggedComponent, for example.
- *
- * @note This Codec should not be used for operations internal to the
- * ORB core since it uses interpretive marshaling rather than compiled
- * marshaling.
- */
-class TAO_Export TAO_CDR_Encaps_Codec
-  : public virtual IOP::Codec,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  TAO_CDR_Encaps_Codec (CORBA::Octet major,
-                        CORBA::Octet minor,
-                        TAO_ORB_Core * orb_core);
-
-  /// Encode the given data, including the TypeCode, into an octet
-  /// sequence.
-  virtual CORBA::OctetSeq * encode (const CORBA::Any & data
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::InvalidTypeForEncoding));
-
-  /// Extract the TypeCode and the value from the octet sequence and
-  /// place them into an Any.
-  virtual CORBA::Any * decode (const CORBA::OctetSeq & data
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::FormatMismatch));
-
-  /// Encode the given data, excluding the TypeCode, into an octet
-  /// sequence.
-  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::InvalidTypeForEncoding));
-
-  /// Extract the value from the octet sequence, based on the given
-  /// TypeCode,  and place it into an Any.
-  virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
-                                     CORBA::TypeCode_ptr tc
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::Codec::FormatMismatch,
-                     IOP::Codec::TypeMismatch));
-
-protected:
-
-  /// Destructor.
-  /**
-   * Only allow this class to be instantiated on the heap since it is
-   * reference counted.
-   */
-  ~TAO_CDR_Encaps_Codec (void);
-
-  /// Verify that it is possible to encode the given data using this
-  /// Codec.
-  /**
-   * Typical reasons for failure include attempting to encode a type
-   * that isn't supported for the version of GIOP associated with this
-   * Codec.
-   */
-  void check_type_for_encoding (const CORBA::Any & data
-                                ACE_ENV_ARG_DECL);
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &))
-
-private:
-
-  /// The major GIOP version associated with this Codec.
-  CORBA::Octet major_;
-
-  /// The minor GIOP version associated with this Codec.
-  CORBA::Octet minor_;
-
-  /// The ORB Core to be used when decoding values from a CDR
-  /// encapsulation.
-  TAO_ORB_Core * orb_core_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_CDR_ENCAPS_CODEC_H */
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
deleted file mode 100644
index 060eeb32c25..00000000000
--- a/TAO/tao/CONV_FRAME.pidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file CONV_FRAME.pidl
- *
- * $Id$
- *
- * This file is used to generate CONV_FRAMEC.{h,cpp}, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -Ge 1 -GA -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include="tao/TAO_Export.h"
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        CONV_FRAME.pidl
- *
- * The files are ready to use.
- */
-
-#ifndef TAO_CORBA_CONV_FRAME_PIDL
-#define TAO_CORBA_CONV_FRAME_PIDL
-
-#pragma prefix "omg.org"
-
-module CONV_FRAME {
-  typedef unsigned long CodeSetId;
-  typedef sequence<CodeSetId> CodeSetIdSeq;
-
-  struct CodeSetComponent {
-     CodeSetId native_code_set;
-     CodeSetIdSeq conversion_code_sets;
-  };
-
-  struct CodeSetComponentInfo {
-     CodeSetComponent ForCharData;
-     CodeSetComponent ForWcharData;
-  };
-
-  struct CodeSetContext {
-     CodeSetId char_data;
-     CodeSetId wchar_data;
-  };
-};
-
-#endif /* TAO_CORBA_CONV_FRAME_PIDL */
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
deleted file mode 100644
index 2c7e626c2f7..00000000000
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CONV_FRAMEC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetId:1.0",
-    "CodeSetId",
-    &CORBA::_tc_ulong);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetId =
-    &_tao_tc_CONV_FRAME_CodeSetId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-#define _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CONV_FRAME_CodeSetIdSeq_0 (
-        CORBA::tk_sequence,
-        &CONV_FRAME::_tc_CodeSetId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CONV_FRAME_CodeSetIdSeq_0 =
-      &CONV_FRAME_CodeSetIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0",
-    "CodeSetIdSeq",
-    &TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq =
-    &_tao_tc_CONV_FRAME_CodeSetIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] =
-  {
-    { "native_code_set", &CONV_FRAME::_tc_CodeSetId },
-    { "conversion_code_sets", &CONV_FRAME::_tc_CodeSetIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0",
-    "CodeSetComponent",
-    _tao_fields_CONV_FRAME_CodeSetComponent,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponent =
-    &_tao_tc_CONV_FRAME_CodeSetComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] =
-  {
-    { "ForCharData", &CONV_FRAME::_tc_CodeSetComponent },
-    { "ForWcharData", &CONV_FRAME::_tc_CodeSetComponent }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponentInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0",
-    "CodeSetComponentInfo",
-    _tao_fields_CONV_FRAME_CodeSetComponentInfo,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo =
-    &_tao_tc_CONV_FRAME_CodeSetComponentInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetContext[] =
-  {
-    { "char_data", &CONV_FRAME::_tc_CodeSetId },
-    { "wchar_data", &CONV_FRAME::_tc_CodeSetId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetContext:1.0",
-    "CodeSetContext",
-    _tao_fields_CONV_FRAME_CodeSetContext,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetContext =
-    &_tao_tc_CONV_FRAME_CodeSetContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponentInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponentInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetContext::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
deleted file mode 100644
index 671886cf99a..00000000000
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "CONV_FRAMEC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CONV_FRAME_CODESETIDSEQ_CS_)
-#define _CONV_FRAME_CODESETIDSEQ_CS_
-
-CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (void)
-{}
-
-CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
-      >
-    (max)
-{}
-
-CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
-      >
-    (max, length, buffer, release)
-{}
-
-CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
-    const CodeSetIdSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
-      >
-    (seq)
-{}
-
-CONV_FRAME::CodeSetIdSeq::~CodeSetIdSeq (void)
-{}
-
-void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  CodeSetIdSeq * _tao_tmp_pointer =
-    static_cast<CodeSetIdSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CONV_FRAME::CodeSetComponent::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  CodeSetComponent *_tao_tmp_pointer =
-    static_cast<CodeSetComponent *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  CodeSetComponentInfo *_tao_tmp_pointer =
-    static_cast<CodeSetComponentInfo *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CONV_FRAME::CodeSetContext::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  CodeSetContext *_tao_tmp_pointer =
-    static_cast<CodeSetContext *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_
-#define _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetIdSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponent &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.native_code_set) &&
-    (strm << _tao_aggregate.conversion_code_sets);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponent &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.native_code_set) &&
-    (strm >> _tao_aggregate.conversion_code_sets);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.ForCharData) &&
-    (strm << _tao_aggregate.ForWcharData);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.ForCharData) &&
-    (strm >> _tao_aggregate.ForWcharData);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.char_data) &&
-    (strm << _tao_aggregate.wchar_data);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.char_data) &&
-    (strm >> _tao_aggregate.wchar_data);
-}
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
deleted file mode 100644
index 670a6aa3237..00000000000
--- a/TAO/tao/CONV_FRAMEC.h
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
-#define _TAO_IDL_ORIG_CONV_FRAMEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CONV_FRAME
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong CodeSetId;
-  typedef CORBA::ULong_out CodeSetId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetId;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CONV_FRAME_CODESETIDSEQ_CH_)
-#define _CONV_FRAME_CODESETIDSEQ_CH_
-  
-  class CodeSetIdSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        CodeSetIdSeq,
-        CodeSetId
-      >
-    CodeSetIdSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        CodeSetIdSeq,
-        CodeSetIdSeq_var,
-        CodeSetId
-      >
-    CodeSetIdSeq_out;
-  
-  class TAO_Export CodeSetIdSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CodeSetId
-          >
-  {
-  public:
-    CodeSetIdSeq (void);
-    CodeSetIdSeq (CORBA::ULong max);
-    CodeSetIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    CodeSetIdSeq (const CodeSetIdSeq &);
-    ~CodeSetIdSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef CodeSetIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct CodeSetComponent;
-  
-  typedef
-    TAO_Var_Var_T<
-        CodeSetComponent
-      >
-    CodeSetComponent_var;
-  
-  typedef
-    TAO_Out_T<
-        CodeSetComponent,
-        CodeSetComponent_var
-      >
-    CodeSetComponent_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export CodeSetComponent
-  {
-    typedef CodeSetComponent_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CONV_FRAME::CodeSetId native_code_set;
-    CONV_FRAME::CodeSetIdSeq conversion_code_sets;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponent;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct CodeSetComponentInfo;
-  
-  typedef
-    TAO_Var_Var_T<
-        CodeSetComponentInfo
-      >
-    CodeSetComponentInfo_var;
-  
-  typedef
-    TAO_Out_T<
-        CodeSetComponentInfo,
-        CodeSetComponentInfo_var
-      >
-    CodeSetComponentInfo_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export CodeSetComponentInfo
-  {
-    typedef CodeSetComponentInfo_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CONV_FRAME::CodeSetComponent ForCharData;
-    CONV_FRAME::CodeSetComponent ForWcharData;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct CodeSetContext;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        CodeSetContext
-      >
-    CodeSetContext_var;
-  
-  typedef
-    CodeSetContext &
-    CodeSetContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export CodeSetContext
-  {
-    typedef CodeSetContext_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CONV_FRAME::CodeSetId char_data;
-    CONV_FRAME::CodeSetId wchar_data;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CONV_FRAME
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetIdSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetIdSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetIdSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetIdSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
-#define _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetIdSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetIdSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/CONV_FRAMES.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
deleted file mode 100644
index a0f8069f180..00000000000
--- a/TAO/tao/CONV_FRAMES_T.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:547
-
-#ifndef _TAO_IDL_ORIG_CONV_FRAMES_T_H_
-#define _TAO_IDL_ORIG_CONV_FRAMES_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_CONV_FRAME
-{
-} // module CONV_FRAME
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1096
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
deleted file mode 100644
index 24e864be1df..00000000000
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-#include "CORBALOC_Parser.h"
-#include "ORB_Core.h"
-#include "Stub.h"
-#include "MProfile.h"
-#include "Connector_Registry.h"
-#include "Transport_Connector.h"
-#include "Protocol_Factory.h"
-#include "tao/debug.h"
-#include "ace/Vector_T.h"
-#include "ace/INET_Addr.h"
-#include "ace/OS_NS_string.h"
-
-#include "ace/os_include/os_netdb.h"
-
-#if !defined(__ACE_INLINE__)
-#include "CORBALOC_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           CORBALOC_Parser,
-           "$Id$")
-
-TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
-{
-}
-
-static const char prefix[] = "corbaloc:";
-static const size_t prefix_len = sizeof prefix - 1;
-static const char rir_token[] = "rir:";
-static const size_t rir_token_len = sizeof rir_token - 1;
-static const char iiop_token[] = "iiop:";
-static const char iiop_token_len = sizeof iiop_token - 1;
-
-int
-TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const
-{
-  // Check if the prefix is 'corbaloc:' and return the result.
-  return (ACE_OS::strncmp (ior_string,
-                           prefix,
-                           prefix_len) == 0);
-}
-
-CORBA::Object_ptr
-TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                                              TAO_MProfile &mprofile
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create a TAO_Stub.
-  TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
-                                                  mprofile
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  TAO_Stub_Auto_Ptr safe_data (data);
-
-  CORBA::Object_var obj = orb->orb_core ()->create_object (data);
-
-  if (!CORBA::is_nil (obj.in ()))
-    {
-      /// All is well, so release the stub object from its
-      /// auto_ptr.
-      (void) safe_data.release ();
-
-      /// Return the object reference to the application.
-      return obj._retn ();
-    }
-
-  /// Shouldnt come here: if so, return nil reference.
-  return CORBA::Object::_nil ();
-}
-
-CORBA::Object_ptr
-TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
-                                              CORBA::ORB_ptr orb
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Pass the key string as an argument to resolve_initial_references.
-  // NameService is the default if an empty key string is supplied.
-  const char *objkey = ior + rir_token_len;
-  if (*objkey == '/') // there is an explicit object key, which may
-                      // validly be null.
-    objkey++;
-
-  CORBA::Object_var rir_obj =
-    orb->resolve_initial_references (*objkey == '\0' ? "NameService" :
-                                     objkey
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return rir_obj._retn ();
-}
-
-CORBA::Object_ptr
-TAO_CORBALOC_Parser::parse_string (const char * ior,
-                                   CORBA::ORB_ptr orb
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The decomposition of a corbaloc string is in Section 13.6.10.
-  //
-  // following the "corbaloc:"
-  //  a comma separated list of <prot_addr> strings
-  //    for each,
-  // Separate out the key, delimited by '/'
-  // Split out the various parts of our corbaloc string, comma-delimited
-  // For each part
-  //   Determine the protocol
-  //     If rir, defer to another function and return the object
-  //     If iiop, make the profile with <endpoint>:<port>/<key>
-  //     If another protocol, use <remainder>/<key>
-  //   Search through the collection of protocols for the correct one
-  //     If not found, throw exception
-  //     If found, make our_connector from it.
-  //     our_connector->make_mprofile_unchecked (...);
-  //     object = this->make_stub_from_mprofile (...);
-  // Return the object
-
-  // Skip the prefix.  We know it is there because this method is only
-  // called if match_prefix() returns 1.
-  ior += ACE_OS::strlen(prefix);
-
-  //  First check for rir
-  if (ACE_OS::strncmp (ior,rir_token,rir_token_len) == 0)
-    return this->parse_string_rir_helper (ior,orb
-                                          ACE_ENV_ARG_PARAMETER);
-
-  // set up space for parsed endpoints. there will be at least 1, and
-  // most likely commas will separate endpoints, although they could be
-  // part of an endpoint address for some protocols.
-  size_t max_endpoint_count = 1;
-  for (const char *comma = ACE_OS::strchr (ior,',');
-       comma;
-       comma = ACE_OS::strchr (comma+1,','))
-    max_endpoint_count++;
-
-  ACE_Array<parsed_endpoint> endpoints(max_endpoint_count);
-  endpoints.size (0);
-
-  // Get the Connector Registry from the ORB.
-  TAO_Connector_Registry *conn_reg =
-    orb->orb_core ()->connector_registry(ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  while (1) { // will loop on comma only.
-    size_t len = 0;
-    size_t ndx = endpoints.size();
-    endpoints.size(ndx+1);
-    int uiop_compatible = 0;
-    TAO_ConnectorSetIterator conn_iter = 0;
-    for (conn_iter = conn_reg->begin();
-         conn_iter != conn_reg->end() &&
-           endpoints[ndx].profile_ == 0;
-         conn_iter ++)
-      {
-        endpoints[ndx].profile_ =
-          (*conn_iter)->corbaloc_scan(ior,len
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-        if (endpoints[ndx].profile_)
-          {
-            endpoints[ndx].obj_key_sep_ =
-              (*conn_iter)->object_key_delimiter();
-            uiop_compatible = (endpoints[ndx].obj_key_sep_ == '|');
-            this->make_canonical (ior,len,endpoints[ndx].prot_addr_
-                                   ACE_ENV_ARG_PARAMETER);
-            ior += len;
-            break;
-          }
-      }
-
-    if (endpoints[ndx].profile_ == 0)
-      {
-        if (TAO_debug_level)
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                      ACE_TEXT("could not parse from %s"),
-                      ACE_TEXT_CHAR_TO_TCHAR(ior)));
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                            CORBA::COMPLETED_NO),
-                          CORBA::Object::_nil ());
-      }
-    if (*ior == ',') // more endpoints follow
-      {
-        ior++;
-        continue;
-      }
-
-    if (*ior == '/') // found key separator
-      {
-        ior ++;
-        break;
-      }
-
-    if (*ior == '\0') // no key separator appended, use default key
-      {
-        break;
-      }
-
-    if (uiop_compatible && *(ior - 1) == '|')
-      // Assume this is an old uiop style corbaloc. No need to warn here,
-      // the UIOP_Connector::corbaloc_scan already did.
-      break;
-
-    // anything else is a violation.
-    if (TAO_debug_level)
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                  ACE_TEXT("could not parse from %s"),
-                  ACE_TEXT_CHAR_TO_TCHAR(ior)));
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                        CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
-  } // end of while
-
-  // At this point, ior points at the start of the object key
-  ACE_CString obj_key (*ior ? ior : (const char *)"NameService");
-
-  // now take the collection of endpoints along with the decoded key and
-  // mix them together to get the mprofile.
-  TAO_MProfile mprofile (endpoints.size());
-
-  for (size_t i = 0; i < endpoints.size(); i++)
-    {
-      ACE_CString full_ep = endpoints[i].prot_addr_ +
-        endpoints[i].obj_key_sep_ +
-        obj_key;
-      const char * str = full_ep.c_str();
-      endpoints[i].profile_->parse_string (str ACE_ENV_ARG_PARAMETER);
-      if (mprofile.give_profile(endpoints[i].profile_) != -1)
-        endpoints[i].profile_ = 0;
-      else
-        {
-          // Although this ought never happen, we want to make some
-          // indication back to the caller, more as an audit trail than
-          // anything else. The only failure possible is that there was
-          // insufficient heap to allocate the mprofile, hence the
-          // mprofile's size is 0, and give_profile fails.
-          if (TAO_debug_level)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
-                        ACE_TEXT("mprofile.give_profile failed for i = %d\n"),
-                        i));
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
-                                              CORBA::COMPLETED_NO),
-                            CORBA::Object::_nil ());
-        }
-    }
-
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  // Get an object stub out.
-  object = this->make_stub_from_mprofile (orb,
-                                          mprofile
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object;
-}
-
-void
-TAO_CORBALOC_Parser::make_canonical (const char *ior,
-                                     size_t prot_addr_len,
-                                     ACE_CString &canonical_endpoint
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const char *separator = ACE_OS::strchr (ior, ':');
-
-  // A special case for handling iiop
-  if (ior[0] != ':' && ACE_OS::strncmp (ior,iiop_token,iiop_token_len) != 0)
-    {
-      canonical_endpoint.set (separator+1,
-                              prot_addr_len - (separator - ior) - 1,1);
-      return;
-    }
-
-  const char *addr_base = separator+1;
-  const char *addr_tail = ior + prot_addr_len;
-  // skip past version, if any
-  separator = ACE_OS::strchr (addr_base,'@');
-  if (separator != 0 && separator < addr_tail)
-    {
-      canonical_endpoint.set (addr_base,(separator - addr_base)+1,1);
-      addr_base = separator + 1;
-    }
-  else
-    canonical_endpoint.clear ();
-
-  ACE_CString raw_host;
-  ACE_CString raw_port;
-  separator = ACE_OS::strchr (addr_base,':');
-  if (separator != 0 && separator < addr_tail)
-    {
-      // we have a port number
-      if (separator - addr_base > 0)
-        raw_host.set (addr_base, (separator - addr_base),1);
-      raw_port.set (separator, (addr_tail - separator), 1);
-    }
-  else
-    {
-      // we must default port #
-      if (addr_base < addr_tail)
-        raw_host.set (addr_base, (addr_tail - addr_base),1);
-      raw_port.set (":2809");
-    }
-
-  if (raw_host.length() == 0)
-    {
-      ACE_INET_Addr host_addr;
-
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host, i.e. the
-      // local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-        {
-          // Can't get the IP address since the INET_Addr wasn't
-          // initialized.  Just throw an exception.
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) ")
-                        ACE_TEXT ("cannot determine hostname.\n")));
-
-          ACE_THROW (CORBA::INV_OBJREF
-                     (CORBA::SystemException::_tao_minor_code
-                      (TAO::VMCID, EINVAL),
-                      CORBA::COMPLETED_NO));
-        }
-      else
-        {
-          canonical_endpoint += tmp_host;
-        }
-    }
-  else
-    {
-      canonical_endpoint += raw_host;
-    }
-
-  canonical_endpoint += raw_port;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser,
-                       ACE_TEXT ("CORBALOC_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_CORBALOC_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                       ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
deleted file mode 100644
index df1d73c4715..00000000000
--- a/TAO/tao/CORBALOC_Parser.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   CORBALOC_Parser.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- *  @author Priyanka Gontla (pgontla@uci.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_CORBALOC_PARSER_H
-#define TAO_CORBALOC_PARSER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/IOR_Parser.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "ace/Array.h"
-#include "tao/Profile.h"
-#include "ace/SString.h"
-
-class TAO_MProfile;
-
-
-/**
- * @class TAO_CORBALOC_Parser
- *
- * @brief Implements the <corbaloc:> IOR format
- *
- * This class implements the <corbaloc:> IOR format.
- * It is dynamically loaded by the ORB and used to parse the
- * string to separate the individual <obj_addr> from the list of object
- * addresses <obj_addr_list>.
- */
-class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser
-{
-public:
-  /// Constructor
-  TAO_CORBALOC_Parser (void);
-
-  /// The destructor
-  virtual ~TAO_CORBALOC_Parser (void);
-
-  /// = The IOR_Parser methods, please read the documentation in
-  ///   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
-
-  /// Parse the ior-string that is passed.
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /**
-   * Make a stub from the MProfile that is created in
-   * parse_string_mprofile_helper. Using this stub, create an object
-   * reference which is sent to the application.
-   */
-  CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                                             TAO_MProfile &mprofile
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Gets the pointer to the key_string when the protocol used is RIR
-  CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
-                                             CORBA::ORB_ptr orb
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void make_canonical (const char *ior,
-                       size_t ior_len,
-                       ACE_CString &canonical_endpoint
-                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  struct parsed_endpoint {
-    parsed_endpoint ();
-    ~parsed_endpoint ();
-    TAO_Profile *profile_;
-    char obj_key_sep_;
-    ACE_CString prot_addr_;
-  };
-};
-
-#if defined (__ACE_INLINE__)
-# include "CORBALOC_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CORBALOC_PARSER_H */
diff --git a/TAO/tao/CORBALOC_Parser.i b/TAO/tao/CORBALOC_Parser.i
deleted file mode 100644
index fddafd15c3f..00000000000
--- a/TAO/tao/CORBALOC_Parser.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_CORBALOC_Parser::TAO_CORBALOC_Parser (void)
-{
-}
-
-ACE_INLINE
-TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint(void)
- : profile_ (0)
-{
-}
-
-ACE_INLINE
-TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void)
-{
-  if (this->profile_ != 0)
-    this->profile_->_decr_refcnt();
-}
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
deleted file mode 100644
index ec3998eb794..00000000000
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#include "CORBANAME_Parser.h"
-#include "ORB.h"
-#include "Object.h"
-#include "SystemException.h"
-#include "UB_String_Arguments.h"
-#include "Invocation_Adapter.h"
-#include "debug.h"
-
-#if !defined(__ACE_INLINE__)
-#include "CORBANAME_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           CORBANAME_Parser,
-           "$Id$")
-
-
-TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void)
-{
-}
-
-static const char corbaname_prefix[] = "corbaname:";
-
-int
-TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const
-{
-  return (ACE_OS::strncmp (ior_string,
-                           corbaname_prefix,
-                           sizeof corbaname_prefix - 1) == 0);
-}
-
-CORBA::Object_ptr
-TAO_CORBANAME_Parser::
-parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-                                     ACE_CString &key_string
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval;
-  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_id (key_string.c_str ());
-
-  TAO::Argument *_tao_signature [] =
-      {
-        &_tao_retval,
-        &_tao_id
-      };
-
-  TAO::Invocation_Adapter tao_call (naming_context,
-                                    _tao_signature,
-                                    2,
-                                    "resolve_str",
-                                    11,
-                                    0);
-
-  tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-
-  return _tao_retval.retn ();
-}
-
-CORBA::Object_ptr
-TAO_CORBANAME_Parser::parse_string (const char *ior,
-                                    CORBA::ORB_ptr orb
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  // Skip the prefix, we know it is there because this method in only
-  // called if <match_prefix> returns 1.
-  const char *corbaname =
-    ior + sizeof corbaname_prefix - 1;
-
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  ACE_TRY
-    {
-      // The position of the seperator between the obj_addr and key
-      // string
-      CORBA::ULong pos_seperator = 0;
-
-      ACE_CString corbaname_str (corbaname, 0, 1);
-
-      pos_seperator = corbaname_str.find ("#", 0);
-
-      // Get the Key String
-      ACE_CString key_string =
-        corbaname_str.substring (pos_seperator + 1,
-                                 -1);
-
-      // Prepare a suitable corbaloc string for the name service.
-      // CORBALOC assumes "NameService" for the object key if none
-      // is provided, so just pass everything between "corbaname:"
-      // and "#" as the address
-      ACE_CString corbaloc_addr ("corbaloc:", 0, 1);
-      corbaloc_addr += corbaname_str.substring (0, pos_seperator);
-
-      // Obtain a reference to the naming context
-      CORBA::Object_var name_context =
-        orb->string_to_object (corbaloc_addr.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Check if the Object reference is nil.
-      if (CORBA::is_nil (name_context.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot resolve Naming Service: CORBANAME_Parser\n"),
-                          0);
-
-      CORBA::Boolean is_a =
-        name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!is_a)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Cannot narrow Naming Service: "
-                             "CORBANAME_Parser\n"),
-                            0);
-        }
-
-      // Make a dynamic request for resolve_str in this naming context
-      obj = this->parse_string_dynamic_request_helper (name_context.in (),
-                                                       key_string
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, ex)
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (ex, "CORBANAME_Parser");
-        }
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return obj;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser,
-                       ACE_TEXT ("CORBANAME_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_CORBANAME_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
deleted file mode 100644
index 5f1f66cf8db..00000000000
--- a/TAO/tao/CORBANAME_Parser.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   CORBANAME_Parser.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla (pgontla@uci.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_CORBANAME_PARSER_H
-#define TAO_CORBANAME_PARSER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOR_Parser.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-
-/**
- * @class TAO_CORBANAME_Parser
- *
- * @brief Implements the <corbaname:> IOR format
- *
- * This class implements the <corbaname:> IOR format.
- * It is dynamically loaded by the ORB and used to get reference
- * to a naming service at the given address and port and then resolve an
- * object in that context.
- */
-class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser
-{
-public:
-  /// Constructor
-  TAO_CORBANAME_Parser (void);
-
-  /// The destructor
-  virtual ~TAO_CORBANAME_Parser (void);
-
-  // = The IOR_Parser methods, please read the documentation in
-  //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
- private:
-  virtual CORBA::Object_ptr
-    parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-                                         ACE_CString &key_string
-                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined (__ACE_INLINE__)
-# include "CORBANAME_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CORBANAME_PARSER_H */
diff --git a/TAO/tao/CORBANAME_Parser.i b/TAO/tao/CORBANAME_Parser.i
deleted file mode 100644
index 1139a868437..00000000000
--- a/TAO/tao/CORBANAME_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_CORBANAME_Parser::TAO_CORBANAME_Parser (void)
-{
-}
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
deleted file mode 100644
index 870c61bf2ca..00000000000
--- a/TAO/tao/CORBA_String.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-#include "CORBA_String.h"
-#include "Managed_Types.h"
-
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_Memory.h"
-
-// FUZZ: disable check_for_streams_include
-#include "ace/streams.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CORBA_String.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           CORBA_String,
-           "$Id$")
-
-char *
-CORBA::string_dup (const char *str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-
-  const size_t len = ACE_OS::strlen (str);
-
-  // This allocates an extra byte for the '\0';
-  char * copy = CORBA::string_alloc (static_cast<CORBA::ULong> (len));
-
-  // The memcpy() below assumes that the destination is a valid buffer.
-  if (copy == 0)
-    {
-      return 0;
-    }
-
-  ACE_OS::memcpy (copy,
-                  str,
-                  len + 1);
-  return copy;
-}
-
-char *
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // Allocate 1 + strlen to accomodate the null terminating character.
-
-  char *s = 0;
-  ACE_NEW_RETURN (s,
-                  char[size_t (len + 1)],
-                  0);
-
-  s[0]= '\0';
-
-  return s;
-}
-
-void
-CORBA::string_free (char *str)
-{
-  delete [] str;
-}
-
-// ****************************************************************
-
-CORBA::WChar*
-CORBA::wstring_dup (const WChar *const str)
-{
-  if (!str)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-
-  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::strlen (str));
-
-  // The wscpy() below assumes that the destination is a valid buffer.
-  if (retval == 0)
-    {
-      return 0;
-    }
-
-  return ACE_OS::wscpy (retval,
-                        str);
-}
-
-CORBA::WChar*
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  CORBA::WChar *s = 0;
-  ACE_NEW_RETURN (s,
-                  CORBA::WChar [(size_t) (len + 1)],
-                  0);
-
-  return s;
-}
-
-void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-// ****************************************************************
-
-CORBA::String_var::String_var (char *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA::String_var::String_var (const CORBA::String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
-
-CORBA::String_var::~String_var (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const char *p)
-{
-  CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const CORBA::String_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = CORBA::string_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// ****************************************************************
-
-CORBA::WString_var::WString_var (CORBA::WChar *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA::WString_var::WString_var (const CORBA::WString_var& r)
-{
-  this->ptr_ = CORBA::wstring_dup (r.ptr_);
-}
-
-CORBA::WString_var::~WString_var (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (CORBA::WChar *p)
-{
-  if (this->ptr_ != p)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (const CORBA::WChar *p)
-{
-  CORBA::wstring_free (this->ptr_);
-
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-CORBA::WString_var &
-CORBA::WString_var::operator= (const CORBA::WString_var& r)
-{
-  if (this != &r)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = CORBA::wstring_dup (r.ptr_);
-    }
-  return *this;
-}
-
-// These methods moved to the CPP file to avoid cyclic dependencies.
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-CORBA::String_out::String_out (TAO_String_Manager &s)
-  : ptr_ (s.out ())
-{
-}
-
-// ----------------------------------------------------
-//  WString_out type
-// ----------------------------------------------------
-CORBA::WString_out::WString_out (TAO_WString_Manager &s)
-  : ptr_ (s.out ())
-{
-}
-
-
-// *************************************************************
-// C++ iostream operators for (W)String_var and (W)String_out
-// *************************************************************
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-ostream &
-operator<< (ostream &os, const CORBA::String_var &sv)
-{
-  os << sv.in ();
-  return os;
-}
-
-istream &
-operator>> (istream &is, CORBA::String_var &sv)
-{
-  is.seekg (0, ios::end);
-  sv = CORBA::string_alloc (is.tellg ());
-  is.seekg (0, ios::beg);
-  is >> sv.inout ();
-  return is;
-}
-
-ostream &
-operator<< (ostream &os, CORBA::String_out &so)
-{
-  os << so.ptr ();
-  return os;
-}
-
-istream &
-operator>> (istream &is, CORBA::String_out &so)
-{
-  is.seekg (0, ios::end);
-  so = CORBA::string_alloc (is.tellg ());
-  is.seekg (0, ios::beg);
-  is >> so.ptr ();
-  return is;
-}
-
-// Until we implement WString support for platforms with a
-// 4-byte wchar_t, we just define the following to emit
-// the CORBA::WChars one by one.
-
-ostream &
-operator<< (ostream &os, const CORBA::WString_var &wsv)
-{
-  const CORBA::ULong len = ACE_OS::strlen (wsv.in ());
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      os << wsv[i];
-    }
-
-  return os;
-}
-
-istream &
-operator>> (istream &is, CORBA::WString_var &wsv)
-{
-  is.seekg (0, ios::end);
-  // @@ is.tellg()/sizeof(CORBA::WChar) instead?
-  const CORBA::ULong len = is.tellg ();
-  wsv = CORBA::wstring_alloc (len);
-  is.seekg (0, ios::beg);
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      CORBA::WChar wc = 0;
-
-      // Unformatted input is used to work around overloaded
-      // extraction operator (>>) ambiguities on some platforms.
-      is.read (reinterpret_cast<char *> (&wc), sizeof (wc));
-
-      wsv[i] = wc;
-    }
-
-  wsv[len] = 0;  // NULL terminate
-
-  return is;
-}
-
-ostream &
-operator<< (ostream &os, CORBA::WString_out &wso)
-{
-  CORBA::WChar *tmp = wso.ptr ();
-  const CORBA::ULong len = ACE_OS::strlen (tmp);
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      os << tmp[i];
-    }
-
-  return os;
-}
-
-istream &
-operator>> (istream &is, CORBA::WString_out &wso)
-{
-  is.seekg (0, ios::end);
-  // @@ is.tellg()/sizeof(CORBA::WChar) instead?
-  const CORBA::ULong len = is.tellg ();
-  wso = CORBA::wstring_alloc (len);
-  is.seekg (0, ios::beg);
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      CORBA::WChar wc = 0;
-
-      // Unformatted input is used to work around overloaded
-      // extraction operator (>>) ambiguities on some platforms.
-      is.read (reinterpret_cast<char *> (&wc), sizeof (wc));
-
-      wso.ptr ()[i] = wc;
-    }
-
-  wso.ptr ()[len] = 0;  // NULL terminate
-
-  return is;
-}
-
-#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
deleted file mode 100644
index 50e3564e806..00000000000
--- a/TAO/tao/CORBA_String.h
+++ /dev/null
@@ -1,318 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    CORBA_String.h
- *
- *  $Id$
- *
- *  Header file for the CORBA string types.
- *
- *  @author DOC Group at Wash U, UCI, and Vanderbilt U.
- */
-//=============================================================================
-
-#ifndef TAO_CORBA_STRING_H
-#define TAO_CORBA_STRING_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// For the (W)String_var and (W)String_out iostream operators.
-#include "ace/iosfwd.h"
-
-class TAO_String_Manager;
-class TAO_WString_Manager;
-
-namespace CORBA
-{
-  /**
-   * @name CORBA String Memory Management
-   *
-   * CORBA string memory management functions.
-   */
-  //@{
-  TAO_Export char * string_alloc (ULong len);
-  TAO_Export char * string_dup (const char *);
-  TAO_Export void string_free (char *);
-  //@}
-
-  /**
-   * @name CORBA Wide String Memory Management
-   *
-   * CORBA wide string memory management functions.
-   */
-  //@{
-  TAO_Export WChar * wstring_alloc (ULong len);
-  TAO_Export WChar * wstring_dup (const WChar * const);
-  TAO_Export void wstring_free (WChar * const);
-  //@}
-
-  /**
-   * @class String_var
-   *
-   * @brief CORBA::String var class.
-   *
-   * Provides automatic deallocation of storage for the string once it
-   * goes out of scope.
-   */
-  class TAO_Export String_var
-  {
-  public:
-    /// Default constructor.
-    String_var (void);
-
-    /// Constructor, owns p.
-    String_var (char *p);
-
-    /// constructor. Makes a copy of p.
-    String_var (const char *p);
-
-    /// copy constructor.
-    String_var (const String_var &s);
-
-    /// destructor.
-    ~String_var (void);
-
-    /// assignment operator.
-    String_var &operator= (char *p);
-
-    /// assignment to a const char*.  Makes a copy.
-    String_var &operator= (const char *p);
-
-    /// assignment operator.
-    String_var &operator= (const String_var &s);
-
-    /// Spec-defined read/write version.
-    operator char *&();
-
-    /// only read privileges.
-    operator const char *() const;
-
-    /// allows access and modification using an slot.
-    char &operator[] (CORBA::ULong slot);
-
-    /// allows only accessing thru an slot.
-    char operator[] (CORBA::ULong slot) const;
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    /// for in parameter.
-    const char *in (void) const;
-
-    /// for inout parameter.
-    char *&inout (void);
-
-    /// for out parameter.
-    char *&out (void);
-
-    /// for string of return type.
-    char *_retn (void);
-
-    /// TAO extension.
-    char *ptr (void);
-
-  private:
-    /// instance.
-    char *ptr_;
-  };
-
-  /**
-   * @class String_out
-   *
-   * @brief String_out
-   *
-   * To support the memory management for "out" parameter passing
-   * mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA::String_out
-   * class
-   */
-  class TAO_Export String_out
-  {
-  public:
-
-    /// Construction from a reference to a string.
-    String_out (char *&p);
-
-    /// Construction from a var.
-    String_out (CORBA::String_var &p);
-
-    /// Construction from a TAO_String_Manager.
-    String_out (TAO_String_Manager &p);
-
-    /// Copy constructor.
-    String_out (const String_out &s);
-
-    /// Assignment from a string_out.
-    String_out &operator= (const String_out &s);
-
-    /// Assignment from a string.
-    String_out &operator= (char *p);
-
-    /// Assignment from a constant char*.
-    String_out& operator= (const char* p);
-
-    /// Cast.
-    operator char *&();
-
-    /// Return underlying instance.
-    char *&ptr (void);
-
-  private:
-    /// Instance.
-    char *&ptr_;
-
-    // assignment from _var disallowed
-    void operator= (const CORBA::String_var &);
-  };
-
-  // ****************************************************************
-
-  /**
-   * @class WString_var
-   *
-   * @brief CORBA::WString var class.
-   *
-   * Provides automatic deallocation of storage for wide strings.
-   */
-  class TAO_Export WString_var
-  {
-  public:
-    /// default constructor.
-    WString_var (void);
-
-    /// constructor, owns p.
-    WString_var (CORBA::WChar *p);
-
-    /// constructor. Makes a copy of p.
-    WString_var (const CORBA::WChar *p);
-
-    /// copy constructor.
-    WString_var (const WString_var &s);
-
-    /// destructor.
-    ~WString_var (void);
-
-    /// assignment operator.
-    WString_var &operator= (CORBA::WChar *p);
-
-    /// assignment to a const char*.  Makes a copy.
-    WString_var &operator= (const CORBA::WChar *p);
-
-    /// assignment operator.
-    WString_var &operator= (const WString_var &s);
-
-    /// access and modify.
-    operator CORBA::WChar *&();
-
-    /// only read privileges.
-    operator const CORBA::WChar *() const;
-
-    /// allows access and modification using an slot.
-    CORBA::WChar &operator[] (CORBA::ULong slot);
-
-    /// allows only accessing thru an slot.
-    CORBA::WChar operator[] (CORBA::ULong slot) const;
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    /// for in parameter.
-    const CORBA::WChar *in (void) const;
-
-    /// for inout parameter.
-    CORBA::WChar *&inout (void);
-
-    /// for out parameter.
-    CORBA::WChar *&out (void);
-
-    /// for string of return type.
-    CORBA::WChar *_retn (void);
-
-    /// TAO extension.
-    CORBA::WChar *ptr (void);
-
-  private:
-    /// instance.
-    CORBA::WChar *ptr_;
-  };
-
-  /**
-   * @class WString_out
-   *
-   * @brief WString_out
-   *
-   * To support the memory management for "out" parameter passing
-   * mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA::WString_out
-   * class.
-   */
-  class TAO_Export WString_out
-  {
-  public:
-
-    /// Construction from a reference to a string.
-    WString_out (CORBA::WChar *&p);
-
-    /// Construction from a var.
-    WString_out (CORBA::WString_var &p);
-
-    /// Construction from a TAO_WString_Manager.
-    WString_out (TAO_WString_Manager &p);
-
-    /// Copy constructor.
-    WString_out (const WString_out &s);
-
-    /// Assignment from a string_out.
-    WString_out &operator= (const WString_out &s);
-
-    /// Assignment from a string.
-    WString_out &operator= (CORBA::WChar *p);
-
-    /// Cast.
-    operator CORBA::WChar *&();
-
-    /// Return underlying instance.
-    CORBA::WChar *&ptr (void);
-
-  private:
-    /// Instance.
-    CORBA::WChar *&ptr_;
-
-    // assignment from _var disallowed
-    void operator= (const CORBA::WString_var &);
-  };
-}  // End CORBA namespace.
-
-# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-TAO_Export ostream &
-operator<< (ostream &, const CORBA::String_var &);
-TAO_Export istream &
-operator>> (istream &, CORBA::String_var &);
-TAO_Export ostream &
-operator<< (ostream &, CORBA::String_out &);
-TAO_Export istream &
-operator>> (istream &, CORBA::String_out &);
-TAO_Export ostream &
-operator<< (ostream &, const CORBA::WString_var &);
-TAO_Export istream &
-operator>> (istream &, CORBA::WString_var &);
-TAO_Export ostream &
-operator<< (ostream &, CORBA::WString_out &);
-TAO_Export istream &
-operator>> (istream &, CORBA::WString_out &);
-
-# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
-#if defined (__ACE_INLINE__)
-# include "tao/CORBA_String.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_CORBA_STRING_H */
diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl
deleted file mode 100644
index af595f91619..00000000000
--- a/TAO/tao/CORBA_String.inl
+++ /dev/null
@@ -1,264 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA::String_var::String_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (const char *p)
-  : ptr_ (CORBA::string_dup (p))
-{
-}
-
-ACE_INLINE CORBA::Char &
-CORBA::String_var::operator[] (CORBA::ULong slot)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::Char
-CORBA::String_var::operator[] (CORBA::ULong slot) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA::String_var::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::String_var::operator const char *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-CORBA::String_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-CORBA::String_var::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-/// TAO extension.
-ACE_INLINE char *
-CORBA::String_var::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::String_out::String_out (char *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (const CORBA::String_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const CORBA::String_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (char *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const char *s)
-{
-  this->ptr_ = CORBA::string_dup (s);
-  return *this;
-}
-
-ACE_INLINE
-CORBA::String_out::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA::WString_var::WString_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::WString_var::WString_var (const CORBA::WChar *p)
-  : ptr_ (CORBA::wstring_dup (p))
-{
-}
-
-ACE_INLINE CORBA::WChar &
-CORBA::WString_var::operator[] (CORBA::ULong slot)
-{
-  // @@ We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE CORBA::WChar
-CORBA::WString_var::operator[] (CORBA::ULong slot) const
-{
-  // @@ We need to verify bounds else raise some exception.
-  return this->ptr_[slot];
-}
-
-ACE_INLINE
-CORBA::WString_var::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WString_var::operator const CORBA::WChar *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-CORBA::WString_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_var::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-CORBA::WString_var::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-/// TAO extension.
-ACE_INLINE CORBA::WChar *
-CORBA::WString_var::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::WString_out::WString_out (CORBA::WChar *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::WString_out::WString_out (CORBA::WString_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::WString_out::WString_out (const CORBA::WString_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::WString_out &
-CORBA::WString_out::operator= (const CORBA::WString_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::WString_out &
-CORBA::WString_out::operator= (CORBA::WChar *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::WString_out::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA::WString_out::ptr (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h
deleted file mode 100644
index df252c7cba5..00000000000
--- a/TAO/tao/CORBA_methods.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    CORBA_methods.h
- *
- *  $Id$
- *
- *  Declarations of common methods in the CORBA namespace.
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_CORBA_METHODS_H
-#define TAO_CORBA_METHODS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-namespace CORBA
-{
-  class ORB;
-  typedef ORB *ORB_ptr;
-
-  class Environment;
-  typedef Environment *Environment_ptr;
-
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Principal;
-  typedef Principal *Principal_ptr;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class OperationDef;
-  typedef OperationDef *OperationDef_ptr;
-
-  /**
-   * @name ORB Initialization
-   *
-   * These could be combined into a single version using an environment macro.
-   *
-   */
-  //@{
-  extern TAO_Export ORB_ptr ORB_init (int & argc,
-                                      char * argv[],
-                                      const char * orb_name = 0);
-
-  extern TAO_Export ORB_ptr ORB_init (int & argc,
-                                      char * argv[],
-                                      const char * orb_name,
-                                      Environment & ACE_TRY_ENV);
-  //@}
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_CORBA_METHODS_H */
diff --git a/TAO/tao/Cache_Entries.cpp b/TAO/tao/Cache_Entries.cpp
deleted file mode 100644
index b4540ba96b3..00000000000
--- a/TAO/tao/Cache_Entries.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//$Id$
-
-#include "tao/Cache_Entries.h"
-#include "tao/Transport.h"
-
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Cache_Entries.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao,
-          Cache_Entries,
-          "$Id$")
-
-
-namespace TAO
-{
-  Cache_IntId::Cache_IntId (TAO_Transport *transport)
-    : transport_ (transport)
-    , recycle_state_ (ENTRY_UNKNOWN)
-  {
-    transport->add_reference ();
-  }
-
-  Cache_IntId::~Cache_IntId (void)
-  {
-    if (this->transport_)
-      this->transport_->remove_reference ();
-  }
-
-  Cache_IntId&
-  Cache_IntId::operator= (const Cache_IntId &rhs)
-  {
-    if (this != &rhs)
-      {
-        this->recycle_state_ = rhs.recycle_state_;
-
-        TAO_Transport *old_transport = this->transport_;
-        this->transport_ = rhs.transport_;
-        if (this->transport_)
-          this->transport_->add_reference ();
-        if (old_transport)
-          old_transport->remove_reference ();
-      }
-
-    return *this;
-  }
-}
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
deleted file mode 100644
index 7987f7def4f..00000000000
--- a/TAO/tao/Cache_Entries.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Cache_Entries.h
- *
- *  $Id$
- *
- *
- *  @author Bala Natarajan  <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_CACHE_ENTRIES_H
-#define TAO_CACHE_ENTRIES_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Transport_Descriptor_Interface.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-
-class TAO_Transport;
-
-#ifdef index
-# undef index
-#endif  /* index */
-
-namespace TAO
-{
-  /// States of a recyclable object.
-  /// @@todo: A lifecycle needs to be designed. It can wait for
-  /// sometime.
-  enum Cache_Entries_State
-    {
-      /// Idle and can be purged.
-      ENTRY_IDLE_AND_PURGABLE,
-
-      /// Idle but cannot be purged.
-      ENTRY_IDLE_BUT_NOT_PURGABLE,
-
-      /// Can be purged, but is not idle (mostly for debugging).
-      ENTRY_PURGABLE_BUT_NOT_IDLE,
-
-      /// Busy (i.e., cannot be recycled or purged).
-      ENTRY_BUSY,
-
-      /// Closed.
-      ENTRY_CLOSED,
-
-      /// Unknown state.
-      ENTRY_UNKNOWN
-    };
-
-  /**
-   * @class Cache_IntId
-   *
-   * @brief Helper class for TAO_Transport_Cache_Manager
-   *
-   * Helper class that wraps the <value> part of the Map or
-   * table holding the Transport state.: unifies data items, so
-   * they can be stored together as a <value> for a <key> in a
-   * table holding the state of the Transport Cache.
-   */
-  class TAO_Export Cache_IntId
-  {
-  public:
-
-    /// Constructor.
-    Cache_IntId (void);
-
-    /// Constructor.
-    Cache_IntId (TAO_Transport *transport);
-
-    /// Copy constructor.
-    Cache_IntId (const Cache_IntId & rhs);
-
-    /// Destructor.
-    ~Cache_IntId (void);
-
-    /// Assignment operator (does copy memory).
-    Cache_IntId& operator= (const Cache_IntId &rhs);
-
-    /// Equality comparison operator (must match both id_ and kind_).
-    bool operator== (const Cache_IntId &rhs) const;
-
-    /// Inequality comparison operator.
-    bool operator!= (const Cache_IntId &rhs) const;
-
-    /// Return the underlying transport
-    TAO_Transport *transport (void);
-
-    /// Return the underlying transport
-    const TAO_Transport *transport (void) const;
-
-    /// Set <recycle_state>.
-    void recycle_state (Cache_Entries_State new_state);
-
-    /// Get <recycle_state>.
-    Cache_Entries_State recycle_state (void);
-
-    /// Relinquish ownership of the TAO_Transport object associated with
-    /// this Cache_IntId.
-    /**
-     * @note This method should go away once the
-     *       Transport_Cache_Map_Manager is improved so that it returns
-     *       TAO_Transport objects when performing a find() operation.
-     *       This method really only exists to get around inadequacies
-     *       in the Transport_Cache_Map_Manager interface.
-     */
-    TAO_Transport *relinquish_transport (void);
-
-  private:
-    /// The transport that needs to be cached.
-    TAO_Transport *transport_;
-
-    /// The state of the handle
-    Cache_Entries_State recycle_state_;
-  };
-
-
-  /**
-   * @class Cache_ExtId
-   *
-   * @brief Helper class for TAO_Transport_Cache_Manager: unifies
-   * several  data items, so they can be stored together as a
-   * <value> for a <key> in a hash table holding the state of the
-   * Transport Cache.
-   */
-  class TAO_Export Cache_ExtId
-  {
-  public:
-
-    /// Constructor.
-    Cache_ExtId (void);
-
-    /// Constructor.
-    Cache_ExtId (TAO_Transport_Descriptor_Interface *prop);
-
-    /// Copy constructor.
-    Cache_ExtId (const Cache_ExtId & rhs);
-
-    /// Destructor.
-    ~Cache_ExtId (void);
-
-    // = Assignment and comparison operators.
-    /// Assignment operator (does copy memory).
-    Cache_ExtId& operator= (const Cache_ExtId &rhs);
-
-    /// Equality comparison operator (must match both id_ and kind_).
-    bool operator== (const Cache_ExtId &rhs) const;
-
-    /// Inequality comparison operator.
-    bool operator!= (const Cache_ExtId &rhs) const;
-
-    /// <hash> function is required in order for this class to be usable by
-    /// ACE_Hash_Map_Manager_Ex.
-    u_long hash (void) const;
-
-    /// Make a deep copy of the underlying pointer
-    void duplicate (void);
-
-    //@{
-    /// Return the index value
-    CORBA::ULong index (void);
-    CORBA::ULong index (void) const;
-    //@}
-
-    /// Set the index value. This calls should not be used by any users
-    /// but for the TAO_Transport_Cache_Manager class.
-    void index (CORBA::ULong index);
-
-    /// Increment the index value
-    void incr_index (void);
-
-    // = Accessors
-    /// Get the underlying the property pointer
-    TAO_Transport_Descriptor_Interface *property (void) const;
-
-  private:
-
-    /// A property object that we represent.
-    TAO_Transport_Descriptor_Interface *transport_property_;
-
-    /// Do we need to delete transport_property?
-    CORBA::Boolean is_delete_;
-
-    /**
-     * This is a supplementary index. Would be set to zero by
-     * default. Would be altered by the Transport_Cache of TAO. Please
-     * see the documentation of TAO_Transport_Cache_Manager for
-     * details.
-     */
-    CORBA::ULong index_;
-  };
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Cache_Entries.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CACHE_ENTRIES_H */
diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl
deleted file mode 100644
index 0b34beb193a..00000000000
--- a/TAO/tao/Cache_Entries.inl
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-namespace TAO
-{
-  ACE_INLINE
-  Cache_IntId::Cache_IntId (void)
-    : transport_ (0),
-      recycle_state_ (ENTRY_UNKNOWN)
-  {
-  }
-
-  ACE_INLINE
-  Cache_IntId::Cache_IntId (const Cache_IntId &rhs)
-    : transport_ (0),
-      recycle_state_ (ENTRY_UNKNOWN)
-  {
-    *this = rhs;
-  }
-
-  ACE_INLINE bool
-  Cache_IntId::operator== (const Cache_IntId &rhs) const
-  {
-    return (this->transport_ == rhs.transport_);
-  }
-
-  ACE_INLINE bool
-  Cache_IntId::operator!= (const Cache_IntId &rhs) const
-  {
-    return (this->transport_ != rhs.transport_);
-  }
-
-  ACE_INLINE TAO_Transport *
-  Cache_IntId::transport (void)
-  {
-    return this->transport_;
-  }
-
-  ACE_INLINE const TAO_Transport *
-  Cache_IntId::transport (void) const
-  {
-    return this->transport_;
-  }
-
-  ACE_INLINE void
-  Cache_IntId::recycle_state (Cache_Entries_State st)
-  {
-    this->recycle_state_ = st;
-  }
-
-  ACE_INLINE Cache_Entries_State
-  Cache_IntId::recycle_state (void)
-  {
-    return this->recycle_state_;
-  }
-
-  ACE_INLINE TAO_Transport *
-  Cache_IntId::relinquish_transport (void)
-  {
-    // Yield ownership of the TAO_Transport object.
-    TAO_Transport *val = this->transport_;
-    this->transport_ = 0;
-    return val;
-  }
-
-  /*******************************************************/
-  ACE_INLINE
-  Cache_ExtId::Cache_ExtId (void)
-    : transport_property_ (0),
-      is_delete_ (0),
-      index_ (0)
-  {
-  }
-
-  ACE_INLINE
-  Cache_ExtId::Cache_ExtId (TAO_Transport_Descriptor_Interface *prop)
-    : transport_property_ (prop),
-      is_delete_ (0),
-      index_ (0)
-  {
-
-  }
-
-  ACE_INLINE
-  Cache_ExtId::~Cache_ExtId (void)
-  {
-    if (this->is_delete_)
-      delete this->transport_property_;
-  }
-
-  ACE_INLINE Cache_ExtId &
-  Cache_ExtId::operator= (const Cache_ExtId &rhs)
-  {
-    if (this != &rhs)
-      {
-        // Do a deep copy
-        this->transport_property_ =
-          rhs.transport_property_->duplicate ();
-
-        if (this->transport_property_ == 0)
-          {
-            this->is_delete_ = 0;
-            this->index_ = 0;
-          }
-        else
-          {
-            this->is_delete_ = 1;
-            this->index_ = rhs.index_;
-          }
-      }
-    return *this;
-  }
-
-  ACE_INLINE
-  Cache_ExtId::Cache_ExtId (const Cache_ExtId &rhs)
-    : transport_property_ (0),
-      is_delete_ (0),
-      index_ (0)
-  {
-    *this = rhs;
-  }
-
-  ACE_INLINE bool
-  Cache_ExtId::operator== (const Cache_ExtId &rhs) const
-  {
-    return (this->transport_property_->is_equivalent (rhs.transport_property_) &&
-            this->index_ == rhs.index_);
-  }
-
-  ACE_INLINE bool
-  Cache_ExtId::operator!= (const Cache_ExtId &rhs) const
-  {
-    if (this->transport_property_->is_equivalent (rhs.transport_property_) &&
-        this->index_ == rhs.index_)
-      return false;
-
-    return true;
-  }
-
-  ACE_INLINE u_long
-  Cache_ExtId::hash (void) const
-  {
-    return (this->transport_property_->hash () + this->index_);
-  }
-
-  ACE_INLINE void
-  Cache_ExtId::duplicate (void)
-  {
-    TAO_Transport_Descriptor_Interface *prop = 0;
-
-    // Make a deep copy
-    prop = this->transport_property_->duplicate ();
-
-    if (prop == 0)
-      return;
-
-    // Release memory if there was some allocated in the first place
-    if (this->is_delete_)
-      delete this->transport_property_;
-
-    this->is_delete_ = 1;
-    this->transport_property_ = prop;
-  }
-
-
-  ACE_INLINE CORBA::ULong
-  Cache_ExtId::index (void)
-  {
-    return this->index_;
-  }
-
-  ACE_INLINE CORBA::ULong
-  Cache_ExtId::index (void) const
-  {
-    return this->index_;
-  }
-
-
-  ACE_INLINE void
-  Cache_ExtId::index (CORBA::ULong index)
-  {
-    this->index_ = index;
-  }
-
-  ACE_INLINE void
-  Cache_ExtId::incr_index (void)
-  {
-    ++this->index_;
-  }
-
-  ACE_INLINE TAO_Transport_Descriptor_Interface *
-  Cache_ExtId::property (void) const
-  {
-    return this->transport_property_;
-  }
-}
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
deleted file mode 100644
index db467f6568c..00000000000
--- a/TAO/tao/CharSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in CharSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          CharSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_CHAR_SEQ_IDL
-#define TAO_CORBA_CHAR_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<char> CharSeq;
-};
-
-#endif  /* TAO_CORBA_CHAR_SEQ_IDL */
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
deleted file mode 100644
index 406d7ac50f1..00000000000
--- a/TAO/tao/CharSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_CharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_CharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_CharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_char,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_CharSeq_0 =
-      &CORBA_CharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_CharSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_CharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/CharSeq:1.0",
-    "CharSeq",
-    &TAO::TypeCode::tc_CORBA_CharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_CharSeq =
-    &_tao_tc_CORBA_CharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::CharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert_copy (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::CharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::CharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::CharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::CharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::CharSeq>::extract (
-        _tao_any,
-        CORBA::CharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_CharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp
deleted file mode 100644
index 6a7a8b69980..00000000000
--- a/TAO/tao/CharSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "CharSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_CHARSEQ_CS_)
-#define _CORBA_CHARSEQ_CS_
-
-CORBA::CharSeq::CharSeq (void)
-{}
-
-CORBA::CharSeq::CharSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Char
-      >
-    (max)
-{}
-
-CORBA::CharSeq::CharSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Char * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Char
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::CharSeq::CharSeq (
-    const CharSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Char
-      >
-    (seq)
-{}
-
-CORBA::CharSeq::~CharSeq (void)
-{}
-
-void CORBA::CharSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  CharSeq * _tao_tmp_pointer =
-    static_cast<CharSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_CharSeq_CPP_
-#define _TAO_CDR_OP_CORBA_CharSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::CharSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_char_array ((const char *)_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::CharSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_char_array ((char *)_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
deleted file mode 100644
index dc9b8949bbb..00000000000
--- a/TAO/tao/CharSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_CHARSEQC_H_
-#define _TAO_IDL_ORIG_CHARSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_CHARSEQ_CH_)
-#define _CORBA_CHARSEQ_CH_
-  
-  class CharSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        CharSeq,
-        CORBA::Char
-      >
-    CharSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        CharSeq,
-        CharSeq_var,
-        CORBA::Char
-      >
-    CharSeq_out;
-  
-  class TAO_Export CharSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Char
-          >
-  {
-  public:
-    CharSeq (void);
-    CharSeq (CORBA::ULong max);
-    CharSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Char* buffer, 
-        CORBA::Boolean release = 0
-      );
-    CharSeq (const CharSeq &);
-    ~CharSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef CharSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CharSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::CharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::CharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::CharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::CharSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_CharSeq_H_
-#define _TAO_CDR_OP_CORBA_CharSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::CharSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::CharSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CharSeqS.h b/TAO/tao/CharSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/CharSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
deleted file mode 100644
index 50e06b17d94..00000000000
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "Cleanup_Func_Registry.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Cleanup_Func_Registry.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           Cleanup_Func_Registry,
-           "$Id$")
-
-TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
-  : cleanup_funcs_ ()
-{
-}
-
-TAO_Cleanup_Func_Registry::~TAO_Cleanup_Func_Registry (void)
-{
-}
-
-int
-TAO_Cleanup_Func_Registry::register_cleanup_function (
-  ACE_CLEANUP_FUNC func,
-  size_t &slot_id)
-{
-  size_t slot = this->cleanup_funcs_.size ();
-
-  if (this->cleanup_funcs_.size (slot + 1) != 0)
-    return -1;
-
-  this->cleanup_funcs_[slot] = func;
-  slot_id = slot;
-
-  return 0;
-}
-
-void
-TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects)
-{
-  size_t len = ts_objects.size ();
-
-  // The allocated slot may never have been used.  It is therefore
-  // possible that the TSS array size may be less than the cleanup
-  // function size.  However, there is still a one-to-one
-  // correspondence between cleanup_func[foo] and ts_object[foo].
-
-  ACE_ASSERT (len <= this->cleanup_funcs_.size ());
-
-  /// Cleanup each TSS object.
-  for (size_t i = 0; i < len; ++i)
-    {
-      ACE_CLEANUP_FUNC destructor = this->cleanup_funcs_[i];
-      if (destructor != 0)
-        destructor (ts_objects[i], 0);
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Array_Base<ACE_CLEANUP_FUNC>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<ACE_CLEANUP_FUNC>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
deleted file mode 100644
index 6d42d4342ec..00000000000
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Cleanup_Func_Registry.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_CLEANUP_FUNC_REGISTRY_H
-#define TAO_CLEANUP_FUNC_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Array_Base.h"
-
-/**
- * @class TAO_Cleanup_Func_Registry
- *
- * @brief
- * This is a helper class that is designed to perform cleanup on
- * thread-specific objects registered in the ORB Core TSS resources by
- * invoking the corresponding cleanup function on each object.  Hence,
- * there is a tight coupling between this class and the TAO ORB Core.
- */
-class TAO_Export TAO_Cleanup_Func_Registry
-{
-  friend class TAO_ORB_Core;
-
-public:
-
-  /// Constructor
-  TAO_Cleanup_Func_Registry (void);
-
-  /// Destructor
-  ~TAO_Cleanup_Func_Registry (void);
-
-  /// Return the number of registered cleanup functions.
-  size_t size (void) const;
-
-protected:
-
-  /// Register a cleanup function.  The number of slot the cleanup
-  /// function is placed is in will match the one reserved for the
-  /// corresponding thread specific object in the ORB Core TSS
-  /// resources.  The slot_id is returned via the second reference
-  /// argument.  This method returns 0 on failure, and -1 on failure.
-  int register_cleanup_function (ACE_CLEANUP_FUNC func,
-                                 size_t &slot_id);
-
-  /// Invoke the corresponding cleanup function on each
-  /// thread-specific object.
-  void cleanup (ACE_Array_Base<void *> &ts_objects);
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &))
-
-private:
-
-  /// Array of registered cleanup functions.  The number of
-  /// registered cleanup functions should be the same as the number
-  /// of registered thread-specific objects in the ORB Core TSS
-  /// resources.
-  ACE_Array_Base<ACE_CLEANUP_FUNC> cleanup_funcs_;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "Cleanup_Func_Registry.inl"
-#endif  /* __ACE_INLINE__ */
-
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_CLEANUP_FUNC_REGISTRY_H */
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
deleted file mode 100644
index 1e2a8362075..00000000000
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE size_t
-TAO_Cleanup_Func_Registry::size (void) const
-{
-  return this->cleanup_funcs_.size ();
-}
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
deleted file mode 100644
index a1d64942028..00000000000
--- a/TAO/tao/ClientRequestInfo.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// $Id$
-
-#include "ClientRequestInfo.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-
-ACE_RCSID (tao,
-           ClientRequestInfo,
-           "$Id$")
-
-
-#include "ClientRequestInfo_i.h"
-#include "Any.h"
-#include "PolicyC.h"
-
-# if !defined (__ACE_INLINE__)
-#   include "ClientRequestInfo.inl"
-# endif /* !__ACE_INLINE__ */
-
-TAO_ClientRequestInfo::TAO_ClientRequestInfo (void)
-  : info_ (0)
-{
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return this->info_->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return this->info_->effective_target (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->effective_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// Use at own risk. There is no way currently of extracting an
-// exception from an Any. This method is in place just to be compliant
-// with the spec.
-CORBA::Any *
-TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-char *
-TAO_ClientRequestInfo::received_exception_id (
-    ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-IOP::TaggedComponent *
-TAO_ClientRequestInfo::get_effective_component (
-    IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->get_effective_component (id
-                                               ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::TaggedComponentSeq *
-TAO_ClientRequestInfo::get_effective_components (
-    IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->get_effective_components (id
-                                                ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return this->info_->get_request_policy (type
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_ClientRequestInfo::add_request_service_context (
-    const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->info_->add_request_service_context (service_context,
-                                            replace
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ULong
-TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-char *
-TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->contexts (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->operation_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Any *
-TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Messaging::SyncScope
-TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->sync_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION);
-
-  return this->info_->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return this->info_->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Any *
-TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->get_slot (id
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->get_request_service_context (id
-                                                   ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->info_->get_reply_service_context (id
-                                                 ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_GIOP_Invocation *
-TAO_ClientRequestInfo::invocation (void)
-{
-  return this->invocation_;
-}
-
-// -------------------------------------------------------------------
-
-
-TAO_ClientRequestInfo_Guard::~TAO_ClientRequestInfo_Guard (void)
-{
-  // Restore the previous request information into the TSS object.
-  // Note that no TSS access occurs here.
-  if (this->info_ != 0)
-    this->info_->info (this->previous_info_);
-}
-
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
deleted file mode 100644
index 15f06bcc7ef..00000000000
--- a/TAO/tao/ClientRequestInfo.h
+++ /dev/null
@@ -1,294 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ClientRequestInfo.h
- *
- * $Id$
- *
- * This is the implementation of the
- * PortableInterceptor::ClientRequestInfo interface.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CLIENT_REQUEST_INFO_H
-#define TAO_CLIENT_REQUEST_INFO_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LocalObject.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "tao/ClientRequestInfoC.h"
-#include "tao/ORB_Constants.h"
-
-class TAO_ClientRequestInfo_i;
-class TAO_GIOP_Invocation;
-
-/**
- * @class TAO_ClientRequestInfo
- *
- * @brief Implementation of the PortableInterceptor::ClientRequestInfo
- *        interface.
- *
- * This class forwards all method calls to the underlying
- * ClientRequestInfo implementation.
- * @par
- * An instance of this class is placed in TSS, where as the underlying
- * implementation is instantiated on the stack during each CORBA
- * request.  During each request invocation, a pointer to the stack
- * instantiated implementation is placed in the instance of this
- * class.
- * @par
- * This may seem unnecessary.  However, it is necessary to avoid
- * instantiating an object that inherits from CORBA::Object in the
- * critical path.  Such an instantiation would cause a lock to be
- * initialized (not acquired) in the critical path, which can degrade
- * performance significantly.
- */
-class TAO_ClientRequestInfo
-  : public virtual PortableInterceptor::ClientRequestInfo,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  TAO_ClientRequestInfo (void);
-
-  /// Return an ID unique to the current request.  This request ID may
-  /// or may not be the same as the GIOP request ID.
-  virtual CORBA::ULong request_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the operation name for the current request.
-  virtual char * operation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the list of exceptions the current operation is capable
-  /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::ContextList * contexts (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual Dynamic::RequestContext * operation_context (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the result of the current request.  If there is no return
-  /// value then an Any with tk_void TypeCode is returned.  This is
-  /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Returns true for a two-way operation, and false otherwise.
-  virtual CORBA::Boolean response_expected (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
-
-  /// Return the sync_scope policy value for the current one-way
-  /// operation.  If the operation is not a one-way, a
-  /// CORBA::BAD_INV_ORDER exception is thrown.
-  virtual Messaging::SyncScope sync_scope (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the reply status for the current request.
-  /**
-   * Statuses can be PortableInterceptor::SUCCESSFUL,
-   * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
-   * TRANSPORT_RETRY, UNKNOWN.
-   */
-  virtual PortableInterceptor::ReplyStatus reply_status (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
-  /// return the object reference to which the request was forwarded.
-  virtual CORBA::Object_ptr forward_reference (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
-
-  virtual CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::InvalidSlot));
-
-  /// Return the IOP::ServiceContext with the given IOP::ServiceId
-  /// from the request service context list.
-  virtual IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the IOP::ServiceContext with the given IOP::ServiceId
-  /// from the reply service context list.
-  virtual IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the (initial, non-forwarded, or permanently forwarded)
-  /// object reference of the target.
-  virtual CORBA::Object_ptr target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the object reference for the current target.  The target
-  /// may change in the even of a location forward.
-  virtual CORBA::Object_ptr effective_target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual IOP::TaggedProfile * effective_profile (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return an Any containing the received exception, if any.
-  /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
-  /**
-   * @note There is no trivial way to extract the exception from an Any.
-   */
-  virtual CORBA::Any * received_exception (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the repository ID for the received exception.
-  virtual char * received_exception_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the first IOP::TaggedComponent that matches the given
-  /// IOP::ComponentId in the object reference for the current
-  /// target.
-  virtual IOP::TaggedComponent * get_effective_component (
-      IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return all IOP::TaggedComponent(s) that match the given
-  /// IOP::ComponentId in the object reference for the current
-  /// target.
-  virtual IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the policy of the given type in effect for the current
-  /// request.
-  virtual CORBA::Policy_ptr get_request_policy (
-      CORBA::PolicyType type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the IOP::ServiceContext to the request (outgoing)
-  /// IOP::ServiceContextList.
-  virtual void add_request_service_context (
-      const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Set the ClientRequestInfo implementation which this class
-  /// forwards all method call to.
-  void info (TAO_ClientRequestInfo_i *info);
-
-  /// Get the ClientRequestInfo implementation which this class
-  /// forwards all method call to.
-  TAO_ClientRequestInfo_i * info (void) const;
-
-  /// Accessor to underlying invocation_
-  TAO_GIOP_Invocation *invocation ();
-
-private:
-
-  /// Check if this ClientRequestInfo object is called within the
-  /// context of a request.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-
-  /// Pointer to the object that actually implements the
-  /// ClientRequestInfo functionality.
-  TAO_ClientRequestInfo_i * info_;
-
-  /// Pointer to the GIOP invocation object.
-  TAO_GIOP_Invocation *invocation_;
-
-};
-
-
-// -------------------------------------------------------------------
-
-
-/**
- * @class TAO_ClientRequestInfo_Guard
- *
- * @brief Guard for exception safe TAO_ClientRequestInfo_i pointer
- *        swapping.
- *
- * This class is used to ensure the swapping of
- * TAO_ClientRequestInfo_i pointers in a TAO_ClientRequestInfo object
- * is performed in an exception-safe manner when interception points
- * are being invoked.
- */
-class TAO_ClientRequestInfo_Guard
-{
-public:
-
-  /// Constructor.
-  TAO_ClientRequestInfo_Guard (TAO_ClientRequestInfo *info,
-                               TAO_ClientRequestInfo_i *ri);
-
-  /// Destructor.
-  ~TAO_ClientRequestInfo_Guard (void);
-
-private:
-
-  /// Pointer to the TAO_ClientRequestInfo object upon which pointer
-  /// swaps will occur.
-  TAO_ClientRequestInfo * info_;
-
-  /// Pointer to the TAO_ClientRequestInfo_i object that was
-  /// previously stored in the TAO_ClientRequestInfo object.
-  TAO_ClientRequestInfo_i * previous_info_;
-
-};
-
-
-# if defined (__ACE_INLINE__)
-#  include "ClientRequestInfo.inl"
-# endif  /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CLIENT_REQUEST_INFO_H */
diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl
deleted file mode 100644
index 07eaef27c7f..00000000000
--- a/TAO/tao/ClientRequestInfo.inl
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "SystemException.h"
-
-ACE_INLINE void
-TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->info_ == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
-}
-
-ACE_INLINE void
-TAO_ClientRequestInfo::info (TAO_ClientRequestInfo_i *info)
-{
-  this->info_ = info;
-}
-
-ACE_INLINE TAO_ClientRequestInfo_i *
-TAO_ClientRequestInfo::info (void) const
-{
-  return this->info_;
-}
-
-
-// -------------------------------------------------------------------
-
-
-ACE_INLINE
-TAO_ClientRequestInfo_Guard::TAO_ClientRequestInfo_Guard (
-  TAO_ClientRequestInfo * info,
-  TAO_ClientRequestInfo_i * ri)
-  : info_ (info),
-    previous_info_ (0)
-{
-  if (info != 0)
-    {
-      this->previous_info_ = info->info ();
-      info->info (ri);
-    }
-}
diff --git a/TAO/tao/ClientRequestInfo.pidl b/TAO/tao/ClientRequestInfo.pidl
deleted file mode 100644
index fb1284ce1b4..00000000000
--- a/TAO/tao/ClientRequestInfo.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ClientRequestInfo.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled ClientRequestInfo
- *
- * This file was used to generate the code in ClientRequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ClientRequestInfo.pidl
- */
-
-#ifndef _CLIENT_REQUESTINFO_PIDL_
-#define _CLIENT_REQUESTINFO_PIDL_
-
-#include <RequestInfo.pidl>
-#include <orb_types.pidl>
-#include <Policy_Forward.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ClientRequestInfo : RequestInfo
-  {
-    readonly attribute Object target;
-    readonly attribute Object effective_target;
-    readonly attribute IOP::TaggedProfile effective_profile;
-    readonly attribute any received_exception;
-    readonly attribute CORBA::RepositoryId received_exception_id;
-    IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
-    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
-    CORBA::Policy get_request_policy (in CORBA::PolicyType type);
-    void add_request_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-};
-
-#endif  /* _CLIENT_REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/ClientRequestInfoA.cpp b/TAO/tao/ClientRequestInfoA.cpp
deleted file mode 100644
index 07ed87cd3b7..00000000000
--- a/TAO/tao/ClientRequestInfoA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ClientRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ClientRequestInfo (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
-    "ClientRequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
-    &_tao_tc_PortableInterceptor_ClientRequestInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ClientRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ClientRequestInfo,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ClientRequestInfoC.cpp b/TAO/tao/ClientRequestInfoC.cpp
deleted file mode 100644
index 1d0f6a5f6ee..00000000000
--- a/TAO/tao/ClientRequestInfoC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ClientRequestInfoC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ClientRequestInfo.
-
-PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate (
-    PortableInterceptor::ClientRequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::ClientRequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
-    PortableInterceptor::ClientRequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void)
-{
-  return PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
-    PortableInterceptor::ClientRequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
-{}
-
-PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
-{}
-
-void 
-PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientRequestInfo *_tao_tmp_pointer =
-    static_cast<ClientRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ClientRequestInfoC.h b/TAO/tao/ClientRequestInfoC.h
deleted file mode 100644
index 431fe9b1b3c..00000000000
--- a/TAO/tao/ClientRequestInfoC.h
+++ /dev/null
@@ -1,316 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
-#define _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/RequestInfoC.h"
-#include "tao/orb_typesC.h"
-#include "tao/Policy_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-  
-  class ClientRequestInfo;
-  typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-  
-  class TAO_Export ClientRequestInfo
-    : public virtual ::PortableInterceptor::RequestInfo
-  {
-  public:
-    typedef ClientRequestInfo_ptr _ptr_type;
-    typedef ClientRequestInfo_var _var_type;
-    
-    // The static operations.
-    static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-    
-    static void _tao_release (ClientRequestInfo_ptr obj);
-    
-    static ClientRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientRequestInfo_ptr _nil (void)
-    {
-      return static_cast<ClientRequestInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr target (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr effective_target (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::TaggedProfile * effective_profile (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * received_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * received_exception_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::TaggedComponent * get_effective_component (
-        ::IOP::ComponentId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::TaggedComponentSeq * get_effective_components (
-        ::IOP::ComponentId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr get_request_policy (
-        ::CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_request_service_context (
-        const ::IOP::ServiceContext & service_context,
-        ::CORBA::Boolean replace
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ClientRequestInfo (void);
-    
-    virtual ~ClientRequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ClientRequestInfo (const ClientRequestInfo &);
-    
-    void operator= (const ClientRequestInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
-  {
-    static ::PortableInterceptor::ClientRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ClientRequestInfoS.h b/TAO/tao/ClientRequestInfoS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ClientRequestInfoS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
deleted file mode 100644
index 8b82ed4a088..00000000000
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-#include "ClientRequestInfo_i.h"
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#include "Invocation_Base.h"
-#include "Stub.h"
-#include "ORB_Core.h"
-#include "Profile.h"
-#include "debug.h"
-#include "Service_Context.h"
-
-# if !defined (__ACE_INLINE__)
-#   include "ClientRequestInfo_i.inl"
-# endif /* !__ACE_INLINE__ */
-
-ACE_RCSID (TAO,
-           ClientRequestInfo_i,
-           "$Id$")
-
-TAO_ClientRequestInfo_i::TAO_ClientRequestInfo_i (TAO::Invocation_Base *inv)
-  : invocation_ (inv),
-    // abstract_target_ (0),
-    caught_exception_ (0),
-    reply_status_ (-1),
-    rs_pi_current_ (),
-    copy_callback_ ()
-{
-  this->setup_picurrent ();
-}
-
-TAO_ClientRequestInfo_i::TAO_ClientRequestInfo_i (
-    TAO::Invocation_Base *inv,
-    CORBA::AbstractBase_ptr /* abstract_target */,
-    CORBA::Boolean
-  )
-  : invocation_ (inv),
-    // abstract_target_ (abstract_target), // No need to duplicate.
-    caught_exception_ (0),
-    reply_status_ (-1),
-    rs_pi_current_ (),
-    copy_callback_ ()
-{
-  this->setup_picurrent ();
-}
-
-TAO_ClientRequestInfo_i::~TAO_ClientRequestInfo_i (void)
-{
-}
-
-void
-TAO_ClientRequestInfo_i::setup_picurrent (void)
-{
-  // Retrieve the thread scope current (no TSS access incurred yet).
-  TAO::PICurrent *pi_current =
-    this->invocation_->orb_core ()->pi_current ();
-
-  // If the slot count is zero, then there is nothing to copy.
-  // Prevent any copying (and hence TSS accesses) from occurring.
-  if (pi_current != 0 && pi_current->slot_count () != 0)
-    {
-      // Retrieve the thread scope current.
-      TAO::PICurrent_Impl *tsc = pi_current->tsc ();
-
-      // Logically copy the TSC's slot table to the RSC.
-      this->rs_pi_current_.lc_slot_table (tsc);
-
-      // PICurrent will potentially have to call back on the request
-      // scope current so that it can deep copy the contents of the
-      // thread scope current if the contents of the thread scope
-      // current are about to be modified.  It is necessary to do this
-      // deep copy once in order to completely isolate the request
-      // scope current from the thread scope current.  This is only
-      // necessary, if the thread scope current is modified after its
-      // contents have been *logically* copied to the request scope
-      // current.
-      this->copy_callback_.src_and_dst (tsc, &this->rs_pi_current_);
-      tsc->copy_callback (&this->copy_callback_);
-    }
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  /*if (CORBA::is_nil (this->target_))
-    {
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            CORBA::Object::_nil ());
-        }
-
-      return adapter->abstractbase_to_object (this->abstract_target_);
-      }*/
-
-  return CORBA::Object::_duplicate (this->invocation_->target ());
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  /*if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
-    {
-      // TAO_GIOP_Invocation::forward_reference() already duplicates
-      // the reference before returning it so there is no need to
-      // duplicate it here.
-      return this->invocation_->forwarded_reference ();
-    }
-
-  if (CORBA::is_nil (this->target_))
-    {
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            CORBA::Object::_nil ());
-        }
-
-      return adapter->abstractbase_to_object (this->abstract_target_);
-    }
-  */
-
-  return CORBA::Object::_duplicate (this->invocation_->effective_target ());
-}
-
-IOP::TaggedProfile *
-TAO_ClientRequestInfo_i::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  IOP::TaggedProfile *tagged_profile = 0;
-  ACE_NEW_THROW_EX (tagged_profile,
-                    IOP::TaggedProfile,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  IOP::TaggedProfile_var safe_tagged_profile = tagged_profile;
-
-  TAO_Stub *stub =
-    this->invocation_->effective_target ()->_stubobj ();
-
-  IOP::TaggedProfile *ep =
-    stub->profile_in_use ()->create_tagged_profile ();
-
-  if (ep == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                          CORBA::COMPLETED_NO),
-                                          0);
-    }
-
-  // @@BAD_PARAM exception
-  tagged_profile->tag = ep->tag;
-  tagged_profile->profile_data = ep->profile_data;  // Deep copy
-
-  return safe_tagged_profile._retn ();
-}
-
-// Use at own risk. There is no way currently of extracting an
-// exception from an Any. This method is in place just to be compliant
-// with the spec.
-CORBA::Any *
-TAO_ClientRequestInfo_i::received_exception (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
-      && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO), 0);
-    }
-
-  // The spec says that if it is a user exception which can't be
-  // inserted then the UNKNOWN exception needs to be thrown with minor
-  // code 1.
-
-  CORBA::Any * temp = 0;
-
-  ACE_NEW_THROW_EX (temp,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var caught_exception = temp;
-
-  if (this->caught_exception_ != 0)
-    *temp <<= *(this->caught_exception_);
-
-  return caught_exception._retn ();
-}
-
-char *
-TAO_ClientRequestInfo_i::received_exception_id (
-    ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
-      && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return CORBA::string_dup (this->caught_exception_->_rep_id ());
-}
-
-IOP::TaggedComponent *
-TAO_ClientRequestInfo_i::get_effective_component (
-    IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Stub *stub =
-    this->invocation_->effective_target ()->_stubobj ();
-
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
-
-  IOP::MultipleComponentProfile &components = ecs.components ();
-
-  const CORBA::ULong len = components.length ();
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      if (components[i].tag == id)
-        {
-          IOP::TaggedComponent *tagged_component = 0;
-
-          // Only allocate a sequence if we have a tagged component
-          // that matches the given IOP::ComponentId.
-          ACE_NEW_THROW_EX (tagged_component,
-                            IOP::TaggedComponent,
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO::VMCID,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (0);
-
-          IOP::TaggedComponent_var safe_tagged_component =
-            tagged_component;
-
-          (*tagged_component) = components[i];  // Deep copy
-
-          return safe_tagged_component._retn ();
-        }
-    }
-
-  // No tagged component was found that matched the given
-  // IOP::ComponentId.
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                      CORBA::COMPLETED_NO),
-                    0);
-}
-
-IOP::TaggedComponentSeq *
-TAO_ClientRequestInfo_i::get_effective_components (
-    IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Stub *stub =
-    this->invocation_->target ()->_stubobj ();
-
-  TAO_Tagged_Components &ecs =
-    stub->profile_in_use ()->tagged_components ();
-
-  IOP::MultipleComponentProfile &components = ecs.components ();
-
-  IOP::TaggedComponentSeq *tagged_components = 0;
-  IOP::TaggedComponentSeq_var safe_tagged_components;
-
-  const CORBA::ULong len = components.length ();
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      if (components[i].tag == id)
-        {
-          if (tagged_components == 0)
-            {
-              // Only allocate a sequence if we have tagged components
-              // to place into the sequence.
-              ACE_NEW_THROW_EX (tagged_components,
-                                IOP::TaggedComponentSeq,
-                                CORBA::NO_MEMORY (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO::VMCID,
-                                    ENOMEM),
-                                  CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (0);
-
-              safe_tagged_components = tagged_components;
-            }
-
-          const CORBA::ULong old_len = safe_tagged_components->length ();
-          safe_tagged_components->length (old_len + 1);
-
-          safe_tagged_components[old_len] = components[i];  // Deep copy
-        }
-    }
-
-  if (tagged_components == 0)
-    {
-      // No tagged component sequence was allocated, meaning no tagged
-      // components were found that matched the given
-      // IOP::ComponentId.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                          CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return safe_tagged_components._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_ClientRequestInfo_i::get_request_policy (CORBA::PolicyType type
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @@ Do we need to look anywhere else for the request policies?
-
-#if TAO_HAS_CORBA_MESSAGING == 1
-  return this->invocation_->target ()->_get_policy (type
-                                                    ACE_ENV_ARG_PARAMETER);
-#else
-  ACE_UNUSED_ARG (type);
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
-#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
-}
-
-void
-TAO_ClientRequestInfo_i::add_request_service_context (
-    const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->request_service_context ();
-
-  if (service_context_list.set_context (service_context, replace) == 0)
-    {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
-                                       CORBA::COMPLETED_NO));
-    }
-}
-
-CORBA::ULong
-TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @todo We may have to worry about AMI once we support interceptors
-  //       in AMI requests since the Invocation object no longer
-  //       exists once an AMI request has been made.  In that case,
-  //       the reply dispatcher address should be used.
-
-  // The request ID must be unique across all outstanding requests.
-  // To avoid synchronization overhead, the address of this Invocation
-  // object is used as the request ID.  This guarantees that the
-  // request ID is unique without being forced to acquire a lock.
-  //
-  // For 64-bit platforms, we right shift 8 bits and then use the
-  // lower 32 bits of that shifted value.  Rather than losing the
-  // upper 32 bits of significant digits by taking the lower 32 bits,
-  // we only lose the upper 24 by doing the shift.  Basically, the
-  // resulting request ID will comprised of bits 8 through 39.  This is
-  // made possible by the fact that this Invocation object is large
-  // enough to increase the likelihood that those bits (0 through 39)
-  // are unique.  In particular, this->buffer_ is 512 bytes
-  // (ACE_CDR::DEFAULT_BUFSIZE) long by default; implying that
-  // dropping the lower 8 bits of the this Invocation object's 64 bit
-  // address (i.e. 256 bytes) is not a problem.
-
-  CORBA::ULong id = 0;
-
-  // Note that we reinterpret_cast to an "unsigned long" instead of
-  // CORBA::ULong since we need to first cast to an integer large
-  // enough to hold an address to avoid compile-time warnings on some
-  // 64-bit platforms.
-
-  // 32 bit address
-  if (sizeof (this) == 4)
-    id =
-      static_cast<CORBA::ULong> (
-        reinterpret_cast<ptrdiff_t> (this->invocation_));
-
-  // 64 bit address -- bits 8 through 39  (see notes above!)
-  // In this case, we make sure this object is large enough to safely
-  // do the right shift.  This is necessary since the size of the
-  // buffer that makes this object is configurable.
-  else if (sizeof (this) == 8
-           && sizeof (*(this->invocation_)) > 256 /* 2 << 8 */)
-    id =
-      (static_cast<CORBA::ULong> (
-         reinterpret_cast<ptrdiff_t> (this->invocation_)) >> 8) & 0xFFFFFFFFu;
-
-  // 64 bit address -- lower 32 bits
-  else if (sizeof (this) == 8)
-    id =
-      static_cast<CORBA::ULong> (
-        reinterpret_cast<ptrdiff_t> (this->invocation_)) & 0xFFFFFFFFu;
-
-  // @@ The following request ID generator prevents the
-  //    PortableInterceptor::ClientRequestInterceptor::send_request()
-  //    interception point from occuring before the call to connect,
-  //    thus preventing us from adding an optimization that itself
-  //    prevents a connection from being unnecessarily performed.
-  //    Thus, the ClientRequestInfo object is forced to have its own
-  //    request ID generator in order to make it possible to implement
-  //    the above optimization.
-  //
-  //    Ideally, this request ID generator should go away, especially
-  //    since it adds a lock to the critical path.
-  //   else    // Fallback
-  //     id = this->invocation_->request_id ();
-
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) ClientRequestInfo::request_id() failed\n"
-                    "(%P|%t) since its request ID generator is not\n"
-                    "(%P|%t) supported on this platform.\n"));
-
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  return id;
-}
-
-char *
-TAO_ClientRequestInfo_i::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->invocation_->operation_name ());
-}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_i::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_i::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->invocation_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-Dynamic::ContextList *
-TAO_ClientRequestInfo_i::contexts (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-Dynamic::RequestContext *
-TAO_ClientRequestInfo_i::operation_context (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Any *
-TAO_ClientRequestInfo_i::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->invocation_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_ClientRequestInfo_i::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->invocation_->response_expected ();
-}
-
-Messaging::SyncScope
-TAO_ClientRequestInfo_i::sync_scope (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->invocation_->sync_scope ();
-}
-
-PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo_i::reply_status (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ == -1)
-    {
-      // A reply hasn't been received yet.
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  return this->reply_status_;
-}
-
-CORBA::Object_ptr
-TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
-    }
-
-  // TAO_GIOP_Invocation::forward_reference() already duplicates the
-  // reference before returning it so there is no need to duplicate it
-  // here.
-  return this->invocation_->forwarded_reference ();
-}
-
-CORBA::Any *
-TAO_ClientRequestInfo_i::get_slot (PortableInterceptor::SlotId id
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  return this->rs_pi_current_.get_slot (id
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo_i::get_request_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->request_service_context ();
-
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo_i::get_reply_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->reply_service_context ();
-
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo_i::get_service_context_i (
-    TAO_Service_Context &service_context_list,
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  IOP::ServiceContext_var service_context;
-
-  if (service_context_list.get_context (id, service_context.out ()) != 0)
-    {
-      // Found.
-      return service_context._retn ();
-    }
-  else
-    {
-      // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 26,
-                                          CORBA::COMPLETED_NO),
-                        0);
-    }
-}
-
-void
-TAO_ClientRequestInfo_i::reply_status (TAO::Invocation_Status invoke_status)
-{
-  switch (invoke_status)
-    {
-    case TAO::TAO_INVOKE_SUCCESS:
-      this->reply_status_ = PortableInterceptor::SUCCESSFUL;
-      break;
-    case TAO::TAO_INVOKE_RESTART:
-      if (this->invocation_->is_forwarded ())
-        this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
-      else
-        this->reply_status_ = PortableInterceptor::TRANSPORT_RETRY;
-      break;
-    case TAO::TAO_INVOKE_USER_EXCEPTION:
-      this->reply_status_ = PortableInterceptor::USER_EXCEPTION;
-      break;
-    case TAO::TAO_INVOKE_SYSTEM_EXCEPTION:
-      this->reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION;
-      break;
-    default:
-      this->reply_status_ = PortableInterceptor::UNKNOWN;
-      break;
-    }
-}
-
-void
-TAO_ClientRequestInfo_i::reply_status (int )
-{
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
deleted file mode 100644
index 55ac729578c..00000000000
--- a/TAO/tao/ClientRequestInfo_i.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file ClientRequestInfo_i.h
- *
- * $Id$
- *
- * This is the implementation of the
- * PortableInterceptor::ClientRequestInfo interface.
- *
- * @author Ossama Othman <ossama@dre.vanderbilt.edu>
- * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CLIENT_REQUEST_INFO_I_H
-#define TAO_CLIENT_REQUEST_INFO_I_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbconf.h"
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#include "Invocation_Utils.h"
-#include "PICurrent.h"
-#include "PICurrent_Copy_Callback.h"
-
-class TAO_Service_Context;
-
-namespace TAO
-{
-  class Invocation_Base;
-}
-
-namespace CORBA
-{
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-}
-
-/**
- * @class TAO_ClientRequestInfo_i
- *
- * @brief Implementation of the PortableInterceptor::ClientRequestInfo
- *        interface.
- */
-class TAO_Export TAO_ClientRequestInfo_i
-{
-public:
-
-  /// Constructor from concrete interface.
-  TAO_ClientRequestInfo_i (TAO::Invocation_Base *invocation);
-
-  /// Constructor from abstract interface.
-  TAO_ClientRequestInfo_i (TAO::Invocation_Base *invocation,
-                           CORBA::AbstractBase_ptr abstract_target,
-                           CORBA::Boolean response_expected = 1);
-
-  /// Destructor.
-  virtual ~TAO_ClientRequestInfo_i (void);
-
-  /// Return an ID unique to the current request.  This request ID may
-  /// or may not be the same as the GIOP request ID.
-  CORBA::ULong request_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the operation name for the current request.
-  char * operation (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the list of exceptions the current operation is capable
-  /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Dynamic::ContextList * contexts (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  Dynamic::RequestContext * operation_context (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the result of the current request.  If there is no return
-  /// value then an Any with tk_void TypeCode is returned.  This is
-  /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Returns true for a two-way operation, and false otherwise.
-  CORBA::Boolean response_expected (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
-
-  /// Return the sync_scope policy value for the current one-way
-  /// operation.  If the operation is not a one-way, a
-  /// CORBA::BAD_INV_ORDER exception is thrown.
-  Messaging::SyncScope sync_scope (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the reply status for the current request.  Statuses can
-  /// be PortableInterceptor::SUCCESSFUL, SYSTEM_EXCEPTION,
-  /// USER_EXCEPTION, LOCATION_FORWARD, TRANSPORT_RETRY, UNKNOWN
-  PortableInterceptor::ReplyStatus reply_status (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// If the reply status is PortableInterceptor::LOCATION_FORWARD
-  /// return the object reference to which the request was forwarded.
-  CORBA::Object_ptr forward_reference (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
-
-  CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::InvalidSlot));
-
-  /// Return the IOP::ServiceContext with the given IOP::ServiceId
-  /// from the request service context list.
-  IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the IOP::ServiceContext with the given IOP::ServiceId
-  /// from the reply service context list.
-  IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the (initial, non-forwarded, or permanently forwarded)
-  /// object reference of the target.
-  CORBA::Object_ptr target (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the object reference for the current target.  The target
-  /// may change in the even of a location forward.
-  CORBA::Object_ptr effective_target (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  IOP::TaggedProfile * effective_profile (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return an Any containing the received exception, if any.
-  /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
-  /**
-   * @note There is no trivial way to extract the exception from an Any.
-   */
-  CORBA::Any * received_exception (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the repository ID for the received exception.
-  char * received_exception_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the first IOP::TaggedComponent that matches the given
-  /// IOP::ComponentId in the object reference for the current
-  /// target.
-  IOP::TaggedComponent * get_effective_component (
-      IOP::ComponentId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return all IOP::TaggedComponent(s) that match the given
-  /// IOP::ComponentId in the object reference for the current
-  /// target.
-  IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the policy of the given type in effect for the current
-  /// request.
-  CORBA::Policy_ptr get_request_policy (
-      CORBA::PolicyType type
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the IOP::ServiceContext to the request (outgoing)
-  /// IOP::ServiceContextList.
-  void add_request_service_context (
-      const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace
-      ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * @name Stub helper methods
-   *
-   * The following methods are used in the implementation of the
-   * Stubs, they are not part of the ClientRequestInfo interface, but
-   * an extension used internally by TAO.
-   */
-  //@{
-
-  /// Change the exception status.
-  void exception (CORBA::Exception *exception);
-
-  /// Set the flag that states whether or not a response is expected.
-  /// For example, no response is expected in a one-way operation.
-  // @@@@@ Need to go
-  void response_expected (CORBA::Boolean flag);
-
-  /// Set the status of the received reply.
-  void reply_status (TAO::Invocation_Status s);
-
-  // @@@@ NEEd to go
-  void reply_status (int s);
-
-  /// Extract the forward object reference from the
-  /// PortableInterceptor::ForwardRequest exception, and set the reply
-  /// status flag accordingly.
-  void forward_reference (PortableInterceptor::ForwardRequest &exc);
-  //@}
-
-protected:
-
-  /// Setup thread scope and request scope
-  /// PortableInterceptor::Current objects.
-  void setup_picurrent (void);
-
-  /// Helper method to get the request and response service contexts.
-  IOP::ServiceContext *get_service_context_i (
-      TAO_Service_Context &service_context_list,
-      IOP::ServiceId id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  TAO_Stub *stub (void) const;
-
-protected:
-
-  /// Pointer to the invocation object.
-  TAO::Invocation_Base *invocation_;
-
-  /// Reference to the abstract interface target.
-  // CORBA::AbstractBase_ptr abstract_target_;
-
-  /// Pointer to the caught exception.
-  CORBA::Exception *caught_exception_;
-
-  /// Reply status for the current request.
-  PortableInterceptor::ReplyStatus reply_status_;
-
-  /// The "Request Scope Current" (RSC) object, as required by
-  /// Portable Interceptors.
-  TAO::PICurrent_Impl rs_pi_current_;
-
-  /// Callback object to be executed when shallow copied slot table
-  /// must be deep copied.
-  /**
-   * This callback object deep copies the slot table from the TSC to
-   * the RSC.
-   * @par
-   * As an optimization, the TSC's slot table is initially only
-   * shallowed copied to the RSC.  If the TSC's slot table will be
-   * modified, e.g. via PICurrent::set_slot(), it's slot table must be
-   * deep copied to the RSC before actually modifying that slot
-   * table.  This is necessary since the RSC is read-only on the
-   * client side, meaning that changes in the TSC that occur after
-   * instantiation of the RSC must not be reflected in the RSC.
-   */
-  TAO::PICurrent_Copy_Callback copy_callback_;
-
-};
-
-# if defined (__ACE_INLINE__)
-#  include "ClientRequestInfo_i.inl"
-# endif  /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CLIENT_REQUEST_INFO_I_H */
diff --git a/TAO/tao/ClientRequestInfo_i.inl b/TAO/tao/ClientRequestInfo_i.inl
deleted file mode 100644
index 877493b58dd..00000000000
--- a/TAO/tao/ClientRequestInfo_i.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "SystemException.h"
-
-ACE_INLINE void
-TAO_ClientRequestInfo_i::exception (CORBA::Exception *exception)
-{
-  if (CORBA::SystemException::_downcast (exception) != 0)
-    this->reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION;
-  else if (CORBA::UserException::_downcast (exception) != 0)
-    this->reply_status_ = PortableInterceptor::USER_EXCEPTION;
-
-  // @@ Is it possible for both of the above downcasts to fail?
-
-  this->caught_exception_ = exception;
-}
-
-// @@ Need to go!
-ACE_INLINE void
-TAO_ClientRequestInfo_i::response_expected (CORBA::Boolean /*flag*/)
-{
-  //   this->response_expected_ = flag;
-}
-
-ACE_INLINE void
-TAO_ClientRequestInfo_i::forward_reference (
-  PortableInterceptor::ForwardRequest &)
-{
-  // Note that we're converting the ForwardRequest exception in to a
-  // LOCATION_FORWARD reply, so we do not set the exception status.
-  //
-  // The forward object reference is not handled here.  Rather, it is
-  // handled by the TAO_GIOP_Invocation object so that its profiles
-  // can be added to the list of forward profiles.
-
-  this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
-}
diff --git a/TAO/tao/ClientRequestInterceptor.pidl b/TAO/tao/ClientRequestInterceptor.pidl
deleted file mode 100644
index 48446e792f6..00000000000
--- a/TAO/tao/ClientRequestInterceptor.pidl
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ClientRequestInterceptor.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableInterceptor
- * components in the ORB.
- *
- * This file contains the interface definitions for "Portable"
- * Interceptor support.
- * The following is from orbos/99-12-02 Portable Interceptors spec,
- * the full IDL is downloadable from orbos/99-12-02.
- *
- * This file was used to generate the code in ClientRequestInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ClientRequestInterceptor.pidl
- */
-
-#ifndef _CLIENT_REQUEST_INTERCEPTOR_IDL_
-#define _CLIENT_REQUEST_INTERCEPTOR_IDL_
-
-#include <Interceptor.pidl>
-#include <PIForwardRequest.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ClientRequestInfo;
-
-  local interface ClientRequestInterceptor : Interceptor
-  {
-    void send_request  (in ClientRequestInfo ri) raises (ForwardRequest);
-    void send_poll (in ClientRequestInfo ri);
-    void receive_reply (in ClientRequestInfo ri);
-    void receive_exception (in ClientRequestInfo ri) raises (ForwardRequest);
-    void receive_other (in ClientRequestInfo ri) raises (ForwardRequest);
-  };
-};
-
-#endif  /* _CLIENT_REQUEST_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/ClientRequestInterceptorA.cpp b/TAO/tao/ClientRequestInterceptorA.cpp
deleted file mode 100644
index 37540f43dbc..00000000000
--- a/TAO/tao/ClientRequestInterceptorA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ClientRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ClientRequestInterceptor (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
-    "ClientRequestInterceptor");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor =
-    &_tao_tc_PortableInterceptor_ClientRequestInterceptor;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ClientRequestInterceptor_ptr _tao_objptr =
-    PortableInterceptor::ClientRequestInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_ClientRequestInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_ClientRequestInterceptor,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ClientRequestInterceptorC.cpp b/TAO/tao/ClientRequestInterceptorC.cpp
deleted file mode 100644
index aa609bfd57f..00000000000
--- a/TAO/tao/ClientRequestInterceptorC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ClientRequestInterceptorC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ClientRequestInterceptor.
-
-PortableInterceptor::ClientRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate (
-    PortableInterceptor::ClientRequestInterceptor_ptr p
-  )
-{
-  return PortableInterceptor::ClientRequestInterceptor::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release (
-    PortableInterceptor::ClientRequestInterceptor_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ClientRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void)
-{
-  return PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal (
-    PortableInterceptor::ClientRequestInterceptor_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
-{}
-
-PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
-{}
-
-void 
-PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientRequestInterceptor *_tao_tmp_pointer =
-    static_cast<ClientRequestInterceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInterceptor::_nil ();
-    }
-  
-  ClientRequestInterceptor_ptr proxy =
-    dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
-  return ClientRequestInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInterceptor::_nil ();
-    }
-  
-  ClientRequestInterceptor_ptr proxy =
-    dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
-  return ClientRequestInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestInterceptor_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterceptor_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInterceptor::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ClientRequestInterceptorC.h b/TAO/tao/ClientRequestInterceptorC.h
deleted file mode 100644
index 01f4a3e16ff..00000000000
--- a/TAO/tao/ClientRequestInterceptorC.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/InterceptorC.h"
-#include "tao/PIForwardRequestC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-
-  class ClientRequestInfo;
-  typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-
-  class ClientRequestInterceptor;
-  typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ClientRequestInterceptor
-      >
-    ClientRequestInterceptor_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ClientRequestInterceptor
-      >
-    ClientRequestInterceptor_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
-  class TAO_Export ClientRequestInterceptor
-    : public virtual ::PortableInterceptor::Interceptor
-  {
-  public:
-    typedef ClientRequestInterceptor_ptr _ptr_type;
-    typedef ClientRequestInterceptor_var _var_type;
-
-    // The static operations.
-    static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
-    static void _tao_release (ClientRequestInterceptor_ptr obj);
-
-    static ClientRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ClientRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ClientRequestInterceptor_ptr _nil (void)
-    {
-      return static_cast<ClientRequestInterceptor_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void send_request (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void send_poll (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void receive_reply (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void receive_exception (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void receive_other (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ClientRequestInterceptor (void);
-    
-    virtual ~ClientRequestInterceptor (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ClientRequestInterceptor (const ClientRequestInterceptor &);
-    
-    void operator= (const ClientRequestInterceptor &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
-  {
-    static ::PortableInterceptor::ClientRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
-  {
-    static ::PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr
-      );
-    static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ClientRequestInterceptorS.h b/TAO/tao/ClientRequestInterceptorS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ClientRequestInterceptorS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
deleted file mode 100644
index 9b5ab09ae81..00000000000
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "ClientRequestInterceptor_Adapter.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#if !defined (__ACE_INLINE__)
-#include "ClientRequestInterceptor_Adapter.inl"
-#endif /* defined INLINE */
-
-#include "ClientRequestInfo.h"
-#include "Invocation_Base.h"
-#include "ORB_Core.h"
-
-ACE_RCSID (tao,
-           ClientInterceptorAdapter,
-           "$Id$")
-
-namespace TAO
-{
-  ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void)
-  {
-  }
-
-  void
-  ClientRequestInterceptor_Adapter::send_request (TAO_ClientRequestInfo_i *ri
-                                                  ACE_ENV_ARG_DECL)
-  {
-    // This method implements one of the "starting" client side
-    // interception point.
-    ACE_TRY
-      {
-        // Only perform the TSS access if interceptors were registered
-        // with the ORB.
-        if (this->len_ > 0)
-          {
-            TAO_ORB_Core *orb_core = this->invocation_->orb_core ();
-            this->info_ =
-              orb_core->get_tss_resources ()->client_request_info_;
-          }
-
-        TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
-
-        for (size_t i = 0 ; i < this->len_; ++i)
-          {
-            this->interceptors_[i]->send_request (this->info_
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            // The starting interception point completed successfully.
-            // Push  the interceptor on to the flow stack.
-            ++this->stack_size_;
-          }
-      }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-      {
-        this->process_forward_request (ri,
-                                       exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
-
-  void
-  ClientRequestInterceptor_Adapter::receive_reply (TAO_ClientRequestInfo_i *ri
-                                                   ACE_ENV_ARG_DECL)
-  {
-    // This is an "ending" interception point so we only process the
-    // interceptors pushed on to the flow stack.
-
-    // Notice that the interceptors are processed in the opposite order
-    // they were pushed onto the stack since this is an "ending"
-    // interception point.
-
-    TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
-
-    // Unwind the stack.
-    const size_t len = this->stack_size_;
-    for (size_t i = 0; i < len; ++i)
-      {
-        // Pop the interceptor off of the flow stack before it is
-        // invoked.  This is necessary to prevent an interceptor already
-        // invoked in this "ending" interception point from being
-        // invoked in another "ending" interception point.
-        --this->stack_size_;
-
-        this->interceptors_[this->stack_size_]->receive_reply (
-          this->info_
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-
-    // The receive_reply() interception point does not raise a
-    // PortableInterceptor::ForwardRequest exception so there is no need
-    // to attempt to catch it here.
-  }
-
-  void
-  ClientRequestInterceptor_Adapter::receive_exception (TAO_ClientRequestInfo_i *ri
-                                                       ACE_ENV_ARG_DECL)
-  {
-    // This is an "ending" interception point so we only process the
-    // interceptors pushed on to the flow stack.
-
-    // Notice that the interceptors are processed in the opposite order
-    // they were pushed onto the stack since this is an "ending"
-    // interception point.
-
-    ACE_TRY
-      {
-        TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
-
-        // Unwind the flow stack.
-        const size_t len = this->stack_size_;
-        for (size_t i = 0; i < len; ++i)
-          {
-            // Pop the interceptor off of the flow stack before it is
-            // invoked.  This is necessary to prevent an interceptor
-            // already invoked in this "ending" interception point from
-            // being invoked in another "ending" interception point.
-            --this->stack_size_;
-
-            this->interceptors_[this->stack_size_]->receive_exception (
-              this->info_
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          }
-      }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-      {
-        this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        // The receive_exception() interception point in the remaining
-        // interceptors must be called so call this method (not the
-        // interceptor's corresponding method) recursively.  The call is
-        // made recursively since the caught exception must survive
-        // until the remaining interceptors have been called.
-
-        // Note that the recursion will stop once the flow stack size
-        // drops to zero, i.e., once each interceptor has been invoked.
-        // This prevents infinite recursion from occuring.
-
-        ri->exception (&ACE_ANY_EXCEPTION);
-
-        this->receive_exception (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        PortableInterceptor::ReplyStatus status =
-          ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // Only re-throw the exception if it hasn't been transformed by
-        // the receive_exception() interception point (e.g. to a
-        // LOCATION_FORWARD).
-        if (status == PortableInterceptor::SYSTEM_EXCEPTION
-            || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
-
-  void
-  ClientRequestInterceptor_Adapter:: receive_other (TAO_ClientRequestInfo_i *ri
-                                                    ACE_ENV_ARG_DECL)
-  {
-    // This is an "ending" interception point so we only process the
-    // interceptors pushed on to the flow stack.
-
-    // Notice that the interceptors are processed in the opposite order
-    // they were pushed onto the stack since this is an "ending"
-    // interception point.
-
-    ACE_TRY
-      {
-        TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
-
-        // Unwind the stack.
-        const size_t len = this->stack_size_;
-        for (size_t i = 0; i < len; ++i)
-        {
-          // Pop the interceptor off of the flow stack before it is
-          // invoked.  This is necessary to prevent an interceptor
-          // already invoked in this "ending" interception point from
-          // being invoked in another "ending" interception point.
-          --this->stack_size_;
-
-          this->interceptors_[this->stack_size_]->receive_other (
-            this->info_
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-      {
-        this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
-
-  void
-  ClientRequestInterceptor_Adapter::process_forward_request (
-      TAO_ClientRequestInfo_i *ri,
-      PortableInterceptor::ForwardRequest &exc
-      ACE_ENV_ARG_DECL)
-  {
-    ri->forward_reference (exc);
-
-    this->invocation_->forwarded_reference (exc.forward.in ());
-
-    // receive_other() is potentially invoked recursively.
-    this->receive_other (ri
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-}
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
deleted file mode 100644
index a527b07cd0a..00000000000
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientRequestInterceptor_Adapter.h
- *
- *  $Id$
- *
- *   This file an adapter class to simplify the support of
- *   interceptors.
- *
- *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- *  @author  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H
-#define TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "Interceptor_List.h"
-#include "ClientRequestInterceptorC.h"
-
-namespace TAO
-{
-  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor>
-    ClientRequestInterceptor_List;
-}
-
-class TAO_ClientRequestInfo;
-class TAO_ClientRequestInfo_i;
-
-namespace TAO
-{
-  class Invocation_Base;
-
-  /**
-   * @class ClientRequestInterceptor_Adapter
-   *
-   * @brief A convenient helper class to invoke registered client request
-   *        interceptors
-   *
-   * This class invokes all registered interceptors at interception
-   * point, and enforces flow rules dictated by the Portable Interceptor
-   * specification/chapter.
-   */
-  class TAO_Export ClientRequestInterceptor_Adapter
-  {
-  public:
-
-    ClientRequestInterceptor_Adapter (
-        ClientRequestInterceptor_List::TYPE & interceptors,
-        Invocation_Base *invocation
-      );
-
-    ~ClientRequestInterceptor_Adapter (void);
-
-    /**
-     * @name PortableInterceptor Client Side Interception Points
-     *
-     * Each of these methods corresponds to a client side interception
-     * point.  There are no "intermediate" interception points on the
-     * client side, only "starting" and "ending" interception points.
-     *
-     */
-    //@{
-    /// This method implements one of the "starting" client side
-    /// interception points.
-    void send_request (TAO_ClientRequestInfo_i * ri
-                       ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" client side
-    /// interception point.
-    void receive_reply (TAO_ClientRequestInfo_i * ri
-                        ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" client side
-    /// interception point.
-    void receive_exception (TAO_ClientRequestInfo_i * ri
-                            ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" client side
-    /// interception point.
-    void receive_other (TAO_ClientRequestInfo_i * ri
-                        ACE_ENV_ARG_DECL);
-    //@}
-
-  protected:
-
-    /// Process the given PortableInterceptor::ForwardRequest exception,
-    /// i.e. invoke the receive_other() interception point, in addition
-    /// to notifying the Invocation object of the LOCATION_FORWARD.
-    void process_forward_request (TAO_ClientRequestInfo_i * ri,
-                                  PortableInterceptor::ForwardRequest & exc
-                                  ACE_ENV_ARG_DECL);
-
-  private:
-
-    /// Reference to the list of registered interceptors.
-    ClientRequestInterceptor_List::TYPE & interceptors_;
-
-    /// Pointer to the GIOP invocation object for the current request.
-    Invocation_Base * invocation_;
-
-    /// Cache the length of the interceptor list so that we don't have
-    /// to compute it at each stage of the current interception.
-    const size_t len_;
-
-    /// The number of interceptors "pushed" onto the logical flow
-    /// stack.  This is used when unwinding the flow stack.
-    size_t stack_size_;
-
-    /// Pointer to the PortableInterceptor::ClientRequestInfo
-    /// implementation.
-    /**
-     * @note The fact that a pointer to the
-     *       PortableInterceptor::ClientRequestInfo object in TSS is
-     *       cached here assumes that all client side interception
-     *       points are invoked in the same thread.  This may not be the
-     *       case for AMI!  In that case, we'll have to perform a TSS
-     *       access in each interception point.
-     */
-    TAO_ClientRequestInfo * info_;
-  };
-
-}
-#if defined (__ACE_INLINE__)
-#include "ClientRequestInterceptor_Adapter.inl"
-#endif  /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.inl b/TAO/tao/ClientRequestInterceptor_Adapter.inl
deleted file mode 100644
index 684c756edce..00000000000
--- a/TAO/tao/ClientRequestInterceptor_Adapter.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace TAO
-{
-  ACE_INLINE
-  ClientRequestInterceptor_Adapter::ClientRequestInterceptor_Adapter (
-    ClientRequestInterceptor_List::TYPE & interceptors,
-    Invocation_Base * invocation)
-    : interceptors_ (interceptors)
-    , invocation_ (invocation)
-    , len_ (interceptors.size ())
-    , stack_size_ (0)
-    , info_ (0)
-  {
-  }
-}
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
deleted file mode 100644
index 59a8ad9a8df..00000000000
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-
-#include "tao/Client_Strategy_Factory.h"
-
-ACE_RCSID(tao, Client_Strategy_Factory, "$Id$")
-
-TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
-{
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_profile_lock (void)
-{
-  return 0;
-}
-
-TAO_Transport_Mux_Strategy *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
-{
-  return 0;
-}
-
-int
-TAO_Client_Strategy_Factory::reply_dispatcher_table_size (void) const
-{
-  return 0;
-}
-
-TAO_Wait_Strategy *
-TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *)
-{
-  return 0;
-}
-
-TAO_Connect_Strategy *
-TAO_Client_Strategy_Factory::create_connect_strategy (TAO_ORB_Core *)
-{
-  return 0;
-}
-
-int
-TAO_Client_Strategy_Factory::allow_callback (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Client_Strategy_Factory::create_ft_service_retention_id_lock (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
deleted file mode 100644
index da3113d98f6..00000000000
--- a/TAO/tao/Client_Strategy_Factory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Client_Strategy_Factory.h
- *
- *  $Id$
- *
- *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_CLIENT_STRATEGY_FACTORY_H
-#define TAO_CLIENT_STRATEGY_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TAO_Export.h"
-
-class ACE_Lock;
-class TAO_Transport_Mux_Strategy;
-class TAO_Wait_Strategy;
-class TAO_Transport;
-class TAO_ORB_Core;
-class TAO_Connect_Strategy;
-
-/**
- * @class TAO_Client_Strategy_Factory
- *
- * @brief Abstract factory used by the client to manufacture various
- * strategies used on the client-side.
- */
-class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object
-{
-public:
-  // = Intialization and termination methods.
-  /// Constructor.
-  TAO_Client_Strategy_Factory (void);
-
-  /// Destructor
-  virtual ~TAO_Client_Strategy_Factory (void);
-
-  /**
-   * Create the lock for the stub and the profile
-   */
-  virtual ACE_Lock* create_profile_lock (void);
-
-  /// Create the correct client request muxing strategy.
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
-
-  /// Create the correct lock for request muxing strategy.
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void);
-
-  /// Return the size of the reply dispatcher table
-  virtual int reply_dispatcher_table_size (void) const;
-
-  /// Create the correct client <wait_for_reply> strategy.
-  virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
-
-  /// Create the correct client <asynch_connect> strategy.
-  virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
-
-  /// Does the client allow any form of callback?
-  virtual int allow_callback (void);
-
-  /// Create a lock to be used by the TAO_Fault_Tolerant_Service class
-  /// to generate unique retention ids
-  virtual ACE_Lock *create_ft_service_retention_id_lock (void);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CLIENT_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
deleted file mode 100644
index ff1ba26d9f8..00000000000
--- a/TAO/tao/CodecFactory.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CodecFactory.h"
-#include "CDR_Encaps_Codec.h"
-#include "SystemException.h"
-#include "ORB_Constants.h"
-
-ACE_RCSID (TAO_CodecFactory,
-           CodecFactory,
-           "$Id$")
-
-TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-IOP::Codec_ptr
-TAO_CodecFactory::create_codec (const IOP::Encoding & enc
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   IOP::CodecFactory::UnknownEncoding))
-{
-  // @todo: Ideally we should have some sort of CodecFactory
-  //        registry to make it possible to add factories
-  //        dynamically.  However, there currently isn't a need to
-  //        support anything other than CDR encapsulations yet so we
-  //        hardcode its Codec.  This may change once TAO starts to
-  //        support messaging formats other than GIOP.
-
-  IOP::Codec_ptr codec = IOP::Codec::_nil ();
-
-  switch (enc.format)
-    {
-
-      // @@ MSVC 6 gets confused and thinks that
-      //    IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual
-      //    value (0) is used instead.
-    case 0 /* IOP::ENCODING_CDR_ENCAPS */:
-      if (enc.major_version < 1)
-        {
-          // There is no such thing as a "0.x" CDR encapsulation.
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            IOP::Codec::_nil ());
-        }
-
-      ACE_NEW_THROW_EX (codec,
-                        TAO_CDR_Encaps_Codec (enc.major_version,
-                                              enc.minor_version,
-                                              this->orb_core_),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_MAYBE));
-      ACE_CHECK_RETURN (IOP::Codec::_nil ());
-      break;
-
-    default:
-      ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (),
-                        IOP::Codec::_nil ());
-
-    }
-
-  return codec;
-}
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
deleted file mode 100644
index 9a08564f50d..00000000000
--- a/TAO/tao/CodecFactory.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file CodecFactory.h
- *
- * $Id$
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CODEC_FACTORY_H
-#define TAO_CODEC_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "IOP_CodecC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_CodecFactory
- *
- * @brief Implementation of the IOP::CodecFactory interface.
- *
- * This class can be used to create Codec (coder/decoder) of a given
- * type, such as a CDR encapsulation Codec.
- */
-class TAO_Export TAO_CodecFactory
-  : public virtual IOP::CodecFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor
-  TAO_CodecFactory (TAO_ORB_Core * orb_core);
-
-  /// Create a Coder/Decoder for the given type of encoding.
-  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     IOP::CodecFactory::UnknownEncoding));
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CodecFactory (const TAO_CodecFactory &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &))
-
-private:
-
-  /// Pointer to the ORB Core.
-  /**
-   * Some Codec implementations may need access to the ORB Core with
-   * which they are associated.
-   */
-  TAO_ORB_Core * orb_core_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_CODEC_FACTORY_H */
diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp
deleted file mode 100644
index c39ec7142b9..00000000000
--- a/TAO/tao/CodecFactory_ORBInitializer.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CodecFactory_ORBInitializer.h"
-#include "CodecFactory.h"
-#include "ORBInitInfo.h"
-#include "SystemException.h"
-#include "ORB_Constants.h"
-
-ACE_RCSID (TAO_CodecFactory,
-           CodecFactory_ORBInitializer,
-           "$Id$")
-
-void
-TAO_CodecFactory_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_ORB_Core * orb_core = tao_info->orb_core ();
-
-  IOP::CodecFactory_ptr codec_factory;
-  ACE_NEW_THROW_EX (codec_factory,
-                    TAO_CodecFactory (orb_core),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  IOP::CodecFactory_var cf = codec_factory;
-
-  info->register_initial_reference ("CodecFactory",
-                                    codec_factory
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_CodecFactory_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
deleted file mode 100644
index f785a9f9df3..00000000000
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CodecFactory_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_CODEC_FACTORY_ORB_INITIALIZER_H
-#define TAO_CODEC_FACTORY_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ORBInitializerC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_CodecFactory_ORBInitializer
- *
- * @brief ORBInitializer for the CodecFactory support.
- *
- * This class simply registers the CodecFactory object with the ORB
- * resolve_initial_references() mechanism.
- */
-class TAO_Export TAO_CodecFactory_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CODEC_FACTORY_ORB_INITIALIZER_H */
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
deleted file mode 100644
index b4ee793e3cf..00000000000
--- a/TAO/tao/Codeset_Manager.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-// $Id$
-
-#include "tao/Codeset_Manager.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/operation_details.h"
-#include "tao/Transport.h"
-#include "tao/Profile.h"
-#include "tao/Codeset_Translator_Factory.h"
-#include "tao/SystemException.h"
-#include "tao/UTF16_BOM_Factory.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Codeset_Registry.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Codeset_Manager,
-           "$Id$")
-
-
-// These numbers are assigned by the OpenGroup, a database is
-// available at
-//
-// ftp://ftp.opengroup.org/pub/code_set_registry/
-//
-#define TAO_CODESET_ID_ISO8859_1 0x00010001U
-#define TAO_CODESET_ID_UNICODE   0x00010109U
-#define TAO_CODESET_ID_XOPEN_UTF_8 0x05010001U
-
-// These are the default codesets that TAO declares, of course they
-// will be different on each platform, once the complete support for
-// character sets is implemented
-
-//#define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_XOPEN_UTF_8
-#define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_ISO8859_1
-#define TAO_DEFAULT_WCHAR_CODESET_ID TAO_CODESET_ID_UNICODE
-
-// ****************************************************************
-
-/// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1
-CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID;
-/// NCS for wchar is not defaulted by the CORBA specification, but a default
-/// may be set here if desired
-CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::default_wchar_codeset = TAO_DEFAULT_WCHAR_CODESET_ID;
-
-TAO_Codeset_Manager::TAO_Codeset_Manager ()
-  : codeset_info_ (),
-    char_factories_ (),
-    wchar_factories_ (),
-    utf16_bom_translator_ (0)
-{
-  this->codeset_info_.ForCharData.native_code_set =
-    TAO_Codeset_Manager::default_char_codeset;
-  this->codeset_info_.ForWcharData.native_code_set =
-    TAO_Codeset_Manager::default_wchar_codeset;
-}
-
-TAO_Codeset_Manager::~TAO_Codeset_Manager ()
-{
-  // Cleanup the character map
-  TAO_CodesetFactorySetItor cf_end = this->char_factories_.end ();
-  TAO_CodesetFactorySetItor cf_iter = this->char_factories_.begin ();
-
-  for (; cf_iter != cf_end; ++cf_iter)
-    {
-      delete *cf_iter;
-    }
-
-  this->char_factories_.reset ();
-
-  // Cleanup the wide character map
-  cf_end = this->wchar_factories_.end ();
-  cf_iter = this->wchar_factories_.begin ();
-
-  for (;cf_iter != cf_end; ++cf_iter)
-    {
-      delete *cf_iter;
-    }
-
-  this->wchar_factories_.reset ();
-
-  // Note: do not delete utf16_bom_translator_  The service manager owns it
-}
-
-void
-TAO_Codeset_Manager::set_codeset (TAO_Tagged_Components& tc) const
-{
-  tc.set_code_sets (this->codeset_info_);
-}
-
-void
-TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
-                              TAO_Transport &trans)
-{
-  /// If tcs is already set on the transport then donot process,
-  /// use existing transport as CDR have translators set.
-  if (trans.is_tcs_set ())
-    {
-      if(TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                      ACE_TEXT ("transport already set\n")));
-        }
-
-      return;
-    }
-
-  TAO_Tagged_Components& theTaggedComp = theProfile.tagged_components ();
-
-  CONV_FRAME::CodeSetComponentInfo remote;
-
-  /// Get the codeset component
-  if (theTaggedComp.get_code_sets(remote) == 0 )
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                      ACE_TEXT ("No codeset component in profile\n")));
-        }
-
-      remote.ForCharData.native_code_set =
-        TAO_Codeset_Manager::default_char_codeset;
-      remote.ForWcharData.native_code_set =
-        TAO_Codeset_Manager::default_wchar_codeset;
-    }
-   else
-     {
-       CONV_FRAME::CodeSetId tcs =
-         computeTCS (remote.ForCharData,
-                     this->codeset_info_.ForCharData);
-       if (TAO_debug_level > 2)
-         ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                     ACE_TEXT("setting char translator (%08x)\n"),
-                     tcs));
-       trans.char_translator(this->get_char_trans (tcs));
-
-       tcs = computeTCS (remote.ForWcharData,
-                         this->codeset_info_.ForWcharData);
-
-       if (TAO_debug_level > 2)
-         ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
-                     ACE_TEXT("setting wchar translator (%08x)\n"),
-                     tcs));
-       trans.wchar_translator(this->get_wchar_trans (tcs));
-     }
-}
-
-void
-TAO_Codeset_Manager::process_service_context (TAO_ServerRequest &request)
-{
-  if (request.transport()->is_tcs_set ())
-    {
-      return;
-    }
-
-  // Get the service Context from an object of TAO_ServerRequest
-  // and set the TCS values on the Transport
-  TAO_Service_Context &service_cntx = request.request_service_context ();
-  IOP::ServiceContext context;
-  context.context_id = IOP::CodeSets;
-
-  CONV_FRAME::CodeSetId tcs_c = TAO_Codeset_Manager::default_char_codeset;
-  CONV_FRAME::CodeSetId tcs_w = TAO_Codeset_Manager::default_wchar_codeset;
-  if (service_cntx.get_context(context))
-    {
-      // Convert the Service Context to Codeset Context
-      const char *buffer =
-        reinterpret_cast<const char*> (context.context_data.get_buffer ());
-
-      TAO_InputCDR cdr (buffer,context.context_data.length ());
-      CORBA::Boolean byte_order;
-
-      if (cdr >> TAO_InputCDR::to_boolean (byte_order))
-        {
-          cdr.reset_byte_order (static_cast<int> (byte_order));
-          cdr >> tcs_c;
-          cdr >> tcs_w;
-        }
-    }
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("TAO (%P|%t) - Codeset_Manager::process_service_context ")
-                    ACE_TEXT("no codeset context in request, inferring TAO backwards compatibility\n")));
-    }
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_TEXT ("process_service_context, ")
-                  ACE_TEXT ("using tcsc = %08x, tcsw = %08x\n"),
-                  tcs_c,tcs_w));
-    }
-
-  request.transport()->char_translator(this->get_char_trans (tcs_c));
-  request.transport()->wchar_translator(this->get_wchar_trans (tcs_w));
-}
-
-void
-TAO_Codeset_Manager::generate_service_context (TAO_Operation_Details &opd,
-                                               TAO_Transport &trans)
-{
-  TAO_Service_Context &service_cntx = opd.request_service_context ();
-  CONV_FRAME::CodeSetContext codeset_cntx;
-
-  // Generating codeset context
-  // Assuming the TCS values from Transport will be defaulted
-  TAO_Codeset_Translator_Factory *tf = trans.char_translator ();
-
-  codeset_cntx.char_data =
-    tf ? tf->tcs () : this->codeset_info_.ForCharData.native_code_set;
-
-  tf = trans.wchar_translator ();
-
-  codeset_cntx.wchar_data =
-    tf ? tf->tcs () : this->codeset_info_.ForWcharData.native_code_set;
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_TEXT ("generate_service_context, ")
-                  ACE_TEXT ("using tcs_c = %08x, tcs_w = %08x\n"),
-                  codeset_cntx.char_data,
-                  codeset_cntx.wchar_data));
-    }
-
-  TAO_OutputCDR codeset_cdr;
-  codeset_cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  codeset_cdr << codeset_cntx;
-
-  service_cntx.set_context (IOP::CodeSets,codeset_cdr);
-}
-
-/// Checks whether the NCS is a part of CCS
-int
-TAO_Codeset_Manager::isElementOf (CONV_FRAME::CodeSetId id,
-                                  CONV_FRAME::CodeSetComponent &cs_comp)
-{
-  for (CORBA::ULong i = 0L;
-       i < cs_comp.conversion_code_sets.length ();
-       ++i )
-    {
-      if (id == cs_comp.conversion_code_sets[i])
-        return 1;
-    }
-
-  return 0;
-}
-
-/// Find the Intersection of Client and Server CCS's
-CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1,
-                                     CONV_FRAME::CodeSetComponent &cs_comp2)
-{
-  for(CORBA::ULong index = 0L;
-       index < cs_comp1.conversion_code_sets.length();
-       ++index )
-    {
-      if (this->isElementOf(cs_comp1.conversion_code_sets[index], cs_comp2))
-        {
-          return cs_comp1.conversion_code_sets[index];
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Codeset_Manager::isCompatible(CONV_FRAME::CodeSetId cs1,
-                                  CONV_FRAME::CodeSetId cs2 )
-{
-  // Call the is_compatible method of ACE_Codeset_Registry
-  return ACE_Codeset_Registry::is_compatible(cs1,cs2);
-}
-
-/// returns the TCS for Char / Wchar
-CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::computeTCS (CONV_FRAME::CodeSetComponent &remote,
-                                 CONV_FRAME::CodeSetComponent &local )
-{
-  if (remote.native_code_set == local.native_code_set)
-    {
-      return local.native_code_set;
-    }
-
-  if (this->isElementOf (remote.native_code_set, local))
-    {
-      return remote.native_code_set;
-    }
-
-  if (this->isElementOf (local.native_code_set, remote))
-    {
-      return local.native_code_set;
-    }
-
-  CONV_FRAME::CodeSetId tcs;
-
-  if ((tcs = this->intersectionOf (remote, local)) == 0)
-    {
-      if (isCompatible (local.native_code_set, remote.native_code_set))
-        {
-          return remote.native_code_set;
-        }
-      else
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_THROW_RETURN(CORBA::CODESET_INCOMPATIBLE (), 0);
-        }
-    }
-
-  return tcs;
-}
-
-void
-TAO_Codeset_Manager::set_ncs_c (CONV_FRAME::CodeSetId ncs)
-{
-  this->codeset_info_.ForCharData.native_code_set = ncs;
-}
-
-void
-TAO_Codeset_Manager::set_ncs_w (CONV_FRAME::CodeSetId ncs,int mb)
-{
-  this->codeset_info_.ForWcharData.native_code_set = ncs;
-  ACE_OutputCDR::wchar_maxbytes(mb);
-}
-
-int
-TAO_Codeset_Manager::add_char_translator (const char *name)
-{
-  TAO_Codeset_Item *item = 0;
-  ACE_NEW_RETURN (item, TAO_Codeset_Item (name), -1);
-
-  if (this->char_factories_.insert (item) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                         ACE_TEXT ("add_char_translator, ")
-                         ACE_TEXT ("Unable to add Codeset ")
-                         ACE_TEXT ("factories for %s: %m\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (name)),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-TAO_Codeset_Manager::add_wchar_translator (const char *name)
-{
-  TAO_Codeset_Item *item = 0;
-  ACE_NEW_RETURN (item, TAO_Codeset_Item (name), -1);
-
-  if (this->wchar_factories_.insert (item) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                         ACE_TEXT ("add_wchar_translator, ")
-                         ACE_TEXT ("Unable to add Codeset ")
-                         ACE_TEXT ("factories for %s: %m\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (name)),
-                        -1);
-    }
-
-  return 0;
-}
-
-void
-TAO_Codeset_Manager::configure_codeset_factories()
-{
-  if (init_codeset_factories_i (this->char_factories_,
-                                this->codeset_info_.ForCharData) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_TEXT ("configure_codeset_factories, failed to init ")
-                  ACE_TEXT ("char codeset factories\n")));
-    }
-
-  if (init_codeset_factories_i (this->wchar_factories_,
-                                this->codeset_info_.ForWcharData) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                  ACE_TEXT ("configure_codeset_factories, failed to init ")
-                  ACE_TEXT ("wchar codeset factories\n")));
-    }
-
-  if (this->codeset_info_.ForWcharData.native_code_set == 0)
-    {
-      ACE_OutputCDR::wchar_maxbytes(0); // disallow wchar when no ncs_w set
-    }
-}
-
-/// Initialise the specific type codeset factories
-int
-TAO_Codeset_Manager::init_codeset_factories_i (
-    TAO_CodesetFactorySet& factset,
-    CONV_FRAME::CodeSetComponent& cs_comp
-  )
-{
-  TAO_CodesetFactorySetItor end = factset.end ();
-  TAO_CodesetFactorySetItor iter = factset.begin ();
-
-  CONV_FRAME::CodeSetId ncs = cs_comp.native_code_set;
-  cs_comp.conversion_code_sets.length (
-    static_cast<CORBA::ULong> (factset.size()));
-  CORBA::ULong index;
-
-  for (index = 0; iter != end; ++iter)
-    {
-      const char *name = (*iter)->codeset_name ();
-      TAO_Codeset_Translator_Factory *trans =
-        ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>::instance (name);
-
-      if (trans == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                      ACE_TEXT ("init_codeset_factories_i, Unable to load ")
-                      ACE_TEXT ("CodeSet <%s>, %m\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name)));
-          continue;
-        }
-
-      if (trans->ncs() == ncs)
-        {
-          (*iter)->factory (trans);
-          cs_comp.conversion_code_sets[index++] = trans->tcs();
-
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                          ACE_TEXT ("init_codeset_factories_i, Loaded CodeSet ")
-                          ACE_TEXT ("<%s>, ncs = %08x tcs = %08x\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR(name),
-                          trans->ncs(),trans->tcs()));
-            }
-        }
-    }
-
-  cs_comp.conversion_code_sets.length(index);
-  return 0;
-}
-
-
-TAO_Codeset_Translator_Factory *
-TAO_Codeset_Manager::get_char_trans (CONV_FRAME::CodeSetId tcs)
-{
-  if (this->codeset_info_.ForCharData.native_code_set == tcs)
-    return 0;
-  return this->get_translator_i (this->char_factories_,tcs);
-}
-
-TAO_Codeset_Translator_Factory *
-TAO_Codeset_Manager::get_wchar_trans (CONV_FRAME::CodeSetId tcs)
-{
-  if (this->codeset_info_.ForWcharData.native_code_set == tcs)
-    {
-      if (tcs != ACE_CODESET_ID_ISO_UTF_16)
-        return 0;
-      else
-        {
-          if (TAO_debug_level > 9)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - Codeset_Manager::")
-                        ACE_TEXT ("get_wchar_trans, ")
-                        ACE_TEXT ("Using utf16 BOM translator\n")));
-          if (this->utf16_bom_translator_ == 0)
-            {
-              this->utf16_bom_translator_ =
-                ACE_Dynamic_Service <UTF16_BOM_Factory>::instance ("UTF16_BOM_Factory");
-            }
-          return this->utf16_bom_translator_;
-        }
-    }
-  return this->get_translator_i (this->wchar_factories_,tcs);
-}
-
-
-
-TAO_Codeset_Translator_Factory *
-TAO_Codeset_Manager::get_translator_i (TAO_CodesetFactorySet& factset,
-                                       CONV_FRAME::CodeSetId tcs)
-{
-  const TAO_CodesetFactorySetItor end = factset.end ();
-
-  for (TAO_CodesetFactorySetItor iter = factset.begin (); iter != end; ++iter)
-    {
-      TAO_Codeset_Translator_Factory *fact = (*iter)->factory ();
-
-      if (fact && tcs == fact->tcs ())
-        {
-          return fact;
-        }
-    }
-
-  return 0;
-}
-
-
-//---------------------------------------------------------------------
-// Codeset Item
-TAO_Codeset_Item::TAO_Codeset_Item (const char *name)
-  :   name_ (0),
-      factory_ (0)
-{
-  if (name)
-    {
-      name_ = ACE_OS::strdup(name);
-    }
-}
-
-TAO_Codeset_Item::~TAO_Codeset_Item (void)
-{
-  ACE_OS::free (this->name_);
-}
-
-const char *
-TAO_Codeset_Item::codeset_name (void)
-{
-  return this->name_;
-}
-
-TAO_Codeset_Translator_Factory *
-TAO_Codeset_Item::factory (void)
-{
-  return this->factory_;
-}
-
-void
-TAO_Codeset_Item::factory (TAO_Codeset_Translator_Factory *factory)
-{
-  this->factory_ = factory;
-}
-
-// End of Codeset Item Class
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>;
-
-template class ACE_Node<TAO_Codeset_Item*>;
-template class ACE_Unbounded_Set<TAO_Codeset_Item*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>
-#pragma instantiate ACE_Node<TAO_Codeset_Item*>
-///
-#pragma instantiate ACE_Unbounded_Set<TAO_Codeset_Item*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
-
-#  endif
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
deleted file mode 100644
index fbe3ea29044..00000000000
--- a/TAO/tao/Codeset_Manager.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/*
- *  @file Codeset_Manager.h
- *
- *  $Id$
- *
- *  Interface for the TAO CodeSet Manager.
- *
- *  @author  Mahesh Vedantam <mahesh#ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CODESET_MANAGER_H
-#define TAO_CODESET_MANAGER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CONV_FRAMEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Set.h"
-
-class ACE_WChar_Codeset_Translator;
-
-class TAO_Profile;
-class TAO_Transport;
-class TAO_Operation_Details;
-
-class TAO_ServerRequest;
-class TAO_Tagged_Components;
-class TAO_Codeset_Translator_Factory;
-class TAO_Codeset_Manager;
-
-// ****************************************************************
-
-/**
- * @class TAO_Codeset_Item
- *
- * @brief A single element in the list of Codeset Translator Factories
- *
- * This class is used by the Codeset_Manager to store references to
- * individual codeset factories. Only those translators that match the
- * char or wchar native codeset will be kept in the list.
- *
- */
-
-class TAO_Codeset_Item
-{
-public:
-  friend class TAO_Codeset_Manager;
-
-  /// Creator method, the codeset name can only be set when the
-  /// object is created.
-  TAO_Codeset_Item (const char *name);
-
-  /// Destructor that deallocates the factory object if the
-  /// CodeSet_Item retains ownership.
-  ~TAO_Codeset_Item (void);
-
-  /// Return a reference to the character representation of the codeset
-  /// factories name.
-  const char *codeset_name (void);
-
-  /// Return a pointer to the codeset factory.
-  TAO_Codeset_Translator_Factory *factory (void);
-
-  /// Set the factory pointer's value.
-  void factory (TAO_Codeset_Translator_Factory *factory);
-
-private:
-  // Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Codeset_Item (const TAO_Codeset_Item&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Codeset_Item&))
-
-private:
-  /// Factory name.
-  char *name_;
-
-  /// Pointer to factory object.
-  TAO_Codeset_Translator_Factory *factory_;
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Codeset_Manager
- *
- * @brief The encapsulation of logic for codeset negotiation
- *
- * The Codeset Manager is owned by the ORB_Core, initialized through Resource
- * Factory configuration options. The codeset manager participates in profile
- * creation by servers and connection establishment by clients. The involvement
- * is necessary to supply a codeset component to the profile including for both
- * chars and wide chars the native code set and any conversion code sets for
- * which translators are available. The codeset manager is also responsible for
- * determining the transmission codesets based an the local and remote codeset
- * information. The transmission codesets are communicated via a service
- * context attached to the first request sent on the new connection.
- *
- */
-
-class TAO_Export TAO_Codeset_Manager
-{
-
-public:
-  /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1
-  static CONV_FRAME::CodeSetId default_char_codeset;
-  /// NCS for wchar is defaulted to 0 (not used), but people wishing to
-  /// provide a non-compliant default wchar codeset may do so.
-  static CONV_FRAME::CodeSetId default_wchar_codeset;
-
-  TAO_Codeset_Manager ();
-  ~TAO_Codeset_Manager();
-
-  ///  Called by an object of TAO_Acceptor to set NCS and CCS values for
-  ///  Char/Wchar in to the Object Reference.
-  void set_codeset (TAO_Tagged_Components& ) const;
-
-  /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the
-  /// Transport
-  void set_tcs (TAO_Profile &theProfile, TAO_Transport &);
-
-  /// Called from an Object of TAO_Messaging for every request at server side
-  /// to process service context and set TCS for Char/WChar
-  void process_service_context (TAO_ServerRequest &);
-
-  /// Called by a client object to generate service context
-  /// at this time Transport has the TCS for Char and WChar
-  void generate_service_context (TAO_Operation_Details&, TAO_Transport & );
-
-  /// Called by the resource factory to set the native char codeset id
-  void set_ncs_c (CONV_FRAME::CodeSetId ncs);
-
-  /// Called by the resource factory to set the native wchar codeset id. The
-  /// maxbytes value is used to communicate the width of untranslated wide
-  /// characters on the stream. This size may be smaller than the size of a
-  /// wchar_t.
-  void set_ncs_w (CONV_FRAME::CodeSetId ncs, int maxbytes = 0);
-
-  /// Called by the resource factory to add a potential codeset translator
-  /// for char data. The actual factory will be added to the list later, if its
-  /// ncs matches that of the codeset manager.
-  int add_char_translator (const char *name);
-
-  /// Called by the resource factory to add a potential codeset translator
-  /// for wchar data. The actual factory will be added to the list later, if
-  /// its ncs matches that of the codeset manager.
-  int add_wchar_translator (const char *name);
-
-  /// Called by the resource factory to signify the end of initialization.
-  /// This will traverse the list of named codeset translator factories and add
-  /// any of those that have a native codeset id matching the manager's native
-  /// codeset id.
-  void configure_codeset_factories();
-
-private:
-  /// Typedefs for containers containing the list of codesets
-  /// factories for character and wide character.
-  typedef ACE_Unbounded_Set<TAO_Codeset_Item*>
-          TAO_CodesetFactorySet;
-
-  /// Iterators
-  typedef ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
-          TAO_CodesetFactorySetItor;
-
-  /// Compute the TCS for Char/WChar asper the CORBA Specification
-  CONV_FRAME::CodeSetId computeTCS (CONV_FRAME::CodeSetComponent &,
-                                    CONV_FRAME::CodeSetComponent &);
-
-  /// Find CodesetId in the codeset component
-  int isElementOf (CONV_FRAME::CodeSetId,
-                   CONV_FRAME::CodeSetComponent & );
-
-  /// Find the intersection of CodesetIds between Client and Server CCS
-  CONV_FRAME::CodeSetId intersectionOf (CONV_FRAME::CodeSetComponent &,
-                                        CONV_FRAME::CodeSetComponent &);
-
-  /// Determine compatibility between two codesets via the codeset registry
-  int isCompatible (CONV_FRAME::CodeSetId,  CONV_FRAME::CodeSetId);
-
-  /// Traverse the list of codeset factories, populating the list of conversion
-  /// codeset values with the translated codeset id from each factory that has
-  /// a matching native codeset. Those factories that do not have a matching
-  /// codeset are not retained in the list.
-  int init_codeset_factories_i (TAO_CodesetFactorySet&,
-                                CONV_FRAME::CodeSetComponent&);
-
-  /// Get the translator between our ncs_c and the supplied tcs_c
-  TAO_Codeset_Translator_Factory * get_char_trans (CONV_FRAME::CodeSetId);
-
-  /// Get the translator between our ncs_w and the supplied tcs_w
-  TAO_Codeset_Translator_Factory * get_wchar_trans (CONV_FRAME::CodeSetId);
-
-  TAO_Codeset_Translator_Factory * get_translator_i (TAO_CodesetFactorySet&,
-                                                     CONV_FRAME::CodeSetId);
-
-  /// The CodeSetComponentInfo struct contains all of the information regarding
-  /// the code sets this application recognizes. This is where the native code
-  /// set for both char and wchar are stored.
-  CONV_FRAME::CodeSetComponentInfo codeset_info_;
-
-  /// The lists of available translators for both chars and wchars.
-  TAO_CodesetFactorySet char_factories_;
-  TAO_CodesetFactorySet wchar_factories_;
-
-  /// The UTF16 BOM (Byte Order Marker) translator is unique in that it is
-  /// required when UTF16 is used as both the native and transmitted codeset.
-  /// It exists to insert or extract the BOM preceeding Wchar data in the
-  /// stream.
-  TAO_Codeset_Translator_Factory *utf16_bom_translator_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CODESET_MANAGER_H */
diff --git a/TAO/tao/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset_Translator_Factory.cpp
deleted file mode 100644
index 58ee5fb5ada..00000000000
--- a/TAO/tao/Codeset_Translator_Factory.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao
-//
-// = FILENAME
-//    Codeset_Translator_Factory.cpp
-//
-// = DESCRIPTION
-//    The base for all the translator factories. Translator factories are
-//    responsible for supplying the proper translator on demand.
-//
-// = AUTHORS
-//      Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
-
-#include "tao/Codeset_Translator_Factory.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (tao,
-           Codeset_Translator_Factory,
-           "$Id$")
-
-TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory ()
-{
-
-}
-
-TAO_Codeset_Translator_Factory::~TAO_Codeset_Translator_Factory ()
-{
-
-}
-
-int
-TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
-{
-  return 0;
-}
-
-void
-TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
-{
-  cdr->char_translator(trans);
-}
-
-void
-TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
-{
-  cdr->char_translator(trans);
-}
-
-void
-TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
-{
-  cdr->wchar_translator(trans);
-}
-
-void
-TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
-{
-  cdr->wchar_translator(trans);
-}
diff --git a/TAO/tao/Codeset_Translator_Factory.h b/TAO/tao/Codeset_Translator_Factory.h
deleted file mode 100644
index 8c3cd1d8aae..00000000000
--- a/TAO/tao/Codeset_Translator_Factory.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Codeset_Translator_Factory.h
- *
- *  $Id$
- *
- *  @author   Phil Mesnier <mesnier_p@ociweb.com>
- */
-// =========================
-
-#ifndef TAO_CODESET_TRANSLATOR_FACTORY_H
-#define TAO_CODESET_TRANSLATOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CONV_FRAMEC.h"
-
-class TAO_InputCDR;
-class TAO_OutputCDR;
-
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
-
-
-// ****************************************************************
-
-/**
- * @class TAO_Codeset_Translator_Factory
- *
- * @brief Abstract base class for factories providing codeset translators
- *
- * The codeset translator factory is a loadable service object. It is used to
- * supply the actual translator used in converting between two codesets. The
- * intent of using a factory is to avoid requiring codeset translators to be
- * multiply inherited both from the translator base class and the service
- * object base. The translator factory is also responsible for assigning
- * translators to CDR streams. Since there is no common base class between
- * input and output CDRs, the assingment code must be duplicated.
- */
-
-class TAO_Export TAO_Codeset_Translator_Factory :
-  public ACE_Service_Object
-{
-public:
-  TAO_Codeset_Translator_Factory ();
-  virtual ~TAO_Codeset_Translator_Factory ();
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// Get the native codeset ID from the factory. There is no reasonable
-  /// default for this method, so it is left abstract.
-  virtual CONV_FRAME::CodeSetId ncs () const = 0;
-
-  /// Get the translated codeset ID from the factory. There is no reasonable
-  /// default for this method, so it is left abstract.
-  virtual CONV_FRAME::CodeSetId tcs () const = 0;
-
-  /// Assign the translator to the supplied input CDR. This is left abstract
-  /// since the factory base does not have a reference to the actual translator
-  /// instance. The template instance provides this implementation.
-  virtual void assign (TAO_InputCDR *) const = 0;
-
-  /// Assign the translator to the supplied output CDR. This is left abstract
-  /// since the factory base does not have a reference to the actual translator
-  /// instance. The template instance provides this implementation.
-  virtual void assign (TAO_OutputCDR *) const = 0;
-
-protected:
-
-  /// Assign the translator to the supplied input CDR. The template instance
-  /// will have a translator that is based on either the Char or Wchar
-  /// translator, so the compiler will select the appropriate call from
-  /// assign().
-  void assign_i (TAO_InputCDR *, ACE_Char_Codeset_Translator* ) const;
-  /// Assign the translator to the supplied input CDR. The template instance
-  /// will have a translator that is based on either the Char or Wchar
-  /// translator, so the compiler will select the appropriate call from
-  /// assign().
-  void assign_i (TAO_InputCDR *, ACE_WChar_Codeset_Translator* ) const;
-  /// Assign the translator to the supplied output CDR. The template instance
-  /// will have a translator that is based on either the Char or Wchar
-  /// translator, so the compiler will select the appropriate call from
-  /// assign().
-  void assign_i (TAO_OutputCDR *, ACE_Char_Codeset_Translator* ) const;
-  /// Assign the translator to the supplied output CDR. The template instance
-  /// will have a translator that is based on either the Char or Wchar
-  /// translator, so the compiler will select the appropriate call from
-  /// assign().
-  void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator* ) const;
-};
-
-// Get the template includes last
-#include "tao/Codeset_Translator_Factory_T.h"
-
-#include /**/ "ace/post.h"
-#endif /* TAO_Codeset_Translator_Factory */
diff --git a/TAO/tao/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset_Translator_Factory_T.cpp
deleted file mode 100644
index 8dcd9262635..00000000000
--- a/TAO/tao/Codeset_Translator_Factory_T.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tao
-//
-// = FILENAME
-//    Codeset_Translator_Factory_T.cpp
-//
-// = DESCRIPTION
-//    The template for creating a particular instance of a codeset translator
-//
-// = AUTHORS
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
-#ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
-#define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
-
-#include "tao/Codeset_Translator_Factory_T.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-template<class NCS_TO_TCS>
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () :
-  translator_(0)
-{
-}
-
-template<class NCS_TO_TCS>
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::~TAO_Codeset_Translator_Factory_T ()
-{
-  delete translator_;
-}
-
-template<class NCS_TO_TCS>
-int
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::init (int argc, ACE_TCHAR* argv[])
-{
-  this->TAO_Codeset_Translator_Factory::init (argc,argv);
-  ACE_NEW_RETURN (translator_,NCS_TO_TCS,-1);
-  if( TAO_debug_level > 0 )
-    ACE_DEBUG((LM_DEBUG, "TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::init() entered\n"));
-  return 0;
-}
-
-// ncs & tcs values set at compile time as a result of instantiating the
-// template.
-template<class NCS_TO_TCS>
-CONV_FRAME::CodeSetId
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::ncs () const
-{
-  return this->translator_->ncs();
-}
-
-template<class NCS_TO_TCS>
-CONV_FRAME::CodeSetId
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::tcs () const
-{
-  return this->translator_->tcs();
-}
-
-// Assign either a reference to teh existing translator or a new translator
-// for input CDR streams
-template<class NCS_TO_TCS>
-void
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::assign (TAO_InputCDR *cdr) const
-{
-  if (cdr)
-    {
-      this->assign_i(cdr,this->translator_);
-    }
-}
-
-// Assign either a reference to teh existing translator or a new translator
-// for input CDR streams
-template<class NCS_TO_TCS>
-void
-TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::assign (TAO_OutputCDR *cdr) const
-{
-  if (cdr)
-    {
-      this->assign_i(cdr,this->translator_);
-    }
-}
-
-#endif /* TAO_CODESET_TRANSLATOR_FACTORY_T_CPP */
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tao/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset_Translator_Factory_T.h
deleted file mode 100644
index b523a863e78..00000000000
--- a/TAO/tao/Codeset_Translator_Factory_T.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Codeset_Translator_Factory_T.h
- *
- *  $Id$
- *
- *  @author   Phil Mesnier <mesnier_p@ociweb.com>
- */
-// =========================
-#ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_H
-#define TAO_CODESET_TRANSLATOR_FACTORY_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Codeset_Translator_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Codeset_Translator_Factory_T
- *
- * @brief Template for translator factory classes.
- *
- * The template argument is the actual translator class. The factory creates an
- * instance of the translator during initialization. Other than that, the
- * template returns the actual values for the native and translated codeset
- * ids, and performs the translator assignment to the CDR objects as needed.
- */
-
-template<class NCS_TO_TCS>
-class TAO_Codeset_Translator_Factory_T
-: public TAO_Codeset_Translator_Factory
-{
-public:
-
-  TAO_Codeset_Translator_Factory_T ();
-  virtual ~TAO_Codeset_Translator_Factory_T ();
-
-  /// Initialize the factory service object. Instantiates the translator.
-  int init( int argc, ACE_TCHAR* argv[]);
-
-  /// ncs returns the translator's native codeset ID.
-  CONV_FRAME::CodeSetId ncs () const;
-  /// tcs returns the translator's transmission codeset ID.
-  CONV_FRAME::CodeSetId tcs () const;
-
-  /// Assign the translator to the input CDR. The inherited assign_i is used
-  /// to assign either a char or wchar translator, depending on the base type
-  /// of NCS_TO_TCS. A null input CDR is permitted, in which case assign is a
-  /// no-op.
-  virtual void assign (TAO_InputCDR *) const;
-  /// Assign the translator to the output CDR. The inherited assign_i is used
-  /// to assign either a char or wchar translator, depending on the base type
-  /// of NCS_TO_TCS. A null output CDR is permitted, in which case assign is a
-  /// no-op.
-  virtual void assign (TAO_OutputCDR *) const;
-
-private:
-  NCS_TO_TCS *translator_;
-};
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Codeset_Translator_Factory_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Codeset_Translator_Factory_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_Codeset_Translator_Factory_T */
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
deleted file mode 100644
index a4e923f6fa0..00000000000
--- a/TAO/tao/Collocated_Invocation.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "Collocated_Invocation.h"
-#include "Collocation_Proxy_Broker.h"
-#include "ORB_Core.h"
-#include "Request_Dispatcher.h"
-#include "TAO_Server_Request.h"
-#include "Stub.h"
-#include "operation_details.h"
-
-
-ACE_RCSID (tao,
-           Collocated_Invocation,
-           "$Id$")
-
-
-namespace TAO
-{
-  Collocated_Invocation::Collocated_Invocation (CORBA::Object_ptr t,
-                                                CORBA::Object_ptr et,
-                                                TAO_Stub *stub,
-                                                TAO_Operation_Details &detail,
-                                                bool response_expected)
-    : Invocation_Base (t,
-                       et,
-                       stub,
-                       detail,
-                       response_expected)
-  {
-  }
-
-  Invocation_Status
-  Collocated_Invocation::invoke (Collocation_Proxy_Broker *cpb,
-                                 Collocation_Strategy strat
-                                 ACE_ENV_ARG_DECL)
-  {
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-    /// Start the interception point
-#if TAO_HAS_INTERCEPTORS == 1
-    s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-    ACE_TRY
-      {
-        if (strat == TAO_CS_THRU_POA_STRATEGY)
-          {
-            // Perform invocations on the servant through the servant's ORB.
-            CORBA::ORB_var servant_orb = this->effective_target ()->_stubobj ()->servant_orb_ptr ();
-            TAO_ORB_Core * const orb_core = servant_orb->orb_core ();
-
-            TAO_ServerRequest request (orb_core,
-                                       this->details_,
-                                       this->effective_target ());
-
-            TAO_Request_Dispatcher * const dispatcher =
-              orb_core->request_dispatcher ();
-
-            // Retain ownership of the servant's ORB_Core in case
-            // another thread attempts to destroy it (e.g. via
-            // CORBA::ORB::destroy()) before this thread complete the
-            // invocation.
-            orb_core->_incr_refcnt ();
-            TAO_ORB_Core_Auto_Ptr my_orb_core (orb_core);
-
-            dispatcher->dispatch (orb_core,
-                                  request,
-                                  this->forwarded_to_.out ()
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        else
-          {
-            cpb->dispatch (this->effective_target (),
-                           this->forwarded_to_.out (),
-                           this->details_.args (),
-                           this->details_.args_num (),
-                           this->details_.opname (),
-                           this->details_.opname_len (),
-                           strat
-                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-
-        // Invocation completed succesfully
-        s = TAO_INVOKE_SUCCESS;
-
-#if TAO_HAS_INTERCEPTORS == 1
-        if (this->forwarded_to_.in () ||
-            this->response_expected_ == false)
-          {
-            if (this->forwarded_to_.in ())
-              this->reply_received (TAO_INVOKE_RESTART);
-
-            s =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        // NOTE: Any other condition that needs handling?
-        else if (this->response_expected ())
-          {
-            this->reply_received (TAO_INVOKE_SUCCESS);
-
-            s =
-              this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
-#endif /*TAO_HAS_INTERCEPTORS */
-      }
-    ACE_CATCHANY
-      {
-        // Ignore exceptions for oneways
-        if (this->response_expected_ == false)
-          return TAO_INVOKE_SUCCESS;
-
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (status == PortableInterceptor::LOCATION_FORWARD ||
-            status == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-        if (this->response_expected () == false)
-          return TAO_INVOKE_SUCCESS;
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (this->forwarded_to_.in () != 0)
-      s =  TAO_INVOKE_RESTART;
-
-    return s;
-  }
-
-}
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
deleted file mode 100644
index 03068bcb8fb..00000000000
--- a/TAO/tao/Collocated_Invocation.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Collocated_Invocation.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_COLLOCATED_INVOCATION_H
-#define TAO_COLLOCATED_INVOCATION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Strategy.h"
-#include "tao/Invocation_Base.h"
-#include "tao/Exception.h"
-
-class TAO_Operation_Details;
-class TAO_Stub;
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-  class Argument;
-  class Collocation_Proxy_Broker;
-
-  /**
-   * @class Collocated_Invocation
-   *
-   * @brief Class for Collocated invocations
-   *
-   * @note Reliable oneways are not handled properly including use of
-   * interceptors. This class should technically serve as the base
-   * for all invocation types. But now, this is the only class that
-   * handles collocated invocations and that too in a brain dead way.
-   */
-  class TAO_Export Collocated_Invocation : public Invocation_Base
-  {
-  public:
-    /// Constructor used by TAO::Invocation_Adapter
-    /**
-     * @param t The target on which invocation first started.
-     *
-     * @param et The effective target in which this invocation is now
-     * flowing
-     *
-     * @param stub Stub for effective target @a et
-     *
-     * @param detail operation details of the invocation including
-     * the service context list
-     *
-     * @param response_expected flag to indicate whether the
-     * operation encapsulated by @a detail returns a response or not.
-     */
-    Collocated_Invocation (CORBA::Object_ptr t,
-                           CORBA::Object_ptr et,
-                           TAO_Stub *stub,
-                           TAO_Operation_Details &detail,
-                           bool response_expected = true);
-
-    /// Invocation on the collocated object mediated through this
-    /// class.
-    /**
-     * Practically this method is a place holder to do the
-     * following
-     *  - Call the start and end interception points on the client
-     *    side.
-     *
-     *  - Handle location forwards that could be thrown by the
-     *    servant.
-     *
-     */
-    Invocation_Status invoke (Collocation_Proxy_Broker *cpb,
-                              Collocation_Strategy strat
-                              ACE_ENV_ARG_DECL);
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (Collocated_Invocation (void))
-
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_COLLOCATED_INVOCATION_H*/
diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h
deleted file mode 100644
index 20c3db3dd93..00000000000
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Collocation_Proxy_Broker.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_COLLOCATION_PROXY_BROKER_H
-#define TAO_COLLOCATION_PROXY_BROKER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Collocation_Strategy.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-namespace TAO
-{
-  class Argument;
-
-  /**
-   * @class Collocation_Proxy_Broker
-   */
-  class TAO_Export Collocation_Proxy_Broker
-  {
-
-  public:
-
-    virtual ~Collocation_Proxy_Broker (void) {}
-
-    virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj
-                                               ACE_ENV_ARG_DECL) = 0;
-
-    virtual void dispatch (CORBA::Object_ptr obj,
-                           CORBA::Object_out forward_obj,
-                           Argument ** args,
-                           int num_args,
-                           const char * op,
-                           size_t op_len,
-                           Collocation_Strategy strategy
-                           ACE_ENV_ARG_DECL) = 0;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_COLLOCATION_PROXY_BROKER_H */
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
deleted file mode 100644
index 3a4c9284555..00000000000
--- a/TAO/tao/Collocation_Resolver.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "tao/Collocation_Resolver.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           Collocation_Resolver,
-           "$Id$")
-
-TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Collocation_Resolver>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Collocation_Resolver>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
deleted file mode 100644
index 46c6466ff47..00000000000
--- a/TAO/tao/Collocation_Resolver.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//=============================================================================
-/**
- *  @file    Collocation_Resolver.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_COLLOCATION_RESOLVER_H
-#define TAO_COLLOCATION_RESOLVER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Environment;
-}
-
-/**
- * @class TAO_Collocation_Resolver
- *
- * @brief This class helps in resolving if a CORBA:Object is collocated.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Collocation_Resolver
-  : public ACE_Service_Object
-{
-public:
-
-  /// Destructor.
-  virtual ~TAO_Collocation_Resolver (void);
-
-  /// Is @a object collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Collocation_Strategy.h b/TAO/tao/Collocation_Strategy.h
deleted file mode 100644
index 9a6e4927b52..00000000000
--- a/TAO/tao/Collocation_Strategy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Collocation_Strategy.h
- *
- *  $Id$
- *
- *  @author  DOC Group - Wash U and UCI
- */
-//=============================================================================
-
-#ifndef TAO_COLLOCATION_STRATEGY_H
-#define TAO_COLLOCATION_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-/// Define symbolic names for the ORB collocation strategies.
-namespace TAO
-{
-  enum Collocation_Strategy 
-    {
-      /// i.e no collocation.
-      TAO_CS_REMOTE_STRATEGY,
-
-      /// Calls to the collocated object are forwarded by the POA.
-      TAO_CS_THRU_POA_STRATEGY,
-
-      /// Calls to the collocated object are made directly to its
-      /// servant.
-      TAO_CS_DIRECT_STRATEGY,
-
-      /// This value should always be the last value in the enumeration.
-      /// It provides the count for the number of collocation
-      /// strategies.
-      TAO_CS_LAST
-    };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_COLLOCATION_STRATEGY_H */
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
deleted file mode 100644
index 5fb831711cb..00000000000
--- a/TAO/tao/Condition.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef TAO_CONDITION_CPP
-#define TAO_CONDITION_CPP
-#include "Condition.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Condition.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (TAO,
-           Condition,
-           "$Id$")
-
-template <class MUTEX>
-TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
-
-  : mutex_ (&m),
-    delete_lock_ (0),
-    cond_ (0)
-{
-  // @@todo: Need to add the allocatore here..
-  ACE_NEW (this->cond_,
-           TAO_SYNCH_CONDITION (*this->mutex_));
-}
-
-template <class MUTEX>
-TAO_Condition<MUTEX>::TAO_Condition (void)
-    : mutex_ (0),
-      delete_lock_ (0),
-      cond_ (0)
-
-{
-  // @@todo: Need to add the allocatore here..
-
-  ACE_NEW (this->mutex_,
-           MUTEX);
-
-  this->delete_lock_ = 1;
-
-  ACE_NEW (this->cond_,
-           TAO_SYNCH_CONDITION (*this->mutex_));
-}
-
-
-template <class MUTEX>
-TAO_Condition<MUTEX>::~TAO_Condition (void)
-{
-  if (this->remove () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("TAO_Condition::~TAO_Condition")));
-
-  delete this->cond_;
-
-  if (this->delete_lock_)
-    delete this->mutex_;
-}
-
-#endif /* TAO_CONDITION_CPP*/
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
deleted file mode 100644
index c167bf85e0b..00000000000
--- a/TAO/tao/Condition.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Condition.h
- *
- *  $Id$
- *
- *  @author From ACE to TAO by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONDITION_H
-#define TAO_CONDITION_H
-
-#include /**/ "ace/pre.h"
-
-#include "orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Condition_T.h"
-#include "ace/Global_Macros.h"
-
-class ACE_Time_Value;
-
-
-/**
- * @class TAO_Condition
- *
- * @brief Same as to the ACE_Condition variable wrapper
- *
- * This class differs from ACE_Condition in that it uses a
- * TAO_SYNCH_CONDITION instead of ACE_cond_t  under the hood to
- * provide blocking.
- */
-template <class MUTEX>
-class TAO_Condition
-{
-public:
-
-  /// Useful typedef
-  typedef MUTEX LOCK;
-
-  // = Initialiation and termination methods.
-  /// Initialize the condition variable.
-  TAO_Condition (MUTEX &m);
-
-  /// A default constructor. Since no lock is provided by the user,
-  /// one will be created internally.
-  TAO_Condition (void);
-
-  /// Implicitly destroy the condition variable.
-  ~TAO_Condition (void);
-
-  // = Lock accessors.
-  /**
-   * Block on condition, or until absolute time-of-day has passed.  If
-   * abstime == 0 use "blocking" <wait> semantics.  Else, if <abstime>
-   * != 0 and the call times out before the condition is signaled
-   * <wait> returns -1 and sets errno to ETIME.
-   */
-  int wait (const ACE_Time_Value *abstime);
-
-  /// Block on condition.
-  int wait (void);
-
-  /**
-   * Block on condition or until absolute time-of-day has passed.  If
-   * abstime == 0 use "blocking" wait() semantics on the <mutex>
-   * passed as a parameter (this is useful if you need to store the
-   * <Condition> in shared memory).  Else, if <abstime> != 0 and the
-   * call times out before the condition is signaled <wait> returns -1
-   * and sets errno to ETIME.
-   */
-  int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0);
-
-  /// Signal one waiting thread.
-  int signal (void);
-
-  /// Signal *all* waiting threads.
-  int broadcast (void);
-
-  // = Utility methods.
-  /// Explicitly destroy the condition variable.
-  int remove (void);
-
-  /// Returns a reference to the underlying mutex_;
-  MUTEX *mutex (void);
-
-private:
-
-  /// Reference to mutex lock.
-  MUTEX *mutex_;
-
-  /// A flag to indicate whether the lock needs to be deleted.
-  int delete_lock_;
-
-  /// Condition variable.
-  TAO_SYNCH_CONDITION *cond_;
-
-  // = Prevent assignment and initialization.
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Condition<MUTEX> &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &))
-};
-
-#if defined (__ACE_INLINE__)
-#include "Condition.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Condition.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Condition.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_CONDITION_H*/
diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl
deleted file mode 100644
index 7e41b1cb2d0..00000000000
--- a/TAO/tao/Condition.inl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::wait (void)
-{
-  return this->cond_->wait ();
-}
-
-template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::wait (MUTEX &mutex,
-                            const ACE_Time_Value *abstime)
-{
-  return this->cond_->wait (mutex,
-                           abstime);
-}
-
-// Peform an "alertable" timed wait.  If the argument ABSTIME == 0
-// then we do a regular cond_wait(), else we do a timed wait for up to
-// ABSTIME using the Solaris cond_timedwait() function.
-
-template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime)
-{
-  return this->wait (*this->mutex_, abstime);
-}
-
-template<class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::remove (void)
-{
-  return this->cond_->remove ();
-}
-
-template<class MUTEX> ACE_INLINE MUTEX *
-TAO_Condition<MUTEX>::mutex (void)
-{
-  return this->mutex_;
-}
-
-template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::signal (void)
-{
-  return this->cond_->signal ();
-}
-
-template <class MUTEX> ACE_INLINE int
-TAO_Condition<MUTEX>::broadcast (void)
-{
-  return this->cond_->broadcast ();
-}
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
deleted file mode 100644
index 98764d36066..00000000000
--- a/TAO/tao/Connect_Strategy.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "Connect_Strategy.h"
-
-ACE_RCSID (tao,
-           Connect_Strategy,
-           "$Id$")
-
-TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-
-TAO_Connect_Strategy::~TAO_Connect_Strategy (void)
-{
-}
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
deleted file mode 100644
index 488fe149d93..00000000000
--- a/TAO/tao/Connect_Strategy.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Connect_Strategy.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONNECT_STRATEGY_H
-#define TAO_CONNECT_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-class TAO_Connector;
-class TAO_Connection_Handler;
-class TAO_Transport;
-class ACE_Synch_Options;
-class ACE_Time_Value;
-
-/**
- * @class TAO_Connect_Strategy
- *
- * @brief Define the interface for the connect strategy, i.e. the
- *  algorithm that controls how does the ORB establishes remote
- *  connections.
- *
- * The thread that establishes remote connections can either make a
- * blocking or a non-blocking connect. The strategy to wait for the
- * connection completion can also be different.
- *
- * This strategy controls how does the ORB schedules and waits for
- * connection completion.
- */
-
-class TAO_Export TAO_Connect_Strategy
-{
-public:
-
-  /// Constructor
-  TAO_Connect_Strategy (TAO_ORB_Core *orb);
-
-  /// Destructor
-  virtual ~TAO_Connect_Strategy (void);
-
-  /// Obtain the synch options that can be passed to ACE_Connector
-  /* Return the synch option for the connector, based on the timeout
-   * and the strategy in place. ACE_Connectors behavior can be altered
-   * by passing the right ACE_Synch_Options to the connect () call.
-   */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt) = 0;
-
-  /// Wait for the connection to be completed till a timeout occurs.
-  /* If the connection establishment fails the state within the
-   * connection handler is set appropriately.
-   */
-  virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val) = 0;
-
-  virtual int wait (TAO_Transport *t,
-                    ACE_Time_Value *val) = 0;
-
-protected:
-  /// Cached copy of the ORB core pointer
-  TAO_ORB_Core *orb_core_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
deleted file mode 100644
index 4049c87ef31..00000000000
--- a/TAO/tao/Connection_Handler.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-//$Id$
-
-#include "Connection_Handler.h"
-#include "ORB_Core.h"
-#include "debug.h"
-#include "Resume_Handle.h"
-#include "Transport.h"
-#include "Wait_Strategy.h"
-
-#include "ace/SOCK.h"
-#include "ace/Reactor.h"
-#include "ace/os_include/sys/os_socket.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Connection_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Connection_Handler,
-           "$Id$")
-
-TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-  , transport_ (0)
-{
-  // @@todo: We need to have a distinct option/ method in the resource
-  // factory for this and TAO_Transport.
-  this->lock_ =
-    this->orb_core_->resource_factory ()->create_cached_connection_lock ();
-
-  // Put ourselves in the connection wait state as soon as we get
-  // created
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_WAIT);
-}
-
-TAO_Connection_Handler::~TAO_Connection_Handler (void)
-{
-  int result =
-    this->release_os_resources ();
-
-  if (result == -1 && TAO_debug_level)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "TAO (%P|%t) - Connection_Handler::~Connection_Handler,"
-                  "release_os_resources() failed %m\n"));
-    }
-
-  // @@ TODO Use auto_ptr<>
-  delete this->lock_;
-}
-
-
-int
-TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
-                                           int snd_size,
-                                           int rcv_size)
-{
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-
-  if (snd_size != 0
-      && sock.set_option (SOL_SOCKET,
-                          SO_SNDBUF,
-                          (void *) &snd_size,
-                          sizeof (snd_size)) == -1
-      && errno != ENOTSUP)
-  {
-    return -1;
-  }
-
-  if (rcv_size != 0
-      && sock.set_option (SOL_SOCKET,
-                          SO_RCVBUF,
-                          (void *) &rcv_size,
-                          sizeof (int)) == -1
-      && errno != ENOTSUP)
-  {
-    return -1;
-  }
-#else
-   ACE_UNUSED_ARG (snd_size);
-   ACE_UNUSED_ARG (rcv_size);
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
-
-  (void) sock.enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  return 0;
-}
-
-int
-TAO_Connection_Handler::svc_i (void)
-{
-  int result = 0;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - Connection_Handler::svc_i begin\n")));
-
-  // Here we simply synthesize the "typical" event loop one might find
-  // in a reactive handler, except that this can simply block waiting
-  // for input.
-
-  ACE_Time_Value *max_wait_time = 0;
-  ACE_Time_Value timeout;
-  ACE_Time_Value current_timeout;
-
-  if (this->orb_core_->thread_per_connection_timeout (timeout))
-    {
-      current_timeout = timeout;
-      max_wait_time = &current_timeout;
-    }
-
-  TAO_Resume_Handle rh (this->orb_core_,
-                        ACE_INVALID_HANDLE);
-
-  // We exit of the loop if
-  // - If the ORB core is shutdown by another thread
-  // - Or if the transport is null. This could happen if an error
-  // occured.
-  // - Or if during processing a return value of -1 is received.
-  while (!this->orb_core_->has_shutdown ()
-         && result >= 0)
-    {
-      // Let the transport know that it is used
-      (void) this->transport ()->update_transport ();
-
-      result =
-        this->transport ()->handle_input (rh,
-                                          max_wait_time);
-
-      if (result == -1 && errno == ETIME)
-        {
-          // Ignore timeouts, they are only used to wake up and
-          // shutdown.
-          result = 0;
-
-          // Reset errno to make sure we don't trip over an old value
-          // of errno in case it is not reset when the recv() call
-          // fails if the socket has been closed.
-          errno = 0;
-        }
-      else if (result == -1)
-        {
-          // Something went wrong with the socket. Just quit
-          return result;
-        }
-
-      current_timeout = timeout;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Connection_Handler::svc_i - "
-                    "loop <%d>\n", current_timeout.msec ()));
-    }
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) - Connection_Handler::svc_i end\n"));
-
-  return result;
-}
-
-void
-TAO_Connection_Handler::transport (TAO_Transport* transport)
-{
-  this->transport_ = transport;
-
-  // Enable reference counting on the event handler.
-  this->transport_->event_handler_i ()->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED
-    );
-}
-
-int
-TAO_Connection_Handler::handle_output_eh (
-    ACE_HANDLE, ACE_Event_Handler * eh)
-{
-  // Let the transport that it is going to be used
-  (void) this->transport ()->update_transport ();
-
-  // Instantiate the resume handle here.. This will automatically
-  // resume the handle once data is written..
-  TAO_Resume_Handle resume_handle (this->orb_core (),
-                                   eh->get_handle ());
-
-  int return_value = 0;
-  this->pre_io_hook (return_value);
-  if (return_value != 0)
-    {
-      resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
-      return return_value;
-    }
-
-  return_value = this->transport ()->handle_output ();
-
-  this->pos_io_hook (return_value);
-  if (return_value != 0)
-    {
-      resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
-    }
-
-  return return_value;
-}
-
-int
-TAO_Connection_Handler::handle_input_eh (
-  ACE_HANDLE h, ACE_Event_Handler *eh)
-{
-  // If we can't process upcalls just return
-  if (!this->transport ()->wait_strategy ()->can_process_upcalls ())
-    {
-      if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, "
-                    "not going to handle_input on transport "
-                    "because upcalls temporarily suspended on this thread\n",
-                    this->transport()->id()));
-      return 0;
-    }
-
-  int result = this->handle_input_internal (h, eh);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_Connection_Handler::handle_input_internal (
-    ACE_HANDLE h, ACE_Event_Handler * eh)
-{
-  // Let the transport know that it is used
-  (void) this->transport ()->update_transport ();
-
-  // Grab the transport id now and use the cached value for printing
-  // since the  transport could dissappear by the time the thread
-  // returns.
-  size_t t_id =
-    this->transport ()->id ();
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_HANDLE handle = eh->get_handle();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
-                  "handle = %d/%d\n",
-                  t_id, handle, h));
-    }
-
-  TAO_Resume_Handle resume_handle (this->orb_core (),
-                                   eh->get_handle ());
-
-  int return_value = 0;
-
-  this->pre_io_hook (return_value);
-  if (return_value != 0)
-    return return_value;
-
-  return_value = this->transport ()->handle_input (resume_handle);
-
-  this->pos_io_hook (return_value);
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_HANDLE handle = eh->get_handle ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
-                  "handle = %d/%d, retval = %d\n",
-                  t_id, handle, h, return_value));
-    }
-
-  return return_value;
-}
-
-int
-TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
-{
-  // Save the ID for debugging messages
-  ACE_HANDLE handle = eh->get_handle ();
-
-  size_t id = this->transport ()->id ();
-  if (TAO_debug_level)
-    {
-      ACE_DEBUG  ((LM_DEBUG,
-                   "TAO (%P|%t) - Connection_Handler[%d]::"
-                   "close_connection_eh, purging entry from cache\n",
-                   handle));
-    }
-
-  this->transport ()->purge_entry ();
-
-  // @@ This seems silly, but if we have no reason to be in the
-  // reactor, then we dont remove ourselves.
-  if (this->transport ()->wait_strategy ()->is_registered ())
-    {
-      ACE_Reactor *eh_reactor = eh->reactor ();
-
-      // These checks are valid as long as the ORB_Core is not
-      // shutdown. It is good to have these checks and they are valid
-      // for most of the cases. Please see below for exceptions
-      if (this->orb_core_->has_shutdown () == 0)
-        {
-          // The exception when these are not valid is for
-          // RTCORBA. With RTCORBA on, you can threads in different
-          // lanes creating handlers and registering them with reactor
-          // in those respective lanes. These threads could then even
-          // go away leaving the task of reclaiming these resources to
-          // the main thread. For the main thread that takes the
-          // responsibility of finalizing () the lanes and the pools,
-          // the calls and comparison make no sense.
-          ACE_Reactor * reactor =
-            this->transport()->orb_core()->reactor ();
-          ACE_ASSERT (eh_reactor == 0 || eh_reactor == reactor);
-
-          ACE_Reactor * orb_core_reactor = this->orb_core_->reactor ();
-          ACE_ASSERT (reactor == orb_core_reactor);
-
-          if (eh_reactor == 0)
-            eh_reactor = reactor;
-
-          ACE_UNUSED_ARG (orb_core_reactor);
-        }
-
-      // The Reactor must not be null, otherwise something else is
-      // horribly broken.
-      ACE_ASSERT (eh_reactor != 0);
-
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG  ((LM_DEBUG,
-                       "TAO (%P|%t) - Connection_Handler[%d]::"
-                       "close_connection_eh, removing from the reactor\n",
-                       handle));
-        }
-
-      eh_reactor->remove_handler (handle,
-                                  ACE_Event_Handler::ALL_EVENTS_MASK |
-                                  ACE_Event_Handler::DONT_CALL);
-
-      // Also cancel any timers, we may create those for time-limited
-      // buffering
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG  ((LM_DEBUG,
-                       "TAO (%P|%t) - Connection_Handler[%d]::"
-                       "close_connection_eh, cancel all timers\n",
-                       handle));
-        }
-
-      eh_reactor->cancel_timer (eh);
-
-      // @@ This seems silly, the reactor is a much better authority to
-      //    find out if a handle is registered...
-      this->transport ()->wait_strategy ()->is_registered (0);
-    }
-
-  // This call should be made only after the cache and reactor are
-  // cleaned up. This call can make upcalls to the application which
-  // in turn can make remote calls (Bug 1551 and Bug 1482). The remote
-  // calls from the application can try to use this handler from the
-  // cache or from the reactor. So clean them up before this is
-  // called.
-  this->transport ()->send_connection_closed_notifications ();
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-
-  if (TAO_debug_level)
-    {
-      ACE_DEBUG  ((LM_DEBUG,
-                   "TAO (%P|%t) - Connection_Handler[%d]::"
-                   "close_connection_eh\n",
-                   id));
-    }
-
-  return 1;
-}
-
-int
-TAO_Connection_Handler::release_os_resources (void)
-{
-  return 0;
-}
-
-void
-TAO_Connection_Handler::pre_io_hook (int & )
-{
-}
-
-void
-TAO_Connection_Handler::pos_io_hook (int & )
-{
-}
-
-int
-TAO_Connection_Handler::close_handler (void)
-{
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-  this->transport ()->remove_reference ();
-  return 0;
-}
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
deleted file mode 100644
index 4653bdf0137..00000000000
--- a/TAO/tao/Connection_Handler.h
+++ /dev/null
@@ -1,180 +0,0 @@
-
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Connection_Handler.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan  <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONNECTION_HANDLER_H
-#define TAO_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "LF_CH_Event.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_ORB_Core;
-class TAO_Transport;
-class ACE_SOCK;
-class ACE_Lock;
-class ACE_Event_Handler;
-
-/**
- * @class TAO_Connection_Handler
- *
- * @brief TAO_Connection_Handler
- *
- * This class is an abstraction for the connection handlers. The
- * connections handler in every protocol can derive from this
- * class as well as the ACE_Svc_Handler specialised for the
- * right protocol. This way, most of the common code for the
- * different protocols would be in this implementation.
- */
-class TAO_Export TAO_Connection_Handler : public TAO_LF_CH_Event
-{
-public:
-
-  /// Constructor
-  TAO_Connection_Handler (void);
-
-  /// Constructor
-  TAO_Connection_Handler (TAO_ORB_Core *orb_core);
-
-  /// Destructor
-  virtual ~TAO_Connection_Handler (void);
-
-  /// Return the underlying transport object
-  TAO_Transport *transport (void);
-
-  /// Set the underlying transport object
-  void transport (TAO_Transport* transport);
-
-  /// Is the handler closed?
-  bool is_closed (void) const;
-
-  /// Is the handler open?
-  bool is_open (void) const;
-
-  /// Is the handler in the process of being connected?
-  bool is_connecting (void) const;
-
-  /// Close the underlying connection.
-  /**
-   * Used by the ORB to actively close connections that are idle,
-   * stale or somehow are determined to be broken before the Reactor
-   * does.
-   *
-   * @return Return 0 if the connection was already closed, non-zero
-   * otherwise.
-   */
-  virtual int close_connection (void) = 0;
-
-  /// The event handler calls, here so that other objects who hold a
-  /// reference to this object can call the event handler methods.
-  virtual int handle_input (ACE_HANDLE fd) = 0;
-
-  /// This method is invoked from the svc () method of the Svc_Handler
-  /// Object.
-  int svc_i (void);
-
-  /// A open () hook
-  /**
-   * See Thread_Per_Connection_Handler for a use case
-   */
-  virtual int open_handler (void *) = 0;
-
-  /// A close() hook, called by the Transport Connector when they want to close
-  /// this handler
-  virtual int close_handler (void);
-
-  /// Set the Diff-Serv codepoint on outgoing packets.  Only has
-  /// effect for remote protocols (e.g., IIOP); no effect for local
-  /// protocols (UIOP).  Default implementation is for local
-  /// protocols.  Remote protocols must overwrite implementation.
-  virtual int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
-  /// Release the OS resources related to this handler.
-  virtual int release_os_resources (void);
-
-protected:
-
-  /// Return our TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
-
-  /// Set options on the socket
-  int set_socket_option (ACE_SOCK &sock,
-                         int snd_size,
-                         int rcv_size);
-
-  //@{
-  /**
-   * @name Helper methods for Event_Handler-based derived classes.
-   *
-   * Many (actually all so far) implementations of
-   * TAO_Connection_Handler are a mixin of TAO_Connection_Handler and
-   * some form of ACE_Event_Handler.  The following methods simplify
-   * such implementations by capturing the common code in a single
-   * place.
-   */
-
-  /// Implement the handle_output() callback
-  int handle_output_eh (ACE_HANDLE h, ACE_Event_Handler * eh);
-
-  /// Implement the handle_input() callback
-  // We're actually going to pull the code from the protocol-specific
-  // handlers back into this class, because they ALL look exactly the same.
-  // If some other protocol comes along and needs to do something different,
-  // it is always free to override handle_input() as it sees fit.
-  int handle_input_eh (ACE_HANDLE h, ACE_Event_Handler * eh);
-  int handle_input_internal (ACE_HANDLE h, ACE_Event_Handler *eh);
-
-  /// Implement close_connection() for Connection_Handlers that are
-  /// also Event_Handlers.
-  int close_connection_eh (ACE_Event_Handler * eh);
-
-  /// Pre-invocation hook for I/O operations (handle_input() &
-  /// handle_output())
-  /**
-   * See the SSLIOP protocol for an interesting use-case
-   */
-  virtual void pre_io_hook (int & return_value);
-
-  /// Post-invocation hook for I/O operations (handle_input() &
-  /// handle_output())
-  /**
-   * See the SSLIOP protocol for an interesting use-case
-   */
-  virtual void pos_io_hook (int & return_value);
-  //@}
-
-
-private:
-  /// Pointer to the TAO_ORB_Core
-  TAO_ORB_Core *orb_core_;
-
-  /// Transport object reference
-  TAO_Transport* transport_;
-
-  /// Internal state lock, needs to be separate from the reference
-  /// count / pending upcalls lock because they interleave.
-  ACE_Lock * lock_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Connection_Handler.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_CONNECTION_HANDLER_H*/
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
deleted file mode 100644
index fd99783d293..00000000000
--- a/TAO/tao/Connection_Handler.inl
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-ACE_INLINE TAO_ORB_Core *
-TAO_Connection_Handler::orb_core (void)
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE TAO_Transport *
-TAO_Connection_Handler::transport (void)
-{
-  return this->transport_;
-}
-
-ACE_INLINE bool
-TAO_Connection_Handler::is_closed (void) const
-{
-  return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED ||
-	  this->state_ == TAO_LF_Event::LFS_TIMEOUT);
-}
-
-ACE_INLINE bool
-TAO_Connection_Handler::is_open (void) const
-{
-  return this->state_ == TAO_LF_Event::LFS_SUCCESS;
-}
-
-ACE_INLINE bool
-TAO_Connection_Handler::is_connecting (void) const
-{
-  return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT;
-}
-
-ACE_INLINE int
-TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
-{
-  return 0;
-}
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
deleted file mode 100644
index f903b1107e8..00000000000
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "tao/Connection_Purging_Strategy.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Connection_Purging_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Connection_Purging_Strategy, 
-           "$Id$")
-
-TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void)
-{
-}
-
-int
-TAO_Connection_Purging_Strategy::cache_maximum (void) const
-{
-  return cache_maximum_;
-}
-
-
diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h
deleted file mode 100644
index eace4e9114c..00000000000
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// ================================================================
-/**
- *  @file   Connection_Purging_Strategy.h
- *
- *  $Id$
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- */
-// ================================================================
-
-#ifndef TAO_PURGING_STRATEGY_H
-#define TAO_PURGING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Transport;
-
-// ****************************************************************
-
-/**
- * @class TAO_Connection_Purging_Strategy
- *
- * @brief The base class for all purging strategies
- *
- * This class is used by the Transport_Cache_Manager to maintain
- * ordering information on each Transport that is created.
- */
-
-class TAO_Export TAO_Connection_Purging_Strategy
-{
-public:
-  /// The constructor
-  TAO_Connection_Purging_Strategy (int cache_maximum);
-
-  /// The destructor
-  virtual ~TAO_Connection_Purging_Strategy (void);
-
-  /// Return the maximum number of cache entries
-  virtual int cache_maximum (void) const;
-
-  /// Sub-classes must implement these methods
-  virtual void update_item (TAO_Transport* transport) = 0;
-
-private:
-  /// The maximum number of cach entries
-  int cache_maximum_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Connection_Purging_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Connection_Purging_Strategy.inl b/TAO/tao/Connection_Purging_Strategy.inl
deleted file mode 100644
index b0bc5b7b8f0..00000000000
--- a/TAO/tao/Connection_Purging_Strategy.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Connection_Purging_Strategy::TAO_Connection_Purging_Strategy (
-                                                      int cache_maximum)
- : cache_maximum_ (cache_maximum)
-{
-}
-
diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp
deleted file mode 100644
index ad333727bce..00000000000
--- a/TAO/tao/Connector_Impl.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef TAO_CONNECTOR_IMPL_CPP
-#define TAO_CONNECTOR_IMPL_CPP
-
-#include "tao/Connector_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-ACE_RCSID(tao, Connector_Impl, "$Id$")
-
-template <class SVC_HANDLER>
-TAO_Connect_Creation_Strategy<SVC_HANDLER>::
-    TAO_Connect_Creation_Strategy (ACE_Thread_Manager* t,
-                                   TAO_ORB_Core *orb_core,
-                                   CORBA::Boolean flag)
-    : ACE_Creation_Strategy <SVC_HANDLER> (t),
-      orb_core_ (orb_core),
-      lite_flag_ (flag)
-{
-
-}
-
-template <class SVC_HANDLER> int
-TAO_Connect_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
-{
-  if (sh == 0)
-    ACE_NEW_RETURN (sh,
-                    SVC_HANDLER (this->orb_core_,
-                                 this->lite_flag_),
-                    -1);
-
-  // We add to the #REFCOUNT# since the Connector needs this. See
-  // Connector::make_connection() for details.
-  sh->add_reference ();
-
-   // At this point, the #REFCOUNT# is two.
-
-  return 0;
-}
-
-
-////////////////////////////////////////////////////////////////
-
-template <class SVC_HANDLER>
-TAO_Connect_Concurrency_Strategy<SVC_HANDLER>::
-     TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core)
-       : orb_core_ (orb_core)
-{
-}
-
-template <class SVC_HANDLER> int
-TAO_Connect_Concurrency_Strategy<SVC_HANDLER>::
-    activate_svc_handler (SVC_HANDLER *sh,
-                          void *arg)
-{
-  return ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (sh,
-                                                                      arg);
-}
-
-
-#endif /*TAO_CONNECTOR_IMPL_CPP*/
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
deleted file mode 100644
index 535d357c209..00000000000
--- a/TAO/tao/Connector_Impl.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   Connector_Impl.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_CONNECTOR_IMPL_H
-#define TAO_CONNECTOR_IMPL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Strategies_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_ORB_Core;
-class ACE_Thread_Manager;
-
-/**
- * @class TAO_Connect_Creation_Strategy
- *
- * @brief Creation strategy helper
- *
- * Creates the TAO_*_Connection_Handler object for the TAO_*_Connector
- * objects. This template class can now be used by all the Connector
- * objects instead of having to duplicate code. This class can be used
- * to set any required properties on the connection handlers at
- * creation time.
- *
- */
-
-template <class SVC_HANDLER>
-class TAO_Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
-{
-public:
-
-  /// Constructor.
-  TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
-                                 TAO_ORB_Core* orb_core = 0,
-                                 CORBA::Boolean flag = 0);
-
-  /// Makes TAO_*_Client_Connection_Handlers
-  virtual int make_svc_handler (SVC_HANDLER *&sh);
-
-
-private:
-
-  /// Pointer to the ORB_Core on which we are activated
-  TAO_ORB_Core* orb_core_;
-
-  /// Are we using GIOP lite?
-  CORBA::Boolean lite_flag_;
-};
-
-
-
-/**
- * @class TAO_Connect_Concurrency_Strategy
- *
- * @brief Concurrency strategy helper
- *
- * Activates the Svc_Handler, and then if the correct wait strategy is
- * in use registers the handler with the reactor.
- *
- */
-
-template <class SVC_HANDLER>
-class TAO_Connect_Concurrency_Strategy :
-  public ACE_Concurrency_Strategy<SVC_HANDLER>
-{
-public:
-
-  /// Constructor.
-  TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core);
-
-
-  /// Activates the Svc_Handler, and if the right wait strategy is in
-  /// use, registers the handle with the reactor.
-  int activate_svc_handler (SVC_HANDLER *svc_handler,
-                            void *arg);
-
-private:
-
-  /// Pointer to the ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Connector_Impl.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Connector_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_CONNECTOR_IMPL_H*/
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
deleted file mode 100644
index 7b7b956af7d..00000000000
--- a/TAO/tao/Connector_Registry.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-// $Id$
-
-#include "tao/Connector_Registry.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Transport_Connector.h"
-#include "tao/Protocol_Factory.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Connector_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Connector_Registry,
-           "$Id$")
-
-
-TAO_Connector_Registry::TAO_Connector_Registry (void)
-  : connectors_ (0),
-    size_ (0)
-{
-}
-
-TAO_Connector_Registry::~TAO_Connector_Registry (void)
-{
-  this->close_all ();
-
-  delete [] this->connectors_;
-}
-
-TAO_Connector *
-TAO_Connector_Registry::get_connector (CORBA::ULong tag)
-{
-  const TAO_ConnectorSetIterator end = this->end ();
-
-  for (TAO_ConnectorSetIterator connector = this->begin ();
-       connector != end;
-       ++connector)
-    {
-      if ((*connector)->tag () == tag)
-        return *connector;
-    }
-
-  return 0;
-}
-
-int
-TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
-{
-  TAO_ProtocolFactorySet *pfs =
-    orb_core->protocol_factories ();
-
-  // The array containing the TAO_Connectors will never contain more
-  // than the number of loaded protocols in the ORB core.
-  if (this->connectors_ == 0)
-    ACE_NEW_RETURN (this->connectors_,
-                    TAO_Connector *[pfs->size ()],
-                    -1);
-
-  // Open one connector for each loaded protocol!
-  const TAO_ProtocolFactorySetItor end = pfs->end ();
-
-  for (TAO_ProtocolFactorySetItor factory = pfs->begin ();
-       factory != end;
-       ++factory)
-    {
-      auto_ptr <TAO_Connector> connector (
-        (*factory)->factory ()->make_connector ());
-
-      if (connector.get ())
-        {
-         if (connector->open (orb_core) != 0)
-           {
-             ACE_ERROR_RETURN ((LM_ERROR,
-                                ACE_TEXT ("TAO (%P|%t) unable to open connector for ")
-                                ACE_TEXT ("<%s>.\n"),
-                                ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
-                               -1);
-           }
-
-         this->connectors_[this->size_++] =
-           connector.release ();
-        }
-      else
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Connector_Registry::close_all (void)
-{
-  const TAO_ConnectorSetIterator end = this->end ();
-
-  for (TAO_ConnectorSetIterator i = this->begin ();
-       i != end;
-       ++i)
-    {
-      if (*i == 0)
-        continue;
-
-      (*i)->close ();
-
-      delete *i;
-    }
-
-  this->size_ = 0;
-
-  return 0;
-}
-
-int
-TAO_Connector_Registry::make_mprofile (const char *ior,
-                                       TAO_MProfile &mprofile
-                                       ACE_ENV_ARG_DECL)
-{
-  if (!ior)
-    // Failure: Null IOR string pointer
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-      CORBA::SystemException::_tao_minor_code (
-        0,
-        EINVAL),
-      CORBA::COMPLETED_NO),
-      -1);
-
-  const TAO_ConnectorSetIterator first_connector = this->begin ();
-  const TAO_ConnectorSetIterator last_connector = this->end ();
-
-  for (TAO_ConnectorSetIterator connector = first_connector;
-       connector != last_connector;
-       ++connector)
-    {
-      if (*connector)
-        {
-          const int mp_result =
-            (*connector)->make_mprofile (ior,
-                                         mprofile
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (mp_result);
-
-          if (mp_result == 0)
-            return 0;  // Success
-        }
-      else
-        // Failure: Null pointer to connector in connector registry.
-        ACE_THROW_RETURN (CORBA::INV_OBJREF (
-          CORBA::SystemException::_tao_minor_code (
-            0,
-            EINVAL),
-          CORBA::COMPLETED_NO),
-          -1);
-    }
-
-  // Failure: None of the connectors were able to parse the URL style
-  // IOR into an MProfile.
-  ACE_THROW_RETURN (CORBA::INV_OBJREF (
-   CORBA::SystemException::_tao_minor_code (
-      TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL,
-      0),
-   CORBA::COMPLETED_NO),
-   -1);
-}
-
-TAO_Profile *
-TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
-{
-  CORBA::ULong tag = 0;
-
-  // If there is an error we abort.
-  if ((cdr >> tag) == 0)
-    return 0;
-
-  TAO_Connector *connector =
-    this->get_connector (tag);
-
-  if (connector == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Unknown profile tag 0x%x\n"),
-                      tag));
-        }
-
-      TAO_ORB_Core *orb_core = cdr.orb_core ();
-      if (orb_core == 0)
-        {
-          orb_core = TAO_ORB_Core_instance ();
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_WARNING,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry")
-                          ACE_TEXT ("::create_profile: ")
-                          ACE_TEXT ("WARNING: extracting object from ")
-                          ACE_TEXT ("default ORB_Core\n")));
-            }
-        }
-
-
-      TAO_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_Unknown_Profile (tag,
-                                           orb_core),
-                      0);
-      if (pfile->decode (cdr) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-        }
-
-      return pfile;
-    }
-
-  // OK, we've got a known profile.  It's going to be encapsulated
-  // ProfileData.  Create a new decoding stream and context for it,
-  // and skip the data in the parent stream
-
-  // ProfileData is encoded as a sequence of octet. So first get the
-  // length of the sequence.
-  CORBA::ULong encap_len = 0;
-  if ((cdr >> encap_len) == 0)
-    return 0;
-
-  // Create the decoding stream from the encapsulation in the buffer,
-  // and skip the encapsulation.
-  TAO_InputCDR str (cdr, encap_len);
-
-  if (str.good_bit () == 0
-      || cdr.skip_bytes (encap_len) == 0)
-    return 0;
-
-  return connector->create_profile (str);
-}
-
-char
-TAO_Connector_Registry::object_key_delimiter (const char *ior)
-{
-  if (!ior)
-    {
-      errno = EINVAL;
-      return 0; // Failure: Null IOR string pointer
-    }
-
-  const TAO_ConnectorSetIterator first_connector = this->begin ();
-  const TAO_ConnectorSetIterator last_connector =  this->end ();
-
-  for (TAO_ConnectorSetIterator connector = first_connector;
-       connector != last_connector;
-       ++connector)
-    {
-      if (*connector)
-        {
-          if ((*connector)->check_prefix (ior) == 0)
-            return (*connector)->object_key_delimiter ();
-        }
-    }
-
-  // Failure: None of the connectors were able to match their protocol
-  // against the provided string.
-  return 0;
-}
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
deleted file mode 100644
index 28bb89cd2a5..00000000000
--- a/TAO/tao/Connector_Registry.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Connector_Registry.h
- *
- *  $Id$
- *
- *  Interface for the TAO Connector Registry
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONNECTOR_REGISTRY_H
-#define TAO_CONNECTOR_REGISTRY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-#include "tao/Basic_Types.h"
-#include "ace/Global_Macros.h"
-
-// Forward declarations.
-class TAO_ORB_Core;
-class TAO_Connector;
-class TAO_MProfile;
-class TAO_Profile;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-typedef TAO_Connector** TAO_ConnectorSetIterator;
-
-/**
- * @class TAO_Connector_Registry
- *
- * @brief Per-ORB TAO Connector Registry
- *
- * Connector Registry and Generic Connector interface definitions.
- * All loaded ESIOP or GIOP connector bridges must register with
- * this object.
- * This class is able to dynamically load a set of
- * concrete protocol connectors which have registered with the service
- * configurator and added their Factory name to the Resource_Factory
- * line of the svc.conf file.
- */
-class TAO_Export TAO_Connector_Registry
-{
-public:
-  ///  Default constructor.
-  TAO_Connector_Registry (void);
-
-  ///  Default destructor.
-  ~TAO_Connector_Registry (void);
-
-  /// Return the connector bridges
-  TAO_Connector *get_connector (CORBA::ULong tag);
-
-  /// Initialize all registered connectors.
-  int open (TAO_ORB_Core *orb_core);
-
-  /// Close all open connectors.
-  int close_all (void);
-
-  /// Parse a string containing a URL style IOR and return an
-  /// MProfile.
-  int make_mprofile (const char *ior,
-                     TAO_MProfile &mprofile
-                     ACE_ENV_ARG_DECL);
-
-  /// Create a profile based on the contents of @a cdr
-  TAO_Profile* create_profile (TAO_InputCDR& cdr);
-
-  /// Obtain the object key delimiter used by the protocol specified in
-  /// the provided URL style IOR.
-  char object_key_delimiter (const char *ior);
-
-  // = Iterator.
-  TAO_ConnectorSetIterator begin (void);
-  TAO_ConnectorSetIterator end (void);
-
-private:
-  // Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Connector_Registry (const TAO_Connector_Registry&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Connector_Registry&))
-
-private:
-  /// List of connectors that are currently open.
-  TAO_Connector** connectors_;
-
-  /// Number of connectors that are currently open.
-  size_t size_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/Connector_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CONNECTOR_REGISTRY_H */
diff --git a/TAO/tao/Connector_Registry.i b/TAO/tao/Connector_Registry.i
deleted file mode 100644
index c2976325560..00000000000
--- a/TAO/tao/Connector_Registry.i
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO_ConnectorSetIterator
-TAO_Connector_Registry::begin (void)
-{
-  return this->connectors_;
-}
-
-ACE_INLINE TAO_ConnectorSetIterator
-TAO_Connector_Registry::end (void)
-{
-  return this->connectors_ + this->size_;
-}
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
deleted file mode 100644
index b1d3067dad6..00000000000
--- a/TAO/tao/Current.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file Current.pidl
- *
- * $Id$
- *
- * This file is used to generate CurrentC.{h,cpp}, using the
- * following command:
- *
- *    tao_idl.exe
- *       -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *         -Wb,export_macro=TAO_Export
- *         -Wb,export_include="tao/TAO_Export.h"
- *         -Wb,pre_include="ace/pre.h"
- *         -Wb,post_include="ace/post.h"
- *         Current.pidl
- *
- *
- * The files are ready to use.
- */
-
-#ifndef TAO_CURRENT_PIDL
-#define TAO_CURRENT_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  local interface Current {};
-};
-
-#endif  /* TAO_CURRENT_PIDL */
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
deleted file mode 100644
index bbc4a381b32..00000000000
--- a/TAO/tao/CurrentA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/Current:1.0",
-    "Current");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_CORBA_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Current_ptr _tao_elem
-  )
-{
-  CORBA::Current_ptr _tao_objptr =
-    CORBA::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Current>::insert (
-      _tao_any,
-      CORBA::Current::_tao_any_destructor,
-      CORBA::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Current>::extract (
-        _tao_any,
-        CORBA::Current::_tao_any_destructor,
-        CORBA::_tc_Current,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
deleted file mode 100644
index 3d614ee39a9..00000000000
--- a/TAO/tao/CurrentC.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "CurrentC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Current.
-
-CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::duplicate (
-    CORBA::Current_ptr p
-  )
-{
-  return CORBA::Current::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Current>::release (
-    CORBA::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::nil (void)
-{
-  return CORBA::Current::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Current>::marshal (
-    CORBA::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::Current::Current (void)
-{}
-
-CORBA::Current::~Current (void)
-{}
-
-void 
-CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Current_ptr
-CORBA::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-CORBA::Current_ptr
-CORBA::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-CORBA::Current_ptr
-CORBA::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Current::_tao_release (Current_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Current::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Current:1.0";
-}
-
-CORBA::Boolean
-CORBA::Current::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
deleted file mode 100644
index d2d3a7e2364..00000000000
--- a/TAO/tao/CurrentC.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_CURRENTC_H_
-#define _TAO_IDL_ORIG_CURRENTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
-#define _CORBA_CURRENT__VAR_OUT_CH_
-  
-  class Current;
-  typedef Current *Current_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Current
-      >
-    Current_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Current
-      >
-    Current_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_CURRENT_CH_)
-#define _CORBA_CURRENT_CH_
-  
-  class TAO_Export Current
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-    
-    // The static operations.
-    static Current_ptr _duplicate (Current_ptr obj);
-    
-    static void _tao_release (Current_ptr obj);
-    
-    static Current_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _nil (void)
-    {
-      return static_cast<Current_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Current (void);
-    
-    virtual ~Current (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-    
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_CURRENT__TRAITS_CH_)
-#define _CORBA_CURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::Current>
-  {
-    static ::CORBA::Current_ptr duplicate (
-        ::CORBA::Current_ptr
-      );
-    static void release (
-        ::CORBA::Current_ptr
-      );
-    static ::CORBA::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Current_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CurrentS.h b/TAO/tao/CurrentS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/CurrentS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
deleted file mode 100644
index 1c9bbd07eca..00000000000
--- a/TAO/tao/DLL_Parser.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#include "DLL_Parser.h"
-#include "Object_Loader.h"
-#include "Object.h"
-#include "Environment.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined(__ACE_INLINE__)
-#include "DLL_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           DLL_Parser,
-           "$Id$")
-
-
-TAO_DLL_Parser::~TAO_DLL_Parser (void)
-{
-}
-
-static const char dll_prefix[] = "DLL:";
-
-int
-TAO_DLL_Parser::match_prefix (const char *ior_string) const
-{
-  return (ACE_OS::strncmp (ior_string,
-                           ::dll_prefix,
-                           sizeof (::dll_prefix) - 1) == 0);
-}
-
-CORBA::Object_ptr
-TAO_DLL_Parser::parse_string (const char *ior,
-                              CORBA::ORB_ptr orb
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Skip the prefix, we know it is there because this method in only
-  // called if <match_prefix> returns 1.
-  const char *name =
-    ior + sizeof (::dll_prefix) - 1;
-
-  TAO_Object_Loader *loader =
-    ACE_Dynamic_Service<TAO_Object_Loader>::instance (name);
-
-  if (loader == 0)
-    {
-      ACE_THROW_RETURN
-        (CORBA::INV_OBJREF
-         (CORBA::SystemException::_tao_minor_code (
-            0,
-            EINVAL),
-          CORBA::COMPLETED_NO),
-         CORBA::Object::_nil ());
-    }
-
-  return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser,
-                       ACE_TEXT ("DLL_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_DLL_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-
-ACE_FACTORY_DEFINE (TAO, TAO_DLL_Parser)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
deleted file mode 100644
index e509ee3ca29..00000000000
--- a/TAO/tao/DLL_Parser.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   DLL_Parser.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_DLL_PARSER_H
-#define TAO_DLL_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOR_Parser.h"
-
-/**
- * @class TAO_DLL_Parser
- *
- * @brief Implment the parser for the DLL-style IORs.
- *
- * The DLL-style IORs allows applications to transparently load object
- * implementations. The ORB can parse an IOR in the format:
- *
- * DLL:Service_Name
- *
- * the string_to_object() function will use ACE's Service Configurator
- * to dynamically load the service named 'Service_Name'.  The ORB
- * assumes that this service implements the TAO_Object_Loader
- * interface, and uses that interface to create a new object
- * implementation locally. The object reference for this local object
- * is returned to the application.
- *
- * This can be used in applications that sometimes require local
- * object while other times they may use a remote implementation.
- * For example, the application could be configured to use a remote
- * Event Service or to dynamically load an Event Service
- * implementation and use the local copy instead.  The local Event
- * Service would federate to its remote peers to work as-if a single
- * Event Service was in place.
- *
- * Such an application could be written as follows:
- *
- * int main (int argc, char* argv)
- * {
- *   CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
- *
- *   CORBA::Object_var object =
- *     orb->resolve_initial_references("EventService");
- *   // Use <object> here...
- * }
- *
- * if the application is invoked using:
- *
- * $ program -ORBInitRef EventService=IOR:....
- *
- * then a remote event service is used, but the application could also
- * be invoked using:
- *
- * $ program -ORBInitRef EventService=DLL:Event_Service_Loader
- *
- * In this case the Event_Service implementation will be dynamically
- * loaded without any modifications to the application code.
- *
- */
-class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser
-{
-public:
-  /// Constructor
-  TAO_DLL_Parser (void);
-
-  /// The destructor
-  virtual ~TAO_DLL_Parser (void);
-
-  // = The IOR_Parser methods, please read the documentation in
-  //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined (__ACE_INLINE__)
-# include "DLL_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DLL_PARSER_H */
diff --git a/TAO/tao/DLL_Parser.i b/TAO/tao/DLL_Parser.i
deleted file mode 100644
index 00a66f43394..00000000000
--- a/TAO/tao/DLL_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_DLL_Parser::TAO_DLL_Parser (void)
-{
-}
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
deleted file mode 100644
index 2b5ea0a0673..00000000000
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#include "tao/Default_Collocation_Resolver.h"
-
-ACE_RCSID (tao,
-           Default_Collocation_Resolver,
-           "$Id$")
-
-#include "tao/Object.h"
-#include "ace/Log_Msg.h"
-
-CORBA::Boolean
-TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                                 ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  return object->_is_collocated ();
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver,
-                       ACE_TEXT ("Default_Collocation_Resolver"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Collocation_Resolver),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Collocation_Resolver)
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
deleted file mode 100644
index 3d42c2a7d64..00000000000
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//=============================================================================
-/**
- *  @file    Default_Collocation_Resolver.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_DEFAULT_COLLOCATION_RESOLVER_H
-#define TAO_DEFAULT_COLLOCATION_RESOLVER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Resolver.h"
-
-namespace CORBA
-{
-  class Environment;
-}
-/**
- * @class TAO_Default_Collocation_Resolver
- *
- * @brief Simple resolver used to decide if a CORBA::Object is
- * collocated.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Default_Collocation_Resolver :
-  public TAO_Collocation_Resolver
-{
-public:
-
-  /// Is @a object collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DEFAULT_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
deleted file mode 100644
index 8b0814e80e8..00000000000
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-
-#include "tao/Default_Endpoint_Selector_Factory.h"
-#include "tao/Invocation_Endpoint_Selectors.h"
-
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (tao,
-           Default_Endpoint_Selector_Factory,
-           "$Id$")
-
-
-TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (void)
-{
-  ACE_NEW (this->default_endpoint_selector_,
-           TAO_Default_Endpoint_Selector);
-
-}
-
-TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void)
-{
-  delete this->default_endpoint_selector_;
-}
-
-
-TAO_Invocation_Endpoint_Selector *
-TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  // Trivial endpoint selector.  Just return the default selector.
-  return this->default_endpoint_selector_;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory,
-                       ACE_TEXT ("Default_Endpoint_Selector_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Endpoint_Selector_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Endpoint_Selector_Factory)
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
deleted file mode 100644
index 00558b91983..00000000000
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Default_Endpoint_Selector_Factory.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H
-#define TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Endpoint_Selector_Factory.h"
-
-// Forward references
-class TAO_Default_Endpoint_Selector;
-
-// ****************************************************************
-
-/**
- * @class TAO_Default_Endpoint_Selector_Factory
- *
- * @brief Factory for initializing <Endpoint_Selection_State> and
- * obtaining appropriate <Invocation_Endpoint_Selector>.
- *
- * Used by Invocation classes to intialize its endpoint selection
- * strategy and state based on the effective policies.
- * Endpoint selection strategies are stateless objects - all the
- * state they need is contained by Invocation in
- * <Endpoint_Selection_State>.  Thus, rather than allocating an
- * endpoint selection strategy object for each Invocation, the
- * factory simply returns the appropriate one from the
- * set preallocated in the ORB_Core.  One endpoint selection
- * strategy object can be used by many invocations concurrently.
- */
-class TAO_Export TAO_Default_Endpoint_Selector_Factory
-  : public TAO_Endpoint_Selector_Factory
-{
-public:
-  /// Constructor.
-  TAO_Default_Endpoint_Selector_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector_Factory (void);
-
-  /// Get an Invocation's endpoint selection strategy and
-  /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  /// The possible endpoint selector strategies that can be
-  /// returned by this factory
-  TAO_Default_Endpoint_Selector *default_endpoint_selector_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Endpoint_Selector_Factory)
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H */
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
deleted file mode 100644
index cc426e44165..00000000000
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// $Id$
-
-#include "Default_Protocols_Hooks.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           Default_Protocols_Hooks,
-           "$Id$")
-
-
-TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
-                                                          CORBA::Policy *,
-                                                          CORBA::Short &
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::get_selector_hook (CORBA::Policy *,
-                                                CORBA::Boolean &,
-                                                CORBA::Short &)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *,
-                                                             CORBA::Short,
-                                                             CORBA::Short &,
-                                                             CORBA::Short &,
-                                                             int &)
-{
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                                   CORBA::Short &
-                                                                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-int
-TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-void
-TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
-                                                 TAO_Service_Context &,
-                                                 CORBA::Boolean
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-CORBA::Boolean
-TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId,
-                                                          TAO_Stub *
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return false;
-}
-
-CORBA::Boolean
-TAO_Default_Protocols_Hooks::set_server_network_priority (IOP::ProfileId,
-                                                          CORBA::Policy *
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return false;
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-CORBA::Long
-TAO_Default_Protocols_Hooks::get_dscp_codepoint (void)
-{
-  return 0;
-}
-
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Protocols_Hooks,
-                       ACE_TEXT ("Protocols_Hooks"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Protocols_Hooks),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Protocols_Hooks)
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
deleted file mode 100644
index ad0d440d7df..00000000000
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Default_Protocols_Hooks.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_DEFAULT_PROTOCOLS_HOOKS_H
-#define TAO_DEFAULT_PROTOCOLS_HOOKS_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Protocols_Hooks.h"
-
-class TAO_POA;
-
-class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
-{
-public:
-
-  /// destructor
-  virtual ~TAO_Default_Protocols_Hooks (void);
-
-  void init_hooks (TAO_ORB_Core *orb_core
-                   ACE_ENV_ARG_DECL);
-
-  CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                              TAO_Stub *stub
-                                              ACE_ENV_ARG_DECL);
-
-  CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                              CORBA::Policy *policy
-                                              ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  CORBA::Long get_dscp_codepoint (void);
-
-  void rt_service_context (TAO_Stub *stub,
-                           TAO_Service_Context &service_context,
-                           CORBA::Boolean restart
-                           ACE_ENV_ARG_DECL);
-
-  void add_rt_service_context_hook (TAO_Service_Context &service_context,
-                                    CORBA::Policy *model_policy,
-                                    CORBA::Short &client_priority
-                                    ACE_ENV_ARG_DECL);
-
-  void get_selector_hook (CORBA::Policy *model_policy,
-                          CORBA::Boolean
-                          &is_client_propagated,
-                          CORBA::Short &server_priority);
-
-  void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                       CORBA::Short p,
-                                       CORBA::Short &min_priority,
-                                       CORBA::Short &max_priority,
-                                       int &in_range);
-
-  int get_thread_CORBA_priority (CORBA::Short &
-                                 ACE_ENV_ARG_DECL);
-
-  int get_thread_native_priority (CORBA::Short &
-                                  ACE_ENV_ARG_DECL);
-
-  int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                            CORBA::Short &
-                                            ACE_ENV_ARG_DECL);
-
-  int set_thread_CORBA_priority (CORBA::Short
-                                 ACE_ENV_ARG_DECL);
-
-  int set_thread_native_priority (CORBA::Short
-                                  ACE_ENV_ARG_DECL);
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
deleted file mode 100644
index d6603362980..00000000000
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-#include "Default_Stub_Factory.h"
-#include "Stub.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (tao,
-           TAO_Default_Stub_Factory,
-           "$Id$")
-
-
-TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
-{
-}
-
-TAO_Stub *
-TAO_Default_Stub_Factory::create_stub (const char *repository_id,
-                                       const TAO_MProfile &profiles,
-                                       TAO_ORB_Core *orb_core
-                                       ACE_ENV_ARG_DECL)
-{
-  TAO_Stub *retval = 0;
-
-  ACE_NEW_THROW_EX (retval,
-                    TAO_Stub (repository_id, profiles, orb_core),
-                    CORBA::NO_MEMORY (0,
-                                      CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (retval);
-
-  return retval;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_Default_Stub_Factory,
-    ACE_TEXT ("Default_Stub_Factory"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_Default_Stub_Factory),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Stub_Factory)
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
deleted file mode 100644
index f5b82a070ee..00000000000
--- a/TAO/tao/Default_Stub_Factory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//=============================================================================
-/**
- *  @file    Default_Stub_Factory.h
- *
- *  $Id$
- *
- *   Defines the a factory interface for creating Stubs.
- *   This class creates the default stub, that is used in
- *   plain CORBA.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_STUB_FACTORY_H_
-#define TAO_DEFAULT_STUB_FACTORY_H_
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Stub_Factory.h"
-
-/**
- * @class TAO_Default_Stub_Factory
- *
- * This class is a factory whose product is the plain TAO_Stub used by
- * TAO. Its subclasses build Stub object that are specialization of
- * the TAO_Stub. As an example TAO_RT_Stub_Factory creates
- * RT_TAO_Stub. This factory, or one of its subclasses is dynamically
- * plugged into the ORB_Core, and is used by the ORB_Core to create
- * Stub Objects.
- */
-class TAO_Export TAO_Default_Stub_Factory
-  : public TAO_Stub_Factory
-{
-public:
-  // -- Ctor/Dtor --
-  virtual ~TAO_Default_Stub_Factory (void);
-
-  /// Creates a Stub Object.
-  virtual TAO_Stub *create_stub (const char *repository_id,
-                                 const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL);
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DEFAULT_STUB_FACTORY_H_ */
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
deleted file mode 100644
index 05268b9920e..00000000000
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-#include "Default_Thread_Lane_Resources_Manager.h"
-#include "Thread_Lane_Resources.h"
-#include "Exception.h"
-#include "Environment.h"
-#include "ORB_Core.h"
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (tao,
-           Default_Thread_Lane_Resources_Manager,
-           "$Id$")
-
-TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
-  : TAO_Thread_Lane_Resources_Manager (orb_core),
-    lane_resources_ (0)
-{
-  // Create the default resources.
-  ACE_NEW (this->lane_resources_,
-           TAO_Thread_Lane_Resources (orb_core));
-}
-
-TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void)
-{
-  // Delete the default resources.
-  delete this->lane_resources_;
-}
-
-int
-TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_ORB_Parameters *params =
-    this->orb_core_->orb_params ();
-
-  TAO_EndpointSet endpoint_set;
-
-  params->get_endpoint_set (TAO_DEFAULT_LANE,
-                            endpoint_set);
-
-  bool ignore_address = false;
-
-  int result =
-    this->lane_resources_->open_acceptor_registry (endpoint_set,
-                                                   ignore_address
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-void
-TAO_Default_Thread_Lane_Resources_Manager::finalize (void)
-{
-  // Finalize default resources.
-  this->lane_resources_->finalize ();
-}
-
-TAO_Thread_Lane_Resources &
-TAO_Default_Thread_Lane_Resources_Manager::lane_resources (void)
-{
-  return *this->lane_resources_;
-}
-
-TAO_Thread_Lane_Resources &
-TAO_Default_Thread_Lane_Resources_Manager::default_lane_resources (void)
-{
-  return this->lane_resources ();
-}
-
-void
-TAO_Default_Thread_Lane_Resources_Manager::shutdown_reactor (void)
-{
-  this->lane_resources_->shutdown_reactor ();
-}
-
-void
-TAO_Default_Thread_Lane_Resources_Manager::cleanup_rw_transports (void)
-{
-  this->lane_resources_->cleanup_rw_transports ();
-}
-
-int
-TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofile)
-{
-  return this->lane_resources_->is_collocated (mprofile);
-}
-
-TAO_Thread_Lane_Resources_Manager *
-TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
-{
-  TAO_Thread_Lane_Resources_Manager *manager = 0;
-
-  /// Create the Default Thread Lane Resources Manager.
-  ACE_NEW_RETURN (manager,
-                  TAO_Default_Thread_Lane_Resources_Manager (core),
-                  0);
-
-  return manager;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory,
-                       ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Thread_Lane_Resources_Manager_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
deleted file mode 100644
index 359158ff0cb..00000000000
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//=============================================================================
-/**
- *  @file    Default_Thread_Lane_Resources_Manager.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H
-#define TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Thread_Lane_Resources_Manager.h"
-
-/**
- * @class TAO_Default_Thread_Lane_Resources_Manager
- *
- * @brief Simple manager for thread lane resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Default_Thread_Lane_Resources_Manager :
-  public TAO_Thread_Lane_Resources_Manager
-{
-public:
-
-  /// Constructor.
-  TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_Default_Thread_Lane_Resources_Manager (void);
-
-  /// Finalize resources.
-  void finalize (void);
-
-  /// Open default resources.
-  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Shutdown reactor.
-  void shutdown_reactor (void);
-
-  /// Shutdown reactor.
-  virtual void cleanup_rw_transports (void);
-
-  /// Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// @name Accessors
-  // @{
-
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
-
-  // @}
-
-protected:
-
-  /// Default lane resources.
-  TAO_Thread_Lane_Resources *lane_resources_;
-};
-
-/**
- * @class TAO_Default_Thread_Lane_Resources_Manager_Factory
- *
- * @brief This class is a factory for managers of thread resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory
-  : public TAO_Thread_Lane_Resources_Manager_Factory
-{
-public:
-
-  /// Factory method.
-  TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
-
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
deleted file mode 100644
index 6669d7e1877..00000000000
--- a/TAO/tao/Domain.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-project : taolib, core, ifr_client, portableserver {
-  sharedname   = TAO_Domain
-  dynamicflags = TAO_DOMAIN_BUILD_DLL
-
-  Source_Files {
-    Domain
-  }
-
-  Header_Files {
-    Domain
-  }
-
-  Inline_Files {
-    Domain
-  }
-
-  Template_Files {
-    Domain
-  }
-
-  Resource_Files {
-    Domain
-  }
-
-  PIDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Domain/TAO_Domain.pc.in
-  }
-}
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
deleted file mode 100644
index cb19c83a9aa..00000000000
--- a/TAO/tao/Domain.pidl
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @file Domain.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::Domain related
- * classes.
- *
- *   This file was used to generate the code in DomainC.{h,inl,cpp}.
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl
- *        -o orig -Gp -Gd -Ge 1 -GA
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Domain.pidl
- *
- *   2. Then patch the generated code.  This patch (a) eliminates
- *   cycles in the include dependencies.
- *
- *   Apply patches using the following commands:
- *
- *   cp orig/DomainC.{h,i,cpp} .
- *   cp orig/Domain{S,S_T}.{h,i,cpp} Domain
- *   patch < diffs/Domain.diff
- *
- *   3. You'll have to move the Domain skeleton files from TAO/tao
- *   to the TAO_Domain library by hand.
- *
- *   Note: The diffs were generated with these commands:
- *
- *   for i in DomainC.{h,cpp}; do
- *     diff -wBbu orig/$i $i;
- *   done > diffs/Domain.diff
- */
-
-#ifndef TAO_CORBA_DOMAIN_PIDL
-#define TAO_CORBA_DOMAIN_PIDL
-
-#include <Policy.pidl>
-#include <InterfaceDef.pidl>
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface DomainManager
-  {
-    Policy get_domain_policy (
-        in PolicyType policy_type
-      );
-  };
-
-  const PolicyType SecConstruction = 11;
-
-  interface ConstructionPolicy : Policy
-  {
-    void make_domain_manager (
-        in InterfaceDef object_type,
-        in boolean constr_policy
-      );
-  };
-
-  typedef sequence <DomainManager> DomainManagerList;
-};
-
-#endif /* TAO_CORBA_DOMAIN_IDL */
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
deleted file mode 100644
index 9135cbf5c47..00000000000
--- a/TAO/tao/Domain/DomainS.cpp
+++ /dev/null
@@ -1,1684 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
-#define _TAO_IDL_ORIG_DOMAINS_CPP_
-
-
-#include "DomainS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.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/TypeCode_SArg_Traits.h"
-#include "tao/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "DomainS.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_SS_
-  
-  template<>
-  class  SArg_Traits<CORBA::Policy>
-    : public
-        Object_SArg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
-  
-  template<>
-  class  SArg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_SArg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
-#define _CORBA_POLICY__ARG_TRAITS_SS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Policy>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-  
-  template<>
-  class  Arg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1455
-
-class TAO_CORBA_DomainManager_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: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
-     18, 18, 18,  5, 18,  0, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18,  0, 18, 18, 18, 18,  0, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18,
-#else
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
-     18,  5, 18,  0, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
-     18,  0, 18, 18, 18, 18, 18, 18,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 5,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 17,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 10
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_is_a", &POA_CORBA::DomainManager::_is_a_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::DomainManager::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_CORBA::DomainManager::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_CORBA::DomainManager::_interface_skel, 0},
-      {"",0,0},
-      {"get_domain_policy", &POA_CORBA::DomainManager::get_domain_policy_skel, &POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy},
-    };
-
-  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];
-        }
-    }
-  return 0;
-}
-
-static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker *
-POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker (void)
-{
-  static POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker
-  strategized_proxy_broker;
-  
-  return &strategized_proxy_broker;
-}
-
-POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::_TAO_DomainManager_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_CORBA::_TAO_DomainManager_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;
-}
-
-void
-POA_CORBA::_TAO_DomainManager_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
-
-TAO::Collocation_Proxy_Broker *
-CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_Strategized_Proxy_Broker ();
-}
-
-int
-CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (size_t)
-{
-  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
-  
-  return 0;
-}
-
-static int
-CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
-    dynamic_cast<POA_CORBA::DomainManager_ptr>
-      (servant)
-    ->get_domain_policy (
-          ((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
-          ACE_ENV_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
-
-POA_CORBA::DomainManager::DomainManager (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_CORBA_DomainManager_optable;
-}
-
-POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_CORBA::DomainManager::~DomainManager (void)
-{
-}
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class get_domain_policy_DomainManager
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline get_domain_policy_DomainManager (
-      POA_CORBA::DomainManager * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_->get_domain_policy (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::DomainManager * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::DomainManager::get_domain_policy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_policy_type
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_CORBA::DomainManager * const impl =
-    static_cast<POA_CORBA::DomainManager *> (servant);
-
-  get_domain_policy_DomainManager command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _is_a_DomainManager_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_DomainManager_Upcall_Command (
-      POA_CORBA::DomainManager * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::DomainManager * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::DomainManager::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_CORBA::DomainManager * const impl =
-    static_cast<POA_CORBA::DomainManager *> (servant);
-  
-  _is_a_DomainManager_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _non_existent_DomainManager_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_DomainManager_Upcall_Command (
-      POA_CORBA::DomainManager * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::DomainManager * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::DomainManager::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::DomainManager * const impl =
-    static_cast<POA_CORBA::DomainManager *> (servant);
-  
-  _non_existent_DomainManager_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_CORBA::DomainManager::_interface_skel (
-    TAO_ServerRequest & server_request, 
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
-  
-  POA_CORBA::DomainManager * const impl =
-    static_cast<POA_CORBA::DomainManager *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_component_DomainManager_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_DomainManager_Upcall_Command (
-      POA_CORBA::DomainManager * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::DomainManager * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::DomainManager::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::DomainManager * const impl =
-    static_cast<POA_CORBA::DomainManager *> (servant);
-  
-  _get_component_DomainManager_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-CORBA::Boolean POA_CORBA::DomainManager::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/DomainManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_CORBA::DomainManager::_dispatch (
-    TAO_ServerRequest & req,
-    void * 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:891
-
-CORBA::DomainManager *
-POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
-  
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
-  
-  typedef ::CORBA::DomainManager STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1455
-
-class TAO_CORBA_ConstructionPolicy_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: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22,  0, 22,
-     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
-     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,
-#else
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
-      0,  5, 22, 22, 22, 22, 22, 22, 22,  0,
-     22, 22, 22, 22,  0, 22,  0, 22, 22, 22,
-     22,  0, 22, 22, 22, 22, 22, 22,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 8,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 21,
-      HASH_VALUE_RANGE = 18,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 12
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"copy", &POA_CORBA::ConstructionPolicy::copy_skel, &POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy},
-      {"_is_a", &POA_CORBA::ConstructionPolicy::_is_a_skel, 0},
-      {"",0,0},
-      {"destroy", &POA_CORBA::ConstructionPolicy::destroy_skel, &POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy},
-      {"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::ConstructionPolicy::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_CORBA::ConstructionPolicy::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_CORBA::ConstructionPolicy::_interface_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},
-      {"make_domain_manager", &POA_CORBA::ConstructionPolicy::make_domain_manager_skel, &POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager},
-      {"",0,0},
-      {"_get_policy_type", &POA_CORBA::ConstructionPolicy::_get_policy_type_skel, &POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type},
-    };
-
-  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];
-        }
-    }
-  return 0;
-}
-
-static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker *
-POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
-{
-  static POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker
-  strategized_proxy_broker;
-  
-  return &strategized_proxy_broker;
-}
-
-POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_CORBA::_TAO_ConstructionPolicy_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;
-}
-
-void
-POA_CORBA::_TAO_ConstructionPolicy_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
-
-TAO::Collocation_Proxy_Broker *
-CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_ConstructionPolicy_Strategized_Proxy_Broker ();
-}
-
-int
-CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (size_t)
-{
-  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
-  
-  return 0;
-}
-
-static int
-CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_TAO_ConstructionPolicy_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_CORBA::ConstructionPolicy_ptr>
-    (servant)
-  ->make_domain_manager (
-        ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
-
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
-}
-
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_CORBA, Policy) (rhs)
-{
-}
-
-POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{
-}
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class make_domain_manager_ConstructionPolicy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline make_domain_manager_ConstructionPolicy (
-      POA_CORBA::ConstructionPolicy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
-        
-      this->servant_->make_domain_manager (
-        arg_1
-        , arg_2
-        ACE_ENV_ARG_PARAMETER);
-      
-    }
-  
-  private:
-    POA_CORBA::ConstructionPolicy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type;
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_object_type,
-      &_tao_constr_policy
-    };
-  
-  static size_t const nargs = 3;
-  
-  POA_CORBA::ConstructionPolicy * const impl =
-    static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-
-  make_domain_manager_ConstructionPolicy command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _is_a_ConstructionPolicy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_ConstructionPolicy_Upcall_Command (
-      POA_CORBA::ConstructionPolicy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::ConstructionPolicy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_CORBA::ConstructionPolicy * const impl =
-    static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
-  _is_a_ConstructionPolicy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _non_existent_ConstructionPolicy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_ConstructionPolicy_Upcall_Command (
-      POA_CORBA::ConstructionPolicy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::ConstructionPolicy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::ConstructionPolicy * const impl =
-    static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
-  _non_existent_ConstructionPolicy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_CORBA::ConstructionPolicy::_interface_skel (
-    TAO_ServerRequest & server_request, 
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
-  
-  POA_CORBA::ConstructionPolicy * const impl =
-    static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_component_ConstructionPolicy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_ConstructionPolicy_Upcall_Command (
-      POA_CORBA::ConstructionPolicy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::ConstructionPolicy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::ConstructionPolicy::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::ConstructionPolicy * const impl =
-    static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
-  _get_component_ConstructionPolicy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_CORBA::ConstructionPolicy::_dispatch (
-    TAO_ServerRequest & req,
-    void * 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:891
-
-CORBA::ConstructionPolicy *
-POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
-  
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
-  
-  typedef ::CORBA::ConstructionPolicy STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
deleted file mode 100644
index 8db5b0aaca4..00000000000
--- a/TAO/tao/Domain/DomainS.h
+++ /dev/null
@@ -1,500 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_ORIG_DOMAINS_H_
-#define _TAO_IDL_ORIG_DOMAINS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/DomainC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/PolicyS.h"
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/IFR_Client/IFR_ExtendedC.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-#include "domain_export.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Domain_Export
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-  
-  class DomainManager;
-  typedef DomainManager *DomainManager_ptr;
-  
-  class _TAO_DomainManager_Direct_Proxy_Impl;
-  class _TAO_DomainManager_Strategized_Proxy_Broker;
-  
-  class TAO_Domain_Export DomainManager
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    DomainManager (void);
-  
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::DomainManager _stub_type;
-    typedef ::CORBA::DomainManager_ptr _stub_ptr_type;
-    typedef ::CORBA::DomainManager_var _stub_var_type;
-    
-    DomainManager (const DomainManager& rhs);
-    virtual ~DomainManager (void);
-    
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    ::CORBA::DomainManager *_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::Policy_ptr get_domain_policy (
-        ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void get_domain_policy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public: 
-    _TAO_DomainManager_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_DomainManager_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_DomainManager_Strategized_Proxy_Broker *
-    the_TAO_DomainManager_Strategized_Proxy_Broker (void);
-  };
-  
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_DomainManager_Direct_Proxy_Impl (void);
-    
-    virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    get_domain_policy (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-  
-  class ConstructionPolicy;
-  typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
-  class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
-  class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
-  
-  class TAO_Domain_Export ConstructionPolicy
-    : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ConstructionPolicy (void);
-  
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::ConstructionPolicy _stub_type;
-    typedef ::CORBA::ConstructionPolicy_ptr _stub_ptr_type;
-    typedef ::CORBA::ConstructionPolicy_var _stub_var_type;
-    
-    ConstructionPolicy (const ConstructionPolicy& rhs);
-    virtual ~ConstructionPolicy (void);
-    
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    ::CORBA::ConstructionPolicy *_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 void make_domain_manager (
-        ::CORBA::InterfaceDef_ptr object_type,
-        ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void make_domain_manager_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void
-    _get_policy_type_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
-    static void
-    copy_skel (
-        TAO_ServerRequest & server_request, 
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
-    static void
-    destroy_skel (
-        TAO_ServerRequest & server_request, 
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public: 
-    _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_ConstructionPolicy_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_ConstructionPolicy_Strategized_Proxy_Broker *
-    the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-  };
-  
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
-    : public virtual ::POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
-    
-    virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    make_domain_manager (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));static void
-    _get_policy_type (
-        TAO_Abstract_ServantBase *servant, 
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:2050
-    
-    static void
-    copy (
-        TAO_Abstract_ServantBase *servant, 
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:2050
-    
-    static void
-    destroy (
-        TAO_Abstract_ServantBase *servant, 
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
-
-} // module CORBA
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:995
-
-#include "DomainS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "DomainS.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
deleted file mode 100644
index 7da816922ac..00000000000
--- a/TAO/tao/Domain/DomainS.inl
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-ACE_INLINE
-void
-POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
-    TAO_ServerRequest & server_request,
-    void * servant_upcall,
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  POA_CORBA::Policy::_get_policy_type_skel (
-      server_request,
-      servant_upcall,
-      impl
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1859
-
-ACE_INLINE
-void
-POA_CORBA::ConstructionPolicy::copy_skel (
-    TAO_ServerRequest & server_request,
-    void * servant_upcall,
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  POA_CORBA::Policy::copy_skel (
-      server_request,
-      servant_upcall,
-      impl
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1859
-
-ACE_INLINE
-void
-POA_CORBA::ConstructionPolicy::destroy_skel (
-    TAO_ServerRequest & server_request,
-    void * servant_upcall,
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  POA_CORBA::Policy::destroy_skel (
-      server_request,
-      servant_upcall,
-      impl
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1244
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1244
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1244
-
-ACE_INLINE void
-POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int num_args
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
-      servant,
-      args,
-      num_args
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp
deleted file mode 100644
index 951f03175c1..00000000000
--- a/TAO/tao/Domain/DomainS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:677
-
-#ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
-#define _TAO_IDL_ORIG_DOMAINS_T_CPP_
-
-#include "DomainS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DomainS_T.inl"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
deleted file mode 100644
index 9d854d72853..00000000000
--- a/TAO/tao/Domain/DomainS_T.h
+++ /dev/null
@@ -1,223 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:536
-
-#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
-#define _TAO_IDL_ORIG_DOMAINS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/tie_sh.cpp:87
-  
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class  DomainManager_tie : public DomainManager
-  {
-  public:
-    DomainManager_tie (T &t);
-    // the T& ctor
-    DomainManager_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    DomainManager_tie (T *tp, CORBA::Boolean release = 1);
-    // ctor taking pointer and an ownership flag
-    DomainManager_tie (
-        T *tp,
-        PortableServer::POA_ptr poa,
-        CORBA::Boolean release = 1
-      );
-    // ctor with T*, ownership flag and a POA
-    ~DomainManager_tie (void);
-    // dtor
-    
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release = 1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-    
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    ::CORBA::Policy_ptr get_domain_policy (
-        ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-  private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-    
-    // copy and assignment are not allowed
-    DomainManager_tie (const DomainManager_tie &);
-    void operator= (const DomainManager_tie &);
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/tie_sh.cpp:87
-  
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class  ConstructionPolicy_tie : public ConstructionPolicy
-  {
-  public:
-    ConstructionPolicy_tie (T &t);
-    // the T& ctor
-    ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ConstructionPolicy_tie (T *tp, CORBA::Boolean release = 1);
-    // ctor taking pointer and an ownership flag
-    ConstructionPolicy_tie (
-        T *tp,
-        PortableServer::POA_ptr poa,
-        CORBA::Boolean release = 1
-      );
-    // ctor with T*, ownership flag and a POA
-    ~ConstructionPolicy_tie (void);
-    // dtor
-    
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release = 1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-    
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    void make_domain_manager (
-        ::CORBA::InterfaceDef_ptr object_type,
-        ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-  private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-    
-    // copy and assignment are not allowed
-    ConstructionPolicy_tie (const ConstructionPolicy_tie &);
-    void operator= (const ConstructionPolicy_tie &);
-  };
-} // module CORBA
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1096
-
-#if defined (__ACE_INLINE__)
-#include "DomainS_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DomainS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DomainS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
deleted file mode 100644
index 83b1baa46c4..00000000000
--- a/TAO/tao/Domain/DomainS_T.inl
+++ /dev/null
@@ -1,300 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::DomainManager_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DomainManager_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
-    ::CORBA::PolicyType policy_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->get_domain_policy (
-    policy_type
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->policy_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->copy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
-    ::CORBA::InterfaceDef_ptr object_type,
-    ::CORBA::Boolean constr_policy
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->make_domain_manager (
-    object_type,
-    constr_policy
-    ACE_ENV_ARG_PARAMETER
-  );
-}
-
diff --git a/TAO/tao/Domain/TAO_Domain.pc.in b/TAO/tao/Domain/TAO_Domain.pc.in
deleted file mode 100644
index fbb92e168fe..00000000000
--- a/TAO/tao/Domain/TAO_Domain.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Domain
-Description: TAO Domain Library
-Requires: TAO_IFR_Client, TAO_PortableServer
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Domain
-Cflags: -I${includedir}
diff --git a/TAO/tao/Domain/TAO_Domain.rc b/TAO/tao/Domain/TAO_Domain.rc
deleted file mode 100644
index 38d9e0edc5b..00000000000
--- a/TAO/tao/Domain/TAO_Domain.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "Domain\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_DomainDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_Domain.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Domain/diffs/Domain.diff b/TAO/tao/Domain/diffs/Domain.diff
deleted file mode 100644
index 6ab958e7571..00000000000
--- a/TAO/tao/Domain/diffs/Domain.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- orig/DomainS.h	2005-02-22 13:41:14.148656000 +0100
-+++ DomainS.h	2005-02-22 13:42:55.244024000 +0100
-@@ -33,17 +33,17 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "DomainC.h"
--#include "tao/PolicyS.h"
--#include "tao/InterfaceDefS.h"
-+#include "tao/DomainC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
-+#include "tao/PortableServer/PolicyS.h"
- #include "tao/Collocation_Proxy_Broker.h"
- #include "tao/PortableServer/PortableServer.h"
- #include "tao/PortableServer/Servant_Base.h"
-+#include "tao/IFR_Client/IFR_ExtendedC.h"
- 
- #if defined(_MSC_VER)
- #pragma warning(push)
diff --git a/TAO/tao/Domain/domain_export.h b/TAO/tao/Domain/domain_export.h
deleted file mode 100644
index 5969e95bd37..00000000000
--- a/TAO/tao/Domain/domain_export.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_DOMAIN_EXPORT_H
-#define TAO_DOMAIN_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_DOMAIN_HAS_DLL)
-#    define TAO_DOMAIN_HAS_DLL 0
-#  endif /* ! TAO_DOMAIN_HAS_DLL */
-#else
-#  if !defined (TAO_DOMAIN_HAS_DLL)
-#    define TAO_DOMAIN_HAS_DLL 1
-#  endif /* ! TAO_DOMAIN_HAS_DLL */
-#endif
-
-#if defined (TAO_DOMAIN_HAS_DLL) && (TAO_DOMAIN_HAS_DLL == 1)
-#  if defined (TAO_DOMAIN_BUILD_DLL)
-#    define TAO_Domain_Export ACE_Proper_Export_Flag
-#    define TAO_DOMAIN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DOMAIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_DOMAIN_BUILD_DLL */
-#    define TAO_Domain_Export ACE_Proper_Import_Flag
-#    define TAO_DOMAIN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DOMAIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_DOMAIN_BUILD_DLL */
-#else /* TAO_DOMAIN_HAS_DLL == 1 */
-#  define TAO_Domain_Export
-#  define TAO_DOMAIN_SINGLETON_DECLARATION(T)
-#  define TAO_DOMAIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_DOMAIN_HAS_DLL == 1 */
-
-#endif /* TAO_DOMAIN_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
deleted file mode 100644
index 2b12440b086..00000000000
--- a/TAO/tao/DomainA.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DomainC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManager (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/DomainManager:1.0",
-    "DomainManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManager =
-    &_tao_tc_CORBA_DomainManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstructionPolicy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
-    "ConstructionPolicy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy =
-    &_tao_tc_CORBA_ConstructionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-#define _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DomainManagerList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_DomainManager,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DomainManagerList_0 =
-      &CORBA_DomainManagerList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DomainManagerList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DomainManagerList:1.0",
-    "DomainManagerList",
-    &TAO::TypeCode::tc_CORBA_DomainManagerList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManagerList =
-    &_tao_tc_CORBA_DomainManagerList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::DomainManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr _tao_elem
-  )
-{
-  CORBA::DomainManager_ptr _tao_objptr =
-    CORBA::DomainManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
-      _tao_any,
-      CORBA::DomainManager::_tao_any_destructor,
-      CORBA::_tc_DomainManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
-        _tao_any,
-        CORBA::DomainManager::_tao_any_destructor,
-        CORBA::_tc_DomainManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstructionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr _tao_elem
-  )
-{
-  CORBA::ConstructionPolicy_ptr _tao_objptr =
-    CORBA::ConstructionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert (
-      _tao_any,
-      CORBA::ConstructionPolicy::_tao_any_destructor,
-      CORBA::_tc_ConstructionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract (
-        _tao_any,
-        CORBA::ConstructionPolicy::_tao_any_destructor,
-        CORBA::_tc_ConstructionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DomainManagerList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
-        _tao_any,
-        CORBA::DomainManagerList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
deleted file mode 100644
index 01811b5e642..00000000000
--- a/TAO/tao/DomainC.cpp
+++ /dev/null
@@ -1,747 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DomainC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "ace/OS_NS_string.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "DomainC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// TAO specific stuff.
-namespace CORBA
-{
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-  typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var;
-  typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out;
-}
-
-namespace TAO
-{
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-  template<>
-  void
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
-  {
-    TAO_IFR_Client_Adapter *adapter =
-      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-          TAO_ORB_Core::ifr_client_adapter_name ()
-        );
-
-    adapter->interfacedef_any_insert (p.argument, this->x_);
-    p.mode = CORBA::PARAM_IN;
-  }
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  template<>
-  CORBA::Boolean
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
-  {
-    TAO_IFR_Client_Adapter *adapter =
-      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-          TAO_ORB_Core::ifr_client_adapter_name ()
-        );
-
-    return adapter->interfacedef_cdr_insert (cdr, this->x_);
-  }
-}
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
-#define _CORBA_POLICY__ARG_TRAITS_CS_
-
-  template<>
-  class  Arg_Traits<CORBA::Policy>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-
-  template<>
-  class  Arg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::DomainManager.
-
-CORBA::DomainManager_ptr
-TAO::Objref_Traits<CORBA::DomainManager>::duplicate (
-    CORBA::DomainManager_ptr p
-  )
-{
-  return CORBA::DomainManager::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::DomainManager>::release (
-    CORBA::DomainManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::DomainManager_ptr
-TAO::Objref_Traits<CORBA::DomainManager>::nil (void)
-{
-  return CORBA::DomainManager::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::DomainManager>::marshal (
-    CORBA::DomainManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
-    ::CORBA::PolicyType policy_type
-    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_DomainManager_Proxy_Broker_ == 0)
-    {
-      CORBA_DomainManager_setup_collocation ();
-    }
-
-  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_policy_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "get_domain_policy",
-      17,
-      this->the_TAO_DomainManager_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::DomainManager::DomainManager (void)
- : the_TAO_DomainManager_Proxy_Broker_ (0)
-{
-  this->CORBA_DomainManager_setup_collocation ();
-}
-
-void
-CORBA::DomainManager::CORBA_DomainManager_setup_collocation ()
-{
-  if (::CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_DomainManager_Proxy_Broker_ =
-        ::CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-CORBA::DomainManager::~DomainManager (void)
-{}
-
-void 
-CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DomainManager *_tao_tmp_pointer =
-    static_cast<DomainManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::DomainManager_ptr
-CORBA::DomainManager::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<DomainManager>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/DomainManager:1.0",
-        CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::DomainManager_ptr
-CORBA::DomainManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<DomainManager>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/DomainManager:1.0",
-        CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::DomainManager_ptr
-CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::DomainManager::_tao_release (DomainManager_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::DomainManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/DomainManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-CORBA::Boolean
-CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ConstructionPolicy.
-
-CORBA::ConstructionPolicy_ptr
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate (
-    CORBA::ConstructionPolicy_ptr p
-  )
-{
-  return CORBA::ConstructionPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::release (
-    CORBA::ConstructionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ConstructionPolicy_ptr
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void)
-{
-  return CORBA::ConstructionPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
-    CORBA::ConstructionPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-void CORBA::ConstructionPolicy::make_domain_manager (
-    ::CORBA::InterfaceDef_ptr object_type,
-    ::CORBA::Boolean constr_policy
-    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_ConstructionPolicy_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstructionPolicy_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_object_type,
-      &_tao_constr_policy
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "make_domain_manager",
-      19,
-      this->the_TAO_ConstructionPolicy_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ConstructionPolicy::ConstructionPolicy (void)
- : the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstructionPolicy_setup_collocation ();
-}
-
-void
-CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation ()
-{
-  if (::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
-        ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Policy_setup_collocation ();
-}
-
-CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{}
-
-void 
-CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ConstructionPolicy *_tao_tmp_pointer =
-    static_cast<ConstructionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConstructionPolicy>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
-        CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConstructionPolicy>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
-        CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ConstructionPolicy::_tao_release (ConstructionPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ConstructionPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-CORBA::Boolean
-CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
-#define _CORBA_DOMAINMANAGERLIST_CS_
-
-CORBA::DomainManagerList::DomainManagerList (void)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
-      >
-    (max)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::DomainManager_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::DomainManagerList::DomainManagerList (
-    const DomainManagerList &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::DomainManager,
-        CORBA::DomainManager_var
-      >
-    (seq)
-{}
-
-CORBA::DomainManagerList::~DomainManagerList (void)
-{}
-
-void CORBA::DomainManagerList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  DomainManagerList * _tao_tmp_pointer =
-    static_cast<DomainManagerList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::DomainManager_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::DomainManager_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ConstructionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ConstructionPolicy_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_DomainManagerList_CPP_
-#define _TAO_CDR_OP_CORBA_DomainManagerList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::DomainManagerList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::DomainManager>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::DomainManagerList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
deleted file mode 100644
index f9ec80e94ca..00000000000
--- a/TAO/tao/DomainC.h
+++ /dev/null
@@ -1,534 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DOMAINC_H_
-#define _TAO_IDL_ORIG_DOMAINC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_)
-#define _CORBA_DOMAINMANAGER__VAR_OUT_CH_
-  
-  class DomainManager;
-  typedef DomainManager *DomainManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DomainManager
-      >
-    DomainManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DomainManager
-      >
-    DomainManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_DOMAINMANAGER_CH_)
-#define _CORBA_DOMAINMANAGER_CH_
-  
-  class TAO_Export DomainManager
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<DomainManager>;
-    typedef DomainManager_ptr _ptr_type;
-    typedef DomainManager_var _var_type;
-    
-    // The static operations.
-    static DomainManager_ptr _duplicate (DomainManager_ptr obj);
-    
-    static void _tao_release (DomainManager_ptr obj);
-    
-    static DomainManager_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DomainManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DomainManager_ptr _nil (void)
-    {
-      return static_cast<DomainManager_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr get_domain_policy (
-        ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    DomainManager (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_DomainManager_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    DomainManager (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    DomainManager (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~DomainManager (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DomainManager (const DomainManager &);
-    
-    void operator= (const DomainManager &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManager;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType SecConstruction = 11U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_
-  
-  class ConstructionPolicy;
-  typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ConstructionPolicy
-      >
-    ConstructionPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ConstructionPolicy
-      >
-    ConstructionPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY_CH_
-  
-  class TAO_Export ConstructionPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    friend class TAO::Narrow_Utils<ConstructionPolicy>;
-    typedef ConstructionPolicy_ptr _ptr_type;
-    typedef ConstructionPolicy_var _var_type;
-    
-    // The static operations.
-    static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj);
-    
-    static void _tao_release (ConstructionPolicy_ptr obj);
-    
-    static ConstructionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConstructionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConstructionPolicy_ptr _nil (void)
-    {
-      return static_cast<ConstructionPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void make_domain_manager (
-        ::CORBA::InterfaceDef_ptr object_type,
-        ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ConstructionPolicy (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ConstructionPolicy_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ConstructionPolicy (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ConstructionPolicy (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ConstructionPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ConstructionPolicy (const ConstructionPolicy &);
-    
-    void operator= (const ConstructionPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
-#define _CORBA_DOMAINMANAGERLIST_CH_
-  
-  class DomainManagerList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        DomainManagerList,
-        TAO_Object_Manager<
-            DomainManager,
-            DomainManager_var
-          >
-      >
-    DomainManagerList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        DomainManagerList,
-        DomainManagerList_var,
-        TAO_Object_Manager<
-            DomainManager,
-            DomainManager_var
-          >
-      >
-    DomainManagerList_out;
-  
-  class TAO_Export DomainManagerList
-    : public
-        TAO_Unbounded_Object_Sequence<
-            DomainManager,
-            DomainManager_var
-          >
-  {
-  public:
-    DomainManagerList (void);
-    DomainManagerList (CORBA::ULong max);
-    DomainManagerList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        DomainManager_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    DomainManagerList (const DomainManagerList &);
-    ~DomainManagerList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef DomainManagerList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManagerList;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_DOMAINMANAGER__TRAITS_CH_)
-#define _CORBA_DOMAINMANAGER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::DomainManager>
-  {
-    static ::CORBA::DomainManager_ptr duplicate (
-        ::CORBA::DomainManager_ptr
-      );
-    static void release (
-        ::CORBA::DomainManager_ptr
-      );
-    static ::CORBA::DomainManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::DomainManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::ConstructionPolicy>
-  {
-    static ::CORBA::ConstructionPolicy_ptr duplicate (
-        ::CORBA::ConstructionPolicy_ptr
-      );
-    static void release (
-        ::CORBA::ConstructionPolicy_ptr
-      );
-    static ::CORBA::ConstructionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ConstructionPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DomainManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstructionPolicy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
-#define _TAO_CDR_OP_CORBA_DomainManagerList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::DomainManagerList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::DomainManagerList &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "DomainC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/DomainC.inl b/TAO/tao/DomainC.inl
deleted file mode 100644
index 59264e65404..00000000000
--- a/TAO/tao/DomainC.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_DOMAINMANAGER___CI_)
-#define _CORBA_DOMAINMANAGER___CI_
-
-ACE_INLINE
-CORBA::DomainManager::DomainManager (
-    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_DomainManager_Proxy_Broker_ (0)
-{
-  this->CORBA_DomainManager_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::DomainManager::DomainManager (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_DomainManager_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___CI_
-
-ACE_INLINE
-CORBA::ConstructionPolicy::ConstructionPolicy (
-    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_ConstructionPolicy_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstructionPolicy_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ConstructionPolicy::ConstructionPolicy (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConstructionPolicy_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
deleted file mode 100644
index 32957bd6a04..00000000000
--- a/TAO/tao/DoubleSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in DoubleSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          DoubleSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_DOUBLE_SEQ_IDL
-#define TAO_CORBA_DOUBLE_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<double> DoubleSeq;
-};
-
-#endif  /* TAO_CORBA_DOUBLE_SEQ_IDL */
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
deleted file mode 100644
index 0d5da3dcd11..00000000000
--- a/TAO/tao/DoubleSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_double,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DoubleSeq_0 =
-      &CORBA_DoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DoubleSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DoubleSeq:1.0",
-    "DoubleSeq",
-    &TAO::TypeCode::tc_CORBA_DoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DoubleSeq =
-    &_tao_tc_CORBA_DoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::extract (
-        _tao_any,
-        CORBA::DoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp
deleted file mode 100644
index 545317d37d0..00000000000
--- a/TAO/tao/DoubleSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DoubleSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_DOUBLESEQ_CS_)
-#define _CORBA_DOUBLESEQ_CS_
-
-CORBA::DoubleSeq::DoubleSeq (void)
-{}
-
-CORBA::DoubleSeq::DoubleSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Double
-      >
-    (max)
-{}
-
-CORBA::DoubleSeq::DoubleSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Double * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Double
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::DoubleSeq::DoubleSeq (
-    const DoubleSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Double
-      >
-    (seq)
-{}
-
-CORBA::DoubleSeq::~DoubleSeq (void)
-{}
-
-void CORBA::DoubleSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  DoubleSeq * _tao_tmp_pointer =
-    static_cast<DoubleSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_DoubleSeq_CPP_
-#define _TAO_CDR_OP_CORBA_DoubleSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::DoubleSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::DoubleSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */
diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h
deleted file mode 100644
index f80935d8347..00000000000
--- a/TAO/tao/DoubleSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DOUBLESEQC_H_
-#define _TAO_IDL_ORIG_DOUBLESEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_DOUBLESEQ_CH_)
-#define _CORBA_DOUBLESEQ_CH_
-  
-  class DoubleSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        DoubleSeq,
-        CORBA::Double
-      >
-    DoubleSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        DoubleSeq,
-        DoubleSeq_var,
-        CORBA::Double
-      >
-    DoubleSeq_out;
-  
-  class TAO_Export DoubleSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Double
-          >
-  {
-  public:
-    DoubleSeq (void);
-    DoubleSeq (CORBA::ULong max);
-    DoubleSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Double* buffer, 
-        CORBA::Boolean release = 0
-      );
-    DoubleSeq (const DoubleSeq &);
-    ~DoubleSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef DoubleSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DoubleSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::DoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DoubleSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_DoubleSeq_H_
-#define _TAO_CDR_OP_CORBA_DoubleSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::DoubleSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::DoubleSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_DoubleSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/DoubleSeqS.h b/TAO/tao/DoubleSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/DoubleSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
deleted file mode 100644
index 2ef06f278df..00000000000
--- a/TAO/tao/Dynamic.pidl
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in DynamicC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic.idl
-// Used primarily for Interceptors
-
-#include "Dynamic_Parameter.pidl"
-#include "StringSeq.pidl"
-#include "Typecode_types.pidl"
-
-#ifndef _DYNAMIC_IDL_
-#define _DYNAMIC_IDL_
-
-module Dynamic
-{
-  typeprefix Dynamic "omg.org";
-
-  typedef sequence<Parameter> ParameterList;
-
-  typedef CORBA::StringSeq ContextList;
-
-  typedef sequence<CORBA::TypeCode> ExceptionList;
-
-  typedef CORBA::StringSeq RequestContext;
-};
-
-#endif // _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
deleted file mode 100644
index 66db199d35f..00000000000
--- a/TAO/tao/DynamicA.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DynamicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-#define _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ParameterList_0 (
-        CORBA::tk_sequence,
-        &Dynamic::_tc_Parameter,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ParameterList_0 =
-      &Dynamic_ParameterList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ParameterList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ParameterList:1.0",
-    "ParameterList",
-    &TAO::TypeCode::tc_Dynamic_ParameterList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterList =
-    &_tao_tc_Dynamic_ParameterList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ContextList:1.0",
-    "ContextList",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextList =
-    &_tao_tc_Dynamic_ContextList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-#define _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ExceptionList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_TypeCode,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ExceptionList_0 =
-      &Dynamic_ExceptionList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ExceptionList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ExceptionList:1.0",
-    "ExceptionList",
-    &TAO::TypeCode::tc_Dynamic_ExceptionList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionList =
-    &_tao_tc_Dynamic_ExceptionList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_RequestContext (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/RequestContext:1.0",
-    "RequestContext",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestContext =
-    &_tao_tc_Dynamic_RequestContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ParameterList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ParameterList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ParameterList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
-        _tao_any,
-        Dynamic::ParameterList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ParameterList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ExceptionList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
-        _tao_any,
-        Dynamic::ExceptionList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
deleted file mode 100644
index a064db9ca07..00000000000
--- a/TAO/tao/DynamicAny.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname    = TAO_DynamicAny
-  dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
-
-  Source_Files {
-    DynamicAny
-  }
-
-  Header_Files {
-    DynamicAny
-  }
-
-  Inline_Files {
-    DynamicAny
-  }
-
-  Template_Files {
-    DynamicAny
-  }
-
-  Resource_Files {
-    DynamicAny
-  }
-
-  PIDL_Files {
-    DynamicAny
-  }
-
-  Pkgconfig_Files {
-    DynamicAny/TAO_DynamicAny.pc.in
-  }
-}
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
deleted file mode 100644
index 032cdb79fb3..00000000000
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    DynAnyFactory.cpp
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#include "DynAnyFactory.h"
-
-#include "DynAny_i.h"
-#include "DynStruct_i.h"
-#include "DynSequence_i.h"
-#include "DynEnum_i.h"
-#include "DynArray_i.h"
-#include "DynUnion_i.h"
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID (DynamicAny,
-           DynAnyFactory,
-           "$Id$")
-
-// Constructor from typecode
-TAO_DynAnyFactory::TAO_DynAnyFactory (void)
-{
-}
-
-// Utility function called by all the DynAny classes
-// to extract the TCKind of possibly aliased types.
-CORBA::TCKind
-TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  while (tck == CORBA::tk_alias)
-    {
-      CORBA::TypeCode_var temp =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-
-      tck = TAO_DynAnyFactory::unalias (temp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
-    }
-
-  return tck;
-}
-
-// Same as above, but returns the type code.
-CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  while (tck == CORBA::tk_alias)
-    {
-      retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-    }
-
-  return retval._retn ();
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::create_dyn_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL
-    )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
-{
-  return TAO_DynAnyFactory::make_dyn_any (value ACE_ENV_ARG_PARAMETER);
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::create_dyn_any_from_type_code (
-      CORBA::TypeCode_ptr type
-      ACE_ENV_ARG_DECL
-    )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
-{
-  return TAO_DynAnyFactory::make_dyn_any (type ACE_ENV_ARG_PARAMETER);
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (const CORBA::Any &any
-                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  switch (kind)
-    {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-      case CORBA::tk_short:
-      case CORBA::tk_long:
-      case CORBA::tk_ushort:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-      case CORBA::tk_wchar:
-      case CORBA::tk_octet:
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_objref:
-      case CORBA::tk_string:
-      case CORBA::tk_wstring:
-        {
-          TAO_DynAny_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynAny_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        {
-          TAO_DynStruct_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynStruct_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_sequence:
-        {
-          TAO_DynSequence_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynSequence_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_union:
-        {
-          TAO_DynUnion_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynUnion_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_enum:
-        {
-          TAO_DynEnum_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynEnum_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_array:
-        {
-          TAO_DynArray_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynArray_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (any ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-
-    case CORBA::tk_fixed:
-    case CORBA::tk_value:
-    case CORBA::tk_value_box:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                        DynamicAny::DynAny::_nil ());
-    case CORBA::tk_native:
-      ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
-                        DynamicAny::DynAny::_nil ());
-    default:
-      break;
-    }
-
-  return DynamicAny::DynAny::_nil ();
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
-                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  switch (kind)
-    {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-      case CORBA::tk_short:
-      case CORBA::tk_long:
-      case CORBA::tk_ushort:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-      case CORBA::tk_wchar:
-      case CORBA::tk_octet:
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_objref:
-      case CORBA::tk_string:
-      case CORBA::tk_wstring:
-        {
-          TAO_DynAny_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynAny_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        {
-          TAO_DynStruct_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynStruct_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_sequence:
-        {
-          TAO_DynSequence_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynSequence_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_union:
-        {
-          TAO_DynUnion_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynUnion_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_enum:
-        {
-          TAO_DynEnum_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynEnum_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-      case CORBA::tk_array:
-        {
-          TAO_DynArray_i *p = 0;
-
-          ACE_NEW_THROW_EX (p,
-                            TAO_DynArray_i,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
-
-          ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (tc ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return dp.release ();
-        }
-
-    case CORBA::tk_fixed:
-    case CORBA::tk_value:
-    case CORBA::tk_value_box:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                        DynamicAny::DynAny::_nil ());
-    case CORBA::tk_native:
-      ACE_THROW_RETURN (DynamicAny::DynAnyFactory::InconsistentTypeCode (),
-                        DynamicAny::DynAny::_nil ());
-    default:
-      break;
-    }
-
-  return DynamicAny::DynAny::_nil ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Array_Base<DynamicAny::DynAny_var>;
-
-template class ACE_Auto_Basic_Ptr<TAO_DynAny_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynArray_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynEnum_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynSequence_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynStruct_i>;
-template class ACE_Auto_Basic_Ptr<TAO_DynUnion_i>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<DynamicAny::DynAny_var>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynAny_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynArray_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynEnum_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynSequence_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynStruct_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynUnion_i>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
deleted file mode 100644
index e4b5e99d949..00000000000
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynAnyFactory.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNANYFACTORY_H
-#define TAO_DYNANYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynAnyFactory
- *
- * Implements the DynamicAnyFactory interface and provides several
- * utility functions shared by all the Dynamic Any components.
- */
-class TAO_DynamicAny_Export TAO_DynAnyFactory
-  : public virtual DynamicAny::DynAnyFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynAnyFactory (void);
-
-  /// Obtain the kind of object, after all aliasing has been removed.
-  static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
-
-  /// Same as above, but returns type code instead of TCKind. Caller
-  /// must release the return value.
-  static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL);
-
-  /// Create the correct type of DynAny object for <any>.
-  static DynamicAny::DynAny_ptr
-     make_dyn_any (const CORBA::Any &any
-                   ACE_ENV_ARG_DECL);
-
-  /// Create the correct type of DynAny object for <tc>
-  static DynamicAny::DynAny_ptr
-     make_dyn_any (CORBA::TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL);
-
-  // = The DynamicAnyFactory methods.
-  virtual DynamicAny::DynAny_ptr create_dyn_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
-
-  virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-      CORBA::TypeCode_ptr type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
-
-private:
-  // Not allowed.
-  TAO_DynAnyFactory (const TAO_DynAnyFactory &src);
-  TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNANYFACTORY_H */
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
deleted file mode 100644
index b8562e2af63..00000000000
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ /dev/null
@@ -1,558 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynAny_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (DynamicAny,
-           DynAny_i,
-           "$Id$")
-
-
-TAO_DynAny_i::TAO_DynAny_i (void)
-{
-}
-
-TAO_DynAny_i::~TAO_DynAny_i (void)
-{
-}
-
-void
-TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
-                              ACE_ENV_ARG_DECL)
-{
-  // Check to see if it's a simple type.
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  switch (tk)
-  {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_wchar:
-    case CORBA::tk_octet:
-    case CORBA::tk_any:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_objref:
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      break;
-    default:
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-  }
-}
-
-void
-TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
-                                    ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  switch (tk)
-  {
-    case CORBA::tk_null:
-      break;
-    case CORBA::tk_void:
-      this->any_._tao_set_typecode (CORBA::_tc_void);
-      break;
-    case CORBA::tk_short:
-      this->any_ <<= static_cast<CORBA::Short> (0);
-      break;
-    case CORBA::tk_long:
-      this->any_ <<= static_cast<CORBA::Long> (0);
-      break;
-    case CORBA::tk_ushort:
-      this->any_ <<= static_cast<CORBA::UShort> (0);
-      break;
-    case CORBA::tk_ulong:
-      this->any_ <<= static_cast<CORBA::ULong> (0);
-      break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-    case CORBA::tk_longlong:
-      this->any_ <<= static_cast<CORBA::LongLong> (0);
-      break;
-    case CORBA::tk_ulonglong:
-      this->any_ <<= static_cast<CORBA::ULongLong> (0);
-      break;
-#endif /* ACE_LACKS_LONGLONG_T */
-    case CORBA::tk_boolean:
-      this->any_ <<= CORBA::Any::from_boolean (0);
-      break;
-    case CORBA::tk_octet:
-      this->any_ <<= CORBA::Any::from_octet (0);
-      break;
-    case CORBA::tk_char:
-      this->any_ <<= CORBA::Any::from_char (0);
-      break;
-    case CORBA::tk_wchar:
-      this->any_ <<= CORBA::Any::from_wchar (0);
-      break;
-    case CORBA::tk_float:
-      this->any_ <<= static_cast<CORBA::Float> (0);
-      break;
-    case CORBA::tk_double:
-      this->any_ <<= static_cast<CORBA::Double> (0);
-      break;
-    case CORBA::tk_any:
-      this->any_._tao_set_typecode (CORBA::_tc_null);
-      break;
-    case CORBA::tk_TypeCode:
-      this->any_ <<= CORBA::_tc_null;
-      break;
-    case CORBA::tk_objref:
-      {
-        TAO_OutputCDR stream;
-        stream << CORBA::Object::_nil ();
-        TAO_InputCDR in (stream);
-        TAO::Unknown_IDL_Type *unk = 0;
-        ACE_NEW (unk,
-                 TAO::Unknown_IDL_Type (tc, in));
-        this->any_.replace (unk);
-        break;
-      }
-    case CORBA::tk_string:
-      this->any_ <<= "";
-      break;
-    case CORBA::tk_wstring:
-      {
-        CORBA::WChar wstr[1];
-        wstr[0] = 0;
-        this->any_ <<= wstr;
-        break;
-      }
-    default:
-      // Should never get here - check_typecode() has already been called.
-      break;
-  }
-}
-
-void
-TAO_DynAny_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 0;
-  this->destroyed_ = 0;
-  this->current_position_ = -1;
-  this->component_count_ = 0;
-}
-
-void
-TAO_DynAny_i::init (CORBA::TypeCode_ptr tc
-                    ACE_ENV_ARG_DECL)
-{
-  this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->set_to_default_value (tc
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->init_common ();
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
-
-void
-TAO_DynAny_i::init (const CORBA::Any& any
-                    ACE_ENV_ARG_DECL)
-{
-  this->type_ = any.type ();
-  this->check_typecode (this->type_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->init_common ();
-
-  this->any_ = any;
-}
-
-// ****************************************************************
-
-TAO_DynAny_i *
-TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref
-                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynAny_i *> (_tao_objref);
-}
-
-// ****************************************************************
-
-void
-TAO_DynAny_i::from_any (const CORBA::Any &any
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var any_tc = any.type ();
-
-  CORBA::Boolean equiv =
-    this->type_->equivalent (any_tc.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!equiv)
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-
-// @@@ (JP) Spec also says we should check for illegal Any
-// value here, and throw InvalidValue if we find one.
-// Something like a null string will be caught in the constructor.
-
-  this->any_ = any;
-}
-
-CORBA::Any_ptr
-TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::Any_ptr retval;
-
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (this->any_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (rhs_n == 0)
-    {
-      return 0;
-    }
-
-  CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv)
-    {
-      return 0;
-    }
-
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  switch (tk)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      return 1;
-    case CORBA::tk_short:
-      {
-        CORBA::Short rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::Short lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_long:
-      {
-        CORBA::Long rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::Long lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_ushort:
-      {
-        CORBA::UShort rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::UShort lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_ulong:
-      {
-        CORBA::ULong rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::ULong lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_float:
-      {
-        CORBA::Float rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::Float lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_double:
-      {
-        CORBA::Double rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::Double lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_longlong:
-      {
-        CORBA::LongLong rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::LongLong lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_ulonglong:
-      {
-        CORBA::ULongLong rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::ULongLong lhs_v;
-        this->any_ >>= lhs_v;
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_boolean:
-      {
-        CORBA::Boolean rhs_v;
-        rhs_n->any_ >>= CORBA::Any::to_boolean (rhs_v);
-        CORBA::Boolean lhs_v;
-        this->any_ >>= CORBA::Any::to_boolean (lhs_v);
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_char:
-      {
-        CORBA::Char rhs_v;
-        rhs_n->any_ >>= CORBA::Any::to_char (rhs_v);
-        CORBA::Char lhs_v;
-        this->any_ >>= CORBA::Any::to_char (lhs_v);
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_wchar:
-      {
-        CORBA::WChar rhs_v;
-        rhs_n->any_ >>= CORBA::Any::to_wchar (rhs_v);
-        CORBA::WChar lhs_v;
-        this->any_ >>= CORBA::Any::to_wchar (lhs_v);
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_octet:
-      {
-        CORBA::Octet rhs_v;
-        rhs_n->any_ >>= CORBA::Any::to_octet (rhs_v);
-        CORBA::Octet lhs_v;
-        this->any_ >>= CORBA::Any::to_octet (lhs_v);
-        return (lhs_v == rhs_v);
-      }
-    case CORBA::tk_any:
-      {
-        const CORBA::Any *rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        const CORBA::Any *lhs_v;
-        this->any_ >>= lhs_v;
-
-        DynamicAny::DynAny_var rhs_dyn =
-          TAO_DynAnyFactory::make_dyn_any (*rhs_v
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        DynamicAny::DynAny_var lhs_dyn =
-          TAO_DynAnyFactory::make_dyn_any (*lhs_v
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        rhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        lhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        return b;
-      }
-    case CORBA::tk_TypeCode:
-      {
-        CORBA::TypeCode_ptr rhs_v;
-        rhs_n->any_ >>= rhs_v;
-        CORBA::TypeCode_ptr lhs_v;
-        this->any_ >>= lhs_v;
-        // See CORBA 2.4.2 - must use equal() here.
-        return lhs_v->equal (lhs_v
-                             ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        CORBA::Object_ptr rhs_v;
-        rhs_n->any_ >>= CORBA::Any::to_object (rhs_v);
-        CORBA::Object_ptr lhs_v;
-        this->any_ >>= CORBA::Any::to_object (lhs_v);
-        return lhs_v->_is_equivalent (lhs_v
-                                      ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        CORBA::TypeCode_var unaliased_tc =
-          TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        CORBA::ULong bound =
-          unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        const char *rhs_v, *lhs_v;
-        CORBA::Boolean rstatus, lstatus;
-
-        if (bound == 0)
-          {
-            rstatus = rhs_n->any_ >>= rhs_v;
-            lstatus = this->any_ >>= lhs_v;
-
-            if ((rstatus && lstatus) == 0)
-              {
-                return 0;
-              }
-          }
-        else
-          {
-            rstatus = rhs_n->any_ >>= CORBA::Any::to_string (rhs_v,
-                                                             bound);
-            lstatus = this->any_ >>= CORBA::Any::to_string (lhs_v,
-                                                            bound);
-
-            if ((rstatus && lstatus) == 0)
-              {
-                return 0;
-              }
-          }
-
-        return ACE_OS::strcmp (rhs_v, lhs_v) == 0;
-      }
-    case CORBA::tk_wstring:
-      {
-        CORBA::TypeCode_var unaliased_tc =
-          TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        CORBA::ULong bound =
-          unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        const CORBA::WChar *rhs_v, *lhs_v;
-        CORBA::Boolean rstatus, lstatus;
-
-        if (bound == 0)
-          {
-            rstatus = rhs_n->any_ >>= rhs_v;
-            lstatus = this->any_ >>= lhs_v;
-
-            if ((rstatus && lstatus) == 0)
-              {
-                return 0;
-              }
-          }
-        else
-          {
-            rstatus = rhs_n->any_ >>= CORBA::Any::to_wstring (rhs_v,
-                                                              bound);
-            lstatus = this->any_ >>= CORBA::Any::to_wstring (lhs_v,
-                                                             bound);
-
-            if ((rstatus && lstatus) == 0)
-              {
-                return 0;
-              }
-          }
-
-        return ACE_OS::wscmp (rhs_v, lhs_v) == 0;
-      }
-    default:
-      break; // Cannot happen...
-    }
-
-  return 0;
-}
-
-void
-TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      this->destroyed_ = 1;
-    }
-}
-
-
-DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                    DynamicAny::DynAny::_nil ());
-}
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
deleted file mode 100644
index db9b893ec58..00000000000
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynAny_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNANY_I_H
-#define TAO_DYNANY_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynAny_i
- *
- * @brief Implementation of the basic Dynamic Any datatype.
- */
-class TAO_DynamicAny_Export TAO_DynAny_i
-  : public virtual DynamicAny::DynAny,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynAny_i (void);
-
-  /// Destructor.
-  ~TAO_DynAny_i (void);
-
-  /// Initialize using just a TypeCode
-  void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
-
-  /// Initialize using an Any.
-  void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods.
-  static TAO_DynAny_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-private:
-  /// Check if the typecode is acceptable.
-  void check_typecode (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL);
-
-  /// Used when we are created from a typecode.
-  void set_to_default_value (CORBA::TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL);
-
-  /// Called by both versions of init().
-  void init_common (void);
-
-  // Use copy() or assign() instead of these.
-  TAO_DynAny_i (const TAO_DynAny_i &src);
-  TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNANY_I_H */
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
deleted file mode 100644
index 371fb0467b4..00000000000
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynArray_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (DynamicAny,
-           DynArray_i,
-           "$Id$")
-
-
-TAO_DynArray_i::TAO_DynArray_i (void)
-{
-}
-
-TAO_DynArray_i::~TAO_DynArray_i (void)
-{
-}
-
-void
-TAO_DynArray_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 1;
-  this->destroyed_ = 0;
-  this->current_position_ = 0;
-  this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ());
-}
-
-void
-TAO_DynArray_i::init (const CORBA::Any & any
-                      ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = any.type ();
-
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_array)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  this->type_ = tc;
-
-  CORBA::ULong numfields = this->get_tc_length (tc.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  // Resize the array.
-  this->da_members_.size (numfields);
-
-  this->init_common ();
-
-  // Get the CDR stream of the Any, if there isn't one, make one.
-  TAO::Any_Impl *impl = any.impl ();
-  TAO_OutputCDR out;
-  TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
-
-  if (impl->encoded  ())
-    {
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
-      cdr = unk->_tao_get_cdr ();
-    }
-  else
-    {
-      impl->marshal_value (out);
-      TAO_InputCDR tmp_in (out);
-      cdr = tmp_in;
-    }
-
-  CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < numfields; ++i)
-    {
-      CORBA::Any field_any;
-      TAO::Unknown_IDL_Type *field_unk = 0;
-      TAO_InputCDR unk_in (cdr);
-      ACE_NEW (field_unk,
-               TAO::Unknown_IDL_Type (field_tc.in (),
-                                      unk_in));
-      field_any.replace (field_unk);
-
-      // This recursive step will call the correct constructor
-      // based on the type of field_any.
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Move to the next field in the CDR stream.
-      (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
-                      ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_array)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-  CORBA::ULong numfields = this->get_tc_length (tc
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Resize the array.
-  this->da_members_.size (numfields);
-
-  this->init_common ();
-
-  CORBA::TypeCode_var elemtype =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < numfields; ++i)
-    {
-      // Recursively initialize each element.
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::TypeCode_var element_type =
-    CORBA::TypeCode::_duplicate (this->type_.in ());
-
-  // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  while (kind != CORBA::tk_array)
-    {
-      element_type =
-        element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-    }
-
-  // Return the content type.
-  CORBA::TypeCode_ptr retval =
-    element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return retval;
-}
-
-// Get the length from the (possibly aliased) typecode.
-CORBA::ULong
-TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
-                               ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  while (kind == CORBA::tk_alias)
-    {
-      tctmp = tctmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  CORBA::ULong retval = tctmp->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return retval;
-}
-
-// ****************************************************************
-
-TAO_DynArray_i *
-TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref
-                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynArray_i *> (_tao_objref);
-}
-
-// ****************************************************************
-
-DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
-
-  DynamicAny::AnySeq *elements = 0;
-  ACE_NEW_THROW_EX (elements,
-                    DynamicAny::AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  elements->length (length);
-  DynamicAny::AnySeq_var safe_retval (elements);
-
-  CORBA::Any_var tmp;
-
-  // Initialize each Any.
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      tmp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i] = tmp.in ();
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::ULong length = value.length ();
-
-  if (length != this->da_members_.size ())
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var element_type = 
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; i++)
-    {
-      // Check each arg element for type match.
-      value_tc = value[i].type ();
-      CORBA::Boolean equivalent = 
-        value_tc->equivalent (element_type.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (equivalent)
-        {
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (value[i]
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
-}
-
-DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  DynamicAny::DynAnySeq *retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    DynamicAny::DynAnySeq (this->component_count_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->length (this->component_count_);
-  DynamicAny::DynAnySeq_var safe_retval (retval);
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
-      // Set the flag so the caller can't destroy.
-      this->set_flag (this->da_members_[i].in (),
-                      0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i] =
-        DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynArray_i::set_elements_as_dyn_any (
-    const DynamicAny::DynAnySeq & values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
-
-  if (values.length () != length)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  CORBA::TypeCode_var element_type = 
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var val_type;
-  CORBA::Boolean equivalent;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      equivalent = val_type->equivalent (element_type.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK;
-
-      if (equivalent)
-        {
-          this->da_members_[i] = 
-            values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
-}
-
-// ****************************************************************
-
-void
-TAO_DynArray_i::from_any (const CORBA::Any& any
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
-    this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equivalent)
-    {
-      // Get the CDR stream of the Any,if there isn't one, make one.
-      TAO::Any_Impl *impl = any.impl ();
-      TAO_OutputCDR out;
-      TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
-
-      if (impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
-          cdr = unk->_tao_get_cdr ();
-        }
-      else
-        {
-          impl->marshal_value (out);
-          TAO_InputCDR tmp_in (out);
-          cdr = tmp_in;
-        }
-
-      CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
-      CORBA::ULong arg_length = this->get_tc_length (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (length != arg_length)
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-
-      CORBA::TypeCode_var field_tc = 
-        this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0; i < arg_length; ++i)
-        {
-          CORBA::Any field_any;
-          TAO_InputCDR unk_in (cdr);
-          TAO::Unknown_IDL_Type *field_unk = 0;
-          ACE_NEW (field_unk,
-                   TAO::Unknown_IDL_Type (field_tc.in (),
-                                          unk_in));
-          field_any.replace (field_unk);
-
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->current_position_ = arg_length ? 0 : -1;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::TypeCode_var field_tc = 
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_OutputCDR out_cdr;
-  CORBA::Any_var field_any;
-  size_t length = this->da_members_.size ();
-
-  for (size_t i = 0; i < length; ++i)
-    {
-      // Recursive step.
-      field_any = 
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      TAO::Any_Impl *field_impl = field_any->impl ();
-      TAO_OutputCDR field_out;
-      TAO_InputCDR field_cdr (static_cast<ACE_Message_Block *> (0));
-
-      if (field_impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *field_unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
-          field_cdr = field_unk->_tao_get_cdr ();
-        }
-      else
-        {
-          field_impl->marshal_value (field_out);
-          TAO_InputCDR tmp_in (field_out);
-          field_cdr = tmp_in;
-        }
-
-      (void) TAO_Marshal_Object::perform_append (field_tc.in (),
-                                                 &field_cdr,
-                                                 &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA::Any_ptr retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW_THROW_EX (unk,
-                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->replace (unk);
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent)
-    {
-      return 0;
-    }
-
-  DynamicAny::DynAny_var tmp;
-  CORBA::Boolean member_equal;
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      rhs->seek (static_cast<CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!member_equal)
-        {
-          return 0;
-        }
-    }
-
-  return 1;
-}
-
-void
-TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      // Do a deep destroy.
-      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-        {
-          this->set_flag (da_members_[i].in (),
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->destroyed_ = 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  if (this->current_position_ == -1)
-    {
-      return DynamicAny::DynAny::_nil ();
-    }
-
-  CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_);
-
-  this->set_flag (this->da_members_[index].in (),
-                  0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  return DynamicAny::DynAny::_duplicate (
-            this->da_members_[index].in ()
-          );
-}
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
deleted file mode 100644
index d8b6120e9cd..00000000000
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynArray_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNARRAY_I_H
-#define TAO_DYNARRAY_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-#include "ace/Containers.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynArray_i
- *
- * Implementation of Dynamic Any type for arrays
- */
-class TAO_DynamicAny_Export TAO_DynArray_i
-  : public virtual DynamicAny::DynArray,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynArray_i (void);
-
-  /// Destructor.
-  ~TAO_DynArray_i (void);
-
-  /// Initialize using just a TypeCode.
-  void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
-
-  /// Initialize using an Any.
-  void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods
-  static TAO_DynArray_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = Functions specific to DynArray.
-
-  virtual DynamicAny::AnySeq * get_elements (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_elements (
-      const DynamicAny::AnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_elements_as_dyn_any (
-      const DynamicAny::DynAnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-    ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-private:
-  /// Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /// Gets the length of the array from the typecode.
-  CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Called by both versions of init().
-  void init_common (void);
-
-  // Use copy() or assign() instead of these.
-  TAO_DynArray_i (const TAO_DynArray_i &src);
-  TAO_DynArray_i &operator= (const TAO_DynArray_i &src);
-
-private:
-  /// Each component is also a DynAny.
-  ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNARRAY_I_H */
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
deleted file mode 100644
index 039093b5baa..00000000000
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ /dev/null
@@ -1,1851 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynCommon.h"
-#include "DynAnyFactory.h"
-#include "DynAny_i.h"
-#include "DynArray_i.h"
-#include "DynEnum_i.h"
-#include "DynSequence_i.h"
-#include "DynStruct_i.h"
-#include "DynUnion_i.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (DynamicAny,
-           DynCommon,
-           "$Id$")
-
-
-TAO_DynCommon::TAO_DynCommon (void)
-{
-}
-
-TAO_DynCommon::~TAO_DynCommon (void)
-{
-}
-
-// *****************************************************************
-
-CORBA::TypeCode_ptr
-TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return CORBA::TypeCode::_duplicate (this->type_.in ());
-}
-
-void
-TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Boolean equivalent =
-    this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equivalent)
-    {
-      CORBA::Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->from_any (any.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-void
-TAO_DynCommon::insert_boolean (CORBA::Boolean value
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_boolean (value
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_boolean
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= CORBA::Any::from_boolean (value);
-    }
-}
-
-void
-TAO_DynCommon::insert_octet (CORBA::Octet value
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_octet (value
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_octet
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= CORBA::Any::from_octet (value);
-    }
-}
-
-void
-TAO_DynCommon::insert_char (CORBA::Char value
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_char (value
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_char
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= CORBA::Any::from_char (value);
-    }
-}
-
-void
-TAO_DynCommon::insert_short (CORBA::Short value
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_short (value
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_short
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_ushort (CORBA::UShort value
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_ushort (value
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_ushort
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_long (CORBA::Long value
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_long (value
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_long
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_ulong (CORBA::ULong value
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_ulong (value
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_ulong
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_float (CORBA::Float value
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_float (value
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_float
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_double (CORBA::Double value
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_double (value
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_double
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_string (const char * value
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_string (value
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::TCKind kind =
-        unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind != CORBA::tk_string)
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-
-      CORBA::ULong bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (bound > 0 && bound < ACE_OS::strlen (value))
-        {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-        }
-
-      this->any_ <<= CORBA::Any::from_string (const_cast<char *> (value),
-                                              bound);
-    }
-}
-
-void
-TAO_DynCommon::insert_reference (CORBA::Object_ptr value
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_reference (value
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::Boolean good_type = 1;
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind != CORBA::tk_objref)
-        {
-          good_type = 0;
-        }
-      else if (!CORBA::is_nil (value))
-        {
-          const char *value_id = value->_interface_repository_id ();
-
-          if (ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/Object:1.0") != 0)
-            {
-              const char *my_id =
-                this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-
-              if (ACE_OS::strcmp (value_id, my_id) != 0)
-                {
-                  good_type = value->_is_a (my_id
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK;
-                }
-            }
-        }
-
-      if (good_type)
-        {
-          TAO_OutputCDR cdr;
-
-          if (CORBA::is_nil (value))
-            {
-              // Empty type hint, no profile.
-              cdr.write_ulong (1);
-              cdr.write_char ('\0');
-              cdr.write_ulong (0);
-            }
-          else
-            {
-              value->marshal (cdr);
-            }
-
-          TAO_InputCDR in (cdr);
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
-                   TAO::Unknown_IDL_Type (this->type_.in (),
-                                          in));
-          this->any_.replace (unk);
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
-}
-
-void
-TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_typecode (value
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_TypeCode
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_longlong (CORBA::LongLong value
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_longlong (value
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_longlong
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_ulonglong (value
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_ulonglong
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_longdouble (value
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_longdouble
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-void
-TAO_DynCommon::insert_wchar (CORBA::WChar value
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_wchar (value
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_wchar
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= CORBA::Any::from_wchar (value);
-    }
-}
-
-void
-TAO_DynCommon::insert_wstring (const CORBA::WChar * value
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_wstring (value
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (bound > 0 && bound < ACE_OS::wslen (value))
-        {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-        }
-
-      this->any_ <<= CORBA::Any::from_wstring (const_cast<CORBA::WChar *> (value),
-                                               bound);
-    }
-}
-
-void
-TAO_DynCommon::insert_any (const CORBA::Any &value
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      cc->insert_any (value
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      this->check_type (CORBA::_tc_any
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->any_ <<= value;
-    }
-}
-
-// @@@ (JP) TODO - optimize - this version was intended by the OMG to
-// have fewer Any/DynAny conversions than insert_any, not more.
-void
-TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->insert_any (any.in ()
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_DynCommon::insert_val (CORBA::ValueBase *
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_boolean (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Boolean retval;
-
-      if ((this->any_ >>= CORBA::Any::to_boolean (retval)) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Octet
-TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_octet (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Octet retval;
-
-      if ((this->any_ >>= CORBA::Any::to_octet (retval)) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Char
-TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Char retval;
-
-      if ((this->any_ >>= CORBA::Any::to_char (retval)) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Short
-TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Short retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::UShort
-TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::UShort retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Long
-TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Long retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::ULong
-TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::ULong retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Float
-TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Float retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::Double
-TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Double retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-char *
-TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::TCKind kind =
-        unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (kind != CORBA::tk_string)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      char *retval = 0;
-
-      CORBA::ULong bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // We will have caught a type mismatch above, so if this fails,
-      // it must be for some other reason.
-      if ((this->any_ >>= CORBA::Any::to_string (retval, bound)) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                            0);
-        }
-
-      return CORBA::string_dup (retval);
-    }
-}
-
-CORBA::Object_ptr
-TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::Object::_nil ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      return cc->get_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::Object_var retval;
-
-      if ((this->any_ >>= CORBA::Any::to_object (retval.inout ())) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            CORBA::Object::_nil ());
-        }
-
-      return retval._retn ();
-    }
-}
-
-CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::TypeCode_ptr retval;
-
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            CORBA::TypeCode::_nil ());
-        }
-
-      return CORBA::TypeCode::_duplicate (retval);
-    }
-}
-
-CORBA::LongLong
-TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::LongLong retval = ACE_CDR_LONGLONG_INITIALIZER;
-
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        retval);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (retval);
-
-      return cc->get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            retval);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::ULongLong retval = 0;
-
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        retval);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (retval);
-
-      return cc->get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            retval);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::LongDouble
-TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::LongDouble retval = ACE_CDR_LONG_DOUBLE_INITIALIZER;
-
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        retval);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (retval);
-
-      return cc->get_longdouble (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      if ((this->any_ >>= retval) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            retval);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::WChar
-TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_wchar (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      CORBA::WChar retval;
-
-      if ((this->any_ >>= CORBA::Any::to_wchar (retval)) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      return retval;
-    }
-}
-
-CORBA::WChar *
-TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_wstring (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      // @@@ (JP) Someday try to find a way to avoid checking for
-      // type code equivalence twice without risking a throw of
-      // BadKind.
-      CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::WChar *retval = 0;
-
-      CORBA::ULong bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      (void) (this->any_ >>= CORBA::Any::to_wstring (retval,
-                                                     bound));
-
-      return CORBA::wstring_dup (retval);
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_)
-    {
-      DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return cc->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-  else
-    {
-      const CORBA::Any *tmp = 0;
-
-      if ((this->any_ >>= tmp) == 0)
-        {
-          ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                            0);
-        }
-
-      CORBA::Any *retval = 0;
-      ACE_NEW_RETURN (retval,
-                      CORBA::Any (*tmp),
-                      0);
-      return retval;
-    }
-}
-
-// @@@ (JP) TODO - optimize - this version was intended by the OMG to
-// have fewer Any/DynAny conversions than get_any, not more.
-DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return TAO_DynAnyFactory::make_dyn_any (any.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::ValueBase *
-TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    0);
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-TAO_DynCommon::seek (CORBA::Long slot
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_ == 0)
-    {
-      ACE_UNUSED_ARG (slot);
-      this->current_position_ = -1;
-      return 0;
-    }
-  else if (slot < 0 || slot >= static_cast<CORBA::Long> (this->component_count_))
-    {
-      this->current_position_ = -1;
-      return 0;
-    }
-  else
-    {
-      this->current_position_ = slot;
-      return 1;
-    }
-}
-
-void
-TAO_DynCommon::rewind (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  (void) this->seek (0
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Boolean
-TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  if (this->has_components_ == 0
-      || this->current_position_ + 1 >= static_cast<CORBA::Long> (this->component_count_
-                                          ))
-    {
-      this->current_position_ = -1;
-      return 0;
-    }
-  else
-    {
-      ++this->current_position_;
-      return 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  CORBA::Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  DynamicAny::DynAny_ptr retval =
-    TAO_DynAnyFactory::make_dyn_any (any.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  return retval;
-}
-
-CORBA::ULong
-TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  return this->component_count_;
-}
-
-void
-TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
-                         CORBA::Boolean destroying
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  CORBA::TypeCode_var tc = component->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  switch (tk)
-  {
-    case CORBA::tk_array:
-      {
-        TAO_DynArray_i *tmp =
-          TAO_DynArray_i::_narrow (component
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-    case CORBA::tk_enum:
-      {
-        TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component
-                                                     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_DynSequence_i *tmp =
-          TAO_DynSequence_i::_narrow (component
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_DynStruct_i *tmp =
-          TAO_DynStruct_i::_narrow (component
-                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-    case CORBA::tk_union:
-      {
-        TAO_DynUnion_i *tmp =
-          TAO_DynUnion_i::_narrow (component
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-    case CORBA::tk_fixed:
-    case CORBA::tk_value:
-    case CORBA::tk_value_box:
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    default:
-      {
-        TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (destroying)
-          {
-            tmp->container_is_destroying_ = 1;
-          }
-        else
-          {
-            tmp->ref_to_component_ = 1;
-          }
-
-        break;
-      }
-  }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->current_position_ == -1)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  DynamicAny::DynAny_var cc =
-    this->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  CORBA::TypeCode_var tc = cc->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  // We are here because we are a component that is the target of
-  // an insert_*() call on our container. It is
-  // illegal to insert anything into a component that itself has
-  // components.
-  switch (kind)
-  {
-    case CORBA::tk_array:
-    case CORBA::tk_except:
-    case CORBA::tk_sequence:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        DynamicAny::DynAny::_nil ());
-    default:
-      return cc._retn ();
-  }
-}
-
-void
-TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  CORBA::Boolean equivalent =
-    this->type_->equivalent (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!equivalent)
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::TypeCode_ptr
-TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  this->check_type (tc
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return TAO_DynAnyFactory::strip_alias (tc
-                                         ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
deleted file mode 100644
index 60a15b01d91..00000000000
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ /dev/null
@@ -1,554 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    DynCommon.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNCOMMON_H
-#define TAO_DYNCOMMON_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynCommon
- *
- * Contains most of the functionality common to all the
- * Dynamic Any implementation classes.
- */
-class TAO_DynamicAny_Export TAO_DynCommon
-  : public virtual DynamicAny::DynAny
-{
-public:
-  /// Constructor.
-  TAO_DynCommon (void);
-
-  /// Destructor.
-  virtual ~TAO_DynCommon (void);
-
-  // = Some functions common to all Dynamic Any types.
-
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void assign (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  virtual void insert_boolean (
-      CORBA::Boolean value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_octet (
-      CORBA::Octet value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_char (
-      CORBA::Char value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_short (
-      CORBA::Short value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_ushort (
-      CORBA::UShort value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_long (
-      CORBA::Long value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_ulong (
-      CORBA::ULong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_float (
-      CORBA::Float value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_double (
-      CORBA::Double value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_string (
-      const char * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_reference (
-      CORBA::Object_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_typecode (
-      CORBA::TypeCode_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_longlong (
-      CORBA::LongLong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_ulonglong (
-      CORBA::ULongLong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_longdouble (
-      CORBA::LongDouble value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_wchar (
-      CORBA::WChar value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_wstring (
-      const CORBA::WChar * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_dyn_any (
-      DynamicAny::DynAny_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual void insert_val (
-      CORBA::ValueBase * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Boolean get_boolean (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Octet get_octet (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Char get_char (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Short get_short (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::UShort get_ushort (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Long get_long (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::ULong get_ulong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Float get_float (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Double get_double (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual char * get_string (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Object_ptr get_reference (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::TypeCode_ptr get_typecode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::LongLong get_longlong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::ULongLong get_ulonglong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::LongDouble get_longdouble (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::WChar get_wchar (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::WChar * get_wstring (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * get_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::DynAny_ptr get_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::ValueBase * get_val (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Boolean seek (
-      CORBA::Long index
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void rewind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean next (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::ULong component_count (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-protected:
-  /// This sets one of two flags in this base class. CORBA 2.4.2
-  /// requires that destroy() do nothing if it is called on
-  /// the result of current_component(), the only non-deep-copying
-  /// method in the Dynamic Any API. If the boolean arg below is 0,
-  /// the call is from inside current_component(), and the flag
-  /// ref_to_component_ is set. If the boolean arg is 1, the call
-  /// is from inside destroy(), and the container_is_destroying_
-  /// flag is set, overriding the first flag in the component's
-  /// destroy() method.
-  void set_flag (
-      DynamicAny::DynAny_ptr component,
-      CORBA::Boolean destroying
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-protected:
-  /// Were we created by current_component()?
-  CORBA::Boolean ref_to_component_;
-
-  /// Flag to let destroy() call by container override the flag above.
-  CORBA::Boolean container_is_destroying_;
-
-  /// Do we contain other Dynamic Anys?
-  CORBA::Boolean has_components_;
-
-  /// Has destroy() been called on us yet?
-  CORBA::Boolean destroyed_;
-
-  /// Slot of the current component (if any).
-  CORBA::Long current_position_;
-
-  /// Number of components, as defined by CORBA 2.4.2.
-  CORBA::ULong component_count_;
-
-  /// Holder for our type code.
-  CORBA::TypeCode_var type_;
-
-  /// Gets a value only for basic types, but used in insert_*
-  /// and get_*, defined in this base class.
-  CORBA::Any any_;
-
-private:
-  // Utility functions used by insert_* and get_*.
-
-  DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  void check_type (CORBA::TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNCOMMON_H */
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
deleted file mode 100644
index 8e2b7314d18..00000000000
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// $Id$
-
-#include "DynEnum_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (DynamicAny,
-           DynEnum_i,
-           "$Id$")
-
-
-TAO_DynEnum_i::TAO_DynEnum_i (void)
-{
-}
-
-TAO_DynEnum_i::~TAO_DynEnum_i (void)
-{
-}
-
-void
-TAO_DynEnum_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 0;
-  this->destroyed_ = 0;
-  this->current_position_ = -1;
-  this->component_count_ = 0;
-}
-
-void
-TAO_DynEnum_i::init (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = any.type ();
-
-  CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_enum)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  this->type_ = tc;
-
-  TAO::Any_Impl *impl = any.impl ();
-
-  if (impl->encoded ())
-    {
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
-      // We don't want unk's rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-      for_reading.read_ulong (this->value_);
-    }
-  else
-    {
-      TAO_OutputCDR out;
-      impl->marshal_value (out);
-      TAO_InputCDR in (out);
-      in.read_ulong (this->value_);
-    }
-
-  this->init_common ();
-}
-
-void
-TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_enum)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-  this->value_ = 0;
-
-  this->init_common ();
-}
-
-// ****************************************************************
-
-TAO_DynEnum_i *
-TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynEnum_i *> (_tao_objref);
-}
-
-// ****************************************************************
-
-char *
-TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  const char *retval =
-    this->type_.in ()->member_name (this->value_
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
-}
-
-void
-TAO_DynEnum_i::set_as_string (const char *value_as_string
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::ULong count =
-    this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong i;
-  const char *temp = 0;
-
-  for (i = 0; i < count; ++i)
-    {
-      temp = this->type_.in ()->member_name (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!ACE_OS::strcmp (value_as_string,
-                           temp))
-        {
-          break;
-        }
-    }
-
-  if (i < count)
-    {
-      this->value_ = i;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-}
-
-CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  return this->value_;
-}
-
-void
-TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::ULong max =
-    this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (value_as_ulong < max)
-    {
-      this->value_ = value_as_ulong;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-}
-
-// ****************************************************************
-
-void
-TAO_DynEnum_i::from_any (const CORBA::Any& any
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_enum)
-    {
-      // Get the CDR stream of the Any, if there isn't one, make one.
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
-          // We don't want unk's rd_ptr to move, in case we are shared by
-          // another Any, so we use this to copy the state, not the buffer.
-          TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-          for_reading.read_ulong (this->value_);
-        }
-      else
-        {
-          TAO_OutputCDR out;
-          impl->marshal_value (out);
-          TAO_InputCDR in (out);
-          in.read_ulong (this->value_);
-        }
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  TAO_OutputCDR out_cdr;
-
-  out_cdr.write_ulong (this->value_);
-
-  CORBA::Any *retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO_InputCDR in_cdr (out_cdr);
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW_THROW_EX (unk,
-                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->replace (unk);
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
-                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent)
-    {
-      return 0;
-    }
-
-  CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO::Any_Impl *impl = any->impl ();
-  CORBA::ULong value;
-
-  if (impl->encoded ())
-    {
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
-      // We don't want unk's rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-      for_reading.read_ulong (value);
-    }
-  else
-    {
-      TAO_OutputCDR out;
-      impl->marshal_value (out);
-      TAO_InputCDR in (out);
-      in.read_ulong (value);
-    }
-
-  return value == this->value_;
-}
-
-void
-TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      this->destroyed_ = 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                    DynamicAny::DynAny::_nil ());
-}
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
deleted file mode 100644
index 57c68a2f69f..00000000000
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynEnum_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNENUM_I_H
-#define TAO_DYNENUM_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-#include "ace/Containers.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynEnum_i
- *
- * Implementation of Dynamic Any type for enums
- */
-class TAO_DynamicAny_Export TAO_DynEnum_i
-  : public virtual DynamicAny::DynEnum,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynEnum_i (void);
-
-  /// Destructor.
-  ~TAO_DynEnum_i (void);
-
-  /// Initialize using just a TypeCode.
-  void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
-
-  /// Initialize using an Any.
-  void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods.
-  static TAO_DynEnum_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = Functions specific to DynEnum.
-
-  virtual char * get_as_string (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_as_string (
-      const char * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::ULong get_as_ulong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_as_ulong (
-      CORBA::ULong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-private:
-  // Called by both versions of init().
-  void init_common (void);
-
-  // = Use copy() or assign() instead of these.
-  TAO_DynEnum_i (const TAO_DynEnum_i &src);
-  TAO_DynEnum_i &operator= (const TAO_DynEnum_i &src);
-
-private:
-  /// Current numeric value of the enum.
-  CORBA::ULong value_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNENUM_I_H */
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
deleted file mode 100644
index f3307fc080a..00000000000
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ /dev/null
@@ -1,831 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynSequence_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (DynamicAny,
-           DynSequence_i,
-           "$Id$")
-
-
-TAO_DynSequence_i::TAO_DynSequence_i (void)
-{
-}
-
-TAO_DynSequence_i::~TAO_DynSequence_i (void)
-{
-}
-
-void
-TAO_DynSequence_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 1;
-  this->destroyed_ = 0;
-  this->current_position_ = -1;
-  this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ());
-}
-
-void
-TAO_DynSequence_i::init (const CORBA::Any& any
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = any.type ();
-
-  CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_sequence)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  this->type_ = tc;
-
-  // Get the CDR stream of the Any, if there isn't one, make one.
-  TAO::Any_Impl *impl = any.impl ();
-  CORBA::ULong length;
-  TAO_OutputCDR out;
-  TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
-
-  if (impl->encoded ())
-    {
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
-      cdr = unk->_tao_get_cdr ();
-    }
-  else
-    {
-      impl->marshal_value (out);
-      TAO_InputCDR tmp_in (out);
-      cdr = tmp_in;
-    }
-
-  // If the any is a sequence, first 4 bytes of cdr hold the
-  // length.
-  cdr.read_ulong (length);
-
-  // Resize the array.
-  this->da_members_.size (length);
-
-  this->init_common ();
-
-  // Get the type of the sequence elments.
-  CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      CORBA::Any field_any;
-      TAO_InputCDR unk_in (cdr);
-      TAO::Unknown_IDL_Type *field_unk = 0;
-      ACE_NEW (field_unk,
-               TAO::Unknown_IDL_Type (field_tc.in (),
-                                      unk_in));
-      field_any.replace (field_unk);
-
-      // This recursive step will call the correct constructor
-      // based on the type of field_any.
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Move to the next field in the CDR stream.
-      (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_sequence)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  // Empty sequence.
-  this->da_members_.size (0);
-
-  this->init_common ();
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
-
-// ****************************************************************
-
-TAO_DynSequence_i *
-TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref
-                            ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynSequence_i *> (_tao_objref);
-}
-
-// ****************************************************************
-
-CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::TypeCode_var element_type =
-    CORBA::TypeCode::_duplicate (this->type_.in ());
-
-  // Strip away aliases (if any) on top of the outer type.
-  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  while (kind != CORBA::tk_sequence)
-    {
-      element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-    }
-
-  // Return the content type.
-  CORBA::TypeCode_ptr retval =
-    element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return retval;
-}
-
-// = Functions specific to DynSequence.
-
-CORBA::ULong
-TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  return this->component_count_;
-}
-
-void
-TAO_DynSequence_i::set_length (CORBA::ULong length
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  // CORBA::TypeCode::length() does not accept aliased type codes.
-  CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (bound > 0 && length > bound)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  // CORBA 2.3.1 has several explicit rules about resetting the
-  // current position, depending on the current value of the
-  // current position, the current size, and the new length.
-  if (length == 0)
-    {
-      this->current_position_ = -1;
-    }
-  else if (length > this->component_count_)
-    {
-      if (this->current_position_ == -1)
-        {
-          // Set it to the first new slot.
-          this->current_position_ = static_cast<CORBA::Long> (this->component_count_);
-        }
-    }
-  else if (length < this->component_count_)
-    {
-      // If the current position will no longer exist..
-      if (this->current_position_ >= static_cast<CORBA::Long> (length))
-        {
-          this->current_position_ = -1;
-        }
-    }
-
-  if (length > this->component_count_)
-    {
-      // Grow array first, then initialize new members.
-      this->da_members_.size (length);
-
-      CORBA::TypeCode_var elemtype =
-        stripped_tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = this->component_count_; i < length; ++i)
-        {
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-  else if (length < this->component_count_)
-    {
-      // Destroy any dangling members first, then shrink array.
-      for (CORBA::ULong j = length; j < this->component_count_; ++j)
-        {
-          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->da_members_.size (length);
-    }
-
-  // Now we can update component_count_.
-  this->component_count_ = length;
-}
-
-DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
-
-  DynamicAny::AnySeq *elements;
-  ACE_NEW_THROW_EX (elements,
-                    DynamicAny::AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  elements->length (length);
-  DynamicAny::AnySeq_var safe_retval = elements;
-
-  // Initialize each Any.
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      CORBA::Any_var tmp =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i] = tmp.in ();
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong length = value.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (bound > 0 && length > bound)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  // CORBA 2.4.2.
-  if (length == 0)
-    {
-      this->current_position_ = -1;
-    }
-  else
-    {
-      this->current_position_ = 0;
-    }
-
-  // If the array grows, we must do it now.
-  if (length > this->component_count_)
-    {
-      this->da_members_.size (length);
-    }
-
-  CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var value_tc;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      // Check each arg element for type match.
-      value_tc = value[i].type ();
-      CORBA::Boolean equivalent =
-        value_tc->equivalent (element_type.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (equivalent)
-        {
-          // Destroy any existing members.
-          if (i < this->component_count_)
-            {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (value[i]
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
-
-  // Destroy any dangling members.
-  for (CORBA::ULong j = length; j < this->component_count_; ++j)
-    {
-      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // If the array shrinks, we must wait until now to do it.
-  if (length < this->component_count_)
-    {
-      this->da_members_.size (length);
-    }
-
-  // Now we can update component_count_.
-  this->component_count_ = length;
-}
-
-DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  DynamicAny::DynAnySeq *retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    DynamicAny::DynAnySeq (this->component_count_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->length (this->component_count_);
-  DynamicAny::DynAnySeq_var safe_retval (retval);
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
-      // Set the flag so the caller can't destroy.
-      this->set_flag (this->da_members_[i].in (),
-                      0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i] =
-        DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynSequence_i::set_elements_as_dyn_any (
-    const DynamicAny::DynAnySeq & values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong length = values.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (bound > 0 && length > bound)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  // If the array grows, we must do it now.
-  if (length > this->component_count_)
-    {
-      this->da_members_.size (length);
-    }
-
-  CORBA::TypeCode_var element_type = 
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var val_type;
-  CORBA::Boolean equivalent;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      equivalent = val_type->equivalent (element_type.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK;
-
-      if (equivalent)
-        {
-          // Destroy any existing members.
-          if (i < this->component_count_)
-            {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] = 
-            values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-    }
-
-  // Destroy any dangling members.
-  for (CORBA::ULong j = length; j < this->component_count_; ++j)
-    {
-      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // If the array shrinks, we must wait until now to do it.
-  if (length < this->component_count_)
-    {
-      this->da_members_.size (length);
-    }
-
-  // Now we can update component_count_.
-  this->component_count_ = length;
-}
-
-// ****************************************************************
-
-void
-TAO_DynSequence_i::from_any (const CORBA::Any & any
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
-    this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equivalent)
-    {
-      // Get the CDR stream of the Any, if there isn't one, make one.
-      TAO::Any_Impl *impl = any.impl ();
-      TAO_OutputCDR out;
-      TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
-
-      if (impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
-          cdr = unk->_tao_get_cdr ();
-        }
-      else
-        {
-          impl->marshal_value (out);
-          TAO_InputCDR tmp_in (out);
-          cdr = tmp_in;
-        }
-
-
-      CORBA::ULong arg_length;
-
-      // If the any is a sequence, first 4 bytes of cdr hold the
-      // length.
-      cdr.read_ulong (arg_length);
-
-      // If the array grows, we must do it now.
-      if (arg_length > this->component_count_)
-        {
-          this->da_members_.size (arg_length);
-        }
-
-      CORBA::TypeCode_var field_tc =
-        this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0; i < arg_length; ++i)
-        {
-          CORBA::Any field_any;
-          TAO_InputCDR unk_in (cdr);
-          TAO::Unknown_IDL_Type *field_unk = 0;
-          ACE_NEW (field_unk,
-                   TAO::Unknown_IDL_Type (field_tc.in (),
-                                          unk_in));
-          field_any.replace (field_unk);
-
-          if (i < this->component_count_)
-            {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // Destroy any dangling members.
-      for (CORBA::ULong j = arg_length; j < this->component_count_; ++j)
-        {
-          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // If the array shrinks, we must wait until now to do it.
-      if (arg_length < this->component_count_)
-        {
-          this->da_members_.size (arg_length);
-        }
-
-      // Now we can update component_count_.
-      this->component_count_ = arg_length;
-
-      this->current_position_ = arg_length ? 0 : -1;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  TAO_OutputCDR out_cdr;
-  out_cdr.write_ulong (this->component_count_);
-
-  CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      // Recursive step
-      CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      TAO::Any_Impl *field_impl = field_any->impl ();
-      TAO_OutputCDR field_out;
-      TAO_InputCDR field_cdr (static_cast<ACE_Message_Block *> (0));
-
-      if (field_impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *field_unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
-          field_cdr = field_unk->_tao_get_cdr ();
-        }
-      else
-        {
-          field_impl->marshal_value (field_out);
-          TAO_InputCDR tmp_in (field_out);
-          field_cdr = tmp_in;
-        }
-
-      (void) TAO_Marshal_Object::perform_append (field_tc.in (),
-                                                 &field_cdr,
-                                                 &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA::Any_ptr retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW_THROW_EX (unk,
-                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->replace (unk);
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent)
-    {
-      return 0;
-    }
-
-  if (rhs->component_count () != this->component_count_)
-    {
-      return 0;
-    }
-
-  DynamicAny::DynAny_var tmp;
-  CORBA::Boolean member_equal;
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      rhs->seek (static_cast<CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!member_equal)
-        {
-          return 0;
-        }
-    }
-
-  return 1;
-}
-
-void
-TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      // Do a deep destroy.
-      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-        {
-          this->set_flag (da_members_[i].in (),
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->destroyed_ = 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  if (this->current_position_ == -1)
-    {
-      return DynamicAny::DynAny::_nil ();
-    }
-
-  CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_);
-
-  this->set_flag (this->da_members_[index].in (),
-                  0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  return DynamicAny::DynAny::_duplicate (
-            this->da_members_[index].in ()
-          );
-}
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
deleted file mode 100644
index 4c0b4f8880a..00000000000
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynSequence_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNSEQUENCE_I_H
-#define TAO_DYNSEQUENCE_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-#include "ace/Containers.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynSequence_i
- *
- * Implementation of Dynamic Any type for Sequences.
- */
-class TAO_DynamicAny_Export TAO_DynSequence_i
-  : public virtual DynamicAny::DynSequence,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynSequence_i (void);
-
-  /// Destructor.
-  ~TAO_DynSequence_i (void);
-
-  /// Initialize using just a TypeCode.
-  void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
-
-  /// Initialize using an Any.
-  void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods.
-  static TAO_DynSequence_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = Functions specific to DynSequence.
-
-  virtual CORBA::ULong get_length (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_length (
-      CORBA::ULong len
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::AnySeq * get_elements (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_elements (
-      const DynamicAny::AnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_elements_as_dyn_any (
-      const DynamicAny::DynAnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-private:
-  // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  // Called by both versions of init().
-  void init_common (void);
-
-  // = Use copy() or assign() instead of these
-  TAO_DynSequence_i (const TAO_DynSequence_i &src);
-  TAO_DynSequence_i &operator= (const TAO_DynSequence_i &src);
-
-private:
-  /// Each component is also a DynAny.
-  ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNSEQUENCE_I_H */
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
deleted file mode 100644
index 4519b46fbb8..00000000000
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynStruct_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (DynamicAny,
-           DynStruct_i,
-           "$Id$")
-
-
-TAO_DynStruct_i::TAO_DynStruct_i (void)
-{
-}
-
-TAO_DynStruct_i::~TAO_DynStruct_i (void)
-{
-}
-
-void
-TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc
-                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_struct || kind == CORBA::tk_except)
-    {
-      return;
-    }
-
-  ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-}
-
-void
-TAO_DynStruct_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 1;
-  this->destroyed_ = 0;
-  this->component_count_ = static_cast <CORBA::ULong> (this->da_members_.size ());
-  this->current_position_ = this->component_count_ ? 0 : -1;
-}
-
-void
-TAO_DynStruct_i::init (const CORBA::Any& any
-                       ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_ptr tc = any._tao_get_typecode ();
-  this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-  this->set_from_any (any
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-// This code is common to from_any() and the init() overload that takes
-// an Any argument.
-void
-TAO_DynStruct_i::set_from_any (const CORBA::Any & any
-                               ACE_ENV_ARG_DECL)
-{
-  // member_type() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (any._tao_get_typecode ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong numfields =
-    unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Resize the array.
-  this->da_members_.size (numfields);
-
-  this->init_common ();
-
-  // Get the CDR stream of the Any, if there isn't one, make one.
-  TAO::Any_Impl *impl = any.impl ();
-  TAO_OutputCDR out;
-  TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
-  TAO::Unknown_IDL_Type *unk = 0;
-
-  if (impl->encoded ())
-    {
-      unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      in = unk->_tao_get_cdr ();
-    }
-  else
-    {
-      impl->marshal_value (out);
-      TAO_InputCDR tmp_in (out);
-      in = tmp_in;
-    }
-
-  // If we have an exception type, unmarshal the repository ID.
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (any._tao_get_typecode ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind == CORBA::tk_except)
-    {
-      CORBA::String_var str;
-      in >> str.out ();
-    }
-
-  for (CORBA::ULong i = 0; i < numfields; i++)
-    {
-      CORBA::TypeCode_var field_tc =
-        unaliased_tc->member_type (i
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any field_any;
-      TAO_InputCDR unk_in (in);
-      ACE_NEW (unk,
-               TAO::Unknown_IDL_Type (field_tc.in (),
-                                      unk_in));
-      field_any.replace (unk);
-
-      // This recursive step will call the correct constructor
-      // based on the type of field_any.
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Move to the next field in the CDR stream.
-      (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &in
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL)
-{
-  this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-  // member_type() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-  TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->component_count_ =
-    unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Resize the array.
-  this->da_members_.size (this->component_count_);
-
-  this->init_common ();
-
-  CORBA::TypeCode_var mtype;
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      mtype = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Recursively initialize each member.
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (mtype.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-// ****************************************************************
-
-TAO_DynStruct_i *
-TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref
-                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynStruct_i *> (_tao_objref);
-}
-
-// ****************************************************************
-
-DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  // Is this an empty exception?
-  if (this->component_count_ == 0)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        0);
-    }
-
-  if (this->current_position_ == -1)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        0);
-    }
-
-  // member_name() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  const char *name =
-    unaliased_tc->member_name (this->current_position_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (name);
-}
-
-// Returns the unaliased TCKind.
-CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
-    }
-
-  // Is this an empty exception?
-  if (this->component_count_ == 0)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        CORBA::tk_null);
-    }
-
-  if (this->current_position_ == -1)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        CORBA::tk_null);
-    }
-
-  // member_type() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-  CORBA::TypeCode_var tc =
-  unaliased_tc->member_type (this->current_position_
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  DynamicAny::NameValuePairSeq* members;
-  ACE_NEW_THROW_EX (members,
-                    DynamicAny::NameValuePairSeq (this->component_count_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // We must do this explicitly.
-  members->length (this->component_count_);
-
-  DynamicAny::NameValuePairSeq_var safe_retval = members;
-  CORBA::Any_var temp;
-  CORBA::TypeCode_var unaliased_tc;
-
-  CORBA::TCKind const tc_kind =
-    this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_kind == CORBA::tk_alias)
-    {
-      unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      unaliased_tc = CORBA::TypeCode::_duplicate (this->type_.in ());
-    }
-
-  // Assign name and value to each pearl on the string.
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      safe_retval[i].id =
-        CORBA::string_dup (unaliased_tc->member_name (i
-                                                      ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK_RETURN (0);
-
-      temp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i].value = temp.in ();
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::ULong length = values.length ();
-
-  // Check for length match.
-  if (length != this->component_count_)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var my_tc;
-  CORBA::Boolean equivalent;
-
-  // member_type() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      // Check for type and name match.
-      my_tc = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      value_tc = values[i].value.type ();
-
-      equivalent = my_tc->equivalent (value_tc.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!equivalent)
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-
-      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (values[i].value
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  this->current_position_ = length ? 0 : -1;
-}
-
-DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  DynamicAny::NameDynAnyPairSeq * members;
-  ACE_NEW_THROW_EX (members,
-                    DynamicAny::NameDynAnyPairSeq (this->component_count_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // We must do this explicitly.
-  members->length (this->component_count_);
-
-  DynamicAny::NameDynAnyPairSeq_var safe_retval = members;
-
-  // member_name() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Assign name and value to each pearl on the string.
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      safe_retval[i].id =
-        CORBA::string_dup (unaliased_tc->member_name (i
-                                                      ACE_ENV_ARG_PARAMETER));
-
-      // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
-      // Set the flag so the caller can't destroy.
-      this->set_flag (this->da_members_[i].in (),
-                      0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      safe_retval[i].value =
-        DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
-    }
-
-  return safe_retval._retn ();
-}
-
-void
-TAO_DynStruct_i::set_members_as_dyn_any (
-    const DynamicAny::NameDynAnyPairSeq & values
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::ULong length = values.length ();
-
-  // Check for length match.
-  if (length != this->component_count_)
-    {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
-    }
-
-  CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var my_tc;
-  CORBA::Boolean equivalent;
-
-  // member_type() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      // Check for type and name match.
-      my_tc = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      value_tc = values[i].value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      equivalent = my_tc->equivalent (value_tc.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!equivalent)
-        {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-        }
-
-      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->da_members_[i] =
-        values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  this->current_position_ = length ? 0 : -1;
-}
-
-// ****************************************************************
-
-void
-TAO_DynStruct_i::from_any (const CORBA::Any & any
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent =
-    this->type_->equivalent (tc.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equivalent)
-    {
-      // Get the CDR stream of the Any, if there isn't one, make one.
-      TAO::Any_Impl *impl = any.impl ();
-      TAO_OutputCDR out;
-      TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
-      TAO::Unknown_IDL_Type *unk = 0;
-
-      if (impl->encoded ())
-        {
-          unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-          in = unk->_tao_get_cdr ();
-        }
-      else
-        {
-          impl->marshal_value (out);
-          TAO_InputCDR tmp_in (out);
-          in = tmp_in;
-        }
-
-      // If we have an exception type, unmarshal the repository ID.
-      CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind == CORBA::tk_except)
-        {
-          CORBA::String_var str;
-          in >> str.out ();
-        }
-
-      CORBA::TypeCode_var field_tc;
-      CORBA::TypeCode_var unaliased =
-        TAO::unaliased_typecode (this->type_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-        {
-          field_tc = unaliased->member_type (i
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          CORBA::Any field_any;
-          TAO_InputCDR unk_in (in);
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
-                   TAO::Unknown_IDL_Type (field_tc.in (),
-                                          unk_in));
-          field_any.replace (unk);
-
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Move to the next field in the CDR stream.
-          (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &in
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->current_position_ = this->component_count_ ? 0 : -1;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  TAO_OutputCDR out_cdr;
-
-  // If we have an exception type, marshal the repository ID.
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (kind == CORBA::tk_except)
-    {
-      out_cdr << this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO::Any_Impl *field_impl = 0;
-  TAO::Unknown_IDL_Type *field_unk = 0;
-  TAO_InputCDR field_in_cdr (static_cast<ACE_Message_Block *> (0));
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      CORBA::TypeCode_var field_tc =
-        this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Recursive step.
-      CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      TAO_OutputCDR field_out_cdr;
-      field_impl = field_any->impl ();
-
-      if (field_impl->encoded ())
-        {
-          field_unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-
-          field_in_cdr = field_unk->_tao_get_cdr ();
-        }
-      else
-        {
-          field_impl->marshal_value (field_out_cdr);
-          TAO_InputCDR tmp (field_out_cdr);
-          field_in_cdr = tmp;
-        }
-
-      (void) TAO_Marshal_Object::perform_append (field_tc.in (),
-                                                 &field_in_cdr,
-                                                 &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA::Any_ptr retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW_THROW_EX (unk,
-                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->replace (unk);
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent)
-    {
-      return 0;
-    }
-
-  DynamicAny::DynAny_var tmp;
-  CORBA::Boolean member_equal;
-
-  for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-    {
-      rhs->seek (static_cast <CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!member_equal)
-        {
-          return 0;
-        }
-    }
-
-  return 1;
-}
-
-void
-TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      // Do a deep destroy.
-      for (CORBA::ULong i = 0; i < this->component_count_; ++i)
-        {
-          this->set_flag (da_members_[i].in (),
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->destroyed_ = 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  if (this->component_count_ == 0)
-    {
-      // Empty exception - no component.
-      ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  if (this->current_position_ == -1)
-    {
-      return DynamicAny::DynAny::_nil ();
-    }
-
-  CORBA::ULong index = static_cast <CORBA::ULong> (this->current_position_);
-
-  this->set_flag (this->da_members_[index].in (),
-                  0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  return DynamicAny::DynAny::_duplicate (
-            this->da_members_[index].in ()
-          );
-}
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
deleted file mode 100644
index 9301e632a5e..00000000000
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynStruct_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNSTRUCT_I_H
-#define TAO_DYNSTRUCT_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-#include "ace/Containers.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynStruct_i
- *
- * Implementation of Dynamic Any type for Structs
- */
-class TAO_DynamicAny_Export TAO_DynStruct_i
-  : public virtual DynamicAny::DynStruct,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynStruct_i (void);
-
-  /// Destructor.
-  ~TAO_DynStruct_i (void);
-
-  /// Initialize using just a TypeCode.
-  void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
-
-  /// Initialize using an Any.
-  void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods.
-  static TAO_DynStruct_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = Functions specific to DynStruct.
-
-  virtual DynamicAny::FieldName current_member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::TCKind current_member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::NameValuePairSeq *get_members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_members (
-      const DynamicAny::NameValuePairSeq& value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_members_as_dyn_any (
-      const DynamicAny::NameDynAnyPairSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ));
-
-private:
-  /// Check if the typecode is acceptable.
-  void check_typecode (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL);
-
-  /// Code common to the constructor from an Any arg and the member
-  /// function from_any().
-  void set_from_any (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL);
-
-  /// Called by both versions of init().
-  void init_common (void);
-
-  // = Use copy() or assign() instead of these.
-  TAO_DynStruct_i (const TAO_DynStruct_i &src);
-  TAO_DynStruct_i &operator= (const TAO_DynStruct_i &src);
-
-private:
-  /// Each component is also a DynAny.
-  ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNSTRUCT_I_H */
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
deleted file mode 100644
index 1e762006c60..00000000000
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ /dev/null
@@ -1,1120 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "DynUnion_i.h"
-#include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (DynamicAny,
-           DynUnion_i,
-           "$Id$")
-
-
-TAO_DynUnion_i::TAO_DynUnion_i (void)
-{
-}
-
-TAO_DynUnion_i::~TAO_DynUnion_i (void)
-{
-}
-
-void
-TAO_DynUnion_i::init_common (void)
-{
-  this->ref_to_component_ = 0;
-  this->container_is_destroying_ = 0;
-  this->has_components_ = 1;
-  this->destroyed_ = 0;
-  this->component_count_ = 2;
-  this->current_position_ = 0;
-  this->member_slot_ = 0;
-}
-
-void
-TAO_DynUnion_i::init (const CORBA::Any& any
-                      ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = any.type ();
-
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_union)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  // Initialize the typecode holder.
-  this->type_ = tc;
-
-  this->init_common ();
-
-  // Set the from_factory arg to TRUE, so any problems will throw
-  // InconsistentTypeCode.
-  this->set_from_any (any,
-                      1
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
-                      ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (kind != CORBA::tk_union)
-    {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
-    }
-
-  // Initialize the typecode holder and current index.
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-
-  this->init_common ();
-
-  // member_type()/member_label() do not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-  TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  CORBA::Any_var first_label =
-    unaliased_tc->member_label (this->current_position_
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Initialize the discriminator to the label value of the first member.
-  this->discriminator_ =
-    TAO_DynAnyFactory::make_dyn_any (first_label.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var first_type =
-    unaliased_tc->member_type (this->current_position_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Recursively initialize the member to its default value.
-  this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-TAO_DynUnion_i *
-TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref
-                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_DynUnion_i *> (_tao_objref);
-}
-
-// This code is common to from_any() and the init() overload that takes
-// an Any argument.
-void
-TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
-                              CORBA::Boolean /* from_factory */
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAnyFactory::InconsistentTypeCode
-    ))
-{
-  // discriminator_type () does not work with aliased type codes,
-  // only on unions, so strip the alias out of the type code
-  //
-  CORBA::TypeCode_var tc =
-   TAO_DynAnyFactory::strip_alias (any.type ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var disc_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Any disc_any;
-  TAO::Unknown_IDL_Type *unk = 0;
-
-  // Get a CDR stream - if the Any doesn't have one, make one.
-  TAO::Any_Impl *impl = any.impl ();
-  TAO_OutputCDR out;
-  TAO_InputCDR in (static_cast<ACE_Message_Block *> (0));
-
-  if (impl->encoded ())
-    {
-      TAO::Unknown_IDL_Type *tmp =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-    
-      in = tmp->_tao_get_cdr ();
-    }
-  else
-    {
-      impl->marshal_value (out);
-      TAO_InputCDR tmp_in (out);
-      in = tmp_in;
-    }
-    
-  TAO_InputCDR unk_in (in);
-  ACE_NEW (unk,
-           TAO::Unknown_IDL_Type (disc_tc.in (),
-                                  unk_in));
-
-  disc_any.replace (unk);
-
-  // Need this here because we might have been called from init().
-  if (!CORBA::is_nil (this->discriminator_.in ()))
-    {
-      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // Set the discriminator.
-  this->discriminator_ =
-    TAO_DynAnyFactory::make_dyn_any (disc_any
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Move to the next field in the CDR stream.
-  (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
-                                           &in
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var unaliased =
-    TAO_DynAnyFactory::strip_alias (tc.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong count =
-    unaliased->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Boolean match = 0;
-  CORBA::ULong i;
-
-  // Get the index.
-  for (i = 0; i < count; ++i)
-    {
-      CORBA::Any_var label_any = tc->member_label (i
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      match = this->label_match (label_any.in (),
-                                 disc_any
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (match)
-        {
-          break;
-        }
-    }
-
-  // Need this here because we might have been called from init().
-  if (!CORBA::is_nil (this->member_.in ()))
-    {
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (match)
-    {
-      CORBA::TypeCode_var member_tc = 
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any member_any;
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW (unk,
-               TAO::Unknown_IDL_Type (member_tc.in (),
-                                      in));
-      member_any.replace (unk);
-
-      this->member_ =
-        TAO_DynAnyFactory::make_dyn_any (member_any
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->member_slot_ = i;
-    }
-  else
-    {
-      // If no match, either the Any contains the default member or the
-      // type code was bad.
-
-      // default_index() does not work with aliased type codes.
-      CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long default_index = 
-        unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (default_index == -1)
-        {
-           set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-      else
-        {
-          CORBA::ULong index = static_cast<CORBA::ULong> (default_index);
-
-          CORBA::TypeCode_var default_tc = 
-            tc->member_type (index
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          CORBA::Any default_any;
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW (unk,
-                   TAO::Unknown_IDL_Type (default_tc.in (),
-                                          in));
-          default_any.replace (unk);
-
-          this->member_ =
-            TAO_DynAnyFactory::make_dyn_any (default_any
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->member_slot_ = index;
-        }
-    }
-}
-
-// ****************************************************************
-
-DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
-  // Set the flag so the caller can't destroy.
-  this->set_flag (this->discriminator_.in (),
-                  0
-                  ACE_ENV_ARG_PARAMETER);
-
-  return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
-}
-
-void
-TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var disc_tc = 
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Boolean equivalent = disc_tc->equivalent (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!equivalent)
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-
-  CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong length = 
-    this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Any_var label_any;
-  CORBA::ULong i;
-
-  // member_label() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Boolean match = 0;
-
-  for (i = 0; i < length; ++i)
-    {
-      label_any = unaliased_tc->member_label (i
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      match = this->label_match (label_any.in (),
-                                 value_any.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (match)
-        {
-          break;
-        }
-    }
-
-  if (match)
-    {
-      // If the incoming label value matches the one we already
-      // have, we do nothing.
-      if (i == this->member_slot_)
-        {
-          return;
-        }
-
-      // If we got a match, a named member will be active.
-      this->discriminator_->from_any (label_any.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // member_type() does not work with aliased type codes.
-      CORBA::TypeCode_var member_tc =
-        unaliased_tc->member_type (i
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Initialize member to default value.
-      this->member_ = 
-        TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Named active member (CORBA 2.3.1).
-      this->current_position_ = 1;
-      this->component_count_ = 2;
-
-      this->member_slot_ = i;
-    }
-  else
-    {
-      // default_index() does not work with aliased type codes.
-      CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // If no match, either the default member or no member is active.
-      CORBA::Long default_index = 
-        unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (default_index == -1)
-        {
-          // This can't throw InvalidValue - if there's no default case
-          // and all possible labels are used, we'd have had a match above.
-          this->set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->member_slot_ = static_cast<CORBA::ULong> (default_index);
-        }
-    }
-
-  // If we get here, we update the discriminator no matter what.
-  // Any value will correspond to one of the three cases above.
-  this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->discriminator_ = value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  // default_index() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Long default_index = 
-    unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (default_index == -1)
-    {
-      // No explicit default case.
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-  else
-    {
-      CORBA::ULong index = static_cast<CORBA::ULong> (default_index);
-
-      CORBA::TypeCode_var default_tc =
-        unaliased_tc->member_type (index
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->member_ = 
-        TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Default member active (CORBA 2.3.1).
-      this->current_position_ = 0;
-      this->component_count_ = 2;
-
-      this->member_slot_ = index;
-    }
-}
-
-void
-TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  // default_index() does not work with aliased type codes.
-  CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Long default_index = 
-    unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Throw an exception is there is an explicit default case or if all
-  // possible case label values are used.
-  if (default_index != -1)
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-  else
-    {
-      CORBA::TypeCode_var disc_tc = 
-        this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::TCKind kind = 
-        TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (kind == CORBA::tk_enum)
-        {
-          CORBA::ULong member_count = 
-            this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          CORBA::ULong label_count = 
-            disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          if (member_count == label_count)
-            {
-              ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-            }
-        }
-    }
-
-  // No active member (CORBA 2.3.1).
-  this->current_position_ = 0;
-  this->component_count_ = 1;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  // No active member (CORBA 2.3.1).
-  return (this->current_position_ == 0
-          && this->component_count_ == 1);
-}
-
-CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
-    }
-
-  CORBA::TypeCode_var tc = 
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  if (has_no_active_member)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
-  // Set the flag so the caller can't destroy.
-  this->set_flag (this->member_.in (),
-                  0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-  return DynamicAny::DynAny::_duplicate (this->member_.in ());
-}
-
-char *
-TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (has_no_active_member)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        0);
-    }
-
-  const char *retval = this->type_->member_name (this->member_slot_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return CORBA::string_dup (retval);
-}
-
-CORBA::TCKind
-TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        CORBA::tk_null);
-    }
-
-  CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  if (has_no_active_member)
-    {
-      ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
-                        CORBA::tk_null);
-    }
-
-  CORBA::TypeCode_var tc = 
-    this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
-
-  return retval;
-}
-
-// ****************************************************************
-
-void
-TAO_DynUnion_i::from_any (const CORBA::Any& any
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch,
-      DynamicAny::DynAny::InvalidValue
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
-    this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (equivalent)
-    {
-      // CORBA 2.3.1 section 9.2.3.3.
-      this->current_position_ = 0;
-
-      // May be changed in set_from_any().
-      this->component_count_ = 2;
-
-      // Set the from_factory arg to FALSE, so any problems will throw
-      // TypeMismatch.
-      this->set_from_any (any,
-                          0
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
-    }
-}
-
-CORBA::Any_ptr
-TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  TAO_OutputCDR out_cdr;
-
-  // Add the discriminator to the CDR stream.
-
-  CORBA::TypeCode_var disc_tc = 
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var disc_any = 
-    this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO::Any_Impl *disc_any_impl = disc_any->impl ();
-  TAO_OutputCDR disc_out_cdr;
-  TAO_InputCDR disc_in_cdr (static_cast<ACE_Message_Block *> (0));
-
-  if (disc_any_impl->encoded ())
-    {
-      TAO::Unknown_IDL_Type *disc_unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (disc_any_impl);
-        
-      disc_in_cdr = disc_unk->_tao_get_cdr ();
-    }
-  else
-    {
-      disc_any_impl->marshal_value (disc_out_cdr);
-      TAO_InputCDR disc_tmp_in_cdr (disc_out_cdr);
-      disc_in_cdr = disc_tmp_in_cdr;
-    }
-
-  (void) TAO_Marshal_Object::perform_append (disc_tc.in (),
-                                             &disc_in_cdr,
-                                             &out_cdr
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Add the member to the CDR stream unless it has no active member.
-  if (this->has_no_active_member () == 0)
-    {
-      CORBA::TypeCode_var member_tc = 
-        this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-     
-      CORBA::Any_var member_any = 
-        this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-     
-      TAO::Any_Impl *member_any_impl = member_any->impl ();
-      TAO_OutputCDR member_out_cdr;
-      TAO_InputCDR member_in_cdr (static_cast<ACE_Message_Block *> (0));
-
-      if (member_any_impl->encoded ())
-        {
-          TAO::Unknown_IDL_Type *member_unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (member_any_impl);
-            
-          member_in_cdr = member_unk->_tao_get_cdr ();
-        }
-      else
-        {
-          member_any_impl->marshal_value (member_out_cdr);
-          TAO_InputCDR member_tmp_in_cdr (member_out_cdr);
-          member_in_cdr = member_tmp_in_cdr;
-        }
-     
-      (void) TAO_Marshal_Object::perform_append (member_tc.in (),
-                                                &member_in_cdr,
-                                                &out_cdr
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  
-  // Make the Any.
-  TAO_InputCDR in_cdr (out_cdr);
-
-  CORBA::Any_ptr retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO::Unknown_IDL_Type *unk = 0;
-  ACE_NEW_THROW_EX (unk,
-                    TAO::Unknown_IDL_Type (this->type_.in (),
-                                           in_cdr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  retval->replace (unk);
-  return retval;
-}
-
-CORBA::Boolean
-TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-  TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (impl == 0)
-    {
-      return 0;
-    }
-
-  CORBA::Boolean equivalent = 
-    this->type_->equivalent (impl->type_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent)
-    {
-      return 0;
-    }
-
-  CORBA::Boolean member_equal = 
-    this->member_->equal (impl->member_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean disc_equal =
-    this->discriminator_->equal (impl->discriminator_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  impl->_remove_ref ();
-
-  return (member_equal && disc_equal);
-}
-
-void
-TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-
-  if (!this->ref_to_component_ || this->container_is_destroying_)
-    {
-      // Free the two components.
-
-      this->set_flag (this->member_.in (),
-                      1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->set_flag (this->discriminator_.in (),
-                      1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->destroyed_ = 1;
-    }
-}
-
-DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      DynamicAny::DynAny::TypeMismatch
-    ))
-{
-  if (this->destroyed_)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        DynamicAny::DynAny::_nil ());
-    }
-
-  if (this->current_position_ == 1)
-    {
-      this->set_flag (this->member_.in (),
-                      0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-      return DynamicAny::DynAny::_duplicate (this->member_.in ());
-    }
-  else
-    {
-      this->set_flag (this->discriminator_.in (),
-                      0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
-
-      return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
-    }
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
-                             const CORBA::Any &other_any
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
-{
-  // Use my_any so we can detect a default case label,
-  // if we are iterating through the union type code's
-  // member_label() calls.
-  CORBA::TypeCode_var tc = my_any.type ();
-
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // No need to do any type checking - it was done before this
-  // call was made.
-  switch (kind)
-  {
-    case CORBA::tk_octet:
-      // Default case label - just skip it.
-      return 0;
-    case CORBA::tk_short:
-      {
-        CORBA::Short my_val;
-        CORBA::Short other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-    case CORBA::tk_long:
-      {
-        CORBA::Long my_val;
-        CORBA::Long other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-    case CORBA::tk_ushort:
-      {
-        CORBA::UShort my_val;
-        CORBA::UShort other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-    case CORBA::tk_ulong:
-      {
-        CORBA::ULong my_val;
-        CORBA::ULong other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-    case CORBA::tk_boolean:
-      {
-        CORBA::Boolean my_val;
-        CORBA::Boolean other_val;
-        my_any >>= CORBA::Any::to_boolean (my_val);
-        other_any >>= CORBA::Any::to_boolean (other_val);
-        return my_val == other_val;
-      }
-    case CORBA::tk_char:
-      {
-        CORBA::Char my_val;
-        CORBA::Char other_val;
-        my_any >>= CORBA::Any::to_char (my_val);
-        other_any >>= CORBA::Any::to_char (other_val);
-        return my_val == other_val;
-      }
-// For platforms without native 64-bit ints.
-#if !defined (ACE_LACKS_LONGLONG_T)
-    case CORBA::tk_longlong:
-      {
-        CORBA::LongLong my_val;
-        CORBA::LongLong other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-#endif /* ACE_LACKS_LONGLONG_T */
-    case CORBA::tk_ulonglong:
-      {
-        CORBA::ULongLong my_val;
-        CORBA::ULongLong other_val;
-        my_any >>= my_val;
-        other_any >>= other_val;
-        return my_val == other_val;
-      }
-    case CORBA::tk_wchar:
-      {
-        CORBA::WChar my_val;
-        CORBA::WChar other_val;
-        my_any >>= CORBA::Any::to_wchar (my_val);
-        other_any >>= CORBA::Any::to_wchar (other_val);
-        return my_val == other_val;
-      }
-    case CORBA::tk_enum:
-      {
-        CORBA::ULong my_val;
-        CORBA::ULong other_val;
-        
-        TAO::Any_Impl *my_impl = my_any.impl ();
-
-        if (my_impl->encoded ())
-          {
-            TAO::Unknown_IDL_Type *my_unk =
-              dynamic_cast<TAO::Unknown_IDL_Type *> (my_impl);
-              
-            // We don't want unk's rd_ptr to move, in case we are shared by
-            // another Any, so we use this to copy the state, not the buffer.
-            TAO_InputCDR for_reading (my_unk->_tao_get_cdr ());
-            for_reading.read_ulong (my_val);
-          }
-        else
-          {
-            TAO_OutputCDR my_out;
-            my_impl->marshal_value (my_out);
-            TAO_InputCDR my_in (my_out);
-            my_in.read_ulong (my_val);
-          }
-
-        TAO::Any_Impl *other_impl = other_any.impl ();
-        
-        if (other_impl->encoded ())
-          {
-            TAO::Unknown_IDL_Type *other_unk =
-              dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
-              
-            // We don't want unk's rd_ptr to move, in case we are shared by
-            // another Any, so we use this to copy the state, not the buffer.
-            TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
-            for_reading.read_ulong (other_val);
-          }
-        else
-          {
-            TAO_OutputCDR other_out;
-            other_impl->marshal_value (other_out);
-            TAO_InputCDR other_in (other_out);
-            other_in.read_ulong (other_val);
-          }
-          
-        return my_val == other_val;
-      }
-    // Cannot happen - we've covered all the legal discriminator types.
-    default:
-      return 0;
-  }
-}
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
deleted file mode 100644
index 3052ca6167e..00000000000
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-//=============================================================================
-/**
- *  @file    DynUnion_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNUNION_I_H
-#define TAO_DYNUNION_I_H
-#include /**/ "ace/pre.h"
-
-#include "DynamicAny.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DynCommon.h"
-#include "tao/LocalObject.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_DynUnion_i
- *
- * Implementation of Dynamic Any type for Unions.
- */
-class TAO_DynamicAny_Export TAO_DynUnion_i
-  : public virtual DynamicAny::DynUnion,
-    public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_DynUnion_i (void);
-
-  /// Destructor.
-  ~TAO_DynUnion_i (void);
-
-  /// Constructor taking an Any argument.
-  void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
-
-  /// Constructor taking a typecode argument.
-  void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
-
-  // = LocalObject methods.
-  static TAO_DynUnion_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  // = Functions specific to DynUnion.
-
-  virtual DynamicAny::DynAny_ptr get_discriminator (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void set_discriminator (
-      DynamicAny::DynAny_ptr d
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  virtual void set_to_default_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  virtual void set_to_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-  virtual CORBA::Boolean has_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::TCKind discriminator_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual char * member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::TCKind member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  // = DynAny common functions not implemented in class TAO_DynCommon.
-
-  virtual void from_any (
-      const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAny::InvalidValue
-      ));
-
-  virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch
-      ));
-
-private:
-  /// Code common to the constructor from an Any arg and the member
-  /// function from_any().
-  void set_from_any (const CORBA::Any &any,
-                     CORBA::Boolean from_factory
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        DynamicAny::DynAny::TypeMismatch,
-        DynamicAny::DynAnyFactory::InconsistentTypeCode
-      ));
-
-  /// Called by both versions of init().
-  void init_common (void);
-
-  /// Iterative check for label value match.
-  CORBA::Boolean label_match (const CORBA::Any &my_any,
-                              const CORBA::Any &other_any
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  /// Use copy() or assign() instead of these.
-  TAO_DynUnion_i (const TAO_DynUnion_i &src);
-  TAO_DynUnion_i &operator= (const TAO_DynUnion_i &src);
-
-private:
-  /// Just two components.
-  DynamicAny::DynAny_var member_;
-  DynamicAny::DynAny_var discriminator_;
-
-  /// The active member's slot in the union type code.
-  CORBA::ULong member_slot_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNUNION_I_H */
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
deleted file mode 100644
index 6601550c40d..00000000000
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    DynamicAny.cpp
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#include "DynamicAny.h"
-#include "DynAnyFactory.h"
-
-ACE_RCSID(DynamicAny, DynamicAny, "$Id$")
-
-TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
-                                      int,
-                                      ACE_TCHAR *[]
-                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Object_ptr obj;
-  ACE_NEW_RETURN (obj,
-                  TAO_DynAnyFactory,
-                  CORBA::Object::_nil ());
-  return obj;
-}
-
-int
-TAO_DynamicAny_Loader::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader);
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader,
-                       ACE_TEXT ("DynamicAny_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_DynamicAny_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_DynamicAny, TAO_DynamicAny_Loader)
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
deleted file mode 100644
index c15a85f0035..00000000000
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- C++ -*- */
-
-
-//=============================================================================
-/**
- *  @file    DynamicAny.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DYNAMICANY_H
-#define TAO_DYNAMICANY_H
-#include /**/ "ace/pre.h"
-
-#include "dynamicany_export.h"
-#include "tao/Object_Loader.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader
-{
-public:
-  /// Constructor
-  TAO_DynamicAny_Loader (void);
-
-  /// Creates a DynamicAny factory and returns it.
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                           int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader)
-ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_DynamicAny_Initializer = &TAO_DynamicAny_Loader::Initializer;
-
-#else
-
-static int
-TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_DYNAMICANY_SAFE_INCLUDE
-#include "DynamicAnyC.h"
-#undef TAO_DYNAMICANY_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNAMICANY_H */
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
deleted file mode 100644
index 1a6db982993..00000000000
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * @file DynamicAny.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the DynamicAny module.
- *
- * This file is used to generate the code in DynamicAnyC.{h,i,cpp}, it
- * was obtained from the OMG website as part of the full CORBA IDL,
- * the document reference number is: formal/00-04-01, or use the
- * following URL:
- * http://www.omg.org/technology/documents/formal/corba_omg_idl_text_file.htm
- *
- * We couldn't find a copyright notice in the document, but it is safe
- * to assume that it is Copyright (C) 2000, OMG.
- *
- * We performed some modifications to the file, mainly to use local
- * interfaces (part of what is coming in CORBA 3.0)
- *
- * The command used to generate code from this file is:
- *
- * tao_idl \
- *  -o orig -Gp -Sci -Gd -Ge 1 -Sa -Sc -St -I../.. \
- *          -Wb,export_macro=TAO_DynamicAny_Export \
- *          -Wb,export_include=dynamicany_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          DynamicAny.pidl
- *
- * after the file is generated a patch must be applied.  The patch
- * fixes some problems with interceptors and local interfaces and
- * disables parts of the code under certain configurations.
- *
- * Apply patches using:
- *
- *   patch < diffs/DynamicAny.diff
- *
- * Note: The diffs are generated using:
- *
- *   for i in DynamicAnyC.{h,cpp}; do
- *     diff -wbu orig/$i $i > diffs/DynamicAny.diff
- *   done
- *
- */
-
-#ifndef _DYNAMIC_ANY_IDL_
-#define _DYNAMIC_ANY_IDL_
-
-#pragma prefix "omg.org"
-
-#include <Typecode_types.pidl>
-
-module DynamicAny {
-
-    local interface DynAny {
-        exception InvalidValue {};
-        exception TypeMismatch {};
-
-        CORBA::TypeCode type();
-
-        void assign(        in DynAny   dyn_any)    raises(TypeMismatch);
-        void from_any(      in any      value)      raises(TypeMismatch, InvalidValue);
-        any to_any();
-
-        boolean equal(      in DynAny   dyn_any);
-
-        void destroy();
-        DynAny copy();
-        void insert_boolean(in boolean  value)      raises(TypeMismatch, InvalidValue);
-        void insert_octet(  in octet    value)      raises(TypeMismatch, InvalidValue);
-        void insert_char(   in char     value)      raises(TypeMismatch, InvalidValue);
-        void insert_short(  in short    value)      raises(TypeMismatch, InvalidValue);
-        void insert_ushort( in unsigned short
-                                        value)      raises(TypeMismatch, InvalidValue);
-        void insert_long(   in long     value)      raises(TypeMismatch, InvalidValue);
-        void insert_ulong(  in unsigned long
-                                        value)      raises(TypeMismatch, InvalidValue);
-        void insert_float(  in float    value)      raises(TypeMismatch, InvalidValue);
-        void insert_double( in double   value)      raises(TypeMismatch, InvalidValue);
-        void insert_string( in string   value)      raises(TypeMismatch, InvalidValue);
-        void insert_reference(in Object value)      raises(TypeMismatch, InvalidValue);
-        void insert_typecode(in CORBA::TypeCode
-                                        value)      raises(TypeMismatch, InvalidValue);
-        void insert_longlong(in long long value)    raises(TypeMismatch, InvalidValue);
-        void insert_ulonglong(in unsigned long long
-                                        value)      raises(TypeMismatch, InvalidValue);
-        void insert_longdouble(in long double
-                                        value)      raises(TypeMismatch, InvalidValue);
-        void insert_wchar(  in wchar    value)      raises(TypeMismatch, InvalidValue);
-        void insert_wstring(in wstring  value)      raises(TypeMismatch, InvalidValue);
-        void insert_any(    in any      value)      raises(TypeMismatch, InvalidValue);
-        void insert_dyn_any(in DynAny   value)      raises(TypeMismatch, InvalidValue);
-        void insert_val(    in ValueBase value)     raises(TypeMismatch, InvalidValue);
-
-        boolean         get_boolean()               raises(TypeMismatch, InvalidValue);
-        octet           get_octet()                 raises(TypeMismatch, InvalidValue);
-        char            get_char()                  raises(TypeMismatch, InvalidValue);
-        short           get_short()                 raises(TypeMismatch, InvalidValue);
-        unsigned short  get_ushort()                raises(TypeMismatch, InvalidValue);
-        long            get_long()                  raises(TypeMismatch, InvalidValue);
-        unsigned long   get_ulong()                 raises(TypeMismatch, InvalidValue);
-        float           get_float()                 raises(TypeMismatch, InvalidValue);
-        double          get_double()                raises(TypeMismatch, InvalidValue);
-        string          get_string()                raises(TypeMismatch, InvalidValue);
-        Object          get_reference()             raises(TypeMismatch, InvalidValue);
-        CORBA::TypeCode get_typecode()              raises(TypeMismatch, InvalidValue);
-        long long       get_longlong()              raises(TypeMismatch, InvalidValue);
-        unsigned long long get_ulonglong()          raises(TypeMismatch, InvalidValue);
-        long double     get_longdouble()            raises(TypeMismatch, InvalidValue);
-        wchar           get_wchar()                 raises(TypeMismatch, InvalidValue);
-        wstring         get_wstring()               raises(TypeMismatch, InvalidValue);
-        any             get_any()                   raises(TypeMismatch, InvalidValue);
-        DynAny          get_dyn_any()               raises(TypeMismatch, InvalidValue);
-        ValueBase       get_val()                   raises(TypeMismatch, InvalidValue);
-
-        boolean         seek(in long index);
-        void            rewind();
-        boolean         next();
-        unsigned long   component_count();
-        DynAny          current_component()         raises(TypeMismatch);
-    };
-
-    local interface DynFixed : DynAny {
-        string          get_value();
-        boolean         set_value(in string val)    raises(TypeMismatch, InvalidValue);
-    };
-
-    local interface DynEnum : DynAny {
-        string          get_as_string();
-        void            set_as_string(in string value)
-                                                    raises(InvalidValue);
-        unsigned long   get_as_ulong();
-        void            set_as_ulong( in unsigned long value)
-                                                    raises(InvalidValue);
-    };
-    typedef string FieldName;
-    struct NameValuePair {
-        FieldName   id;
-        any         value;
-    };
-
-    typedef sequence<NameValuePair> NameValuePairSeq;
-    struct NameDynAnyPair {
-        FieldName   id;
-        DynAny      value;
-    };
-
-    typedef sequence<NameDynAnyPair> NameDynAnyPairSeq;
-    local interface DynStruct : DynAny {
-        FieldName           current_member_name()   raises(TypeMismatch, InvalidValue);
-        CORBA::TCKind       current_member_kind()   raises(TypeMismatch, InvalidValue);
-        NameValuePairSeq    get_members();
-        void                set_members(in NameValuePairSeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-        NameDynAnyPairSeq   get_members_as_dyn_any();
-        void                set_members_as_dyn_any(in NameDynAnyPairSeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-    };
-
-    local interface DynUnion : DynAny {
-        DynAny              get_discriminator();
-        void                set_discriminator(in DynAny d)
-                                                    raises(TypeMismatch);
-        void                set_to_default_member() raises(TypeMismatch);
-        void                set_to_no_active_member() raises(TypeMismatch);
-        boolean             has_no_active_member();
-        CORBA::TCKind       discriminator_kind();
-        DynAny              member()                raises(InvalidValue);
-        FieldName           member_name()           raises(InvalidValue);
-        CORBA::TCKind       member_kind()           raises(InvalidValue);
-    };
-
-    typedef sequence<any>    AnySeq;
-    typedef sequence<DynAny> DynAnySeq;
-    local interface DynSequence : DynAny {
-        unsigned long       get_length();
-        void                set_length(in unsigned long len)
-                                                    raises(InvalidValue);
-        AnySeq              get_elements();
-        void                set_elements(in AnySeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-        DynAnySeq           get_elements_as_dyn_any();
-        void                set_elements_as_dyn_any(in DynAnySeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-    };
-
-    local interface DynArray : DynAny {
-        AnySeq              get_elements();
-        void                set_elements(in AnySeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-        DynAnySeq           get_elements_as_dyn_any();
-        void                set_elements_as_dyn_any(in DynAnySeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-    };
-
-    local interface DynValue : DynAny {
-        FieldName           current_member_name()   raises(TypeMismatch, InvalidValue);
-        CORBA::TCKind       current_member_kind()   raises(TypeMismatch, InvalidValue);
-        NameValuePairSeq    get_members();
-        void                set_members(in NameValuePairSeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-        NameDynAnyPairSeq   get_members_as_dyn_any();
-        void                set_members_as_dyn_any(in NameDynAnyPairSeq value)
-                                                    raises(TypeMismatch, InvalidValue);
-    };
-
-    local interface DynAnyFactory {
-        exception           InconsistentTypeCode {};
-        DynAny              create_dyn_any(in any value)
-                                                    raises(InconsistentTypeCode);
-        DynAny              create_dyn_any_from_type_code(in CORBA::TypeCode type)
-                                                    raises(InconsistentTypeCode);
-    };
-
-}; // module DynamicAny
-
-#endif // _DYNAMIC_ANY_IDL_
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
deleted file mode 100644
index ba64e06d5b0..00000000000
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ /dev/null
@@ -1,1880 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DynamicAny.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynAny.
-
-DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::duplicate (
-    DynamicAny::DynAny_ptr p
-  )
-{
-  return DynamicAny::DynAny::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynAny>::release (
-    DynamicAny::DynAny_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynAny_ptr
-TAO::Objref_Traits<DynamicAny::DynAny>::nil (void)
-{
-  return DynamicAny::DynAny::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAny>::marshal (
-    DynamicAny::DynAny_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAny::InvalidValue::InvalidValue (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
-        "InvalidValue"
-      )
-{
-}
-
-DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
-{
-}
-
-DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAny::InvalidValue&
-DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidValue *> (_tao_excp);
-}
-
-const DynamicAny::DynAny::InvalidValue *
-DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidValue *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAny::InvalidValue::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::InvalidValue, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAny::InvalidValue::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAny::InvalidValue (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAny::InvalidValue::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAny::InvalidValue::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAny::InvalidValue::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
-        "TypeMismatch"
-      )
-{
-}
-
-DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
-{
-}
-
-DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAny::TypeMismatch&
-DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<TypeMismatch *> (_tao_excp);
-}
-
-const DynamicAny::DynAny::TypeMismatch *
-DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const TypeMismatch *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAny::TypeMismatch, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAny::TypeMismatch::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAny::TypeMismatch (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAny::TypeMismatch::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAny::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAny::TypeMismatch::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-DynamicAny::DynAny::DynAny (void)
-{}
-
-DynamicAny::DynAny::~DynAny (void)
-{}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAny::_nil ();
-    }
-  
-  DynAny_ptr proxy =
-    dynamic_cast<DynAny_ptr> (_tao_objref);
-  
-  return DynAny::_duplicate (proxy);
-}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAny::_nil ();
-    }
-  
-  DynAny_ptr proxy =
-    dynamic_cast<DynAny_ptr> (_tao_objref);
-  
-  return DynAny::_duplicate (proxy);
-}
-
-DynamicAny::DynAny_ptr
-DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynAny::_tao_release (DynAny_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynAny::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynAny::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynAny:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynAny::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynFixed.
-
-DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate (
-    DynamicAny::DynFixed_ptr p
-  )
-{
-  return DynamicAny::DynFixed::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynFixed>::release (
-    DynamicAny::DynFixed_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynFixed_ptr
-TAO::Objref_Traits<DynamicAny::DynFixed>::nil (void)
-{
-  return DynamicAny::DynFixed::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynFixed>::marshal (
-    DynamicAny::DynFixed_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynFixed::DynFixed (void)
-{}
-
-DynamicAny::DynFixed::~DynFixed (void)
-{}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynFixed::_nil ();
-    }
-  
-  DynFixed_ptr proxy =
-    dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
-  return DynFixed::_duplicate (proxy);
-}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynFixed::_nil ();
-    }
-  
-  DynFixed_ptr proxy =
-    dynamic_cast<DynFixed_ptr> (_tao_objref);
-  
-  return DynFixed::_duplicate (proxy);
-}
-
-DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynFixed::_tao_release (DynFixed_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynFixed::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynFixed:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynFixed::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynFixed:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynEnum.
-
-DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate (
-    DynamicAny::DynEnum_ptr p
-  )
-{
-  return DynamicAny::DynEnum::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynEnum>::release (
-    DynamicAny::DynEnum_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynEnum_ptr
-TAO::Objref_Traits<DynamicAny::DynEnum>::nil (void)
-{
-  return DynamicAny::DynEnum::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynEnum>::marshal (
-    DynamicAny::DynEnum_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynEnum::DynEnum (void)
-{}
-
-DynamicAny::DynEnum::~DynEnum (void)
-{}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynEnum::_nil ();
-    }
-  
-  DynEnum_ptr proxy =
-    dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
-  return DynEnum::_duplicate (proxy);
-}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynEnum::_nil ();
-    }
-  
-  DynEnum_ptr proxy =
-    dynamic_cast<DynEnum_ptr> (_tao_objref);
-  
-  return DynEnum::_duplicate (proxy);
-}
-
-DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynEnum::_tao_release (DynEnum_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynEnum::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynEnum:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynEnum::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynEnum:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameValuePair
-      >
-    (max)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameValuePair * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameValuePair
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::NameValuePairSeq::NameValuePairSeq (
-    const NameValuePairSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameValuePair
-      >
-    (seq)
-{}
-
-DynamicAny::NameValuePairSeq::~NameValuePairSeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (max)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameDynAnyPair * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
-    const NameDynAnyPairSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        DynamicAny::NameDynAnyPair
-      >
-    (seq)
-{}
-
-DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynStruct.
-
-DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate (
-    DynamicAny::DynStruct_ptr p
-  )
-{
-  return DynamicAny::DynStruct::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynStruct>::release (
-    DynamicAny::DynStruct_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynStruct_ptr
-TAO::Objref_Traits<DynamicAny::DynStruct>::nil (void)
-{
-  return DynamicAny::DynStruct::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynStruct>::marshal (
-    DynamicAny::DynStruct_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynStruct::DynStruct (void)
-{}
-
-DynamicAny::DynStruct::~DynStruct (void)
-{}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynStruct::_nil ();
-    }
-  
-  DynStruct_ptr proxy =
-    dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
-  return DynStruct::_duplicate (proxy);
-}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynStruct::_nil ();
-    }
-  
-  DynStruct_ptr proxy =
-    dynamic_cast<DynStruct_ptr> (_tao_objref);
-  
-  return DynStruct::_duplicate (proxy);
-}
-
-DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynStruct::_tao_release (DynStruct_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynStruct::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynStruct:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynStruct::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynStruct:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynUnion.
-
-DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate (
-    DynamicAny::DynUnion_ptr p
-  )
-{
-  return DynamicAny::DynUnion::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynUnion>::release (
-    DynamicAny::DynUnion_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynUnion_ptr
-TAO::Objref_Traits<DynamicAny::DynUnion>::nil (void)
-{
-  return DynamicAny::DynUnion::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynUnion>::marshal (
-    DynamicAny::DynUnion_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynUnion::DynUnion (void)
-{}
-
-DynamicAny::DynUnion::~DynUnion (void)
-{}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynUnion::_nil ();
-    }
-  
-  DynUnion_ptr proxy =
-    dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
-  return DynUnion::_duplicate (proxy);
-}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynUnion::_nil ();
-    }
-  
-  DynUnion_ptr proxy =
-    dynamic_cast<DynUnion_ptr> (_tao_objref);
-  
-  return DynUnion::_duplicate (proxy);
-}
-
-DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynUnion::_tao_release (DynUnion_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynUnion::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynUnion:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynUnion::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynUnion:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_ANYSEQ_CS_)
-#define _DYNAMICANY_ANYSEQ_CS_
-
-DynamicAny::AnySeq::AnySeq (void)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::AnySeq::AnySeq (
-    const AnySeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (seq)
-{}
-
-DynamicAny::AnySeq::~AnySeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
-#define _DYNAMICANY_DYNANYSEQ_CS_
-
-DynamicAny::DynAnySeq::DynAnySeq (void)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (max)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::DynAny_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (max, length, buffer, release)
-{}
-
-DynamicAny::DynAnySeq::DynAnySeq (
-    const DynAnySeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        DynamicAny::DynAny,
-        DynamicAny::DynAny_var
-      >
-    (seq)
-{}
-
-DynamicAny::DynAnySeq::~DynAnySeq (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynSequence.
-
-DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  return DynamicAny::DynSequence::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynSequence>::release (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynSequence_ptr
-TAO::Objref_Traits<DynamicAny::DynSequence>::nil (void)
-{
-  return DynamicAny::DynSequence::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynSequence>::marshal (
-    DynamicAny::DynSequence_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynSequence::DynSequence (void)
-{}
-
-DynamicAny::DynSequence::~DynSequence (void)
-{}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynSequence::_nil ();
-    }
-  
-  DynSequence_ptr proxy =
-    dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
-  return DynSequence::_duplicate (proxy);
-}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynSequence::_nil ();
-    }
-  
-  DynSequence_ptr proxy =
-    dynamic_cast<DynSequence_ptr> (_tao_objref);
-  
-  return DynSequence::_duplicate (proxy);
-}
-
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynSequence::_tao_release (DynSequence_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynSequence::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynSequence:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynSequence::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynSequence:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynArray.
-
-DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::duplicate (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  return DynamicAny::DynArray::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynArray>::release (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynArray_ptr
-TAO::Objref_Traits<DynamicAny::DynArray>::nil (void)
-{
-  return DynamicAny::DynArray::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynArray>::marshal (
-    DynamicAny::DynArray_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynArray::DynArray (void)
-{}
-
-DynamicAny::DynArray::~DynArray (void)
-{}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynArray::_nil ();
-    }
-  
-  DynArray_ptr proxy =
-    dynamic_cast<DynArray_ptr> (_tao_objref);
-  
-  return DynArray::_duplicate (proxy);
-}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynArray::_nil ();
-    }
-  
-  DynArray_ptr proxy =
-    dynamic_cast<DynArray_ptr> (_tao_objref);
-  
-  return DynArray::_duplicate (proxy);
-}
-
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynArray::_tao_release (DynArray_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynArray::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynArray:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynArray::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynArray:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynArray::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynValue.
-
-DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::duplicate (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  return DynamicAny::DynValue::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynValue>::release (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynValue_ptr
-TAO::Objref_Traits<DynamicAny::DynValue>::nil (void)
-{
-  return DynamicAny::DynValue::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynValue>::marshal (
-    DynamicAny::DynValue_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-DynamicAny::DynValue::DynValue (void)
-{}
-
-DynamicAny::DynValue::~DynValue (void)
-{}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynValue::_nil ();
-    }
-  
-  DynValue_ptr proxy =
-    dynamic_cast<DynValue_ptr> (_tao_objref);
-  
-  return DynValue::_duplicate (proxy);
-}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynValue::_nil ();
-    }
-  
-  DynValue_ptr proxy =
-    dynamic_cast<DynValue_ptr> (_tao_objref);
-  
-  return DynValue::_duplicate (proxy);
-}
-
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynValue::_tao_release (DynValue_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynValue::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAny:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynValue:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynValue::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynValue:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynValue::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for DynamicAny::DynAnyFactory.
-
-DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  return DynamicAny::DynAnyFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynAnyFactory_ptr
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::nil (void)
-{
-  return DynamicAny::DynAnyFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal (
-    DynamicAny::DynAnyFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
-        "InconsistentTypeCode"
-      )
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode&
-DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InconsistentTypeCode *> (_tao_excp);
-}
-
-const DynamicAny::DynAnyFactory::InconsistentTypeCode *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InconsistentTypeCode *> (_tao_excp);
-}
-
-CORBA::Exception *DynamicAny::DynAnyFactory::InconsistentTypeCode::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::DynamicAny::DynAnyFactory::InconsistentTypeCode, 0);
-  return retval;
-}
-
-CORBA::Exception *
-DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::DynamicAny::DynAnyFactory::InconsistentTypeCode (*this),
-      0
-    );
-  return result;
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-DynamicAny::DynAnyFactory::DynAnyFactory (void)
-{}
-
-DynamicAny::DynAnyFactory::~DynAnyFactory (void)
-{}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAnyFactory::_nil ();
-    }
-  
-  DynAnyFactory_ptr proxy =
-    dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
-  return DynAnyFactory::_duplicate (proxy);
-}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DynAnyFactory::_nil ();
-    }
-  
-  DynAnyFactory_ptr proxy =
-    dynamic_cast<DynAnyFactory_ptr> (_tao_objref);
-  
-  return DynAnyFactory::_duplicate (proxy);
-}
-
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-DynamicAny::DynAnyFactory::_tao_release (DynAnyFactory_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-DynamicAny::DynAnyFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
-}
-
-CORBA::Boolean
-DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::NameValuePair &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.value);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::NameValuePair &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.value);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_
-#define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::NameValuePairSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::NameValuePairSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_DynamicAny_AnySeq_CPP_
-#define _TAO_CDR_OP_DynamicAny_AnySeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const DynamicAny::AnySeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    DynamicAny::AnySeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
deleted file mode 100644
index 38d2c82257e..00000000000
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ /dev/null
@@ -1,2547 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
-#define _TAO_IDL_ORIG_DYNAMICANYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
-#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
-#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "dynamicany_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicAny_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace DynamicAny
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNANY__VAR_OUT_CH_
-  
-  class DynAny;
-  typedef DynAny *DynAny_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynAny
-      >
-    DynAny_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynAny
-      >
-    DynAny_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNANY_CH_)
-#define _DYNAMICANY_DYNANY_CH_
-  
-  class TAO_DynamicAny_Export DynAny
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef DynAny_ptr _ptr_type;
-    typedef DynAny_var _var_type;
-    
-    // The static operations.
-    static DynAny_ptr _duplicate (DynAny_ptr obj);
-    
-    static void _tao_release (DynAny_ptr obj);
-    
-    static DynAny_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynAny_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynAny_ptr _nil (void)
-    {
-      return static_cast<DynAny_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
-#define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
-    
-    class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException
-    {
-    public:
-      
-      InvalidValue (void);
-      InvalidValue (const InvalidValue &);
-      ~InvalidValue (void);
-
-      InvalidValue &operator= (const InvalidValue &);
-      
-      static InvalidValue *_downcast (CORBA::Exception *);
-      static const InvalidValue *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
-#define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
-    
-    class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException
-    {
-    public:
-      
-      TypeMismatch (void);
-      TypeMismatch (const TypeMismatch &);
-      ~TypeMismatch (void);
-
-      TypeMismatch &operator= (const TypeMismatch &);
-      
-      static TypeMismatch *_downcast (CORBA::Exception *);
-      static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void assign (
-        ::DynamicAny::DynAny_ptr dyn_any
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void from_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * to_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean equal (
-        ::DynamicAny::DynAny_ptr dyn_any
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_boolean (
-        ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_octet (
-        ::CORBA::Octet value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_char (
-        ::CORBA::Char value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_short (
-        ::CORBA::Short value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_ushort (
-        ::CORBA::UShort value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_long (
-        ::CORBA::Long value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_ulong (
-        ::CORBA::ULong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_float (
-        ::CORBA::Float value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_double (
-        ::CORBA::Double value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_string (
-        const char * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_reference (
-        ::CORBA::Object_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_typecode (
-        ::CORBA::TypeCode_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_longlong (
-        ::CORBA::LongLong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_ulonglong (
-        ::CORBA::ULongLong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_longdouble (
-        ::CORBA::LongDouble value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_wchar (
-        ::CORBA::WChar value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_wstring (
-        const CORBA::WChar * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_dyn_any (
-        ::DynamicAny::DynAny_ptr value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void insert_val (
-        ::CORBA::ValueBase * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean get_boolean (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Octet get_octet (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Char get_char (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Short get_short (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::UShort get_ushort (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long get_long (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong get_ulong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Float get_float (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Double get_double (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * get_string (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr get_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr get_typecode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::LongLong get_longlong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULongLong get_ulonglong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::LongDouble get_longdouble (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::WChar get_wchar (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::WChar * get_wstring (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * get_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr get_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ValueBase * get_val (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean seek (
-        ::CORBA::Long index
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void rewind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean next (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong component_count (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr current_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynAny (void);
-    
-    virtual ~DynAny (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynAny (const DynAny &);
-    
-    void operator= (const DynAny &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
-  
-  class DynFixed;
-  typedef DynFixed *DynFixed_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynFixed
-      >
-    DynFixed_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynFixed
-      >
-    DynFixed_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNFIXED_CH_)
-#define _DYNAMICANY_DYNFIXED_CH_
-  
-  class TAO_DynamicAny_Export DynFixed
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynFixed_ptr _ptr_type;
-    typedef DynFixed_var _var_type;
-    
-    // The static operations.
-    static DynFixed_ptr _duplicate (DynFixed_ptr obj);
-    
-    static void _tao_release (DynFixed_ptr obj);
-    
-    static DynFixed_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynFixed_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynFixed_ptr _nil (void)
-    {
-      return static_cast<DynFixed_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * get_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean set_value (
-        const char * val
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynFixed (void);
-    
-    virtual ~DynFixed (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynFixed (const DynFixed &);
-    
-    void operator= (const DynFixed &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
-  
-  class DynEnum;
-  typedef DynEnum *DynEnum_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynEnum
-      >
-    DynEnum_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynEnum
-      >
-    DynEnum_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNENUM_CH_)
-#define _DYNAMICANY_DYNENUM_CH_
-  
-  class TAO_DynamicAny_Export DynEnum
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynEnum_ptr _ptr_type;
-    typedef DynEnum_var _var_type;
-    
-    // The static operations.
-    static DynEnum_ptr _duplicate (DynEnum_ptr obj);
-    
-    static void _tao_release (DynEnum_ptr obj);
-    
-    static DynEnum_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynEnum_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynEnum_ptr _nil (void)
-    {
-      return static_cast<DynEnum_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * get_as_string (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_as_string (
-        const char * value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong get_as_ulong (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_as_ulong (
-        ::CORBA::ULong value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynEnum (void);
-    
-    virtual ~DynEnum (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynEnum (const DynEnum &);
-    
-    void operator= (const DynEnum &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * FieldName;
-  typedef CORBA::String_var FieldName_var;
-  typedef CORBA::String_out FieldName_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct NameValuePair;
-  
-  typedef
-    TAO_Var_Var_T<
-        NameValuePair
-      >
-    NameValuePair_var;
-  
-  typedef
-    TAO_Out_T<
-        NameValuePair,
-        NameValuePair_var
-      >
-    NameValuePair_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_DynamicAny_Export NameValuePair
-  {
-    typedef NameValuePair_var _var_type;
-    
-    
-    TAO_String_Manager id;
-    CORBA::Any value;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-  
-  class NameValuePairSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        NameValuePairSeq,
-        NameValuePair
-      >
-    NameValuePairSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        NameValuePairSeq,
-        NameValuePairSeq_var,
-        NameValuePair
-      >
-    NameValuePairSeq_out;
-  
-  class TAO_DynamicAny_Export NameValuePairSeq
-    : public
-        TAO_Unbounded_Sequence<
-            NameValuePair
-          >
-  {
-  public:
-    NameValuePairSeq (void);
-    NameValuePairSeq (CORBA::ULong max);
-    NameValuePairSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameValuePair* buffer, 
-        CORBA::Boolean release = 0
-      );
-    NameValuePairSeq (const NameValuePairSeq &);
-    ~NameValuePairSeq (void);
-    
-    typedef NameValuePairSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct NameDynAnyPair;
-  
-  typedef
-    TAO_Var_Var_T<
-        NameDynAnyPair
-      >
-    NameDynAnyPair_var;
-  
-  typedef
-    TAO_Out_T<
-        NameDynAnyPair,
-        NameDynAnyPair_var
-      >
-    NameDynAnyPair_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_DynamicAny_Export NameDynAnyPair
-  {
-    typedef NameDynAnyPair_var _var_type;
-    
-    
-    TAO_String_Manager id;
-    DynamicAny::DynAny_var value;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-  
-  class NameDynAnyPairSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPair
-      >
-    NameDynAnyPairSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        NameDynAnyPairSeq,
-        NameDynAnyPairSeq_var,
-        NameDynAnyPair
-      >
-    NameDynAnyPairSeq_out;
-  
-  class TAO_DynamicAny_Export NameDynAnyPairSeq
-    : public
-        TAO_Unbounded_Sequence<
-            NameDynAnyPair
-          >
-  {
-  public:
-    NameDynAnyPairSeq (void);
-    NameDynAnyPairSeq (CORBA::ULong max);
-    NameDynAnyPairSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameDynAnyPair* buffer, 
-        CORBA::Boolean release = 0
-      );
-    NameDynAnyPairSeq (const NameDynAnyPairSeq &);
-    ~NameDynAnyPairSeq (void);
-    
-    typedef NameDynAnyPairSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
-  
-  class DynStruct;
-  typedef DynStruct *DynStruct_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynStruct
-      >
-    DynStruct_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynStruct
-      >
-    DynStruct_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
-#define _DYNAMICANY_DYNSTRUCT_CH_
-  
-  class TAO_DynamicAny_Export DynStruct
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynStruct_ptr _ptr_type;
-    typedef DynStruct_var _var_type;
-    
-    // The static operations.
-    static DynStruct_ptr _duplicate (DynStruct_ptr obj);
-    
-    static void _tao_release (DynStruct_ptr obj);
-    
-    static DynStruct_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynStruct_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynStruct_ptr _nil (void)
-    {
-      return static_cast<DynStruct_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * current_member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::TCKind current_member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::NameValuePairSeq * get_members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_members (
-        const ::DynamicAny::NameValuePairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_members_as_dyn_any (
-        const ::DynamicAny::NameDynAnyPairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynStruct (void);
-    
-    virtual ~DynStruct (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynStruct (const DynStruct &);
-    
-    void operator= (const DynStruct &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
-  
-  class DynUnion;
-  typedef DynUnion *DynUnion_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynUnion
-      >
-    DynUnion_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynUnion
-      >
-    DynUnion_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNUNION_CH_)
-#define _DYNAMICANY_DYNUNION_CH_
-  
-  class TAO_DynamicAny_Export DynUnion
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynUnion_ptr _ptr_type;
-    typedef DynUnion_var _var_type;
-    
-    // The static operations.
-    static DynUnion_ptr _duplicate (DynUnion_ptr obj);
-    
-    static void _tao_release (DynUnion_ptr obj);
-    
-    static DynUnion_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynUnion_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynUnion_ptr _nil (void)
-    {
-      return static_cast<DynUnion_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr get_discriminator (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_discriminator (
-        ::DynamicAny::DynAny_ptr d
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_to_default_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_to_no_active_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean has_no_active_member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::TCKind discriminator_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr member (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::TCKind member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynUnion (void);
-    
-    virtual ~DynUnion (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynUnion (const DynUnion &);
-    
-    void operator= (const DynUnion &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_ANYSEQ_CH_)
-#define _DYNAMICANY_ANYSEQ_CH_
-  
-  class AnySeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
-      >
-    AnySeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
-      >
-    AnySeq_out;
-  
-  class TAO_DynamicAny_Export AnySeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Any
-          >
-  {
-  public:
-    AnySeq (void);
-    AnySeq (CORBA::ULong max);
-    AnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AnySeq (const AnySeq &);
-    ~AnySeq (void);
-    
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
-#define _DYNAMICANY_DYNANYSEQ_CH_
-  
-  class DynAnySeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        DynAnySeq,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
-      >
-    DynAnySeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        DynAnySeq,
-        DynAnySeq_var,
-        TAO_Object_Manager<
-            DynAny,
-            DynAny_var
-          >
-      >
-    DynAnySeq_out;
-  
-  class TAO_DynamicAny_Export DynAnySeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            DynAny,
-            DynAny_var
-          >
-  {
-  public:
-    DynAnySeq (void);
-    DynAnySeq (CORBA::ULong max);
-    DynAnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        DynAny_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    DynAnySeq (const DynAnySeq &);
-    ~DynAnySeq (void);
-    
-    typedef DynAnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
-  
-  class DynSequence;
-  typedef DynSequence *DynSequence_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynSequence
-      >
-    DynSequence_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynSequence
-      >
-    DynSequence_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
-#define _DYNAMICANY_DYNSEQUENCE_CH_
-  
-  class TAO_DynamicAny_Export DynSequence
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynSequence_ptr _ptr_type;
-    typedef DynSequence_var _var_type;
-    
-    // The static operations.
-    static DynSequence_ptr _duplicate (DynSequence_ptr obj);
-    
-    static void _tao_release (DynSequence_ptr obj);
-    
-    static DynSequence_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynSequence_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynSequence_ptr _nil (void)
-    {
-      return static_cast<DynSequence_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong get_length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_length (
-        ::CORBA::ULong len
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::AnySeq * get_elements (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_elements (
-        const ::DynamicAny::AnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_elements_as_dyn_any (
-        const ::DynamicAny::DynAnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynSequence (void);
-    
-    virtual ~DynSequence (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynSequence (const DynSequence &);
-    
-    void operator= (const DynSequence &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
-  
-  class DynArray;
-  typedef DynArray *DynArray_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynArray
-      >
-    DynArray_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynArray
-      >
-    DynArray_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNARRAY_CH_)
-#define _DYNAMICANY_DYNARRAY_CH_
-  
-  class TAO_DynamicAny_Export DynArray
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynArray_ptr _ptr_type;
-    typedef DynArray_var _var_type;
-    
-    // The static operations.
-    static DynArray_ptr _duplicate (DynArray_ptr obj);
-    
-    static void _tao_release (DynArray_ptr obj);
-    
-    static DynArray_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynArray_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynArray_ptr _nil (void)
-    {
-      return static_cast<DynArray_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::AnySeq * get_elements (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_elements (
-        const ::DynamicAny::AnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_elements_as_dyn_any (
-        const ::DynamicAny::DynAnySeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynArray (void);
-    
-    virtual ~DynArray (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynArray (const DynArray &);
-    
-    void operator= (const DynArray &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
-  
-  class DynValue;
-  typedef DynValue *DynValue_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynValue
-      >
-    DynValue_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynValue
-      >
-    DynValue_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNVALUE_CH_)
-#define _DYNAMICANY_DYNVALUE_CH_
-  
-  class TAO_DynamicAny_Export DynValue
-    : public virtual ::DynamicAny::DynAny
-  {
-  public:
-    typedef DynValue_ptr _ptr_type;
-    typedef DynValue_var _var_type;
-    
-    // The static operations.
-    static DynValue_ptr _duplicate (DynValue_ptr obj);
-    
-    static void _tao_release (DynValue_ptr obj);
-    
-    static DynValue_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynValue_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynValue_ptr _nil (void)
-    {
-      return static_cast<DynValue_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * current_member_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::TCKind current_member_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::NameValuePairSeq * get_members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_members (
-        const ::DynamicAny::NameValuePairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_members_as_dyn_any (
-        const ::DynamicAny::NameDynAnyPairSeq & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAny::TypeMismatch,
-        ::DynamicAny::DynAny::InvalidValue
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynValue (void);
-    
-    virtual ~DynValue (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynValue (const DynValue &);
-    
-    void operator= (const DynValue &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
-#define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
-  
-  class DynAnyFactory;
-  typedef DynAnyFactory *DynAnyFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DynAnyFactory
-      >
-    DynAnyFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DynAnyFactory
-      >
-    DynAnyFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
-#define _DYNAMICANY_DYNANYFACTORY_CH_
-  
-  class TAO_DynamicAny_Export DynAnyFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef DynAnyFactory_ptr _ptr_type;
-    typedef DynAnyFactory_var _var_type;
-    
-    // The static operations.
-    static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
-    
-    static void _tao_release (DynAnyFactory_ptr obj);
-    
-    static DynAnyFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynAnyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DynAnyFactory_ptr _nil (void)
-    {
-      return static_cast<DynAnyFactory_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
-#define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
-    
-    class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException
-    {
-    public:
-      
-      InconsistentTypeCode (void);
-      InconsistentTypeCode (const InconsistentTypeCode &);
-      ~InconsistentTypeCode (void);
-
-      InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-      
-      static InconsistentTypeCode *_downcast (CORBA::Exception *);
-      static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr create_dyn_any (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-        ::CORBA::TypeCode_ptr type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::DynamicAny::DynAnyFactory::InconsistentTypeCode
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DynAnyFactory (void);
-    
-    virtual ~DynAnyFactory (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DynAnyFactory (const DynAnyFactory &);
-    
-    void operator= (const DynAnyFactory &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module DynamicAny
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_DYNAMICANY_DYNANY__TRAITS_CH_)
-#define _DYNAMICANY_DYNANY__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
-  {
-    static ::DynamicAny::DynAny_ptr duplicate (
-        ::DynamicAny::DynAny_ptr
-      );
-    static void release (
-        ::DynamicAny::DynAny_ptr
-      );
-    static ::DynamicAny::DynAny_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynAny_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNFIXED__TRAITS_CH_)
-#define _DYNAMICANY_DYNFIXED__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
-  {
-    static ::DynamicAny::DynFixed_ptr duplicate (
-        ::DynamicAny::DynFixed_ptr
-      );
-    static void release (
-        ::DynamicAny::DynFixed_ptr
-      );
-    static ::DynamicAny::DynFixed_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynFixed_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNENUM__TRAITS_CH_)
-#define _DYNAMICANY_DYNENUM__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
-  {
-    static ::DynamicAny::DynEnum_ptr duplicate (
-        ::DynamicAny::DynEnum_ptr
-      );
-    static void release (
-        ::DynamicAny::DynEnum_ptr
-      );
-    static ::DynamicAny::DynEnum_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynEnum_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSTRUCT__TRAITS_CH_)
-#define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
-  {
-    static ::DynamicAny::DynStruct_ptr duplicate (
-        ::DynamicAny::DynStruct_ptr
-      );
-    static void release (
-        ::DynamicAny::DynStruct_ptr
-      );
-    static ::DynamicAny::DynStruct_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynStruct_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNUNION__TRAITS_CH_)
-#define _DYNAMICANY_DYNUNION__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
-  {
-    static ::DynamicAny::DynUnion_ptr duplicate (
-        ::DynamicAny::DynUnion_ptr
-      );
-    static void release (
-        ::DynamicAny::DynUnion_ptr
-      );
-    static ::DynamicAny::DynUnion_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynUnion_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE__TRAITS_CH_)
-#define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
-  {
-    static ::DynamicAny::DynSequence_ptr duplicate (
-        ::DynamicAny::DynSequence_ptr
-      );
-    static void release (
-        ::DynamicAny::DynSequence_ptr
-      );
-    static ::DynamicAny::DynSequence_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynSequence_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNARRAY__TRAITS_CH_)
-#define _DYNAMICANY_DYNARRAY__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
-  {
-    static ::DynamicAny::DynArray_ptr duplicate (
-        ::DynamicAny::DynArray_ptr
-      );
-    static void release (
-        ::DynamicAny::DynArray_ptr
-      );
-    static ::DynamicAny::DynArray_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynArray_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNVALUE__TRAITS_CH_)
-#define _DYNAMICANY_DYNVALUE__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
-  {
-    static ::DynamicAny::DynValue_ptr duplicate (
-        ::DynamicAny::DynValue_ptr
-      );
-    static void release (
-        ::DynamicAny::DynValue_ptr
-      );
-    static ::DynamicAny::DynValue_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynValue_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY__TRAITS_CH_)
-#define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
-  {
-    static ::DynamicAny::DynAnyFactory_ptr duplicate (
-        ::DynamicAny::DynAnyFactory_ptr
-      );
-    static void release (
-        ::DynamicAny::DynAnyFactory_ptr
-      );
-    static ::DynamicAny::DynAnyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::DynamicAny::DynAnyFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const DynamicAny::NameValuePair &);
-TAO_DynamicAny_Export CORBA::Boolean operator>> (TAO_InputCDR &, DynamicAny::NameValuePair &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
-#define _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const DynamicAny::NameValuePairSeq &
-  );
-TAO_DynamicAny_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    DynamicAny::NameValuePairSeq &
-  );
-
-#endif /* _TAO_CDR_OP_DynamicAny_NameValuePairSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_DynamicAny_AnySeq_H_
-#define _TAO_CDR_OP_DynamicAny_AnySeq_H_
-
-TAO_DynamicAny_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const DynamicAny::AnySeq &
-  );
-TAO_DynamicAny_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    DynamicAny::AnySeq &
-  );
-
-#endif /* _TAO_CDR_OP_DynamicAny_AnySeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.pc.in b/TAO/tao/DynamicAny/TAO_DynamicAny.pc.in
deleted file mode 100644
index 69ad7c05064..00000000000
--- a/TAO/tao/DynamicAny/TAO_DynamicAny.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_DynamicAny
-Description: TAO Dynamic Any Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_DynamicAny
-Cflags: -I${includedir}
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.rc b/TAO/tao/DynamicAny/TAO_DynamicAny.rc
deleted file mode 100644
index f8f1131c54d..00000000000
--- a/TAO/tao/DynamicAny/TAO_DynamicAny.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "DymanicAny\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_DynamicAnyDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_DynamicAny.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
deleted file mode 100644
index 30516db185e..00000000000
--- a/TAO/tao/DynamicAny/diffs/DynamicAny.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- orig/DynamicAnyC.h	2005-02-18 12:28:35.777297600 +0100
-+++ DynamicAnyC.h	2005-02-18 12:28:36.067715200 +0100
-@@ -34,6 +34,10 @@
- #include /**/ "ace/pre.h"
- 
- 
-+#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
-+#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
-+#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
-+
- #include "ace/config-all.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -41,7 +45,6 @@
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "dynamicany_export.h"
--#include "tao/Valuetype/ValueBase.h"
- #include "tao/ORB.h"
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
---- orig/DynamicAnyC.cpp	2005-02-18 12:28:35.787312000 +0100
-+++ DynamicAnyC.cpp	2005-02-18 12:28:36.077729600 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "DynamicAnyC.h"
-+#include "DynamicAny.h"
- #include "tao/CDR.h"
- #include "ace/OS_NS_string.h"
- 
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.pidl.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.pidl.diff
deleted file mode 100644
index 9e23cae814c..00000000000
--- a/TAO/tao/DynamicAny/diffs/DynamicAny.pidl.diff
+++ /dev/null
@@ -1,158 +0,0 @@
---- orig/DynamicAny.pidl	Fri Aug 25 09:46:46 2000
-+++ DynamicAny.pidl	Fri Aug 25 15:19:49 2000
-@@ -1,5 +1,57 @@
--// File: DynamicAny.idl
--// CORBA 2.3, Chapter 9
-+//
-+// $Id$
-+//
-+// ================================================================
-+//
-+// = LIBRARY
-+//   TAO
-+//
-+// = FILENAME
-+//   DynamicAny.pidl
-+//
-+// = DESCRIPTION
-+//   This file was used to generate the code in DynamicAnyC.{h,i,cpp}
-+//   The file was obtained from the OMG website as part of the full
-+//   CORBA IDL formal/00-04-01:
-+// http://www.omg.org/technology/documents/formal/corba_omg_idl_text_file.htm
-+//   I couldn't find a copyright notice in the document, but I will
-+//   assume that it is Copyright (C) 2000, OMG.
-+//   We performed some modifications to the file, mainly to use local
-+//   interfaces (part of what is coming in CORBA 2.4 and CORBA 3.0).
-+//
-+//   The command used to generate code from this file is:
-+//
-+//     tao_idl.exe -o orig -Gp -Gd -Ge 1 -Gv \
-+//          -Wb,export_macro=TAO_DynamicAny_Export \
-+//          -Wb,export_include=dynamicany_export.h \
-+//          -Wb,pre_include="ace/pre.h" \
-+//          -Wb,post_include="ace/post.h" \
-+//          DynamicAny.pidl
-+//
-+//   after the file is generated a patch must be applied.  The patch
-+//   fixes some problems with interceptors and local interfaces and
-+//   disables parts of the code under certain configurations.
-+//
-+//   Apply patches using the following commands:
-+//
-+//   patch < diffs/DynamicAnyC.h.diff
-+//   patch < diffs/DynamicAnyC.i.diff
-+//   patch < diffs/DynamicAnyC.cpp.diff
-+//
-+//   Those changes are required because the generated
-+//   code is part of the TAO library, it hardly makes any sense to
-+//   change the IDL compiler to support changes that are very
-+//   occasional.
-+//
-+//   Note: The diffs were generated with these commands:
-+//
-+//   diff -wbu orig/DynamicAny.pidl DynamicAny.pidl > diffs\DynamicAny.pidl.diff
-+//
-+//   diff -wbu orig/DynamicAnyC.h DynamicAnyC.h > diffs/DynamicAnyC.h.diff
-+//   diff -wbu orig/DynamicAnyC.i DynamicAnyC.i > diffs/DynamicAnyC.i.diff
-+//   diff -wbu orig/DynamicAnyC.cpp DynamicAnyC.cpp > diffs/DynamicAnyC.cpp.diff
-+//
-+// ================================================================
- 
- #ifndef _DYNAMIC_ANY_IDL_
- #define _DYNAMIC_ANY_IDL_
-@@ -8,7 +60,7 @@
- 
- module DynamicAny {
- 
--    interface DynAny {
-+    local interface DynAny {
-         exception InvalidValue {};
-         exception TypeMismatch {};
-                 
-@@ -46,7 +98,7 @@
-         void insert_wstring(in wstring  value)      raises(TypeMismatch, InvalidValue);
-         void insert_any(    in any      value)      raises(TypeMismatch, InvalidValue);
-         void insert_dyn_any(in DynAny   value)      raises(TypeMismatch, InvalidValue);
--        void insert_val(    in ValueBase value)     raises(TypeMismatch, InvalidValue);
-+        void insert_val(    in CORBA::ValueBase value)     raises(TypeMismatch, InvalidValue);
- 
-         boolean         get_boolean()               raises(TypeMismatch, InvalidValue);
-         octet           get_octet()                 raises(TypeMismatch, InvalidValue);
-@@ -67,7 +119,7 @@
-         wstring         get_wstring()               raises(TypeMismatch, InvalidValue);
-         any             get_any()                   raises(TypeMismatch, InvalidValue);
-         DynAny          get_dyn_any()               raises(TypeMismatch, InvalidValue);
--        ValueBase       get_val()                   raises(TypeMismatch, InvalidValue);
-+        CORBA::ValueBase       get_val()                   raises(TypeMismatch, InvalidValue);
- 
-         boolean         seek(in long index);
-         void            rewind();
-@@ -76,12 +128,12 @@
-         DynAny          current_component()         raises(TypeMismatch);
-     };
-     
--    interface DynFixed : DynAny {
-+    local interface DynFixed : DynAny {
-         string          get_value();
-         boolean         set_value(in string val)    raises(TypeMismatch, InvalidValue);
-     };
-     
--    interface DynEnum : DynAny {
-+    local interface DynEnum : DynAny {
-         string          get_as_string();
-         void            set_as_string(in string value) 
-                                                     raises(InvalidValue);
-@@ -102,7 +154,7 @@
-     };
- 
-     typedef sequence<NameDynAnyPair> NameDynAnyPairSeq;
--    interface DynStruct : DynAny {
-+    local interface DynStruct : DynAny {
-         FieldName           current_member_name()   raises(TypeMismatch, InvalidValue);
-         CORBA::TCKind       current_member_kind()   raises(TypeMismatch, InvalidValue);
-         NameValuePairSeq    get_members();
-@@ -113,7 +165,7 @@
-                                                     raises(TypeMismatch, InvalidValue);
-     };
- 
--    interface DynUnion : DynAny {
-+    local interface DynUnion : DynAny {
-         DynAny              get_discriminator();
-         void                set_discriminator(in DynAny d) 
-                                                     raises(TypeMismatch);
-@@ -128,7 +180,7 @@
-     
-     typedef sequence<any>    AnySeq;
-     typedef sequence<DynAny> DynAnySeq;
--    interface DynSequence : DynAny {
-+    local interface DynSequence : DynAny {
-         unsigned long       get_length();
-         void                set_length(in unsigned long len) 
-                                                     raises(InvalidValue);
-@@ -140,7 +192,7 @@
-                                                     raises(TypeMismatch, InvalidValue);
-     };
- 
--    interface DynArray : DynAny {
-+    local interface DynArray : DynAny {
-         AnySeq              get_elements();
-         void                set_elements(in AnySeq value)
-                                                     raises(TypeMismatch, InvalidValue);
-@@ -149,7 +201,7 @@
-                                                     raises(TypeMismatch, InvalidValue);
-     };
-     
--    interface DynValue : DynAny {
-+    local interface DynValue : DynAny {
-         FieldName           current_member_name()   raises(TypeMismatch, InvalidValue);
-         CORBA::TCKind       current_member_kind()   raises(TypeMismatch, InvalidValue);
-         NameValuePairSeq    get_members();
-@@ -160,7 +212,7 @@
-                                                     raises(TypeMismatch, InvalidValue);
-     };
- 
--    interface DynAnyFactory {
-+    local interface DynAnyFactory {
-         exception           InconsistentTypeCode {};
-         DynAny              create_dyn_any(in any value)
-                                                     raises(InconsistentTypeCode);
diff --git a/TAO/tao/DynamicAny/dynamicany_export.h b/TAO/tao/DynamicAny/dynamicany_export.h
deleted file mode 100644
index 83eed065565..00000000000
--- a/TAO/tao/DynamicAny/dynamicany_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_DYNAMICANY_EXPORT_H
-#define TAO_DYNAMICANY_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_DYNAMICANY_HAS_DLL)
-#    define TAO_DYNAMICANY_HAS_DLL 0
-#  endif /* ! TAO_DYNAMICANY_HAS_DLL */
-#else
-#  if !defined (TAO_DYNAMICANY_HAS_DLL)
-#    define TAO_DYNAMICANY_HAS_DLL 1
-#  endif /* ! TAO_DYNAMICANY_HAS_DLL */
-#endif
-
-#if defined (TAO_DYNAMICANY_HAS_DLL) && (TAO_DYNAMICANY_HAS_DLL == 1)
-#  if defined (TAO_DYNAMICANY_BUILD_DLL)
-#    define TAO_DynamicAny_Export ACE_Proper_Export_Flag
-#    define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_DYNAMICANY_BUILD_DLL */
-#    define TAO_DynamicAny_Export ACE_Proper_Import_Flag
-#    define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_DYNAMICANY_BUILD_DLL */
-#else /* TAO_DYNAMICANY_HAS_DLL == 1 */
-#  define TAO_DynamicAny_Export
-#  define TAO_DYNAMICANY_SINGLETON_DECLARATION(T)
-#  define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_DYNAMICANY_HAS_DLL == 1 */
-
-#endif /* TAO_DYNAMICANY_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
deleted file mode 100644
index 67f9cf132a1..00000000000
--- a/TAO/tao/DynamicC.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DynamicC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
-
-Dynamic::ParameterList::ParameterList (void)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    const ParameterList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (seq)
-{}
-
-Dynamic::ParameterList::~ParameterList (void)
-{}
-
-void Dynamic::ParameterList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ParameterList * _tao_tmp_pointer =
-    static_cast<ParameterList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
-#define _DYNAMIC_EXCEPTIONLIST_CS_
-
-Dynamic::ExceptionList::ExceptionList (void)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    const ExceptionList &seq
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (seq)
-{}
-
-Dynamic::ExceptionList::~ExceptionList (void)
-{}
-
-void Dynamic::ExceptionList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExceptionList * _tao_tmp_pointer =
-    static_cast<ExceptionList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-#define _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ParameterList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ParameterList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ExceptionList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ExceptionList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
deleted file mode 100644
index c9e70f316ed..00000000000
--- a/TAO/tao/DynamicC.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
-#define _TAO_IDL_ORIG_DYNAMICC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/Dynamic_ParameterC.h"
-#include "tao/StringSeqC.h"
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CH_)
-#define _DYNAMIC_PARAMETERLIST_CH_
-  
-  class ParameterList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ParameterList,
-        Parameter
-      >
-    ParameterList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ParameterList,
-        ParameterList_var,
-        Parameter
-      >
-    ParameterList_out;
-  
-  class TAO_Export ParameterList
-    : public
-        TAO_Unbounded_Sequence<
-            Parameter
-          >
-  {
-  public:
-    ParameterList (void);
-    ParameterList (CORBA::ULong max);
-    ParameterList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Parameter* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ParameterList (const ParameterList &);
-    ~ParameterList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ParameterList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq ContextList;
-  typedef CORBA::StringSeq_var ContextList_var;
-  typedef CORBA::StringSeq_out ContextList_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ContextList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
-#define _DYNAMIC_EXCEPTIONLIST_CH_
-  
-  class ExceptionList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExceptionList,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExceptionList,
-        ExceptionList_var,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_out;
-  
-  class TAO_Export ExceptionList
-    : public
-        TAO_Unbounded_Pseudo_Sequence<
-            CORBA::TypeCode
-          >
-  {
-  public:
-    ExceptionList (void);
-    ExceptionList (CORBA::ULong max);
-    ExceptionList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExceptionList (const ExceptionList &);
-    ~ExceptionList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExceptionList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ExceptionList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq RequestContext;
-  typedef CORBA::StringSeq_var RequestContext_var;
-  typedef CORBA::StringSeq_out RequestContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
-#define _TAO_CDR_OP_Dynamic_ParameterList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ParameterList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ParameterList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ExceptionList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ExceptionList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
deleted file mode 100644
index 3c5a4cd6488..00000000000
--- a/TAO/tao/DynamicInterface.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-project : taolib, core, messaging, minimum_corba {
-  sharedname   = TAO_DynamicInterface
-  dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL
-
-  Source_Files {
-    DynamicInterface
-  }
-
-  Header_Files {
-    DynamicInterface 
-  }
-
-  Inline_Files {
-    DynamicInterface
-  }
-
-  Template_Files {
-    DynamicInterface
-  }
-
-  Resource_Files {
-    DynamicInterface
-  }
-
-  PIDL_Files {
-  }
-
-  Pkgconfig_Files {
-    DynamicInterface/TAO_DynamicInterface.pc.in
-  }
-}
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
deleted file mode 100644
index 23c5c331827..00000000000
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-#include "Context.h"
-
-
-ACE_RCSID (DynamicInterface,
-           Context,
-           "$Id$")
-
-
-#include "tao/TypeCode.h"
-#include "tao/NVList.h"
-#include "tao/Environment.h"
-#include "tao/CORBA_String.h"
-#include "tao/SystemException.h"
-
-#include "ace/Guard_T.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Context.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-CORBA::Context::Context (void)
-  : refcount_ (1)
-{
-}
-
-CORBA::Context::~Context (void)
-{
-}
-
-CORBA::ULong
-CORBA::Context::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->refcount_lock_,
-                    0);
-
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA::Context::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      ace_mon,
-                      this->refcount_lock_,
-                      0);
-
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-const char *
-CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Context_ptr
-CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-void
-CORBA::Context::create_child (const char * /* child_ctx_name */,
-                              CORBA::Context_out /* child_ctx */
-                              ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::Context::set_one_value (const char * /* propname */,
-                               const CORBA::Any & /* propvalue */
-                               ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::Context::set_values (CORBA::NVList_ptr
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::Context::delete_values (const char * /* propname */
-                               ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::Context::get_values (const char * /* start_scope */,
-                            CORBA::Flags /* op_flags */,
-                            const char * /* pattern */,
-                            CORBA::NVList_ptr & /* values */
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::ContextList::ContextList (CORBA::ULong len,
-                                 char* *ctx_list)
-  : ref_count_ (1)
-{
-  for (CORBA::ULong i=0; i < len; i++)
-    {
-      this->add (ctx_list [i]);
-    }
-}
-
-CORBA::ContextList::~ContextList (void)
-{
-  for (CORBA::ULong i = 0; i < this->count (); ++i)
-    {
-      char **ctx;
-
-      if (this->ctx_list_.get (ctx, i) == -1)
-        {
-          return;
-        }
-
-      CORBA::string_free (*ctx);
-    }
-}
-
-void
-CORBA::ContextList::add (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (CORBA::string_dup (ctx));
-}
-
-void
-CORBA::ContextList::add_consume (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (ctx);
-}
-
-char *
-CORBA::ContextList::item (CORBA::ULong slot
-                         ACE_ENV_ARG_DECL)
-{
-  char **ctx = 0;
-
-  if (this->ctx_list_.get (ctx, slot) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                        0);
-    }
-  else
-    {
-      return CORBA::string_dup (*ctx);
-    }
-}
-
-void
-CORBA::ContextList::remove (CORBA::ULong
-                           ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA::ContextList_ptr
-CORBA::ContextList::_duplicate (void)
-{
-  ++this->ref_count_;
-  return this;
-}
-
-void
-CORBA::ContextList::_destroy (void)
-{
-  CORBA::ULong current = --this->ref_count_;
-
-  if (current == 0)
-    {
-      delete this;
-    }
-}
-
-void
-CORBA::ContextList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA::ContextList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-
-  if (this->ref_count_ != 0)
-    {
-      delete this;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::Context>;
-  template class TAO_Pseudo_Out_T<CORBA::Context, CORBA::Context_var>;
-  template class TAO_Pseudo_Var_T<CORBA::ContextList>;
-  template class TAO_Pseudo_Out_T<CORBA::ContextList, CORBA::ContextList_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::Context>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::Context, CORBA::Context_var>
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::ContextList>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::ContextList, CORBA::ContextList_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
deleted file mode 100644
index 82b9a5b0a0a..00000000000
--- a/TAO/tao/DynamicInterface/Context.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-//=============================================================================
-/**
- *  @file    Context.h
- *
- *  $Id$
- *
- *  Header file for CORBA Context class.
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONTEXT_H
-#define TAO_CONTEXT_H
-
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DII_CORBA_methods.h"
-
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/orbconf.h"
-#include "tao/Basic_Types.h"
-#include "tao/ORB_Constants.h"
-#include "tao/default_environment.h"
-
-#include "ace/Unbounded_Queue.h"
-#include "ace/Atomic_Op.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Synch_Traits.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-namespace CORBA
-{
-  typedef ULong Flags;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
-  class Environment;
-
-  typedef TAO_Pseudo_Var_T<Context> Context_var;
-  typedef TAO_Pseudo_Out_T<Context, Context_var> Context_out;
-
-  typedef TAO_Pseudo_Var_T<ContextList> ContextList_var;
-  typedef TAO_Pseudo_Out_T<ContextList, ContextList_var> ContextList_out;
-
-  /**
-   * @class Context
-   *
-   * @brief CORBA::Context
-   *
-   * TAO's minimal implementation of the Context interface.  Since
-   * Contexts are inherently un-typesafe, there use is deprecated and
-   * the feature may eventaully disappear from CORBA.  It is
-   * implemented only to make the arg list of
-   * CORBA::Object::_create_request() compliant. The only (pointer)
-   * value that should be passed is 0.
-   */
-  class TAO_DynamicInterface_Export Context
-  {
-  public:
-
-    Context (void);
-
-    ~Context (void);
-
-    // = Pseudo-object methods
-    static Context *_duplicate (Context*);
-    static Context *_nil (void);
-
-    // = Reference counting.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
-
-    // = All the spec-required functions below will just throw a
-    //   CORBA::NO_IMPLEMENT exception and do nothing else.
-
-    const char *context_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
-
-    CORBA::Context_ptr parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
-
-    void create_child (const char *child_ctx_name,
-                       CORBA::Context_out child_ctx
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void set_one_value (const char *propname,
-                        const CORBA::Any &propvalue
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void set_values (CORBA::NVList_ptr values
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void delete_values (const char *propname
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void get_values (const char *start_scope,
-                     CORBA::Flags op_flags,
-                     const char *pattern,
-                     CORBA::NVList_ptr &values
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // Useful for template programming.
-    typedef CORBA::Context_ptr _ptr_type;
-    typedef CORBA::Context_var _var_type;
-
-  private:
-    /// Reference counting.
-    CORBA::ULong refcount_;
-
-    /// Protect the reference count.
-    TAO_SYNCH_MUTEX refcount_lock_;
-  };
-
-  /**
-   * @class ContextList
-   *
-   * @brief ContextList definition taken from CORBA v2.3a Dec 1998
-   *
-   * Maintains a list of strings for Contexts.
-   */
-  class TAO_DynamicInterface_Export ContextList
-  {
-  public:
-    /// Constructor.
-    ContextList (void);
-
-    /// Constructor - initialize given a length and an array of
-    /// strings.
-    ContextList (CORBA::ULong len,
-                       char **ctx_list);
-
-    /// Destructor.
-    ~ContextList (void);
-
-    /// Return the number of elements.
-    CORBA::ULong count (void);
-
-    /// Increment the reference count.
-    ContextList_ptr _duplicate (void);
-
-    /// Increment the reference count.
-    static ContextList_ptr _duplicate (ContextList *);
-
-    /// Decrement the reference count and delete if it is 0.
-    void _destroy (void);
-
-    /// Return null pointer of this type.
-    static ContextList_ptr _nil ();
-
-    /// Add a string to the list.
-    void add (char *ctx);
-
-    /// Add and consume a string to the list.
-    void add_consume (char *ctx);
-
-    /// Return the typecode at slot i. Raises the "Bounds" exception.
-    char *item (CORBA::ULong slot
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Remove the typecode at slot i. Raises the "Bounds" exception.
-    void remove (CORBA::ULong slot
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Increment and decrement ref counts.
-    void _incr_refcnt (void);
-    void  _decr_refcnt (void);
-
-    // Useful for template programming.
-    typedef CORBA::ContextList_ptr _ptr_type;
-    typedef CORBA::ContextList_var _var_type;
-
-  private:
-    // Not allowed.
-    ContextList (const ContextList &);
-    ContextList &operator= (const ContextList &);
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-
-    /// Internal list of typecodes.
-    ACE_Unbounded_Queue<char *> ctx_list_;
-  };
-} // End CORBA namespace.
-
-#if defined (__ACE_INLINE__)
-# include "Context.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CONTEXT_H */
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
deleted file mode 100644
index 1542333d043..00000000000
--- a/TAO/tao/DynamicInterface/Context.inl
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-void
-CORBA::release (CORBA::Context_ptr x)
-{
-  if (x != 0)
-    {
-      x->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::Context_ptr x)
-{
-  return (CORBA::Boolean) (x == 0);
-}
-
-ACE_INLINE
-void
-CORBA::release (CORBA::ContextList *x)
-{
-  if (x != 0)
-    {
-      x->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::ContextList_ptr x)
-{
-  return (CORBA::Boolean) (x == 0);
-}
-
-// ===================================================================
-
-ACE_INLINE
-CORBA::Context_ptr
-CORBA::Context::_duplicate (CORBA::Context_ptr x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::Context_ptr
-CORBA::Context::_nil (void)
-{
-  return (CORBA::Context_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ContextList
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextList::ContextList (void)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-CORBA::ContextList::count (void)
-{
-  return (CORBA::ULong) this->ctx_list_.size ();
-}
-
-ACE_INLINE
-CORBA::ContextList_ptr
-CORBA::ContextList::_nil (void)
-{
-  return (CORBA::ContextList_ptr)0;
-}
-
-ACE_INLINE
-CORBA::ContextList_ptr
-CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
deleted file mode 100644
index f4f6941ad97..00000000000
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// $Id$
-
-#include "DII_Arguments.h"
-
-#include "tao/NVList.h"
-#include "tao/Any_Impl.h"
-#include "tao/Exception.h"
-#include "tao/CDR.h"
-#include "tao/DynamicC.h"
-
-ACE_RCSID (DynamicInterface,
-           DII_Arguments,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "DII_Arguments.inl"
-#endif /* ! __ACE_INLINE__ */
-
-namespace TAO
-{
-  CORBA::Boolean
-  NamedValue_Argument::demarshal (TAO_InputCDR &cdr)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-      {
-        if (this->x_ !=0 && this->x_->value ()->impl ())
-          {
-            this->x_->value ()->impl ()->_tao_decode (cdr
-                                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-      }
-    ACE_CATCHANY
-      {
-        return 0;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
-
-    this->byte_order_ = cdr.byte_order ();
-
-    return 1;
-  }
-
-  void
-  NamedValue_Argument::interceptor_result (CORBA::Any *any)
-  {
-    (*any) <<= *this->x_->value ();
-  }
-
-  // ========================================================================
-
-  CORBA::Boolean
-  NVList_Argument::marshal (TAO_OutputCDR &cdr)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-      {
-        this->x_->_tao_encode (cdr,
-                               CORBA::ARG_IN | CORBA::ARG_INOUT
-                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return 0;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
-
-    return 1;
-  }
-
-  CORBA::Boolean
-  NVList_Argument::demarshal (TAO_InputCDR &cdr)
-  {
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-      {
-        // Now, get all the "return", "out", and "inout" parameters
-        // from the response message body ... return parameter is
-        // first, the rest are in the order defined in the IDL spec
-        // (which is also the order that DII users are required to
-        // use).
-
-        this->x_->_tao_incoming_cdr (
-            cdr,
-            CORBA::ARG_OUT | CORBA::ARG_INOUT,
-            this->lazy_evaluation_
-            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return 0;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
-
-    return 1;
-  }
-
-  void
-  NVList_Argument::interceptor_paramlist (Dynamic::ParameterList *lst)
-  {
-    const CORBA::ULong len = this->x_->count ();
-    lst->length (len);
-
-    for (CORBA::ULong i = 0; i < len; ++i)
-      {
-        if (!this->x_->item (i)->value ())
-          return;
-
-        (*lst)[i].argument.replace (
-          this->x_->item (i)->value ()->impl ());
-
-        switch (this->x_->item (i)->flags ())
-          {
-          case CORBA::ARG_IN:
-            {
-              (*lst)[i].mode = CORBA::PARAM_IN;
-              break;
-            }
-          case CORBA::ARG_INOUT:
-            {
-              (*lst)[i].mode = CORBA::PARAM_INOUT;
-              break;
-            }
-          case CORBA::ARG_OUT:
-            {
-              (*lst)[i].mode = CORBA::PARAM_OUT;
-              break;
-            }
-          default:
-            break;
-          }
-      }
-  }
-}
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
deleted file mode 100644
index b15ccca1a03..00000000000
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DII_Arguments.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DII_ARGUMENTS_H
-#define TAO_DII_ARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-}
-
-namespace Dynamic
-{
-  class ParameterList;
-}
-
-namespace TAO
-{
-  /**
-   * @class NamedValue_Argument
-   *
-   * @brief Class for the return value of a CORBA::(Server)Request.
-   */
-  class NamedValue_Argument : public Argument
-  {
-  public:
-    NamedValue_Argument (CORBA::NamedValue_ptr);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-    virtual void interceptor_result (CORBA::Any *);
-
-    int byte_order (void) const;
-
-  private:
-    CORBA::NamedValue_ptr x_;
-
-    /// Byte order that the Request class will use
-    int byte_order_;
-  };
-
-  /**
-   * @class NVList_Argument
-   *
-   * @brief Class for the argument list of a CORBA::(Server)Request.
-   */
-  class NVList_Argument : public Argument
-  {
-  public:
-    NVList_Argument (CORBA::NVList_ptr,
-                     bool lazy_eval);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-    // Not an override of a base class method, but a new one that
-    // deals with the argument list as a whole.
-    void interceptor_paramlist (Dynamic::ParameterList *);
-
-  private:
-    CORBA::NVList_ptr x_;
-
-    bool lazy_evaluation_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "DII_Arguments.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DII_ARGUMENTS_H */
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl
deleted file mode 100644
index f2c11256c20..00000000000
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace TAO
-{
-  ACE_INLINE
-  NamedValue_Argument::NamedValue_Argument (CORBA::NamedValue_ptr x)
-    : x_ (x)
-      , byte_order_ (0)
-  {}
-
-  ACE_INLINE int
-  NamedValue_Argument::byte_order (void) const
-  {
-    return this->byte_order_;
-  }
-
-  // ===================================================================
-
-  ACE_INLINE
-  NVList_Argument::NVList_Argument (CORBA::NVList_ptr x,
-                                    bool lazy_eval)
-    : x_ (x)
-      , lazy_evaluation_ (lazy_eval)
-  {}
-}
diff --git a/TAO/tao/DynamicInterface/DII_CORBA_methods.h b/TAO/tao/DynamicInterface/DII_CORBA_methods.h
deleted file mode 100644
index b45e4362296..00000000000
--- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DII_CORBA_methods.h
- *
- *  $Id$
- *
- *  Declarations of DII methods in the CORBA namespace.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DII_CORBA_METHODS_H
-#define TAO_DII_CORBA_METHODS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/DynamicInterface/dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-
-namespace CORBA
-{
-  class ContextList;
-  typedef ContextList *ContextList_ptr;
-
-  class Context;
-  typedef Context *Context_ptr;
-
-  class ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
-
-  class Request;
-  typedef Request *Request_ptr;
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Context_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Context_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ContextList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ContextList_ptr );
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ExceptionList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ExceptionList_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Request_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Request_ptr);
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DII_CORBA_METHODS_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
deleted file mode 100644
index 6d9339420e3..00000000000
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// $Id$
-
-#include "DII_Invocation.h"
-#include "Unknown_User_Exception.h"
-#include "DII_Arguments.h"
-#include "ExceptionList.h"
-#include "Request.h"
-#include "DII_Reply_Dispatcher.h"
-
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
-#include "tao/operation_details.h"
-#include "tao/RequestInfo_Util.h"
-#include "tao/Invocation_Utils.h"
-#include "tao/debug.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Profile_Transport_Resolver.h"
-
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "DII_Invocation.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (DynamicInterface,
-           DII_Invocation,
-           "$Id$")
-
-
-namespace TAO
-{
-  DII_Invocation::DII_Invocation (CORBA::Object_ptr otarget,
-                                  Profile_Transport_Resolver &resolver,
-                                  TAO_Operation_Details &detail,
-                                  CORBA::ExceptionList *excp,
-                                  CORBA::Request_ptr req,
-                                  bool response_expected)
-    : Synch_Twoway_Invocation (otarget,
-                               resolver,
-                               detail,
-                               response_expected)
-      , excp_list_ (excp)
-      , host_ (req)
-  {
-  }
-
-#if TAO_HAS_INTERCEPTORS == 1
-  Dynamic::ParameterList *
-  DII_Invocation::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;
-
-    TAO::Argument **args =
-      this->details_.args ();
-
-    if (this->details_.args_num () > 1)
-      {
-        // Take the second argument since the first is a return value.
-        TAO::NVList_Argument *tmp_arg =
-          dynamic_cast <TAO::NVList_Argument*> (args[1]);
-
-        tmp_arg->interceptor_paramlist (parameter_list);
-      }
-
-    return safe_parameter_list._retn ();
-  }
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-  Invocation_Status
-  DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    return Synch_Twoway_Invocation::remote_twoway (max_wait_time
-                                                   ACE_ENV_ARG_PARAMETER);
-  }
-
-  Invocation_Status
-  DII_Invocation::handle_user_exception (TAO_InputCDR &cdr
-                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    Reply_Guard mon (this,
-                     TAO_INVOKE_FAILURE);
-
-    if (TAO_debug_level > 3)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - DII_Invocation::"
-                    "handle_user_exception \n"));
-      }
-
-    // Match the exception interface repository id with the
-    // exception in the exception list.
-    // This is important to decode the exception.
-    CORBA::String_var buf;
-
-    TAO_InputCDR tmp_stream (cdr,
-                             cdr.start ()->length (),
-                             0);
-
-    // Pull the exception ID out of the marshaling buffer.
-    if (tmp_stream.read_string (buf.inout ()) == 0)
-      {
-        ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                          CORBA::COMPLETED_YES),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    for (CORBA::ULong i = 0;
-         this->excp_list_ != 0 && i < this->excp_list_->count ();
-         i++)
-      {
-          CORBA::TypeCode_var tc =
-            this->excp_list_->item (i
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-          const char *xid = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-          if (ACE_OS::strcmp (buf.in (), xid) != 0)
-            {
-              continue;
-            }
-
-          CORBA::Any any;
-          TAO::Unknown_IDL_Type *unk = 0;
-          ACE_NEW_RETURN (unk,
-                          TAO::Unknown_IDL_Type (
-                              tc.in (),
-                              cdr
-                            ),
-                          TAO_INVOKE_FAILURE);
-
-          any.replace (unk);
-
-          mon.set_status (TAO_INVOKE_USER_EXCEPTION);
-
-          ACE_THROW_RETURN (CORBA::UnknownUserException (any),
-                            TAO_INVOKE_USER_EXCEPTION);
-        }
-
-    // If we couldn't find the right exception, report it as
-    // CORBA::UNKNOWN.
-
-    // But first, save the user exception in case we
-    // are being used in a TAO gateway.
-    this->host_->raw_user_exception (cdr);
-
-
-    mon.set_status (TAO_INVOKE_USER_EXCEPTION);
-
-    // @@ It would seem that if the remote exception is a
-    //    UserException we can assume that the request was
-    //    completed.
-    ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
-                                      CORBA::COMPLETED_YES),
-                      TAO_INVOKE_USER_EXCEPTION);
-
-
-    return TAO::TAO_INVOKE_SUCCESS;
-  }
-
-
-//***************************************************************************
-  DII_Deferred_Invocation::DII_Deferred_Invocation (
-      CORBA::Object_ptr otarget,
-      Profile_Transport_Resolver &resolver,
-      TAO_Operation_Details &detail,
-      TAO_DII_Deferred_Reply_Dispatcher *rd,
-      CORBA::Request_ptr req,
-      bool response_expected)
-    : Asynch_Remote_Invocation (otarget,
-                                resolver,
-                                detail,
-                                rd,
-                                response_expected)
-      , host_ (req)
-  {
-
-  }
-
-#if TAO_HAS_INTERCEPTORS == 1
-  //@NOTE: Need to figure a way to share this code
-  Dynamic::ParameterList *
-  DII_Deferred_Invocation::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;
-
-    TAO::Argument **args =
-      this->details_.args ();
-
-    if (this->details_.args_num () > 1)
-      {
-        // Take the second argument since the first is a return value.
-        TAO::NVList_Argument *tmp_arg =
-          dynamic_cast <TAO::NVList_Argument*> (args[1]);
-
-        tmp_arg->interceptor_paramlist (parameter_list);
-      }
-
-    return safe_parameter_list._retn ();
-  }
-#endif /* TAO_HAS_INTERCEPTORS == 1*/
-
-  Invocation_Status
-  DII_Deferred_Invocation::remote_invocation (
-      ACE_Time_Value *max_wait_time
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    this->safe_rd_->transport (this->resolver_.transport ());
-
-    return Asynch_Remote_Invocation::remote_invocation (
-        max_wait_time
-        ACE_ENV_ARG_PARAMETER);
-  }
-}
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
deleted file mode 100644
index 70498392ec5..00000000000
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DII_Invocation.h
- *
- *  $Id$
- *
- *  @brief The DII invocation classes.
- *
- *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DII_INVOCATION_H
-#define TAO_DII_INVOCATION_H
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#  pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Synch_Invocation.h"
-#include "tao/Messaging/Asynch_Invocation.h"
-
-class TAO_DII_Deferred_Reply_Dispatcher;
-
-namespace TAO
-{
-  /**
-   */
-  class TAO_DynamicInterface_Export DII_Invocation:
-    public Synch_Twoway_Invocation
-  {
-  public:
-    friend class DII_Invocation_Adapter;
-
-    DII_Invocation (CORBA::Object_ptr otarget,
-                    Profile_Transport_Resolver &resolver,
-                    TAO_Operation_Details &detail,
-                    CORBA::ExceptionList *excp,
-                    CORBA::Request_ptr req,
-                    bool response_expected = true);
-
-#if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-
-    Invocation_Status remote_invocation (
-        ACE_Time_Value *max_wait_time
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-    virtual Invocation_Status handle_user_exception (
-        TAO_InputCDR &cdr
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
-  private:
-
-    CORBA::ExceptionList *excp_list_;
-
-    /// Back pointer to the DII request that created us.
-    CORBA::Request_ptr host_;
-
-  };
-
-
-  /*
-   *
-   */
-  class TAO_DynamicInterface_Export DII_Deferred_Invocation :
-    public Asynch_Remote_Invocation
-  {
-  public:
-    friend class DII_Deferred_Invocation_Adapter;
-
-    DII_Deferred_Invocation (CORBA::Object_ptr otarget,
-                             Profile_Transport_Resolver &resolver,
-                             TAO_Operation_Details &detail,
-                             TAO_DII_Deferred_Reply_Dispatcher *rd,
-                             CORBA::Request_ptr req,
-                             bool response_expected = true);
-
-#if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-
-    Invocation_Status remote_invocation (
-        ACE_Time_Value *max_wait_time
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-  private:
-
-    /// Back pointer to the DII request that created us.
-    CORBA::Request_ptr host_;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#  include "DII_Invocation.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.inl b/TAO/tao/DynamicInterface/DII_Invocation.inl
deleted file mode 100644
index 39c6815d5fb..00000000000
--- a/TAO/tao/DynamicInterface/DII_Invocation.inl
+++ /dev/null
@@ -1,48 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-//
-#if 0
-ACE_INLINE
-TAO_GIOP_DII_Invocation::TAO_GIOP_DII_Invocation (TAO_Stub *data,
-                                                  const char *operation,
-                                                  CORBA::ULong opname_len,
-                                                  CORBA::Boolean argument_flag,
-                                                  TAO_ORB_Core *orb_core,
-                                                  CORBA::Request_ptr host,
-                                                  int byte_order)
-  : TAO_GIOP_Twoway_Invocation (data,
-                                operation,
-                                opname_len,
-                                argument_flag,
-                                orb_core,
-                                byte_order),
-    host_ (host)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_DII_Deferred_Invocation::TAO_GIOP_DII_Deferred_Invocation (
-    TAO_Stub *stub,
-    TAO_ORB_Core *orb_core,
-    CORBA::Boolean argument_flag,
-    const CORBA::Request_ptr req,
-    int byte_order
-  )
-  : TAO_GIOP_Asynch_Invocation (stub,
-                                req->operation (),
-                                static_cast<CORBA::ULong> (ACE_OS::strlen (req->operation ())),
-                                argument_flag,
-                                orb_core,
-                                byte_order)
-{
-  // New reply dispatcher on the heap, because
-  // we will go out of scope and hand over the
-  // reply dispatcher to the ORB.
-  // So this->rd_ is 0, because we do not need to
-  // hold a pointer to it.
-  ACE_NEW (this->rd_,
-           TAO_DII_Deferred_Reply_Dispatcher (req,
-                                              orb_core));
-}
-#endif /*if 0*/
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
deleted file mode 100644
index 14c2576825a..00000000000
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//$Id$
-#include "DII_Invocation_Adapter.h"
-#include "DII_Invocation.h"
-#include "DII_Reply_Dispatcher.h"
-
-#include "tao/Exception.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/Transport.h"
-#include "tao/Transport.h"
-#include "tao/Pluggable_Messaging.h"
-#include "Request.h"
-
-#include "ace/os_include/os_errno.h"
-
-ACE_RCSID (tao,
-           Invocation_Adapter,
-           "$Id$")
-
-
-namespace TAO
-{
-  DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target,
-                                                  Argument **args,
-                                                  int arg_number,
-                                                  const char *operation,
-                                                  int op_len,
-                                                  CORBA::ExceptionList *excp,
-                                                  CORBA::Request *r,
-                                                  Invocation_Mode m)
-
-    : Invocation_Adapter (target,
-                          args,
-                          arg_number,
-                          operation,
-                          op_len,
-                          0, // Collocation Proxy broker pointer
-                          TAO_TWOWAY_INVOCATION,
-                          m)
-      , exception_list_ (excp)
-      , request_ (r)
-  {
-  }
-
-  Invocation_Status
-  DII_Invocation_Adapter::invoke_twoway (
-        TAO_Operation_Details &op,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL)
-  {
-    // Simple sanity check
-    if (this->mode_ != TAO_DII_INVOCATION ||
-        this->type_ != TAO_TWOWAY_INVOCATION)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
-
-    TAO::DII_Invocation synch (this->target_,
-                               r,
-                               op,
-                               this->exception_list_,
-                               this->request_);
-
-
-    Invocation_Status status =
-      synch.remote_invocation (max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (status == TAO_INVOKE_RESTART)
-      {
-        effective_target =
-          synch.steal_forwarded_reference ();
-      }
-
-    return status;
-  }
-
-  //================================================================
-  DII_Deferred_Invocation_Adapter::DII_Deferred_Invocation_Adapter (
-      CORBA::Object *target,
-      Argument **args,
-      int arg_number,
-      const char *operation,
-      int op_len,
-      Collocation_Proxy_Broker *b,
-      TAO_ORB_Core *oc,
-      CORBA::Request *req,
-      Invocation_Mode mode)
-    : Invocation_Adapter (target,
-                          args,
-                          arg_number,
-                          operation,
-                          op_len,
-                          b,
-                          TAO_TWOWAY_INVOCATION,
-                          mode)
-      , request_ (req)
-      , rd_ (0)
-      , orb_core_ (oc)
-  {
-  }
-
-  void
-  DII_Deferred_Invocation_Adapter::invoke (
-      TAO::Exception_Data *ex,
-      unsigned long ex_count
-      ACE_ENV_ARG_DECL)
-  {
-    // New reply dispatcher on the heap, because we will go out of
-    // scope and hand over the  reply dispatcher to the ORB.
-    // So this->rd_ is 0, because we do not need to
-    // hold a pointer to it.
-    ACE_NEW_THROW_EX (this->rd_,
-        TAO_DII_Deferred_Reply_Dispatcher (this->request_,
-                                           this->orb_core_),
-                      CORBA::NO_MEMORY ());
-
-    Invocation_Adapter::invoke (ex,
-                                ex_count
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  Invocation_Status
-  DII_Deferred_Invocation_Adapter::invoke_twoway (
-      TAO_Operation_Details &op,
-      CORBA::Object_var &effective_target,
-      Profile_Transport_Resolver &r,
-      ACE_Time_Value *&max_wait_time
-      ACE_ENV_ARG_DECL)
-  {
-    // Simple sanity check
-    if (this->mode_ != TAO_DII_DEFERRED_INVOCATION ||
-        this->type_ != TAO_TWOWAY_INVOCATION)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                   TAO_INVOKE_FAILURE);
-      }
-
-    r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
-    TAO::DII_Deferred_Invocation synch (
-        this->target_,
-        r,
-        op,
-        this->rd_,
-        this->request_);
-
-    r.transport ()->messaging_object ()->out_stream ().reset_byte_order (request_->_tao_byte_order ());
-
-    Invocation_Status status =
-      synch.remote_invocation (max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (status == TAO_INVOKE_RESTART)
-      {
-        effective_target =
-          synch.steal_forwarded_reference ();
-      }
-
-    return status;
-  }
-} // End namespace TAO
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
deleted file mode 100644
index f1225e60691..00000000000
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DII_Invocation_Adapter.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_DII_INVOCATION_ADAPTER_H
-#define TAO_DII_INVOCATION_ADAPTER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/DynamicInterface/dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "tao/Invocation_Adapter.h"
-
-class TAO_Operation_Details;
-class TAO_Stub;
-class ACE_Time_Value;
-class TAO_ORB_Core;
-class TAO_DII_Deferred_Reply_Dispatcher;
-namespace  CORBA
-{
-  class Object;
-  class Environment;
-  class SystemException;
-  class ExceptionList;
-  class Request;
-}
-
-namespace TAO
-{
-  class Argument;
-  class Collocation_Proxy_Broker;
-  struct Exception_Data;
-
-  /**
-   * @class DII_Invocation_Adapter
-   *
-   * @brief Generic interface for the DII invocation object visible
-   */
-  class TAO_DynamicInterface_Export DII_Invocation_Adapter :
-    public Invocation_Adapter
-  {
-  public:
-    /// The only constructor used by the IDL compiler and onlly way to
-    /// create this adapter.
-    /**
-     *
-     * @param target Points to the object on which this invocation is
-     * being invoked.
-     *
-     * @param args Array of pointers to the argument list in the
-     * operation declaration. this includes the return, inout and out
-     * arguments.
-     *
-     * @param arg_number Number of arguments in the above array. This
-     * is the number of elements in the above array.
-     *
-     * @param operation The name of the operation being invoked.
-     *
-     * @param ope_len Number of charecters in the operation name. This
-     * is an optimization which helps us to avoid calling strlen ()
-     * while creating a message format.
-     *
-     * @param cpb The collocation proxy broker for the target if one
-     * exists.
-     *
-     * @param type The operation type which could be a oneway or two
-     * way operation. this information is availbe in the IDL file.
-     *
-     * @param mode Invocation mode. This information is also available
-     * in the IDL file and in the generated code.
-     */
-    DII_Invocation_Adapter (CORBA::Object *target,
-                            Argument **args,
-                            int arg_number,
-                            const char *operation,
-                            int op_len,
-                            CORBA::ExceptionList *exception,
-                            CORBA::Request *r,
-                            Invocation_Mode m = TAO_DII_INVOCATION);
-
-
-    virtual ~DII_Invocation_Adapter (void) {}
-
-  protected:
-
-    virtual Invocation_Status invoke_twoway (
-        TAO_Operation_Details &op,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-
-  private:
-
-    CORBA::ExceptionList *exception_list_;
-
-    CORBA::Request *request_;
-  private:
-
-    /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void))
-
-    ACE_UNIMPLEMENTED_FUNC (
-        DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &))
-  };
-
-  /**
-   *
-   */
-  class TAO_DynamicInterface_Export DII_Deferred_Invocation_Adapter
-    : protected Invocation_Adapter
-  {
-  public:
-    DII_Deferred_Invocation_Adapter (
-        CORBA::Object *target,
-        Argument **args,
-        int arg_number,
-        const char *operation,
-        int op_len,
-        Collocation_Proxy_Broker *b,
-        TAO_ORB_Core *oc,
-        CORBA::Request *req,
-        TAO::Invocation_Mode mode = TAO_DII_DEFERRED_INVOCATION);
-
-    /// Invoke the target
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
-
-
-  protected:
-    virtual Invocation_Status invoke_twoway (
-        TAO_Operation_Details &op,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-
-  private:
-    CORBA::Request *request_;
-
-    /// Reply dispatcher for the current Invocation.
-    TAO_DII_Deferred_Reply_Dispatcher *rd_;
-
-    /// Cache the orb_core
-    TAO_ORB_Core *orb_core_;
-  };
-} // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
deleted file mode 100644
index f835b4eca4c..00000000000
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "DII_Reply_Dispatcher.h"
-#include "Request.h"
-#include "tao/Environment.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-
-
-ACE_RCSID(DynamicInterface,
-          DII_Reply_Dispatcher,
-          "$Id$")
-
-
-
-
-
-// Constructor.
-TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
-    const CORBA::Request_ptr req,
-    TAO_ORB_Core *orb_core)
-  : TAO_Asynch_Reply_Dispatcher_Base (orb_core)
-  , req_ (req)
-{
-}
-
-// Destructor.
-TAO_DII_Deferred_Reply_Dispatcher::~TAO_DII_Deferred_Reply_Dispatcher (void)
-{
-}
-
-// Dispatch the reply.
-int
-TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
-    TAO_Pluggable_Reply_Params &params
-  )
-{
-  if (params.input_cdr_ == 0)
-    return -1;
-
-  this->reply_status_ = params.reply_status_;
-
-  // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
-
-
-  if (db == 0)
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_ERROR ((
-            LM_ERROR,
-            "TAO (%P|%t) - DII_Deferred_Reply_Dispatcher::dispatch_reply "
-            "clone_from failed \n"));
-        }
-      return -1;
-    }
-
-  // See whether we need to delete the data block by checking the
-  // flags. We cannot be happy that we initally allocated the
-  // datablocks of the stack. If this method is called twice, as is in
-  // some cases where the same invocation object is used to make two
-  // invocations like forwarding, the release becomes essential.
-  if (ACE_BIT_DISABLED (db->flags (),
-                        ACE_Message_Block::DONT_DELETE))
-    db->release ();
-
-  // Steal the buffer, that way we don't do any unnecesary copies of
-  // this data.
-  CORBA::ULong max = params.svc_ctx_.maximum ();
-  CORBA::ULong len = params.svc_ctx_.length ();
-  IOP::ServiceContext* context_list = params.svc_ctx_.get_buffer (1);
-  this->reply_service_info_.replace (max, len, context_list, 1);
-
-  if (TAO_debug_level >= 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n")));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      // Call the Request back and send the reply data.
-      this->req_->handle_response (this->reply_cdr_,
-                                   this->reply_status_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception during reply handler");
-        }
-    }
-  ACE_ENDTRY;
-
-  // This was dynamically allocated. Now the job is done.
-  (void) this->decr_refcount ();
-
-  return 1;
-}
-
-void
-TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Generate a fake exception....
-      CORBA::COMM_FAILURE comm_failure (0,
-                                        CORBA::COMPLETED_MAYBE);
-
-      TAO_OutputCDR out_cdr;
-
-      comm_failure._tao_encode (out_cdr
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Turn into an output CDR
-      TAO_InputCDR cdr (out_cdr);
-
-      this->req_->handle_response (cdr,
-                                   TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "DII_Deferred_Reply_Dispacher::connection_closed"
-            );
-        }
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  (void) this->decr_refcount ();
-}
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
deleted file mode 100644
index 8c1719fbec3..00000000000
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DII_Reply_Dispatcher.h
- *
- *  $Id$
- *
- *  @brief Dispatch the reply appropriately.
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-
-#ifndef TAO_DII_REPLY_DISPATCHER_H
-#define TAO_DII_REPLY_DISPATCHER_H
-
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
-
-namespace CORBA
-{
-  class Request;
-  typedef Request *Request_ptr;
-}
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_DII_Deferred_Reply_Dispatcher
- *
- * @brief Reply dispatcher for DII deferred requests.
- */
-
-class TAO_DynamicInterface_Export TAO_DII_Deferred_Reply_Dispatcher
-  : public TAO_Asynch_Reply_Dispatcher_Base
-{
-public:
-  TAO_DII_Deferred_Reply_Dispatcher (const CORBA::Request_ptr req,
-                                     TAO_ORB_Core *orb_core);
-
-
-
-  // = The Reply_Dispatcher methods
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &param);
-
-  virtual void connection_closed (void);
-
-  /// The following methods are not needed for this class..
-  virtual void reply_timed_out (void)  {}
-  virtual long schedule_timer (CORBA::ULong ,
-                               const ACE_Time_Value &
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  {
-    return 0;
-  }
-
-protected:
-  /// Destructor.
-  ~TAO_DII_Deferred_Reply_Dispatcher (void);
-
-private:
-  /// Where the reply needs to go.
-  const CORBA::Request_ptr req_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
deleted file mode 100644
index ce379c1a689..00000000000
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-#include "Dynamic_Adapter_Impl.h"
-
-ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
-
-#include "Request.h"
-#include "Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Exception.h"
-
-TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void)
-{
-}
-
-TAO_Dynamic_Adapter_Impl::~TAO_Dynamic_Adapter_Impl (void)
-{
-}
-
-void
-TAO_Dynamic_Adapter_Impl::create_request (
-    CORBA::Object_ptr obj,
-    CORBA::ORB_ptr orb,
-    const char *operation,
-    CORBA::NVList_ptr arg_list,
-    CORBA::NamedValue_ptr result,
-    CORBA::ExceptionList_ptr exceptions,
-    CORBA::Request_ptr &request,
-    CORBA::Flags req_flags
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_NEW_THROW_EX (request,
-                    CORBA::Request (obj,
-                                    orb,
-                                    operation,
-                                    arg_list,
-                                    result,
-                                    req_flags,
-                                    exceptions
-                                    ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM
-                          ),
-                        CORBA::COMPLETED_MAYBE
-                      ));
-}
-
-CORBA::Request_ptr
-TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
-                                   CORBA::ORB_ptr orb,
-                                   const char *operation
-                                   ACE_ENV_ARG_DECL)
-{
-  CORBA::Request_ptr req = CORBA::Request::_nil ();
-  ACE_NEW_THROW_EX (req,
-                    CORBA::Request (obj,
-                                    orb,
-                                    operation
-                                    ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM
-                          ),
-                        CORBA::COMPLETED_MAYBE
-                      ));
-  ACE_CHECK_RETURN (CORBA::Request::_nil ());
-
-  return req;
-}
-
-CORBA::Boolean
-TAO_Dynamic_Adapter_Impl::context_is_nil (CORBA::Context_ptr ctx)
-{
-  return ctx == 0;
-}
-
-void
-TAO_Dynamic_Adapter_Impl::context_release (CORBA::Context_ptr ctx)
-{
-  if (ctx != 0)
-    {
-      ctx->_decr_refcnt ();
-    }
-}
-
-CORBA::Boolean
-TAO_Dynamic_Adapter_Impl::request_is_nil (CORBA::Request_ptr req)
-{
-  return req == 0;
-}
-
-void
-TAO_Dynamic_Adapter_Impl::request_release (CORBA::Request_ptr req)
-{
-  if (req != 0)
-    {
-      req->_decr_refcnt ();
-    }
-}
-
-CORBA::Boolean
-TAO_Dynamic_Adapter_Impl::server_request_is_nil (CORBA::ServerRequest_ptr req)
-{
-  return req == 0;
-}
-
-void
-TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
-{
-  if (req != 0)
-    {
-      req->_decr_refcnt ();
-    }
-}
-
-void
-TAO_Dynamic_Adapter_Impl::create_exception_list (
-    CORBA::ExceptionList_ptr &list
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_NEW_THROW_EX (list,
-                    CORBA::ExceptionList,
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM
-                          ),
-                        CORBA::COMPLETED_NO
-                      ));
-}
-
-int
-TAO_Dynamic_Adapter_Impl::Initializer (void)
-{
-  TAO_ORB_Core::dynamic_adapter_name ("Concrete_Dynamic_Adapter");
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl);
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_Dynamic_Adapter_Impl,
-    ACE_TEXT ("Concrete_Dynamic_Adapter"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_Dynamic_Adapter_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
deleted file mode 100644
index 641f1eabc7d..00000000000
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    Dynamic_Adapter_Impl.h
-//
-// = DESCRIPTION
-//    Header file for class TAO_Dynamic_Adapter_Impl.
-//
-// = AUTHOR
-//     Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_DYNAMIC_ADAPTER_IMPL_H
-#define TAO_DYNAMIC_ADAPTER_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Dynamic_Adapter.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "dynamicinterface_export.h"
-#include "ace/Service_Config.h"
-
-  /**
-   * @class TAO_Dynamic_Adapter_Impl
-   *
-   * Concrete subclass of TAO_Dynamic_Adapter
-   * in the TAO library. This class helps implement various
-   * functions in the CORBA namespace relating to DII/DSI
-   * invocations.
-   */
-class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl
-  : public TAO_Dynamic_Adapter
-{
-public:
-  TAO_Dynamic_Adapter_Impl (void);
-  virtual ~TAO_Dynamic_Adapter_Impl (void);
-
-  // CORBA::Object::_create_request and CORBA::Object::_request.
-
-  virtual void create_request (CORBA::Object_ptr obj,
-                               CORBA::ORB_ptr orb,
-                               const char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::ExceptionList_ptr exceptions,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags
-                               ACE_ENV_ARG_DECL);
-
-  virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
-                                      CORBA::ORB_ptr orb,
-                                      const char *op
-                                      ACE_ENV_ARG_DECL);
-
-  // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
-
-  virtual CORBA::Boolean context_is_nil (CORBA::Context_ptr ctx);
-
-  virtual CORBA::Boolean request_is_nil (CORBA::Request_ptr req);
-
-  virtual CORBA::Boolean server_request_is_nil (CORBA::ServerRequest_ptr req);
-
-  virtual void context_release (CORBA::Context_ptr ctx);
-
-  virtual void request_release (CORBA::Request_ptr req);
-
-  virtual void server_request_release (CORBA::ServerRequest_ptr req);
-
-  // CORBA::ORB::create_exception_list.
-
-  virtual void create_exception_list (CORBA::ExceptionList_ptr &list
-                                      ACE_ENV_ARG_DECL);
-
-  // Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Request_Factory_Initializer =
-  &TAO_Dynamic_Adapter_Impl::Initializer;
-
-#else
-
-static int
-TAO_Requires_Request_Factory_Initializer =
-  TAO_Dynamic_Adapter_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
deleted file mode 100644
index d88ea1cef70..00000000000
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "Dynamic_Implementation.h"
-
-ACE_RCSID (DynamicInterface,
-           Dynamic_Implementation,
-           "$Id$")
-
-
-#include "Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/TSS_Resources.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/POA_Current_Impl.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-CORBA::Boolean
-TAO_DynamicImplementation::_is_a (const char *logical_type_id
-                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return ACE_OS::strcmp (logical_type_id, id.in ()) == 0;
-}
-
-CORBA::Object_ptr
-TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The _this() function returns a CORBA::Object_ptr for the target
-  // object. Unlike _this() for static skeletons, its return type is
-  // not interface-specific because a DSI servant may very well
-  // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Create a object.
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  ACE_NEW_RETURN (retval,
-                  CORBA::Object (stub,
-                                 1,
-                                 this),
-                  CORBA::Object::_nil ());
-
-  return retval;
-}
-
-CORBA::InterfaceDef_ptr
-TAO_DynamicImplementation::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_IFR_Client_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
-    }
-
-  CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // This doesn't take multiple ORBs into account, but it's being
-  // used only to resolve the IFR, so we should be ok.
-  return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
-                                 id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-const char *
-TAO_DynamicImplementation::_interface_repository_id (void) const
-{
-  // This should never be called.
-  return 0;
-}
-
-void *
-TAO_DynamicImplementation::_downcast (const char *repository_id)
-{
-  ACE_UNUSED_ARG (repository_id);
-
-  // Don't know enough to do better.
-  return this;
-}
-
-TAO_Stub *
-TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // If DynamicImplementation::_this() is invoked outside of the
-  // context of a request invocation on a target object being served
-  // by the DSI servant, it raises the PortableServer::WrongPolicy
-  // exception. See the CORBA C++ mapping, section 1.38.3.
-  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
-    static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-
-  if (poa_current_impl == 0
-      || this != poa_current_impl->servant ())
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  PortableServer::POA_var poa =
-    poa_current_impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::PolicyList_var client_exposed_policies =
-    poa_current_impl->poa ()->client_exposed_policies (
-        poa_current_impl->priority ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK_RETURN (0);
-
-  CORBA::RepositoryId_var pinterface =
-    this->_primary_interface (poa_current_impl->object_id (),
-                              poa.in ()
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (),
-                                           pinterface.in (),
-                                           poa_current_impl->priority ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
-                                      void * /* context */
-                                      ACE_ENV_ARG_DECL)
-{
-  // No need to do any of this if the client isn't waiting.
-  if (request.response_expected ())
-    {
-      if (!CORBA::is_nil (request.forward_location ()))
-        {
-          request.init_reply ();
-          request.tao_send_reply ();
-
-          // No need to invoke in this case.
-          return;
-        }
-      else if (request.sync_with_server ())
-        {
-          // The last line before the call to this function
-          // was an ACE_CHECK_RETURN, so if we're here, we
-          // know there is no exception so far, and that's all
-          // a SYNC_WITH_SERVER client request cares about.
-          request.send_no_exception_reply ();
-        }
-    }
-
-  // Create DSI request object.
-  CORBA::ServerRequest *dsi_request = 0;
-  ACE_NEW (dsi_request,
-           CORBA::ServerRequest (request));
-
-  ACE_TRY
-    {
-      // Delegate to user.
-      this->invoke (dsi_request
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          dsi_request->dsi_marshal (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      // Only if the client is waiting.
-      if (request.response_expected () && !request.sync_with_server ())
-        {
-          request.tao_send_reply_exception (ex);
-        }
-    }
-  ACE_ENDTRY;
-
-  CORBA::release (dsi_request);
-}
-
-CORBA::RepositoryId
-TAO_DynamicImplementation::get_id_from_primary_interface (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-{
-  // If this method is called outside of the
-  // context of a request invocation on a target object being served
-  // by the DSI servant, it raises the PortableServer::WrongPolicy
-  // exception. See the CORBA C++ mapping, section 1.38.3.
-  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
-    static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-
-  if (poa_current_impl == 0
-      || this != poa_current_impl->servant ())
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  PortableServer::POA_var poa =
-    poa_current_impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->_primary_interface (poa_current_impl->object_id (),
-                                   poa.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
deleted file mode 100644
index 9c50fc9ce95..00000000000
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    Dynamic_Implementation.h
-//
-// = DESCRIPTION
-//    Header file for class TAO_DynamicImplementation.
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_DYNAMIC_IMPLEMENTATION_H
-#define TAO_DYNAMIC_IMPLEMENTATION_H
-
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Servant_Base.h"
-
-namespace CORBA
-{
-  typedef char *RepositoryId;
-  typedef String_var RepositoryId_var;
-
-  class ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-}
-
-class TAO_DynamicInterface_Export TAO_DynamicImplementation
-  : public virtual TAO_ServantBase
-{
-  // = TITLE
-  //    Base class for DSI.
-  //
-  // = DESCRIPTION
-  //    It is expected that the <invoke> and <_primary_interface>
-  //    methods will be only invoked by the POA in the context of
-  //    serving a CORBA request. Invoking this method in other
-  //    circumstances may lead to unpredictable results.
-public:
-  /// The invoke() method receives requests issued to any CORBA object
-  /// incarnated by the DSI servant and performs the processing
-  /// necessary to execute the request.
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
-
-  /// The _primary_interface() method receives an ObjectId value and a
-  /// POA_ptr as input parameters and returns a valid RepositoryId
-  /// representing the most-derived interface for that oid.
-  virtual CORBA::RepositoryId _primary_interface (
-      const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) = 0;
-
-  /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Returns a CORBA::Object_ptr for the target object.
-  CORBA::Object_ptr _this (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-protected:
-
-  /// Return 0.  Should never be used.
-  virtual const char *_interface_repository_id (void) const;
-
-  /// Simply returns "this"
-  virtual void *_downcast (const char *repository_id);
-
-  /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /// Turns around and calls invoke.
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-private:
-  /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
-  CORBA::RepositoryId get_id_from_primary_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DYNAMIC_IMPLEMENTATION_H */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
deleted file mode 100644
index 34445946608..00000000000
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "ExceptionList.h"
-
-ACE_RCSID (DynamicInterface,
-           ExceptionList,
-           "$Id$")
-
-#include "tao/TypeCode.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "ExceptionList.inl"
-#endif /* __ACE_INLINE__ */
-
-
-CORBA::ExceptionList::ExceptionList (CORBA::ULong len,
-                                     CORBA::TypeCode_ptr *tc_list)
-  : ref_count_ (1)
-{
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      this->add (tc_list [i]);
-    }
-}
-
-CORBA::ExceptionList::~ExceptionList (void)
-{
-  for (CORBA::ULong i = 0; i < this->count (); ++i)
-    {
-      CORBA::TypeCode_ptr *tc = 0;
-
-      if (this->tc_list_.get (tc, i) == -1)
-        {
-          return;
-        }
-
-      CORBA::release (*tc);
-    }
-}
-
-void
-CORBA::ExceptionList::add (CORBA::TypeCode_ptr tc)
-{
-  this->tc_list_.enqueue_tail (CORBA::TypeCode::_duplicate (tc));
-}
-
-void
-CORBA::ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
-{
-  this->tc_list_.enqueue_tail (tc);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ExceptionList::item (CORBA::ULong slot
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_ptr *tc = 0;
-
-  if (this->tc_list_.get (tc, slot) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                        CORBA::TypeCode::_nil ());
-    }
-  else
-    {
-      return CORBA::TypeCode::_duplicate (*tc);
-    }
-}
-
-void
-CORBA::ExceptionList::remove (CORBA::ULong
-                              ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_duplicate (void)
-{
-  this->_incr_refcnt ();
-  return this;
-}
-
-void
-CORBA::ExceptionList::_destroy (void)
-{
-  this->_decr_refcnt ();
-}
-
-void
-CORBA::ExceptionList::_incr_refcnt (void)
-{
-  this->ref_count_++;
-}
-
-void
-CORBA::ExceptionList::_decr_refcnt (void)
-{
-  this->ref_count_--;
-
-  if (this->ref_count_ == 0)
-    {
-      delete this;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>;
-template class ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong>;
-template class ACE_Node<CORBA::TypeCode_ptr>;
-template class ACE_Unbounded_Queue<CORBA::TypeCode_ptr>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>
-#pragma instantiate ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong>
-#pragma instantiate ACE_Node<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
deleted file mode 100644
index 17bb26ff7f4..00000000000
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    DynamicInterface
-//
-// = FILENAME
-//    ExceptionList.h
-//
-// = DESCRIPTION
-//    This file defines the ExceptionList datatype used in
-//    dynamic invocations.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#ifndef TAO_CORBA_EXCEPTIONLIST_H
-#define TAO_CORBA_EXCEPTIONLIST_H
-
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DII_CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/orbconf.h"
-#include "tao/Basic_Types.h"
-#include "tao/default_environment.h"
-
-#include "ace/Unbounded_Queue.h"
-#include "ace/Atomic_Op.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Synch_Traits.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var;
-  typedef TAO_Pseudo_Out_T<ExceptionList, ExceptionList_var> ExceptionList_out;
-
-  /**
-   * @class ExceptionList
-   *
-   * @brief ExceptionList definition taken from CORBA v2.2 Feb 1998.
-   *
-   * Maintains a list of TypeCodes for Exceptions.
-   */
-  class TAO_DynamicInterface_Export ExceptionList
-  {
-  public:
-    // = Intialization and termination methods.
-
-    /// Constructor.
-    ExceptionList (void);
-
-    /// Constructor - initialize given a length and an array of
-    /// TypeCodes.
-    ExceptionList (CORBA::ULong len,
-                   CORBA::TypeCode_ptr *tc_list);
-
-    /// Destructor.
-    ~ExceptionList (void);
-
-    /// Return the number of elements.
-    CORBA::ULong count (void);
-
-    /// Increase the reference count.
-    ExceptionList_ptr _duplicate (void);
-
-    /// Increase the reference count in the spec defined manner.
-    static ExceptionList_ptr _duplicate (ExceptionList *);
-
-    void _destroy (void);
-
-    static ExceptionList_ptr _nil (void);
-
-    /// Add a TypeCode to the list.
-    void add (CORBA::TypeCode_ptr tc);
-
-    /// Add and consume a TypeCode to the list.
-    void add_consume (CORBA::TypeCode_ptr tc);
-
-    /// Return the typecode at slot i. Raises the "Bounds" exception.
-    CORBA::TypeCode_ptr item (CORBA::ULong slot
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Remove the typecode at slot i. Raises the "Bounds" exception.
-    void remove (CORBA::ULong slot
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Increment and decrement ref counts.
-    void _incr_refcnt (void);
-    void _decr_refcnt (void);
-
-    /// Useful for template programming.
-    typedef CORBA::ExceptionList_ptr _ptr_type;
-    typedef CORBA::ExceptionList_var _var_type;
-
-  private:
-    // = Not allowed.
-    ExceptionList (const ExceptionList &);
-    ExceptionList &operator= (const ExceptionList &);
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-
-    /// Internal list of typecodes.
-    ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_;
-  };
-}  // End CORBA namespace
-
-#if defined (__ACE_INLINE__)
-# include "ExceptionList.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CORBA_EXCEPTIONLIST_H */
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
deleted file mode 100644
index fda8385bd58..00000000000
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-void
-CORBA::release (CORBA::ExceptionList_ptr x)
-{
-  if (x != 0)
-    {
-      x->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::ExceptionList_ptr x)
-{
-  return (CORBA::Boolean) (x == 0);
-}
-
-// ===================================================================
-
-ACE_INLINE
-CORBA::ExceptionList::ExceptionList (void)
-  : ref_count_ (1)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-CORBA::ExceptionList::count (void)
-{
-  return (CORBA::ULong) this->tc_list_.size ();
-}
-
-ACE_INLINE
-CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_nil (void)
-{
-  return (CORBA::ExceptionList_ptr)0;
-}
-
-ACE_INLINE
-CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
deleted file mode 100644
index 1aa2e74cdbf..00000000000
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// $Id$
-
-#include "Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Request,
-           "$Id$")
-
-#include "DII_Invocation_Adapter.h"
-#include "DII_Arguments.h"
-
-#include "tao/Object.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/NVList.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-// Reference counting for DII Request object.
-
-CORBA::ULong
-CORBA::Request::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->lock_,
-                    0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA::Request::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      0);
-
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-// DII Request class implementation
-
-CORBA::Request::Request (CORBA::Object_ptr obj,
-                         CORBA::ORB_ptr orb,
-                         const CORBA::Char *op,
-                         CORBA::NVList_ptr args,
-                         CORBA::NamedValue_ptr result,
-                         CORBA::Flags flags,
-                         CORBA::ExceptionList_ptr exceptions
-                         ACE_ENV_ARG_DECL_NOT_USED)
-  : target_ (CORBA::Object::_duplicate (obj)),
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    opname_ (CORBA::string_dup (op)),
-    args_ (CORBA::NVList::_duplicate (args)),
-    result_ (CORBA::NamedValue::_duplicate (result)),
-    flags_ (flags),
-    // env_ (env),
-    exceptions_ (CORBA::ExceptionList::_duplicate (exceptions)),
-    contexts_ (0),
-    ctx_ (CORBA::Context::_nil ()),
-    refcount_ (1),
-    lazy_evaluation_ (false),
-    response_received_ (0),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER)
-{
-  if (this->exceptions_.in () == 0)
-    {
-      CORBA::ExceptionList *tmp = 0;
-      ACE_NEW (tmp,
-               CORBA::ExceptionList);
-
-      this->exceptions_ = tmp;
-    }
-}
-
-CORBA::Request::Request (CORBA::Object_ptr obj,
-                         CORBA::ORB_ptr orb,
-                         const CORBA::Char *op
-                         ACE_ENV_ARG_DECL_NOT_USED)
-  : target_ (CORBA::Object::_duplicate (obj)),
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    opname_ (CORBA::string_dup (op)),
-    flags_ (0),
-    // env_ (env),
-    contexts_ (0),
-    ctx_ (CORBA::Context::_nil ()),
-    refcount_ (1),
-    lazy_evaluation_ (false),
-    response_received_ (0),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER)
-{
-  CORBA::ExceptionList *tmp = 0;
-  ACE_NEW (tmp,
-           CORBA::ExceptionList);
-
-  this->exceptions_ = tmp;
-
-  ACE_NEW (this->args_,
-           CORBA::NVList);
-
-  ACE_NEW (this->result_,
-           CORBA::NamedValue);
-}
-
-CORBA::Request::~Request (void)
-{
-  ACE_ASSERT (refcount_ == 0);
-
-  CORBA::release (this->target_);
-  CORBA::string_free ((char*) this->opname_);
-  this->opname_ = 0;
-  CORBA::release (this->args_);
-  CORBA::release (this->result_);
-}
-
-// The public DII interfaces:  normal and oneway calls.
-//
-// NOTE that using DII, programmers can get the special behaviour of
-// discarding the response for normal calls.  This doesn't change the
-// semantics of any OMG-IDL interface, it just streamlines control
-// flow in some exotic situations.
-
-void
-CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
-{
-  const CORBA::Boolean argument_flag =
-    this->args_->_lazy_has_arguments ();
-
-  size_t number_args = 0;
-
-  TAO::NamedValue_Argument _tao_retval (this->result_);
-
-
-  TAO::NVList_Argument _tao_in_list (this->args_,
-                                     this->lazy_evaluation_);
-
-  TAO::Argument *_tao_arg_list [] = {
-    &_tao_retval,
-    &_tao_in_list
-  };
-
-  if (argument_flag)
-    number_args = 2;
-  else
-    number_args = 1;
-
-  TAO::DII_Invocation_Adapter _tao_call (
-       this->target_,
-       _tao_arg_list,
-       number_args,
-       const_cast<char *> (this->opname_),
-       static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
-       this->exceptions_.in (),
-       this);
-
-  _tao_call.invoke (0,
-                    0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If this request was created by a gateway, then result_
-  // and/or args_ are shared by a CORBA::ServerRequest, whose
-  // reply must be in the same byte order as the reply we are
-  // handling here. So we set the member to be accessed later.
-  this->byte_order_ = _tao_retval.byte_order ();
-}
-
-void
-CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
-{
-  const CORBA::Boolean argument_flag =
-    this->args_->_lazy_has_arguments ();
-
-  size_t number_args = 0;
-
-  TAO::NamedValue_Argument _tao_retval (this->result_);
-
-
-  TAO::NVList_Argument _tao_in_list (this->args_,
-                                     this->lazy_evaluation_);
-
-  TAO::Argument *_tao_arg_list [] = {
-    &_tao_retval,
-    &_tao_in_list
-  };
-
-  if (argument_flag)
-    number_args = 2;
-  else
-    number_args = 1;
-
-  TAO::Invocation_Adapter _tao_call (
-      this->target_,
-      _tao_arg_list,
-      number_args,
-      const_cast<char *> (this->opname_),
-      static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
-      0,
-      TAO::TAO_ONEWAY_INVOCATION);
-
-  _tao_call.invoke (0,
-                    0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX,
-               ace_mon,
-               this->lock_);
-
-    this->response_received_ = 0;
-  }
-
-  const CORBA::Boolean argument_flag = this->args_->count () ? 1 : 0;
-
-  TAO::NamedValue_Argument _tao_retval (this->result_);
-
-  TAO::NVList_Argument _tao_in_list (this->args_,
-                                     this->lazy_evaluation_);
-
-  TAO::Argument *_tao_arg_list [] = {
-    &_tao_retval,
-    &_tao_in_list
-  };
-
-  size_t number_args = 0;
-
-  if (argument_flag)
-    number_args = 2;
-  else
-    number_args = 1;
-
-  TAO::DII_Deferred_Invocation_Adapter _tao_call (
-      this->target_,
-      _tao_arg_list,
-      number_args,
-      const_cast<char *> (this->opname_),
-      static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
-      0,
-      this->orb_->orb_core (),
-      this);
-
-  _tao_call.invoke (0,
-                    0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-CORBA::Request::get_response (ACE_ENV_SINGLE_ARG_DECL)
-{
-  while (!this->response_received_)
-    {
-      (void) this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (this->lazy_evaluation_)
-    {
-      this->args_->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-CORBA::Boolean
-CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->lock_,
-                    0);
-
-  if (!this->response_received_)
-    {
-      // If we're single-threaded, the application could starve the ORB,
-      // and the response never gets received, so let the ORB do an
-      // atom of work, if necessary, each time we poll.
-      ACE_Time_Value tv (0, 0);
-      (void) this->orb_->perform_work (&tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return this->response_received_;
-}
-
-void
-CORBA::Request::handle_response (TAO_InputCDR &incoming,
-                                 CORBA::ULong reply_status
-                                 ACE_ENV_ARG_DECL)
-{
-  // If this request was created by a gateway, then result_
-  // and/or args_ are shared by a CORBA::ServerRequest, whose
-  // reply must be in the same byte order as the reply we are
-  // handling here. So we set the member to be accessed later.
-  this->byte_order_ = incoming.byte_order ();
-
-  switch (reply_status)
-  {
-    case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
-      if (this->result_ != 0)
-        {
-          // We can be sure that the impl is a TAO::Unknown_IDL_Type.
-          this->result_->value ()->impl ()->_tao_decode (incoming
-                                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      this->args_->_tao_incoming_cdr (incoming,
-                                      CORBA::ARG_OUT | CORBA::ARG_INOUT,
-                                      this->lazy_evaluation_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      {
-        ACE_GUARD (TAO_SYNCH_MUTEX,
-                   ace_mon,
-                   this->lock_);
-
-        this->response_received_ = 1;
-      }
-
-      break;
-    case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-    case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-    default:
-      // @@ (JP) Don't know what to do about any of these yet.
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) unhandled reply status\n")));
-  }
-}
-
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::Request>;
-  template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>;
-  template class
-    TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Request
-      >;
-  template class
-    TAO_MngSeq_Var_T<
-        CORBA::ORB::RequestSeq,
-        TAO_Pseudo_Object_Manager<
-            CORBA::Request
-          >
-      >;
-  template class
-    TAO_Seq_Var_Base_T<
-        CORBA::ORB::RequestSeq,
-        TAO_Pseudo_Object_Manager<
-            CORBA::Request
-          >
-      >;
-  template class
-    TAO_MngSeq_Out_T<
-        CORBA::ORB::RequestSeq,
-        CORBA::ORB::RequestSeq_var,
-        TAO_Pseudo_Object_Manager<
-            CORBA::Request
-          >
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::Request>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>
-# pragma instantiate \
-    TAO_Unbounded_Pseudo_Sequence< \
-        CORBA::Request \
-      >
-# pragma instantiate \
-    TAO_VarSeq_Var_T< \
-        CORBA::ORB::RequestSeq, \
-        TAO_Pseudo_Object_Manager< \
-            CORBA::Request \
-          > \
-      >
-# pragma instantiate \
-    TAO_Seq_Var_Base_T< \
-        CORBA::ORB::RequestSeq, \
-        TAO_Pseudo_Object_Manager< \
-            CORBA::Request \
-          > \
-      >
-# pragma instantiate \
-    TAO_Seq_Out_T< \
-        CORBA::ORB::RequestSeq, \
-        CORBA::ORB::RequestSeq_var, \
-        TAO_Pseudo_Object_Manager< \
-            CORBA::Request \
-          > \
-      >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
deleted file mode 100644
index 8c9c49840d9..00000000000
--- a/TAO/tao/DynamicInterface/Request.h
+++ /dev/null
@@ -1,267 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Request.h
- *
- *  $Id$
- *
- *  Header file for CORBA's Dynamic Invocation Interface "Request"
- *  type.
- *
- *  @author Copyright 1994-1995 by Sun Microsystems, Inc.
- *  @author Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REQUEST_H
-#define TAO_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// To force execution of the static constructor
-// that registers the dynamic service object.
-#include "Dynamic_Adapter_Impl.h"
-
-#include "ExceptionList.h"
-#include "Context.h"
-
-#include "tao/ORB.h"
-#include "tao/NVList.h"
-#include "tao/Environment.h"
-#include "tao/Sequence.h"
-#include "tao/CDR.h"
-
-#include "ace/SString.h"
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-namespace CORBA
-{
-  /**
-   * @class Request
-   *
-   * @brief CORBA::Request
-   *
-   * Provides a way to create requests and populate it with parameters
-   * for use in the Dynamic Invocation Interface.
-   */
-  class TAO_DynamicInterface_Export Request
-  {
-  public:
-
-    /// Return the target of this request.
-    CORBA::Object_ptr target (void) const;
-
-    /// Return the operation name for the request.
-    const CORBA::Char *operation (void) const;
-
-    /// Return the arguments for the request.
-    CORBA::NVList_ptr arguments (void);
-
-    /// Return the result for the request.
-    CORBA::NamedValue_ptr result (void);
-
-    /// Return the exceptions resulting from this request.
-    CORBA::ExceptionList_ptr exceptions (void);
-
-    /// Accessor for the Context member.
-    CORBA::Context_ptr ctx (void) const;
-
-    /// Mutator for the Context member.
-    void ctx (CORBA::Context_ptr);
-
-    /// Return a list of the request's result's contexts.  Since TAO
-    /// does not implement Contexts, this will always be 0.
-    CORBA::ContextList_ptr contexts (void);
-
-    // @deprecated  Return the <Environment> for this request.
-    // CORBA::Environment_ptr env (void);
-
-
-    /**
-     * @name Argument manipulation helper functions.
-     *
-     * Arg adders, one for each type of parameter, with and without
-     * optional name. Returns reference to Any for insertion using
-     * <<=.
-     */
-    //@{
-    CORBA::Any &add_in_arg (void);
-    CORBA::Any &add_in_arg (const char* name);
-    CORBA::Any &add_inout_arg (void);
-    CORBA::Any &add_inout_arg (const char* name);
-    CORBA::Any &add_out_arg (void);
-    CORBA::Any &add_out_arg (const char* name);
-    //@}
-
-    /// Initialize the return type.
-    void set_return_type (CORBA::TypeCode_ptr tc);
-
-    /// Returns reference to Any for extraction using >>=.
-    CORBA::Any &return_value (void);
-
-    /// Perform method resolution and invoke an appropriate method.
-    /**
-     * If the method returns successfully, its result is placed in
-     * the result argument specified on @c create_request. The behavior
-     * is undefined if this @c Request has already been used with a
-     * previous call to @c invoke>, @c send>, or
-     * @send_multiple_requests.
-     *
-     * @note A default argument is set, but please note that this not
-     *       recommended as the user may not be able to propagate the
-     *       exceptions.
-     */
-    void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /// Send a oneway request.
-    /**
-     * @note A default argument is set, but please note that this not
-     *       recommended as the user may not be able to propagate the
-     *       exceptions.
-     */
-    void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * @name The 'deferred synchronous' methods.
-     *
-     * The 'deferred synchronous' methods.
-     */
-    //@{
-    void send_deferred (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void get_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    CORBA::Boolean poll_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    //@}
-
-    /// Callback method for deferred synchronous requests.
-    void handle_response (TAO_InputCDR &incoming,
-                          CORBA::ULong reply_status
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Pseudo object methods.
-    static CORBA::Request* _duplicate (CORBA::Request*);
-    static CORBA::Request* _nil (void);
-
-    // = Reference counting.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
-
-    /// Set the lazy evaluation flag.
-    void _tao_lazy_evaluation (bool lazy_evaluation);
-
-    /// Get the byte order member.
-    int _tao_byte_order (void) const;
-
-    /// Set the byte order member.
-    void _tao_byte_order (int byte_order);
-
-    // Hold on to a user exception in case we are part of a TAO
-    // gateway.
-    void raw_user_exception (TAO_InputCDR &cdr);
-
-    /// Accessor for the input stream containing the exception.
-    ACE_CString &raw_user_exception (void);
-
-
-    /// Proprietary method to check whether a response has been 
-    /// received. 
-    CORBA::Boolean response_received (void);
-
-    // Useful for template programming.
-    typedef CORBA::Request_ptr _ptr_type;
-    typedef CORBA::Request_var _var_type;
-
-  private:
-    friend class ::TAO_Dynamic_Adapter_Impl;
-
-    // The following are not allowed except when called from the
-    // friend class.
-
-    Request (CORBA::Object_ptr obj,
-             CORBA::ORB_ptr orb,
-             const CORBA::Char *op,
-             CORBA::NVList_ptr args,
-             CORBA::NamedValue_ptr result,
-             CORBA::Flags flags,
-             CORBA::ExceptionList_ptr exceptions
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    Request (CORBA::Object_ptr obj,
-             CORBA::ORB_ptr orb,
-             const CORBA::Char *op
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    ~Request (void);
-
-  private:
-
-    /// Target object.
-    CORBA::Object_ptr target_;
-
-    /// Pointer to our ORB.
-    CORBA::ORB_var orb_;
-
-    /// Operation name.
-    const char * opname_;
-
-    /// Parameter list.
-    CORBA::NVList_ptr args_;
-
-    /// Result of the operation.
-    CORBA::NamedValue_ptr result_;
-
-    /// Invocation flags.
-    CORBA::Flags flags_;
-
-    /// @deprecated  Holds exceptions.
-    // CORBA::Environment env_;
-
-    /// List of exceptions raised by the operation.
-    CORBA::ExceptionList_var exceptions_;
-
-    /// List of the request's result's contexts.
-    CORBA::ContextList_ptr contexts_;
-
-    /// Context associated with this request.
-    CORBA::Context_ptr ctx_;
-
-    /// Reference counting.
-    CORBA::ULong refcount_;
-
-    /// Protect the refcount_ and response_receieved_.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// If not zero then the NVList is not evaluated by default.
-    bool lazy_evaluation_;
-
-    /// Set to TRUE upon completion of invoke() or handle_response().
-    CORBA::Boolean response_received_;
-
-    /// Can be reset by a gateway when passing along a request.
-    int byte_order_;
-
-    /// Stores user exception as a CDR stream when this request is
-    /// used in a TAO gateway.
-    ACE_CString raw_user_exception_;
-
-  };
-} // End CORBA namespace.
-
-#if defined (__ACE_INLINE__)
-# include "Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
deleted file mode 100644
index 4b625ef61da..00000000000
--- a/TAO/tao/DynamicInterface/Request.inl
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-void
-CORBA::release (CORBA::Request_ptr x)
-{
-  if (x != 0)
-    {
-      x->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::Request_ptr x)
-{
-  return (CORBA::Boolean) (x == 0);
-}
-
-// ===================================================================
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request::_duplicate (CORBA::Request_ptr x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Request::target (void) const
-{
-  return this->target_;
-}
-
-// Return the operation name for the request.
-ACE_INLINE const CORBA::Char *
-CORBA::Request::operation (void) const
-{
-  return this->opname_;
-}
-
-// Return the arguments for the request.
-ACE_INLINE CORBA::NVList_ptr
-CORBA::Request::arguments (void)
-{
-  return this->args_;
-}
-
-// Return the result for the request.
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::Request::result (void)
-{
-  return this->result_;
-}
-
-// Return the exceptions resulting from this request.
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::Request::exceptions (void)
-{
-  return this->exceptions_.in ();
-}
-
-// Return the request's contexts
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::Request::contexts (void)
-{
-  return this->contexts_;
-}
-
-//// *** DEPRECATED ***  Return the <Environment> for this request.
-// ACE_INLINE CORBA::Environment *
-// CORBA::Request::env (void)
-// {
-//   return &this->env_;
-// }
-
-// The argument manipulation helper functions
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_in_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_in_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_inout_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_inout_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_out_arg (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::add_out_arg (const CORBA::Char *name)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
-}
-
-ACE_INLINE void
-CORBA::Request::set_return_type (CORBA::TypeCode_ptr tc)
-{
-  this->result_->any_._tao_set_typecode (tc);
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Request::return_value (void )
-{
-  return this->result_->any_;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::Request::ctx (void) const
-{
-  return this->ctx_;
-}
-
-ACE_INLINE void
-CORBA::Request::ctx (CORBA::Context_ptr ctx)
-{
-  this->ctx_ = ctx;
-}
-
-ACE_INLINE void
-CORBA::Request::_tao_lazy_evaluation (bool lazy_evaluation)
-{
-  this->lazy_evaluation_ = lazy_evaluation;
-}
-
-ACE_INLINE int
-CORBA::Request::_tao_byte_order (void) const
-{
-  return this->byte_order_;
-}
-
-ACE_INLINE void
-CORBA::Request::_tao_byte_order (int byte_order)
-{
-  this->byte_order_ = byte_order;
-}
-
-ACE_INLINE void
-CORBA::Request::raw_user_exception (TAO_InputCDR &cdr)
-{
-  this->raw_user_exception_.set (cdr.start ()->rd_ptr (),
-                                 cdr.start ()->length (),
-                                 1);
-}
-
-ACE_INLINE ACE_CString &
-CORBA::Request::raw_user_exception (void)
-{
-  return this->raw_user_exception_;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::Request::response_received (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-		    ace_mon,
-		    this->lock_,
-		    0);
-
-  return this->response_received_;
-}
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
deleted file mode 100644
index e22d6e273a2..00000000000
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// $Id$
-
-// Implementation of the Dynamic Server Skeleton Interface.
-
-#include "Server_Request.h"
-
-ACE_RCSID (DynamicInterface,
-           Server_Request,
-           "$Id$")
-
-#include "tao/NVList.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/Any_Impl.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Server_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-// Reference counting for DSI ServerRequest object.
-
-CORBA::ULong
-CORBA::ServerRequest::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->lock_,
-                    0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA::ServerRequest::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      0);
-
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
-  : lazy_evaluation_ (0),
-    ctx_ (CORBA::Context::_nil ()),
-    params_ (CORBA::NVList::_nil ()),
-    retval_ (0),
-    exception_ (0),
-    refcount_ (1),
-    orb_server_request_ (orb_server_request),
-    sent_gateway_exception_ (0)
-{
-  this->orb_server_request_.is_dsi ();
-}
-
-CORBA::ServerRequest::~ServerRequest (void)
-{
-  if (this->params_ != 0)
-    {
-      CORBA::release (this->params_);
-    }
-
-  delete this->retval_;
-  delete this->exception_;
-}
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-void
-CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
-                                 ACE_ENV_ARG_DECL)
-{
-  // arguments() must be called before either of these.
-  if (this->params_ != 0 || this->exception_ != 0)
-    {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO));
-    }
-
-  // Save params for later use when marshaling the reply.
-  this->params_ = list;
-
-  this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
-                                    CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                    this->lazy_evaluation_
-                                    ACE_ENV_ARG_PARAMETER);
-
-  // Pass this alignment back to the TAO_ServerRequest.
-  this->orb_server_request_.dsi_nvlist_align (
-                                this->params_->_tao_target_alignment ()
-                              );
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results can be reported (at most once)
-// only after the parameter list has been provided (maybe empty).
-void
-CORBA::ServerRequest::set_result (const CORBA::Any &value
-                                  ACE_ENV_ARG_DECL)
-{
-  // Setting a result when another result already exists or if an exception
-  // exists or before the args have been processeed is an error.
-  if (this->retval_ != 0 || this->exception_ != 0 || this->params_ == 0)
-    {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO));
-    }
-
-  ACE_NEW_THROW_EX (this->retval_,
-                    CORBA::Any (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-}
-
-  // NOTE: if "ACE_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception,
-  // and it will take precedence over exceptions reported using the
-  // set_exception() mechanism of the ServerRequest, which we assume
-  // the application writer will use to report only user exceptions.
-  // If both types of exception happen on the same invocation, the user
-  // exception will be lost.
-
-// Store the exception value.
-void
-CORBA::ServerRequest::set_exception (const CORBA::Any &value
-                                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var tc = value.type ();
-
-  CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // set_exception() can be called at any time, but the Any arg MUST
-  // contain an exception.
-  if (kind != CORBA::tk_except)
-    {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 21,
-                                   CORBA::COMPLETED_MAYBE));
-    }
-
-  ACE_NEW_THROW_EX (this->exception_,
-                    CORBA::Any (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  this->orb_server_request_.exception_type (TAO_GIOP_USER_EXCEPTION);
-}
-
-// This method will be utilized by the DSI servant to marshal outgoing
-// parameters.
-void
-CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // There was a user exception, no need to marshal any parameters.
-  if (this->sent_gateway_exception_)
-    {
-      return;
-    }
-
-  if (this->orb_server_request_.exception_type () == TAO_GIOP_NO_EXCEPTION)
-    {
-      // In DSI, we can't rely on the skeleton to do this.
-      if (this->retval_ == 0 && this->params_ == 0)
-        {
-          this->orb_server_request_.argument_flag (0);
-        }
-
-      this->orb_server_request_.init_reply ();
-
-      // Send the return value, if any.
-      if (this->retval_ != 0)
-        {
-          this->retval_->impl ()->marshal_value (
-                                      *this->orb_server_request_.outgoing ()
-                                    );
-        }
-
-      // Send the "inout" and "out" parameters.
-      if (this->params_ != 0)
-        {
-          this->params_->_tao_encode (
-                             *this->orb_server_request_.outgoing (),
-                             CORBA::ARG_INOUT | CORBA::ARG_OUT
-                             ACE_ENV_ARG_PARAMETER
-                           );
-          ACE_CHECK;
-        }
-    }
-  else
-    {
-      // This defaults to 1, but just to be safe...
-      this->orb_server_request_.argument_flag (1);
-
-      // Write the reply header to the ORB request's outgoing CDR stream.
-      this->orb_server_request_.init_reply ();
-
-      this->exception_->impl ()->marshal_value (
-                                     *this->orb_server_request_.outgoing ()
-                                   );
-    }
-
-  this->orb_server_request_.tao_send_reply ();
-}
-
-void
-CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
-{
-  // This defaults to 1, but just to be safe...
-  this->orb_server_request_.argument_flag (1);
-
-  // This reply path handles only user exceptions.
-  this->orb_server_request_.exception_type (TAO_GIOP_USER_EXCEPTION);
-
-  this->orb_server_request_.init_reply ();
-
-  // We know nothing about this exception, so we marshal it as a block
-  // of bytes. The outgoing stream's byte order has already been matched
-  // to the original source of the reply.
-  this->orb_server_request_.outgoing ()->write_octet_array (
-      reinterpret_cast<const CORBA::Octet *> (raw_exception.fast_rep ()),
-      static_cast<CORBA::ULong> (raw_exception.length () + ACE_CDR::MAX_ALIGNMENT)
-    );
-
-  // This will prevent the marshaling of any parameters into this reply.
-  this->sent_gateway_exception_ = 1;
-
-  this->orb_server_request_.tao_send_reply ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::ServerRequest>;
-  template class TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::ServerRequest>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
deleted file mode 100644
index 235898bd4a6..00000000000
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
-
-#ifndef TAO_CORBA_SERVER_REQUEST_H
-#define TAO_CORBA_SERVER_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "Context.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// To force execution of the static constructor
-// that registers the dynamic service object.
-#include "Dynamic_Adapter_Impl.h"
-
-#include "tao/TAO_Server_Request.h"
-#include "tao/CDR.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-namespace CORBA
-{
-  class ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ServerRequest_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ServerRequest_ptr);
-
-  typedef TAO_Pseudo_Var_T<ServerRequest> ServerRequest_var;
-  typedef TAO_Pseudo_Out_T<ServerRequest, ServerRequest_var> ServerRequest_out;
-
-  class TAO_DynamicInterface_Export ServerRequest
-  {
-    // = TITLE
-    //    Class representing the CORBA ServerRequest pseudo-object.
-    //
-    // = DESCRIPTION
-    //    Instantiated by the POA for DSI requests and passed up
-    //    to the application. Contains a reference to the instance
-    //    of TAO_ServerRequest that is passed up to the POA from
-    //    the ORB.
-  public:
-    /// Constructor.
-    ServerRequest (TAO_ServerRequest &orb_server_request);
-
-    /// Destructor.
-    ~ServerRequest (void);
-
-    /// Implementation uses this to provide the ORB with the operation's
-    /// parameter list ... on return, their values are available; the
-    /// list fed in has typecodes and (perhap) memory assigned.
-    void arguments (CORBA::NVList_ptr &list
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Implementation uses this to provide the operation result
-    /// ... illegal if exception() was called or params() was not called.
-    ///
-    /// XXX Implementation should be able to assume response has been
-    /// sent when this returns, and reclaim memory it allocated.
-    void set_result (const CORBA::Any &value
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Implementation uses this to provide the exception value which is
-    /// the only result of this particular invocation.
-    ///
-    /// XXX Implementation should be able to assume response has been
-    /// sent when this returns, and reclaim memory it allocated.
-    void set_exception (const CORBA::Any &value
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // = Get various universal call attributes.
-
-    // e.g., who made the call, the target of the call, what ORB and OA
-    // that target object uses.
-    //
-    // NOTE: none of these report exceptions; unavailability of any of
-    // this stuff is a catastrophic error since this is all part of the
-    // basic CORBA Object Model.
-
-    /// Marshal outgoing parameters.
-    void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /// Accessor for the Context member.
-    CORBA::Context_ptr ctx (void) const;
-
-    /// Mutator for the Context member.
-    void ctx (CORBA::Context_ptr);
-
-    /// Get the operation name.
-    const char *operation (void) const;
-
-    // Pseudo object methods.
-    static ServerRequest_ptr _duplicate (ServerRequest_ptr);
-    static ServerRequest_ptr _nil (void);
-
-    // = Reference counting.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
-
-    /// Set the lazy evaluation flag.
-    void _tao_lazy_evaluation (bool lazy_evaluation);
-
-    /// Get the byte order of the incoming CDR stream.
-    int _tao_incoming_byte_order (void) const;
-
-    /// Set the byte order of the outgoing CDR stream.
-    void _tao_reply_byte_order (int byte_order);
-
-    /// Return a reference to the underlying TAO_ServerRequest object.
-    TAO_ServerRequest & _tao_server_request (void);
-
-    /// Returns a user exception through a TAO gateway without
-    /// knowing its type.
-    void gateway_exception_reply (ACE_CString &raw_exception);
-
-    /// Useful for template programming.
-    typedef CORBA::ServerRequest_ptr _ptr_type;
-
-  private:
-    /// If zero then the NVList is evaluated ASAP.
-    bool lazy_evaluation_;
-
-    /// Context associated with this request.
-    CORBA::Context_ptr ctx_;
-
-    /// Incoming parameters.
-    CORBA::NVList_ptr params_;
-
-    /// Return value.
-    CORBA::Any_ptr retval_;
-
-    /// Any exception which might be raised.
-    CORBA::Any_ptr exception_;
-
-    /// Reference counting.
-    CORBA::ULong refcount_;
-
-    /// Protect the refcount_ and response_receieved_.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Request from the ORB.
-    TAO_ServerRequest &orb_server_request_;
-
-    /// Have we sent a user exception obtained from a gateway?
-    int sent_gateway_exception_;
-  };
-} // End CORBA namespace
-
-#if defined (__ACE_INLINE__)
-# include "Server_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CORBA_SERVER_REQUEST_H */
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
deleted file mode 100644
index 8431d78ad0d..00000000000
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-void
-CORBA::release (CORBA::ServerRequest_ptr x)
-{
-  if (x != 0)
-    {
-      x->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::ServerRequest_ptr x)
-{
-  return (CORBA::Boolean) (x == 0);
-}
-
-// ===================================================================
-
-ACE_INLINE CORBA::ServerRequest_ptr
-CORBA::ServerRequest::_duplicate (CORBA::ServerRequest_ptr x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE CORBA::ServerRequest_ptr
-CORBA::ServerRequest::_nil (void)
-{
-  return (CORBA::ServerRequest_ptr)0;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::ServerRequest::ctx (void) const
-{
-  return this->ctx_;
-}
-
-ACE_INLINE void
-CORBA::ServerRequest::ctx (CORBA::Context_ptr ctx)
-{
-  this->ctx_ = ctx;
-}
-
-ACE_INLINE const char *
-CORBA::ServerRequest::operation (void) const
-{
-  return this->orb_server_request_.operation ();
-}
-
-ACE_INLINE void
-CORBA::ServerRequest::_tao_lazy_evaluation (bool lazy_evaluation)
-{
-  this->lazy_evaluation_ = lazy_evaluation;
-}
-
-ACE_INLINE int
-CORBA::ServerRequest::_tao_incoming_byte_order (void) const
-{
-  return this->orb_server_request_.incoming ()->byte_order ();
-}
-
-ACE_INLINE void
-CORBA::ServerRequest::_tao_reply_byte_order (int byte_order)
-{
-  this->orb_server_request_.outgoing ()->reset_byte_order (byte_order);
-}
-
-
-ACE_INLINE TAO_ServerRequest &
-CORBA::ServerRequest::_tao_server_request (void)
-{
-  return this->orb_server_request_;
-}
diff --git a/TAO/tao/DynamicInterface/TAO_DynamicInterface.pc.in b/TAO/tao/DynamicInterface/TAO_DynamicInterface.pc.in
deleted file mode 100644
index d4da3129f49..00000000000
--- a/TAO/tao/DynamicInterface/TAO_DynamicInterface.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_DynamicInterface
-Description: TAO Dynamic Interface Library
-Requires: TAO_Messaging
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_DynamicInterface
-Cflags: -I${includedir}
diff --git a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc b/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc
deleted file mode 100644
index 5cca9fe43d2..00000000000
--- a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "DynamicInterface\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_DynamicInterfaceDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_DynamicInterface.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
deleted file mode 100644
index 57107224f2c..00000000000
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "Unknown_User_Exception.h"
-
-#include "tao/Any.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/SystemException.h"
-
-#include "ace/OS_NS_string.h"
-#include "ace/OS_Memory.h"
-
-
-ACE_RCSID (DynamicInterface,
-           Unknown_User_Exception,
-           "$Id$")
-
-
-CORBA::UnknownUserException::UnknownUserException (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
-                          "UnknownUserException"),
-    exception_ (0)
-{
-}
-
-CORBA::UnknownUserException::UnknownUserException (CORBA::Any &ex)
-  : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0",
-                         "UnknownUserException")
-{
-  ACE_NEW (this->exception_,
-           CORBA::Any (ex));
-}
-
-CORBA::UnknownUserException::UnknownUserException (
-    const CORBA::UnknownUserException& e
-  )
-  : CORBA::UserException (e._rep_id (),
-                         e._name ())
-{
-  ACE_NEW (this->exception_,
-           CORBA::Any (*e.exception_));
-}
-
-CORBA::UnknownUserException::~UnknownUserException (void)
-{
-  delete this->exception_;
-}
-
-CORBA::Any &
-CORBA::UnknownUserException::exception (void)
-{
-  return *this->exception_;
-}
-
-int
-CORBA::UnknownUserException::_is_a (const char *interface_id) const
-{
-  return
-    ((ACE_OS::strcmp (interface_id,
-                      "IDL:omg.org/CORBA/UnknownUserException:1.0")
-        == 0)
-      || UserException::_is_a (interface_id));
-}
-
-CORBA::UnknownUserException *
-CORBA::UnknownUserException::_downcast (CORBA::Exception *ex)
-{
-  return dynamic_cast<CORBA::UnknownUserException *> (ex);
-}
-
-CORBA::UnknownUserException const *
-CORBA::UnknownUserException::_downcast (CORBA::Exception const * ex)
-{
-  return dynamic_cast<CORBA::UnknownUserException const *> (ex);
-}
-
-void
-CORBA::UnknownUserException::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-CORBA::Exception *
-CORBA::UnknownUserException::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      CORBA::UnknownUserException (*this),
-      0
-    );
-  return result;
-}
-
-void
-CORBA::UnknownUserException::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &
-                                         ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::TypeCode_ptr
-CORBA::UnknownUserException::_tao_type (void) const
-{
-  return CORBA::_tc_UnknownUserException;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    Struct_Field<char const *, CORBA::TypeCode_ptr const *> const
-    fields_CORBA_UnknownUserException[] =
-      {
-        { "exception", &CORBA::_tc_any }
-      };
-
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_UnknownUserException (
-             CORBA::tk_except,
-             "IDL:omg.org/CORBA/UnknownUserException:1.0",
-             "UnknownUserException",
-             TAO::TypeCode::fields_CORBA_UnknownUserException,
-             1 /* # of fields */);
-  }
-}
-
-namespace CORBA
-{
-  CORBA::TypeCode_ptr const _tc_UnknownUserException =
-    &TAO::TypeCode::tc_UnknownUserException;
-}
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
deleted file mode 100644
index 91d06d3e7a0..00000000000
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Unknown_User_Exception.h
- *
- *  $Id$
- *
- *  Defines the way an exception is reported by a DII request.
- *
- *
- *  @author  Portions Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Portions Copyright 1997-2003 by Washington University
- */
-//=============================================================================
-
-
-#ifndef TAO_UNKNOWN_USER_EXCEPTION_H
-#define TAO_UNKNOWN_USER_EXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "dynamicinterface_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#  pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/UserException.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-namespace CORBA
-{
-  /**
-   * @class UnknownUserException
-   *
-   * @brief UnknownUserException
-   *
-   * When user exceptions are received by a DII invocation the ORB
-   * is unable to create the exception with the right dynamic type;
-   * to workaround this problem it throws a
-   * @c CORBA::UnknownUserException that contains the exception inside
-   * an Any.
-   */
-  class TAO_DynamicInterface_Export UnknownUserException
-    : public CORBA::UserException
-  {
-  public:
-
-    /// Constructor.
-    UnknownUserException (void);
-
-    /// Constructor.
-    UnknownUserException (CORBA::Any& exception);
-
-    /// Copy constructor.
-    UnknownUserException (const UnknownUserException& e);
-
-    /// Destructor.
-    virtual ~UnknownUserException (void);
-
-    /// Return the any containing the user exception.
-    CORBA::Any& exception (void);
-
-    /// To throw an UnknownUserException of this type.
-    virtual void _raise (void) const;
-
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL);
-
-    /// Narrow to an UnknowUserException.
-    static UnknownUserException * _downcast (CORBA::Exception *ex);
-    static UnknownUserException const * _downcast (
-      CORBA::Exception const * ex);
-
-    // = TAO specific extension.
-
-    /// Helper method to implement _downcast.
-    virtual int _is_a (const char *type_id) const;
-
-    /// This class has a specific typecode.
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-
-  private:
-    /// Holder for the actual exception.
-    CORBA::Any *exception_;
-  };
-
-  // The CORBA::UnknownUserException TypeCode.
-  extern TAO_DynamicInterface_Export TypeCode_ptr const
-    _tc_UnknownUserException;
-
-} // End CORBA namespace.
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNKNOWN_USER_EXCEPTION_H */
diff --git a/TAO/tao/DynamicInterface/dynamicinterface_export.h b/TAO/tao/DynamicInterface/dynamicinterface_export.h
deleted file mode 100644
index f1e680434fc..00000000000
--- a/TAO/tao/DynamicInterface/dynamicinterface_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#ifndef TAO_DYNAMICINTERFACE_EXPORT_H
-#define TAO_DYNAMICINTERFACE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_DYNAMICINTERFACE_HAS_DLL)
-#    define TAO_DYNAMICINTERFACE_HAS_DLL 0
-#  endif /* ! TAO_DYNAMICINTERFACE_HAS_DLL */
-#else
-#  if !defined (TAO_DYNAMICINTERFACE_HAS_DLL)
-#    define TAO_DYNAMICINTERFACE_HAS_DLL 1
-#  endif /* ! TAO_DYNAMICINTERFACE_HAS_DLL */
-#endif
-
-#if defined (TAO_DYNAMICINTERFACE_HAS_DLL) && (TAO_DYNAMICINTERFACE_HAS_DLL == 1)
-#  if defined (TAO_DYNAMICINTERFACE_BUILD_DLL)
-#    define TAO_DynamicInterface_Export ACE_Proper_Export_Flag
-#    define TAO_DYNAMICINTERFACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DYNAMICINTERFACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else
-#    define TAO_DynamicInterface_Export ACE_Proper_Import_Flag
-#    define TAO_DYNAMICINTERFACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DYNAMICINTERFACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_DYNAMICINTERFACE_BUILD_DLL */
-#else
-#  define TAO_DynamicInterface_Export
-#  define TAO_DYNAMICINTERFACE_SINGLETON_DECLARATION(T)
-#  define TAO_DYNAMICINTERFACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_DYNAMICINTERFACE_HAS_DLL */
-
-#endif /* TAO_DYNAMICINTERFACE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/DynamicS.h b/TAO/tao/DynamicS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/DynamicS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
deleted file mode 100644
index 4db3657cee7..00000000000
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// @(#) $Id$
-
-#include "tao/Dynamic_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Dynamic_Adapter, 
-           "$Id$")
-
-TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Dynamic_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
deleted file mode 100644
index 9db31e492bb..00000000000
--- a/TAO/tao/Dynamic_Adapter.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Dynamic_Adapter.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DYNAMIC_ADAPTER_H
-#define TAO_DYNAMIC_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "ace/CORBA_macros.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ORB;
-  typedef ORB *ORB_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  class ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
-
-  class Request;
-  typedef Request *Request_ptr;
-
-  class Context;
-  typedef Context *Context_ptr;
-
-  class ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-
-  typedef ULong Flags;
-
-  class Environment;
-}
-
-class TAO_GIOP_Twoway_Invocation;
-
-/**
- * @class TAO_Dynamic_Adapter
- *
- * @brief TAO_Dynamic_Adapter.
- *
- * Class that adapts various functions in the CORBA namespace
- * related to DII/DSI, which is no longer found in the TAO library.
- * This is a base for the actual implementation in the DynamicInterface
- * library.
- */
-class TAO_Export TAO_Dynamic_Adapter : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_Dynamic_Adapter (void);
-
-  // CORBA::Object::_create_request and CORBA::Object::_request.
-
-  virtual void create_request (CORBA::Object_ptr obj,
-                               CORBA::ORB_ptr orb,
-                               const char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::ExceptionList_ptr exceptions,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags
-                               ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
-                                      CORBA::ORB_ptr orb,
-                                      const char *op
-                                      ACE_ENV_ARG_DECL) = 0;
-
-  // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
-
-  virtual CORBA::Boolean context_is_nil (CORBA::Context_ptr ctx) = 0;
-
-  virtual CORBA::Boolean request_is_nil (CORBA::Request_ptr req) = 0;
-
-  virtual CORBA::Boolean server_request_is_nil (CORBA::ServerRequest_ptr req) = 0;
-
-  virtual void context_release (CORBA::Context_ptr ctx) = 0;
-
-  virtual void request_release (CORBA::Request_ptr req) = 0;
-
-  virtual void server_request_release (CORBA::ServerRequest_ptr req) = 0;
-
-  // CORBA::ORB::create_exception_list.
-  virtual void create_exception_list (CORBA::ExceptionList_ptr &
-                                      ACE_ENV_ARG_DECL) = 0;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DYNAMIC_ADAPTER_H */
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
deleted file mode 100644
index f82dd8ba366..00000000000
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic_Parameter.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in Dynamic_ParameterC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic_Parameter.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic_Parameter.idl
-// Piece of module Dynamic generated separately for use by
-// template argument helper classes.
-
-#ifndef _DYNAMIC_PARAMETER_IDL_
-#define _DYNAMIC_PARAMETER_IDL_
-
-#include <ParameterMode.pidl>
-
-module Dynamic
-{
-  struct Parameter
-  {
-    any argument;
-    CORBA::ParameterMode mode;
-  };
-};
-
-#endif // _DYNAMIC_PARAMETER_IDL_
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
deleted file mode 100644
index c294007298d..00000000000
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Dynamic_ParameterC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Dynamic_Parameter[] =
-  {
-    { "argument", &CORBA::_tc_any },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_Parameter (
-    CORBA::tk_struct,
-    "IDL:Dynamic/Parameter:1.0",
-    "Parameter",
-    _tao_fields_Dynamic_Parameter,
-    2);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_Parameter =
-    &_tao_tc_Dynamic_Parameter;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::Parameter &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert_copy (
-      _tao_any,
-      Dynamic::Parameter::_tao_any_destructor,
-      Dynamic::_tc_Parameter,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::Parameter *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert (
-      _tao_any,
-      Dynamic::Parameter::_tao_any_destructor,
-      Dynamic::_tc_Parameter,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::Parameter *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::Parameter *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::Parameter *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::Parameter>::extract (
-        _tao_any,
-        Dynamic::Parameter::_tao_any_destructor,
-        Dynamic::_tc_Parameter,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
deleted file mode 100644
index 9b9ed5f8582..00000000000
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Dynamic_ParameterC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Dynamic::Parameter::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Parameter *_tao_tmp_pointer =
-    static_cast<Parameter *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.argument) &&
-    (strm << _tao_aggregate.mode);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.argument) &&
-    (strm >> _tao_aggregate.mode);
-}
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
deleted file mode 100644
index 64cf2cb2410..00000000000
--- a/TAO/tao/Dynamic_ParameterC.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-#define _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/ParameterModeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct Parameter;
-  
-  typedef
-    TAO_Var_Var_T<
-        Parameter
-      >
-    Parameter_var;
-  
-  typedef
-    TAO_Out_T<
-        Parameter,
-        Parameter_var
-      >
-    Parameter_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export Parameter
-  {
-    typedef Parameter_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::Any argument;
-    CORBA::ParameterMode mode;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Parameter;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Parameter *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Empty_Param_TypeCode.cpp b/TAO/tao/Empty_Param_TypeCode.cpp
deleted file mode 100644
index 6f9f5589c15..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-#include "Empty_Param_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "Empty_Param_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Empty_Param_TypeCode,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
-                                         CORBA::ULong) const
-{
-  // Empty parameter list.  Nothing to marshal.
-
-  return true;
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_duplicate (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_release (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL) const
-{
-  // We could refactor this code to the CORBA::TypeCode::equivalent()
-  // method but doing so would force us to determine the unaliased
-  // kind of this TypeCode.  Since we already know the unaliased kind
-  // of this TypeCode, choose to optimize away the additional kind
-  // unaliasing operation rather than save space.
-
-  CORBA::TCKind const tc_kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_kind != this->kind_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since parameter list is empty.
-
-  // Since empty parameter TypeCodes are never created
-  // dynamically, there is no need to manipulate a reference count.
-
-  static TAO::TypeCode::Empty_Param compact_typecode (this->kind_);
-
-  return &compact_typecode;
-}
diff --git a/TAO/tao/Empty_Param_TypeCode.h b/TAO/tao/Empty_Param_TypeCode.h
deleted file mode 100644
index a45f9bea94a..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Empty_Param_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::TypeCodes with empty parameter lists.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_EMPTY_PARAM_TYPECODE_H
-#define TAO_EMPTY_PARAM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Empty_Param
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL types with
-     *        empty parameter lists.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL types
-     * with empty parameter lists.
-     *
-     * @note @c Empty_Param @c TypeCodes are not reference counted in
-     *       TAO since they are static, exist as constants for the
-     *       length of a given OS process, and cannot be created
-     *       through the @c CORBA::ORB or @c CORBA::TypeCodeFactory
-     *       interfaces.
-     */
-    class Empty_Param : public CORBA::TypeCode
-    {
-    public:
-
-      /// Constructor.
-      Empty_Param (CORBA::TCKind k);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c TypeCodes
-       * with empty parameter lists.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Empty_Param_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_EMPTY_PARAM_TYPECODE_H */
diff --git a/TAO/tao/Empty_Param_TypeCode.inl b/TAO/tao/Empty_Param_TypeCode.inl
deleted file mode 100644
index 85ec45fd029..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k)
-  : CORBA::TypeCode (k)
-{
-}
diff --git a/TAO/tao/Encodable.cpp b/TAO/tao/Encodable.cpp
deleted file mode 100644
index 70d75c09de0..00000000000
--- a/TAO/tao/Encodable.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-#include "tao/Encodable.h"
-
-TAO_Encodable::~TAO_Encodable (void) 
-{ 
-}
diff --git a/TAO/tao/Encodable.h b/TAO/tao/Encodable.h
deleted file mode 100644
index 43afb17fd43..00000000000
--- a/TAO/tao/Encodable.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    Encodable.h
- *
- *  $Id$
- *
- *   Defines the interface for classes that wish to be
- *   encodable/decodable into/from a CDR representation.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENCODABLE_H_
-#define TAO_ENCODABLE_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-/**
- * @class TAO_Encodable
- *
- * @brief TAO_Encodable Interface
- *
- * This interface should be inherited by classes that wish to be
- * encoded/decoded into/from a CDR stream. Implementation of the
- * streaming methods is deferred to the subclasses.
- */
-class TAO_Export TAO_Encodable
-{
-public:
-
-  virtual ~TAO_Encodable (void);
-
-  ///  Encodes the object implementing this method into a CDR stream.
-  ///  Returns true on success and false on failure.
-  virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr) = 0;
-
-  ///  Decodes the object implementing this method from a CDR stream.
-  ///  Returns true on success and false on failure.
-  virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENCODABLE_H_ */
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
deleted file mode 100644
index 63348e95eaa..00000000000
--- a/TAO/tao/Endpoint.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#include "tao/Endpoint.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Endpoint, 
-           "$Id$")
-
-
-TAO_Endpoint::~TAO_Endpoint (void)
-{
-}
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
deleted file mode 100644
index 4e214943836..00000000000
--- a/TAO/tao/Endpoint.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Endpoint.h
- *
- *  $Id$
- *
- * Endpoint interface, part of TAO pluggable protocol framework.
- *
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENDPOINT_H
-#define TAO_ENDPOINT_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-/**
- * @class TAO_Endpoint
- *
- * @brief Defines the Endpoint interface in the Pluggable Protocol
- * framework.
- *
- * Lightweight encapsulation of addressing information for a
- * single acceptor endpoint.  In other words, Endpoint represents
- * a single point of contact for the server, and is the smallest
- * unit of addressing information necessary for a client to connect
- * to a server.
- * A Profile contains one or more Endpoints, i.e., knows of
- * one or more ways to contact server(s).
- */
-class TAO_Export TAO_Endpoint
-{
-public:
-  /// Constructor.
-  TAO_Endpoint (CORBA::ULong tag,
-                CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Destructor.
-  virtual ~TAO_Endpoint (void);
-
-  /// IOP protocol tag accessor.
-  CORBA::ULong tag (void) const;
-
-  /// <priority_> attribute setter.
-  void priority (CORBA::Short priority);
-
-  /// <priority_> attribute getter.
-  CORBA::Short priority (void) const;
-
-  /**
-   * @name TAO_Endpoint Template Methods
-   *
-   * Abstract methods to be implemented by concrete subclasses.
-   */
-  //@{
-  /**
-   * @return true if this endpoint is equivalent to @a other_endpoint.
-   */
-  virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint) = 0;
-
-  /// Endpoints can be stringed in a list.
-  /**
-   * @return The next endpoint in the list, if any.
-   */
-  virtual TAO_Endpoint *next (void) = 0;
-
-  /// Return a string representation for the address.
-  /**
-   * The purpose of this method is to provide a general interface to
-   * the underlying address object's @c addr_to_string method.  This
-   * allows the protocol implementor to select the appropriate string
-   * format.
-   *
-   * @return -1 if buffer is too small.
-   */
-  virtual int addr_to_string (char *buffer, size_t length) = 0;
-
-  /// This method returns a deep copy of the corresponding endpoints by
-  /// allocating memory.
-  virtual TAO_Endpoint *duplicate (void) = 0;
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void) = 0;
-
-protected:
-
-  /// Lock for the address lookup.
-  /**
-   * @todo This lock should be strategized so that we dont lock in
-   *       single threaded configurations.  It is not possible to do
-   *       this now as most of the information is available in the
-   *       ORB_Core which is not available here.
-   */
-  mutable TAO_SYNCH_MUTEX addr_lookup_lock_;
-
-  /// Cache the hash value
-  CORBA::ULong hash_val_;
-
-  /// IOP tag, identifying the protocol for which this endpoint
-  /// contains addressing info.
-  CORBA::ULong tag_;
-
-  /**
-   * CORBA priority of the acceptor this Endpoint is representing.
-   * This is part of TAO 'prioritized endpoints' architecture, and is
-   * currently used for RTCORBA only.
-   */
-  CORBA::Short priority_;
-
-private:
-
-  /// Endpoints should not be copied.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&))
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_PROFILE_H */
diff --git a/TAO/tao/Endpoint.i b/TAO/tao/Endpoint.i
deleted file mode 100644
index 10d7d86325b..00000000000
--- a/TAO/tao/Endpoint.i
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_Endpoint::TAO_Endpoint (CORBA::ULong tag,
-                            CORBA::Short priority)
-  : addr_lookup_lock_ ()
-  // @@Would be a tragedy if the hash value of this endpoint is 0, in
-  // which  case this optimizaton wouldn't work. We can get around
-  // that using a bool. But we don't want to increase the runtime
-  // memory
-  , hash_val_ (0)
-  , tag_ (tag)
-  , priority_ (priority)
-
-{
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Endpoint::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE CORBA::Short
-TAO_Endpoint::priority (void) const
-{
-  return this->priority_;
-}
-
-ACE_INLINE void
-TAO_Endpoint::priority (CORBA::Short p)
-{
-  this->priority_ = p;
-}
diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp
deleted file mode 100644
index eac24e2509a..00000000000
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "tao/Endpoint_Selector_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Endpoint_Selector_Factory, 
-           "$Id$")
-
-TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
deleted file mode 100644
index 39540be51c4..00000000000
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Endpoint_Selector_Factory.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENDPOINT_SELECTOR_FACTORY_H
-#define TAO_ENDPOINT_SELECTOR_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  class Environment;
-
-  class Exception;
-}
-
-class TAO_Invocation_Endpoint_Selector;
-
-
-// ****************************************************************
-
-/**
- * @class TAO_Endpoint_Selector_Factory
- *
- * @brief Factory for initializing <Endpoint_Selection_State> and
- * obtaining appropriate <Invocation_Endpoint_Selector>.
- *
- * Used by Invocation classes to intialize its endpoint selection
- * strategy and state based on the effective policies.
- * Endpoint selection strategies are stateless objects - all the
- * state they need is contained by Invocation in
- * <Endpoint_Selection_State>.  Thus, rather than allocating an
- * endpoint selection strategy object for each Invocation, the
- * factory simply returns the appropriate one from the
- * set preallocated in the ORB_Core.  One endpoint selection
- * strategy object can be used by many invocations concurrently.
- */
-class TAO_Export TAO_Endpoint_Selector_Factory
-  : public ACE_Service_Object
-{
-public:
-  /// Destructor.
-  virtual ~TAO_Endpoint_Selector_Factory (void);
-
-  /// Get an Invocation's endpoint selection strategy and
-  /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-              ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-
-};
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_ENDPOINT_SELECTOR_FACTORY_H */
diff --git a/TAO/tao/Enum_TypeCode.cpp b/TAO/tao/Enum_TypeCode.cpp
deleted file mode 100644
index d7c3cd7d92a..00000000000
--- a/TAO/tao/Enum_TypeCode.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-
-#ifndef TAO_ENUM_TYPECODE_CPP
-#define TAO_ENUM_TYPECODE_CPP
-
-#include "tao/Enum_TypeCode.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-bool
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  StringType const * const begin = &this->enumerators_[0];
-  StringType const * const end   = begin + this->nenumerators_;
-
-  for (StringType const * i = begin; i != end; ++i)
-    {
-      StringType const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<StringType>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      StringType const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->enumerators_[index]);
-}
-
-#endif  /* TAO_ENUM_TYPECODE_CPP */
diff --git a/TAO/tao/Enum_TypeCode.h b/TAO/tao/Enum_TypeCode.h
deleted file mode 100644
index 3a4b30076bc..00000000000
--- a/TAO/tao/Enum_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_H
-#define TAO_ENUM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy>
-    class Enum
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            EnumeratorArrayType const & enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      EnumeratorArrayType const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Enum_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Enum_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_H */
diff --git a/TAO/tao/Enum_TypeCode.inl b/TAO/tao/Enum_TypeCode.inl
deleted file mode 100644
index 8b8e04f8632..00000000000
--- a/TAO/tao/Enum_TypeCode.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          class EnumeratorArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
-  char const * id,
-  char const * name,
-  EnumeratorArrayType const & enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.cpp b/TAO/tao/Enum_TypeCode_Static.cpp
deleted file mode 100644
index adda05c5985..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// $Id$
-
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Enum_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  char const * const * const begin = &this->enumerators_[0];
-  char const * const * const end   = begin + this->nenumerators_;
-
-  for (char const * const * i = begin; i != end; ++i)
-    {
-      char const * const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<char const *>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      char const * const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->enumerators_[index]);
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.h b/TAO/tao/Enum_TypeCode_Static.h
deleted file mode 100644
index fd1bf6f579a..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_STATIC_H
-#define TAO_ENUM_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy> class Enum;
-
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template<>
-    class TAO_Export Enum<char const *,
-                          char const * const *,
-                          TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            char const * const * enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      char const * const * const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Enum_TypeCode_Static.inl b/TAO/tao/Enum_TypeCode_Static.inl
deleted file mode 100644
index 1d2ab5ca8cb..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.inl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::Enum (
-  char const * id,
-  char const * name,
-  char const * const * enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
deleted file mode 100644
index c69aa599a9a..00000000000
--- a/TAO/tao/Environment.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-#include "Environment.h"
-#include "ORB_Core.h"
-#include "SystemException.h"
-#include "default_environment.h"
-
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Environment.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Environment,
-           "$Id$")
-
-
-CORBA::Environment::Environment (void)
-  : exception_ (0)
-  , previous_ (0)
-{
-}
-
-CORBA::Environment::Environment (const CORBA::Environment& rhs)
-  : exception_ (0)
-  , previous_ (0)
-{
-  if (rhs.exception_)
-    this->exception_ = rhs.exception_->_tao_duplicate ();
-}
-
-CORBA::Environment::Environment (TAO_ORB_Core* orb_core)
-  : exception_ (0)
-  , previous_ (orb_core->default_environment ())
-{
-  orb_core->default_environment (this);
-}
-
-CORBA::Environment&
-CORBA::Environment::operator= (const CORBA::Environment& rhs)
-{
-  CORBA::Environment tmp (rhs);
-  {
-    CORBA::Exception *tmp_ex = this->exception_;
-    this->exception_ = tmp.exception_;
-    tmp.exception_ = tmp_ex;
-  }
-  {
-    CORBA::Environment *tmp_env = this->previous_;
-    this->previous_ = rhs.previous_;
-    tmp.previous_ = tmp_env;
-  }
-  return *this;
-}
-
-CORBA::Environment::~Environment (void)
-{
-  this->clear ();
-
-  // If previous is 0 then this is the first Environment, allocated
-  // with the ORB, it shouldn't try to pop because the ORB is beign
-  // destroyed also.
-  if (this->previous_ != 0)
-    TAO_ORB_Core_instance ()->default_environment (this->previous_);
-}
-
-void
-CORBA::Environment::exception (CORBA::Exception *ex)
-{
-  // @@ This does not look right, setting the exception to the
-  //    contained exception is a bug,  the application is only
-  //    supposed to pass in a pointer to an exception that it (the
-  //    application) owns, however, if we contain the exception then
-  //    *WE* own it.
-  //    Normally I (coryan) would remove code like this, but I feel
-  //    that it is a typical example of defensive programming for the
-  //    *BAD*, i.e. we are not helping the application to get better
-  //    and only making the ORB bigger and slower.
-#if 0
-  if (ex != this->exception_)
-    {
-      this->clear ();
-    }
-#else
-  ACE_ASSERT (ex != this->exception_);
-  this->clear ();
-#endif /* 0 */
-
-  this->exception_ = ex;
-
-#if defined (TAO_HAS_EXCEPTIONS)
-  if (this->exception_ != 0)
-    this->exception_->_raise ();
-#endif /* TAO_HAS_EXCEPTIONS */
-}
-
-void
-CORBA::Environment::clear (void)
-{
-  delete this->exception_;
-  this->exception_ = 0;
-}
-
-CORBA::Environment&
-CORBA::Environment::default_environment ()
-{
-#if defined (TAO_HAS_EXCEPTIONS)
-  //
-  // If we are using native C++ exceptions the user is *not* supposed
-  // to clear the environment every time she calls into TAO.  In fact
-  // the user is not supposed to use the environment at all!
-  //
-  // But TAO is using the default environment internally, thus
-  // somebody has to clear it. Since TAO passes the environment around
-  // this function should only be called when going from the user code
-  // into TAO's code.
-  //
-  // This is not an issue when using the alternative C++ mapping (with
-  // the Environment argument) because then the user is supposed to
-  // clear the environment before calling into the ORB.
-  //
-  TAO_ORB_Core_instance ()->default_environment ()->clear ();
-#endif /* TAO_HAS_EXCEPTIONS */
-
-  return TAO_default_environment ();;
-}
-
-// Convenience -- say if the exception is a system exception or not.
-
-int
-CORBA::Environment::exception_type (void) const
-{
-  // @@ Carlos, is this stuff that's properly "transformed" for EBCDIC
-  //    platforms?!
-  // @@ Doug: Yes, they are used to compare against the _id() of the
-  //    exception, which should have been mappend to the native
-  //    codeset.  Notice the "should" we haven't tried that stuff yet,
-  //    and i find it hard to keep track of all the transformations
-  //    going on, specially for the TypeCodes that are generated by
-  //    the IDL compiler vs. the ones hard-coded in
-  //    $TAO_ROOT/tao/Typecode_Constants.cpp
-
-  static char sysex_prefix [] = "IDL:omg.org/CORBA/";
-  static char typecode_extra [] = "TypeCode/";
-
-  if (!this->exception_)
-    {
-      return CORBA::NO_EXCEPTION;
-    }
-
-  // All exceptions currently (CORBA 2.0) defined in the CORBA scope
-  // are system exceptions ... except for a couple that are related to
-  // TypeCodes.
-
-  const char *id = this->exception_->_rep_id ();
-
-  if ((ACE_OS::strncmp (id,
-                        sysex_prefix,
-                        sizeof sysex_prefix - 1) == 0
-       && ACE_OS::strncmp (id + sizeof sysex_prefix - 1,
-                           typecode_extra,
-                           sizeof typecode_extra - 1) != 0))
-    return CORBA::SYSTEM_EXCEPTION;
-  else
-    return CORBA::USER_EXCEPTION;
-}
-
-const char*
-CORBA::Environment::exception_id (void) const
-{
-  if (this->exception_ == 0)
-    return 0;
-
-  return this->exception_->_rep_id ();
-}
-
-// Diagnostic utility routine: describe the exception onto the
-// standard I/O stream passed as a parameter.
-
-void
-CORBA::Environment::print_exception (const char *info,
-                                     FILE *) const
-{
-  if (this->exception_)
-    {
-      const char *id = this->exception_->_rep_id ();
-
-      ACE_DEBUG ((LM_ERROR,
-                  ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (info)));
-
-      CORBA::SystemException *x2 =
-        CORBA::SystemException::_downcast (this->exception_);
-
-      if (x2 != 0)
-        x2->_tao_print_system_exception ();
-      else
-        // @@ we can use the exception's typecode to dump all the data
-        // held within it ...
-
-        ACE_DEBUG ((LM_ERROR,
-                    ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
-    }
-  else
-    ACE_DEBUG ((LM_ERROR,
-                ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info)));
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::Environment>;
-  template class TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::Environment>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
deleted file mode 100644
index 5446f342097..00000000000
--- a/TAO/tao/Environment.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Environment.h
- *
- *  $Id$
- *
- * Declare the CORBA::Environment class.  Note that this header file
- * only requires a few forward declarations of CORBA classes, this
- * is *very* important because even the ORB needs to know about it;
- * make your changes with care.  It is also a good idea trying to
- * minimize cross dependencies between header files.
- *
- * @author Carlos O'Ryan <coryan@cs.wustl.edu>
- */
-//=============================================================================
-#ifndef TAO_ENVIRONMENT_H
-#define TAO_ENVIRONMENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/CORBA_methods.h"
-#include "tao/orbconf.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/default_environment.h"
-
-class TAO_ORB_Core;
-
-namespace CORBA
-{
-  class Exception;
-
-  class Environment;
-  typedef Environment *Environment_ptr;
-  typedef TAO_Pseudo_Var_T<Environment> Environment_var;
-  typedef TAO_Pseudo_Out_T<Environment, Environment_var> Environment_out;
-
-  /**
-   * @class Environment
-   *
-   * @brief Environment
-   *
-   * A CORBA::Environment is a way to automagically ensure that
-   * exception data is freed -- the "var" class for Exceptions.  It
-   * adds just a bit of convenience function support, helping
-   * classify exceptions as well as reducing memory leakage.
-   * The thread has a default environment to simplify porting
-   * between platforms that support native C++ exceptions and those
-   * that don't. This is a TSS resource (always), but with a twist:
-   * if the user creates a new environment the old one is "pushed"
-   * (actually the new one remembers it), eventually the new
-   * environment destructor pops itself from the stack and we
-   * recover the old environment.  This means that if the user
-   * create a new environment and somebody calls a function using
-   * the default one the exception will still be received in the
-   * environment created by the user.  The only drawback is that
-   * environments life time must nest properly, this shouldn't be a
-   * problem because environments are usually created on the stack,
-   * but, the spec allows their creation on the heap and/or as class
-   * members; we need to investigate the tradeoffs and take a
-   * decision.
-   */
-  class TAO_Export Environment
-  {
-  public:
-    /// The default constructor.  The environment will hold no
-    /// exceptions.
-    Environment (void);
-
-    /// Copy constructor.
-    Environment (const Environment &ACE_TRY_ENV);
-
-    /// Assingment.
-    Environment &operator=(const Environment &ACE_TRY_ENV);
-
-    /// Destructor, release the exception.
-    ~Environment (void);
-
-    /// Some static methods that need to be defined in every pseudo object
-    static Environment * _duplicate (Environment *);
-    static Environment * _nil (void);
-
-    /// Return the contained CORBA::Exception.
-    /**
-     * CORBA::Environment retains ownership of the exception, this is
-     * contrary to the normal memory management rules in the C++
-     * mapping, but actually mandated by the specification:
-     *
-     * "C++ Language Mapping" (formal/00-01-02). Section 1.27
-     * Environment (page 1-113)
-     */
-    CORBA::Exception* exception (void) const;
-
-    /// Set the contained CORBA::Exception to <ex>
-    /**
-     * CORBA::Environment assumes ownership of the exception, this is
-     * contrary to the normal memory management rules in the C++
-     * mapping, but actually mandated by the specification:
-     *
-     * "C++ Language Mapping" (formal/00-01-02). Section 1.27
-     * Environment (page 1-113)
-     *
-     */
-    void exception (CORBA::Exception *ex);
-
-    /// Return if the exception is a user exception or a system
-    /// exception.
-    int exception_type (void) const;
-
-    /// return the repository ID for the exception.
-    const char *exception_id (void) const;
-
-    /// Clear the exception.
-    void clear (void);
-
-    /// Print the exception to output determined by f.  This function
-    /// is not CORBA compliant.
-    void print_exception (const char *info,
-                          FILE *f=stdout) const;
-
-    // = Obtain a default environment to use with TAO.
-    static CORBA::Environment &default_environment (void);
-
-    // Useful for template programming.
-    typedef CORBA::Environment_ptr _ptr_type;
-    typedef CORBA::Environment_var _var_type;
-
-  private:
-
-    /// Initialize using a well known ORB Core; this is intended for
-    /// the bootstraping of the ORB_Core, not for general
-    /// consumption.
-    Environment (TAO_ORB_Core *orb_core);
-
-    /// Pointer to the exception object contained in the environment.
-    CORBA::Exception *exception_;
-
-    /// The previous environment on the "default environment stack".
-    Environment *previous_;
-  };
-} // End CORBA namespace
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Environment.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ENVIRONMENT_H */
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
deleted file mode 100644
index 966da4ea4bc..00000000000
--- a/TAO/tao/Environment.i
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::Environment_ptr env)
-{
-  return env == 0;
-}
-
-ACE_INLINE
-void
-CORBA::release (CORBA::Environment_ptr env)
-{
-  delete env;
-}
-
-ACE_INLINE
-CORBA::Exception *
-CORBA::Environment::exception (void) const
-{
-  return this->exception_;
-}
-
-ACE_INLINE
-CORBA::Environment *
-CORBA::Environment::_duplicate (CORBA::Environment *x)
-{
-  if (x == 0)
-    {
-      return 0;
-    }
-
-  return new CORBA::Environment (*x);
-}
-
-ACE_INLINE
-CORBA::Environment_ptr
-CORBA::Environment::_nil (void)
-{
-  return (CORBA::Environment_ptr) 0;
-}
-
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
deleted file mode 100644
index 1f88e3ff36d..00000000000
--- a/TAO/tao/Exception.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// $Id$
-
-#include "Exception.h"
-#include "SystemException.h"
-#include "Environment.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
-#include "ORB_Constants.h"
-#include "TypeCode_Constants.h"
-#include "CORBA_String.h"
-#include "CDR.h"
-#include "debug.h"
-
-#include "ace/Malloc.h"
-#include "ace/SString.h"
-#include "ace/OS_NS_string.h"
-
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-// Needed for ostream& operator<< (ostream &os, const CORBA::Exception &e)
-// FUZZ: disable check_for_streams_include
-#include "ace/streams.h"
-#endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_stdio.h"
-
-
-ACE_RCSID (tao,
-           Exception,
-           "$Id$")
-
-
-// ****************************************************************
-
-CORBA::Exception::Exception (const char * repository_id,
-                             const char * local_name)
-  : id_ (CORBA::string_dup (repository_id)),
-    name_ (CORBA::string_dup (local_name))
-{
-  ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0);
-}
-
-CORBA::Exception::Exception (const CORBA::Exception &src)
-  : id_ (CORBA::string_dup (src.id_)),
-    name_ (CORBA::string_dup (src.name_))
-{
-  ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0);
-}
-
-// NOTE: It's this code, not anything defined in a subclass, which is
-// responsible for releasing any storage owned by the exception.  It
-// can do this because it's got the local name and the id.
-
-CORBA::Exception::Exception (void)
-  : id_ (),
-    name_ ()
-{
-}
-
-CORBA::Exception::~Exception (void)
-{
-}
-
-CORBA::Exception &
-CORBA::Exception::operator= (const CORBA::Exception &src)
-{
-  this->id_ = CORBA::string_dup (src.id_);
-  ACE_ASSERT (this->id_.in () != 0);
-
-  this->name_ = CORBA::string_dup (src.name_);
-  ACE_ASSERT (this->name_.in () != 0);
-
-  return *this;
-}
-
-const char *
-CORBA::Exception::_rep_id (void) const
-{
-  return this->id_.in ();
-}
-
-const char *
-CORBA::Exception::_name (void) const
-{
-  return this->name_.in ();
-}
-
-CORBA::TypeCode_ptr
-CORBA::Exception::_tao_type (void) const
-{
-  return CORBA::TypeCode::_nil ();
-}
-
-int
-CORBA::Exception::_is_a (const char* repository_id) const
-{
-  return ACE_OS::strcmp (repository_id,
-                         "IDL:omg.org/CORBA/Exception:1.0") == 0;
-}
-
-
-
-void
-CORBA::Exception::_tao_print_exception (const char *user_provided_info,
-                                        FILE *) const
-{
-  ACE_DEBUG ((LM_ERROR,
-              ACE_TEXT ("(%P|%t) EXCEPTION, %s\n")
-              ACE_TEXT ("%s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (user_provided_info),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
-}
-
-#if defined (ACE_USES_WCHAR)
-void
-CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info,
-                                        FILE *f) const
-{
-  // Even though this call causes additional type conversions, this is
-  // better for the maintenance.  Plus, this will occur only on
-  // exception anyway.
-  this->_tao_print_exception (ACE_TEXT_ALWAYS_CHAR (info), f);
-}
-#endif  // ACE_USES_WCHAR
-
-void
-CORBA::Exception::_tao_any_destructor (void *x)
-{
-  CORBA::Exception *tmp = static_cast<CORBA::Exception *> (x);
-  delete tmp;
-}
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-namespace CORBA
-{
-  ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os,
-                                const CORBA::Exception &e)
-  {
-    os << e._name () << " (" << e._rep_id () << ')';
-
-    return os;
-  }
-
-  ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os,
-                                const CORBA::Exception *e)
-  {
-    os << e->_name () << " (" << e->_rep_id () << ')';
-
-    return os;
-  }
-}
-
-#endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
-
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-TAO_DONT_CATCH::TAO_DONT_CATCH (void)
-{}
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-// Specializations for CORBA::Exception Any operators.
-namespace TAO
-{
-  template<>
-  void
-  Any_Dual_Impl_T<CORBA::Exception>::value (
-      const CORBA::Exception & val
-    )
-  {
-    this->value_ = val._tao_duplicate ();
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_encode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  // This should never get called since we don't have extraction operators
-  // for CORBA::Exception, but it is here to sidestep the constructor call
-  // in the unspecialized version that causes a problem with compilers that
-  // require explicit instantiation
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::extract (
-      const CORBA::Any &,
-      _tao_destructor,
-      CORBA::TypeCode_ptr,
-      const CORBA::Exception *&
-    )
-  {
-    return 0;
-  }
-}
-
-// =======================================================================
-
-// Insertion of CORBA::Exception - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception._tao_type (),
-      exception
-    );
-}
-
-// Insertion of CORBA::Exception - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Exception *exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception->_tao_type (),
-      exception
-    );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Any_Dual_Impl_T<CORBA::Exception>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Exception>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
deleted file mode 100644
index b25c539335d..00000000000
--- a/TAO/tao/Exception.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Exception.h
- *
- *  $Id$
- *
- *   This file defines way in which CORBA exceptions are reported.
- *
- *  @author DOC Group at Vanderbilt U., Wash U, and UCI
- */
-//=============================================================================
-
-#ifndef TAO_EXCEPTION_H
-#define TAO_EXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-// Do not try removing this. If you remove this for subsetting lots of
-// things go wrong in TAO.
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This is used in the implementation of the _raise methods
-#if defined (TAO_HAS_EXCEPTIONS)
-#define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* ACE_HAS_EXCEPTIONS */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/CORBA_String.h"
-#include "ace/SStringfwd.h"
-#include "ace/iosfwd.h"
-#include "ace/CORBA_macros.h"
-
-class ACE_Allocator;
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// This is already done in orbconf.h. But this file is totally
-// decoupled from its contents that we have to do this here. Including
-// orbconf.h is probably going to be a overhead.
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
-
-  class Environment;
-
-  class Any;
-  typedef Any * Any_ptr;
-
-  class SystemException;
-
-  /**
-   * @enum exception_type
-   *
-   * @brief Enumeration used to identify the type of CORBA exception.
-   *
-   * CORBA exceptions generally fall into two categories, user
-   * exceptions and system exceptions.  This enumeration is used when
-   * identifying the type of CORBA exception.
-   */
-  enum exception_type
-  {
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION
-  };
-
-  extern TAO_Export TypeCode_ptr _tc_exception_type;
-
-  /**
-   * @class Exception
-   *
-   * @brief Exception
-   *
-   * CORBA2-specified exception hierarchy.  All exceptions have a
-   * type (represented by a @c TypeCode) and a widely scoped type ID
-   * (in the @c TypeCode) that are generated by any OMG-IDL compiler
-   * and available through the Interface Repository.  Think of it as a
-   * "globally scoped" name distinguishing each exception.
-   *
-   * @todo According to the OMG CORBA C++ Mapping version 1.1, all
-   *       constructors, copy constructors and assignment operators
-   *       should be moved to "protected" section in class
-   *       declarations.  Since the current MS Visual C++ 6.0 compiler
-   *       will cause some problems to TAO's exception mechanism, we
-   *       defer doing this until we drop support for MSVC++ 6.
-   */
-  class TAO_Export Exception
-  {
-  public:
-
-    /// Copy constructor.
-    Exception (const Exception &src);
-
-    /// Assignment operator.
-    Exception & operator = (const Exception & src);
-
-    /// Construct from a respository id.
-    Exception (const char *repository_id,
-               const char *local_name);
-
-    /// Destructor.
-    virtual ~Exception (void);
-
-    // = To throw the exception (when using the standard mapping).
-    virtual void _raise (void) const = 0;
-
-    // = The static narrow operations.
-    static Exception * _downcast (Exception * x);
-    static Exception const * _downcast (Exception const * x);
-
-    /// Return the repository ID of the Exception.
-    virtual const char * _rep_id (void) const;
-
-    /// Return the name of the Exception.
-    virtual const char * _name (void) const;
-
-    // = These are TAO-specific extensions.
-
-    /// Will be overridden in the concrete derived classes.
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-
-    // = To implement the narrow method.
-    virtual int _is_a (const char* repository_id) const;
-
-    /// Print the exception to output determined by @a f.
-    /**
-     * @note This method is TAO-specific.
-     */
-    void _tao_print_exception (const char *info,
-                               FILE *f = stdout) const;
-
-#if defined (ACE_USES_WCHAR)
-    /// ACE_WCHAR_T version of _tao_print_exception.
-    void _tao_print_exception (const ACE_WCHAR_T *info,
-                               FILE *f = stdout) const;
-#endif  // ACE_USES_WCHAR
-
-    /// Returns a string containing information about the exception. This
-    /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const = 0;
-
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const = 0;
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) = 0;
-
-    /// Used in the non-copying Any insertion operator.
-    static void _tao_any_destructor (void *);
-
-    /// Deep copy
-    /**
-     * The following operation is used in the implementation of
-     * it performs a deep copy of the
-     * exception, normally it is implemented as:
-     *
-     * <PRE>
-     * class SomeException : public // Derives from CORBA::Exception
-     * {
-     * public:
-     *   virtual CORBA::Exception *_tao_duplicate (void) const
-     *   {
-     *     return new SomeException (*this);
-     *   }
-     * };
-     * </PRE>
-     */
-    virtual CORBA::Exception *_tao_duplicate (void) const = 0;
-
-  protected:
-
-    /// Default constructor.
-    Exception (void);
-
-  private:
-
-    /// Repository Id
-    CORBA::String_var id_;
-
-    /// Local name.
-    CORBA::String_var name_;
-
-  };
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-  // Required by C++ mapping.
-  TAO_Export ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os,
-                                          const CORBA::Exception &e);
-
-  TAO_Export ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os,
-                                           const CORBA::Exception *e);
-
-#endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
-} // End CORBA namespace
-
-/**
- * @class TAO_Exceptions
- *
- * @brief This class is a namespace for exception-related static data and
- * methods.
- */
-class TAO_Export TAO_Exceptions
-{
-public:
-
-  /// Create a CORBA::SystemException given the interface repository ID.
-  static CORBA::SystemException *create_system_exception (
-      const char *id
-      ACE_ENV_ARG_DECL
-    );
-
-};
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-/**
- * @class TAO_DONT_CATCH
- *
- * @brief This class is only used internally in TAO as an exception
- * that never gets thrown.  Never use this class anywhere.
- *
- * @internal
- */
-class TAO_Export TAO_DONT_CATCH
-{
-public:
-  TAO_DONT_CATCH (void);
-};
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Exception.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/"ace/post.h"
-
-#endif /* TAO_EXCEPTION_H */
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
deleted file mode 100644
index 4eadae1c5a2..00000000000
--- a/TAO/tao/Exception.i
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::Exception *
-CORBA::Exception::_downcast (CORBA::Exception * x)
-{
-  return x;
-}
-
-ACE_INLINE CORBA::Exception const *
-CORBA::Exception::_downcast (CORBA::Exception const * x)
-{
-  return x;
-}
diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h
deleted file mode 100644
index 868ec5ce961..00000000000
--- a/TAO/tao/Exception_Data.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Exception_Data.h
- *
- *  $Id$
- *
- *  @author  balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_EXCEPTION_DATA_H
-#define TAO_EXCEPTION_DATA_H
-#include /**/ "ace/pre.h"
-#include "ace/config-all.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace TAO
-{
-  // Function pointer returning a pointer to CORBA::Exception. This is used to
-  // describe the allocator for user-defined exceptions that are used internally
-  // by the interpreter.
-  typedef CORBA::Exception* (*TAO_Exception_Alloc) (void);
-
-  /**
-   * @struct Exception_Data
-   *
-   * @brief Description of a single exception.
-   *
-   * The interpreter needs a way to allocate memory to hold the exception
-   * that was raised by the stub. This data structure provides the typecode
-   * for the exception as well as a static function pointer that
-   * does the job of memory allocation.
-   */
-  struct Exception_Data
-  {
-    /// Repository id of the exception.
-    const char *id;
-
-    /// The allocator for this exception.
-    TAO_Exception_Alloc alloc;
-
-    /// The typecode pointer for this exception.
-    CORBA::TypeCode_ptr tc_ptr;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_EXCEPTION_DATA_H*/
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
deleted file mode 100644
index f2d7edfe627..00000000000
--- a/TAO/tao/Exclusive_TMS.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-
-#include "tao/Exclusive_TMS.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/debug.h"
-#include "Transport.h"
-
-ACE_RCSID (tao, 
-           Exclusive_TMS, 
-           "$Id$")
-
-TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
-  : TAO_Transport_Mux_Strategy (transport),
-    request_id_generator_ (0),
-    has_request_ (0),
-    request_id_ (0),
-    rd_ (0)
-{
-}
-
-TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void)
-{
-}
-
-// Generate and return an unique request id for the current
-// invocation. We can actually return a predecided ULong, since we
-// allow only one invocation over this connection at a time.
-CORBA::ULong
-TAO_Exclusive_TMS::request_id (void)
-{
-  this->request_id_generator_++;
-
-  // if TAO_Transport::bidirectional_flag_
-  //  ==  1 --> originating side
-  //  ==  0 --> other side
-  //  == -1 --> no bi-directional connection was negotiated
-  // The originating side must have an even request ID, and the other
-  // side must have an odd request ID.  Make sure that is the case.
-  int bidir_flag =
-    this->transport_->bidirectional_flag ();
-
-  if ((bidir_flag == 1 && ACE_ODD (this->request_id_generator_))
-       || (bidir_flag == 0 && ACE_EVEN (this->request_id_generator_)))
-    ++this->request_id_generator_;
-
-  if (TAO_debug_level > 4)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::request_id - <%d>\n"),
-                this->request_id_generator_));
-
-  return this->request_id_generator_;
-}
-
-// Bind the handler with the request id.
-int
-TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
-                                    TAO_Reply_Dispatcher *rd)
-{
-  this->has_request_ = 1;
-  this->request_id_ = request_id;
-  this->rd_ = rd;
-
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::unbind_dispatcher (CORBA::ULong request_id)
-{
-  if (!this->has_request_ || this->request_id_ != request_id)
-    return -1;
-  this->has_request_ = 0;
-  this->request_id_ = 0;
-  this->rd_ = 0;
-
-  return 0;
-}
-
-int
-TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
-{
-  // Check the ids.
-  if (!this->has_request_ || this->request_id_ != params.request_id_)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n"),
-                    this->request_id_, params.request_id_));
-
-      // The return value 0 informs the transport that the mux strategy
-      // did not find the right reply handler.
-      return 0;
-    }
-
-  TAO_Reply_Dispatcher *rd = this->rd_;
-  this->has_request_ = 0;
-  this->request_id_ = 0; // @@ What is a good value???
-  this->rd_ = 0;
-
-  // Dispatch the reply.
-  // Returns 1 on success, -1 on failure.
-  return rd->dispatch_reply (params);
-}
-
-bool
-TAO_Exclusive_TMS::idle_after_send (void)
-{
-  return false;
-}
-
-bool
-TAO_Exclusive_TMS::idle_after_reply (void)
-{
-  // Irrespective of whether we are successful or not we need to
-  // return true. If *this* class is not successfull in idling the
-  // transport no one can.
-  if (this->transport_ != 0)
-    (void) this->transport_->make_idle ();
-
-  return true;
-}
-
-void
-TAO_Exclusive_TMS::connection_closed (void)
-{
-  if (this->rd_ != 0)
-    this->rd_->connection_closed ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h
deleted file mode 100644
index 6937340cb4c..00000000000
--- a/TAO/tao/Exclusive_TMS.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Exclusive_TMS.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_EXCLUSIVE_TMS_H
-#define TAO_EXCLUSIVE_TMS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Transport_Mux_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_Pluggable_Reply_Params;
-
-/**
- * @class TAO_Exclusive_TMS
- *
- * Using this strategy only one request can be pending at a time
- * in a connection.  This improves performance because the client
- * does not have to demux the reply, and there is less need for
- * synchronization.
- * On the other hand, it does not scale well when you have
- * multiple client threads or asynchronous messaging.
- */
-class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Exclusive_TMS (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Exclusive_TMS (void);
-
-  /**
-   * @name The TAO_Transport_Mux_Strategy overrided methods
-   *
-   * Please read the documentation in the TAO_Transport_Mux_Strategy class
-   * for details.
-   */
-  //@{
-  virtual CORBA::ULong request_id (void);
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rh);
-  virtual int unbind_dispatcher (CORBA::ULong request_id);
-
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
-
-  virtual bool idle_after_send (void);
-  virtual bool idle_after_reply (void);
-  virtual void connection_closed (void);
-  //@}
-
-protected:
-  /// Used to generate a different request_id on each call to
-  /// request_id().
-  CORBA::ULong request_id_generator_;
-
-  /// If 0 then the request id and reply dispatcher below are
-  /// meaningless
-  int has_request_;
-
-  /// Request id for the current request.
-  CORBA::ULong request_id_;
-
-  /// Reply Dispatcher corresponding to the request.
-  TAO_Reply_Dispatcher *rd_;
-
-  // @@ Commented for the time being, let the commented line stay for
-  //    sometime - Bala
-  // TAO_GIOP_Message_State message_state_;
-  // Message state to read the incoming message.
-
-  // @@ Having members of type TAO_GIOP* indicates that we
-  // (Transport_Mux_Strategy) are aware of the underlying messaging
-  // protocol. But for the present let us close our eyes till we are
-  // able to iterate on a use case - Bala.
-};
-
-#include /**/ "ace/post.h"
-#endif /* EXCLUSIVE_TMS_H */
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
deleted file mode 100644
index d0ba65b8959..00000000000
--- a/TAO/tao/FILE_Parser.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-
-#include "FILE_Parser.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-
-#include "ace/Read_Buffer.h"
-
-#if !defined(__ACE_INLINE__)
-#include "FILE_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Malloc_Base.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           FILE_Parser,
-           "$Id$")
-
-
-TAO_FILE_Parser::~TAO_FILE_Parser (void)
-{
-}
-
-static const char file_prefix[] = "file:";
-
-int
-TAO_FILE_Parser::match_prefix (const char *ior_string) const
-{
-  return (ACE_OS::strncmp (ior_string,
-                           ::file_prefix,
-                           sizeof (::file_prefix) - 1) == 0);
-}
-
-CORBA::Object_ptr
-TAO_FILE_Parser::parse_string (const char *ior,
-                               CORBA::ORB_ptr orb
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Skip the prefix, we know it is there because this method in only
-  // called if <match_prefix> returns 1.
-  const char *filename =
-    ior + sizeof (::file_prefix)+1;
-
-  FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename),
-                              ACE_TEXT("r"));
-
-  if (file == 0)
-    return CORBA::Object::_nil ();
-
-  ACE_Read_Buffer reader (file, 1);
-
-  char* string = reader.read ();
-
-  if (string == 0)
-    return CORBA::Object::_nil ();
-
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
-    {
-      object = orb->string_to_object (string ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      reader.alloc ()->free (string);
-    }
-  ACE_CATCHANY
-    {
-      reader.alloc ()->free (string);
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser,
-                       ACE_TEXT ("FILE_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_FILE_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_FILE_Parser)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
deleted file mode 100644
index 480fb653d18..00000000000
--- a/TAO/tao/FILE_Parser.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   FILE_Parser.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_FILE_PARSER_H
-#define TAO_FILE_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOR_Parser.h"
-
-/**
- * @class TAO_FILE_Parser
- *
- * @brief Implements the <file:> IOR format
- *
- * This class implements the <file:> IOR format.
- * It is dynamically loaded by the ORB and used to open a file,
- * read its contents and then interepret the file as an IOR (that
- * can be in any valid format).
- */
-class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser
-{
-public:
-  /// Constructor
-  TAO_FILE_Parser (void);
-
-  /// The destructor
-  virtual ~TAO_FILE_Parser (void);
-
-  // = The IOR_Parser methods, please read the documentation in
-  //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined (__ACE_INLINE__)
-# include "FILE_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_FILE_PARSER_H */
diff --git a/TAO/tao/FILE_Parser.i b/TAO/tao/FILE_Parser.i
deleted file mode 100644
index c3ca97a6149..00000000000
--- a/TAO/tao/FILE_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_FILE_Parser::TAO_FILE_Parser (void)
-{
-}
diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp
deleted file mode 100644
index 847d5f00469..00000000000
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "tao/Fault_Tolerance_Service.h"
-#include "tao/Services_Activate.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-
-#include "ace/Dynamic_Service.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Fault_Tolerance_Service.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Fault_Tolerance_Service,
-           "$Id$")
-
-TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void)
-{
-  delete this->ft_service_callback_;
-  delete this->ft_object_retention_id_lock_;
-}
-
-void
-TAO_Fault_Tolerance_Service::init (TAO_ORB_Core *orb_core)
-{
-  // Look in to the svc conf stuff to get an instance of the
-  // FT_Service.
-  if (this->ft_service_callback_ == 0)
-    {
-      TAO_Services_Activate *service =
-        ACE_Dynamic_Service <TAO_Services_Activate>::instance ("FT_ClientService_Activate");
-
-      // Activate the callback
-      if (service)
-        this->ft_service_callback_ = service->activate_services (orb_core);
-    }
-
-  // If we have a valid service then we instantiate our lock and the
-  // client id
-  if (this->ft_service_callback_)
-    {
-      // Initialize the lock
-      this->ft_object_retention_id_lock_ =
-        orb_core->client_factory ()
-          ->create_ft_service_retention_id_lock ();
-
-      // Initialize the client id
-      this->ft_object_id_ = "TAO_Client";
-    }
-
-  return;
-}
-
-CORBA::Long
-TAO_Fault_Tolerance_Service::retention_id (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->ft_object_retention_id_lock_,
-                            0));
-
-  return ++this->ft_object_retention_id_;
-}
diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h
deleted file mode 100644
index ff8fd90b6a1..00000000000
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//-*- C++ -*-
-//=============================================================================
-/**
- *  @file    Fault_Tolerance_Service.h
- *
- *  $Id$
- *
- *  A collection of the ORB and ORB core related properties that are
- *  specific to FT service. The TAO_ORB_Core holds an instance of this
- *  class.
- *
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-#ifndef TAO_FAULT_TOLERANCE_SERVICE_H
-#define TAO_FAULT_TOLERANCE_SERVICE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-class ACE_Lock;
-class TAO_Service_Callbacks;
-class TAO_ORB_Core;
-class ACE_Lock;
-
-/**
- * @class TAO_Fault_Tolerance_Service
- *
- * @brief TAO_Fault_Tolerant_Service
- *
- * A collection of ORB & ORB_Core related stuff that is needed at
- * the ORB level. The ORB Core would carry an instance of this
- * class and invoke methods on this.
- * Note: This collection would be really useful when we have
- * logging in  place. The contents of this class can be logged at
- * regular check point intervals.
- */
-class TAO_Export TAO_Fault_Tolerance_Service
-{
-
-public:
-  /// Ctor
-  TAO_Fault_Tolerance_Service (void);
-
-  /// Dtor
-  ~TAO_Fault_Tolerance_Service (void);
-
-  /// Initialise the internal data structures
-  void init (TAO_ORB_Core *orb_core);
-
-  /// Return the underlying callback object
-  TAO_Service_Callbacks *service_callback (void);
-
-  /// Return the underlying <ft_object_id>
-  const ACE_CString &client_id (void);
-
-  /// Set the client id
-  void client_id (const char *id);
-
-  /// Generate and return a new retention id
-  CORBA::Long retention_id (void);
-
-private:
-
-  /// hook to callback on to the service
-  TAO_Service_Callbacks *ft_service_callback_;
-
-  /// The object id that would be used if the ft service is loaded.
-  ACE_CString ft_object_id_;
-
-  /**
-   * This and the <ft_object_id_> act as unique identifiers for the
-   * request sent from the source Object. Modification of this value
-   * is done by the loaded FT
-   */
-  CORBA::Long ft_object_retention_id_;
-
-  /// Lock for the retention id
-  ACE_Lock *ft_object_retention_id_lock_;
-
-  // NOTE: At a glance this retention id can be easily mistaken for a
-  // request id in a GIOP request. But the purpose served are a lot
-  // more than what a RequestId does for GIOP. So, we have a unique
-  // generator with a lock to protect from different threads accessing
-  // this.
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Fault_Tolerance_Service.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_FAULT_TOLERANCE_SERVICE_H*/
diff --git a/TAO/tao/Fault_Tolerance_Service.i b/TAO/tao/Fault_Tolerance_Service.i
deleted file mode 100644
index f7f4fefd7d3..00000000000
--- a/TAO/tao/Fault_Tolerance_Service.i
+++ /dev/null
@@ -1,30 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void)
-  : ft_service_callback_ (0),
-    ft_object_id_ (),
-    ft_object_retention_id_ (-1),
-    ft_object_retention_id_lock_ (0)
-{
-}
-
-
-
-ACE_INLINE TAO_Service_Callbacks *
-TAO_Fault_Tolerance_Service::service_callback (void)
-{
-  return this->ft_service_callback_;
-}
-
-ACE_INLINE const ACE_CString &
-TAO_Fault_Tolerance_Service::client_id (void)
-{
-  return this->ft_object_id_;
-}
-
-ACE_INLINE void
-TAO_Fault_Tolerance_Service::client_id (const char *id)
-{
-  this->ft_object_id_ = id;
-}
-
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
deleted file mode 100644
index 4d02a03d3bf..00000000000
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_C
-#define TAO_FIXED_ARRAY_ARGUMENT_T_C
-
-#include "tao/Fixed_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Fixed_Array_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Fixed_Array_Argument_T,
-           "$Id$")
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << this->x_;
-}
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-CORBA::Boolean
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
-  S_slice * tmp_ptr = 0;
-  ACE_ALLOCATOR_RETURN (tmp_ptr,
-                        ARRAY_TRAITS::alloc (),
-                        0);
-  this->x_ = tmp_ptr;
-  S_forany tmp (this->x_.ptr ());
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-void
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= S_forany (this->x_.ptr ());
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
deleted file mode 100644
index bf3522022e5..00000000000
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_Array_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_H
-#define TAO_FIXED_ARRAY_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Fixed_Array_Argument_T
-   *
-   * @brief IN stub argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_Argument_T : public Argument
-  {
-  public:
-    In_Fixed_Array_Argument_T (const S_slice * x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice const * arg (void) const;
-
-  private:
-    S_forany x_;
-  };
-
-  /**
-   * @class Inout_Fixed_Array_Argument_T
-   *
-   * @brief INOUT stub argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_Argument_T : public Argument
-  {
-  public:
-    Inout_Fixed_Array_Argument_T (S_slice *&x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
-
-  private:
-    S_forany x_;
-  };
-
-  /**
-   * @class Out_Fixed_Array_Argument_T
-   *
-   * @brief OUT stub argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_Argument_T : public Argument
-  {
-  public:
-    Out_Fixed_Array_Argument_T (S_slice *& x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S_forany x_;
-  };
-
-  /**
-   * @class Ret_Fixed_Array_Argument_T
-   *
-   * @brief Return stub value of fixed size element array.
-   *
-   */
-  template<typename S,
-           typename S_slice,
-           typename S_var,
-           typename S_forany,
-           typename S_tag>
-  class Ret_Fixed_Array_Argument_T : public Argument
-  {
-  public:
-    Ret_Fixed_Array_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-    S_slice * excp (void);
-    S_slice * retn (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Fixed_Array_Tag
-   *
-   * @brief Struct for fixed size element array argument id tag.
-   *
-   */
-  struct TAO_Export Fixed_Array_Tag {};
-
-  /**
-   * @struct Fixed_Array_Arg_Traits_T
-   *
-   * @brief Argument traits of fixed size element array.
-   *
-   */
-  template<typename T,
-           typename T_slice,
-           typename T_var,
-           typename T_forany,
-           typename T_tag>
-  struct Fixed_Array_Arg_Traits_T
-  {
-    typedef T_slice *                                   ret_type;
-    typedef T const                                     in_type;
-    typedef T                                           inout_type;
-    typedef T                                           out_type;
-
-    typedef In_Fixed_Array_Argument_T<T,
-                                      T_slice,
-                                      T_forany>         in_arg_val;
-    typedef Inout_Fixed_Array_Argument_T<T,
-                                         T_slice,
-                                         T_forany>      inout_arg_val;
-    typedef Out_Fixed_Array_Argument_T<T,
-                                       T_slice,
-                                       T_forany>        out_arg_val;
-    typedef Ret_Fixed_Array_Argument_T<T,
-                                       T_slice,
-                                       T_var,
-                                       T_forany,
-                                       T_tag>           ret_val;
-
-    typedef Fixed_Array_Tag                             idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Fixed_Array_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Fixed_Array_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Array_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_H */
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
deleted file mode 100644
index 58b57f35a05..00000000000
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ /dev/null
@@ -1,124 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::
-In_Fixed_Array_Argument_T (const S_slice * x)
-  : x_ (
-#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
-        // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the
-        //         multi-dimensional array case so C-style
-        //         "sledgehammer" cast instead (reinterpret_cast<>
-        //         doesn't work either).  It's not clear if this is
-        //         really the right thing to do but the code won't
-        //         compile with MSVC++ 6 without it.
-        (S_slice *) x
-#else
-        const_cast<S_slice *> (x)
-#endif  /* _MSC_VER <= 1200 */
-        )
-{
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-const S_slice *
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
-{
-  return this->x_.in ();
-}
-
-// ===========================================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::
-Inout_Fixed_Array_Argument_T (S_slice *& x)
-  : x_ (x)
-{}
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-S_slice *
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
-{
-  return this->x_.inout ();
-}
-
-// ===========================================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::Out_Fixed_Array_Argument_T (S_slice *&x)
-  : x_ (x)
-{}
-
-template<typename S,
-         typename S_slice,
-         typename S_forany>
-ACE_INLINE
-S_slice *&
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ===========================================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-Ret_Fixed_Array_Argument_T (void)
-{}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *&
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
-{
-  return this->x_.out ();
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
-{
-  return this->x_._retn ();
-}
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
deleted file mode 100644
index 0819eabf688..00000000000
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_SIZE_ARGUMENT_T_C
-#define TAO_FIXED_SIZE_ARGUMENT_T_C
-
-#include "tao/Fixed_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Fixed_Size_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Fixed_Size_Argument_T,
-           "$Id$")
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << *this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << *this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> *this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
deleted file mode 100644
index c71bf4047ba..00000000000
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_Size_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_FIXED_SIZE_ARGUMENT_T_H
-#define TAO_FIXED_SIZE_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Fixed_Size_Argument_T
-   *
-   * @brief Template class for IN stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class In_Fixed_Size_Argument_T : public Argument
-  {
-  public:
-    In_Fixed_Size_Argument_T (S const & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
-
-  private:
-    S const * x_;
-  };
-
-  /**
-   * @class Inout_Fixed_Size_Argument_T
-   *
-   * @brief Template class for INOUT stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Fixed_Size_Argument_T : public Argument
-  {
-  public:
-    Inout_Fixed_Size_Argument_T (S & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S * x_;
-  };
-
-  /**
-   * @class Out_Fixed_Size_Argument_T
-   *
-   * @brief Template class for OUT stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Out_Fixed_Size_Argument_T : public Argument
-  {
-  public:
-    Out_Fixed_Size_Argument_T (S & x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-
-    S & x_;
-  };
-
-  /**
-   * @class Ret_Fixed_Size_Argument_T
-   *
-   * @brief Template class for return stub value of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Ret_Fixed_Size_Argument_T : public Argument
-  {
-  public:
-    Ret_Fixed_Size_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-    S excp (void);
-    S retn (void);
-
-  protected:
-    S x_;
-  };
-
-  /**
-   * @struct Basic_Tag
-   *
-   * @brief Struct for fixed size IDL type arguments id tag.
-   *
-   */
-  struct TAO_Export Fixed_Size_Tag {};
-
-  /**
-   * @struct Basic_Arg_Traits_T
-   *
-   * @brief Template class for argument traits of fixed size IDL types.
-   *
-   */
-  template<typename T>
-  struct Fixed_Size_Arg_Traits_T
-  {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
-
-    typedef In_Fixed_Size_Argument_T<T>       in_arg_val;
-    typedef Inout_Fixed_Size_Argument_T<T>    inout_arg_val;
-    typedef Out_Fixed_Size_Argument_T<T>      out_arg_val;
-    typedef Ret_Fixed_Size_Argument_T<T>      ret_val;
-
-    typedef Fixed_Size_Tag                    idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Fixed_Size_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Fixed_Size_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Size_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_SIZE_ARGUMENT_T_H */
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
deleted file mode 100644
index 2c057588662..00000000000
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-template<typename S>
-ACE_INLINE
-TAO::In_Fixed_Size_Argument_T<S>::In_Fixed_Size_Argument_T (S const & x)
-  : x_ (&x)
-{}
-
-template<typename S>
-ACE_INLINE
-const S &
-TAO::In_Fixed_Size_Argument_T<S>::arg (void) const
-{
-  return *this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Fixed_Size_Argument_T<S>::Inout_Fixed_Size_Argument_T (S & x)
-  : x_ (&x)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Inout_Fixed_Size_Argument_T<S>::arg (void)
-{
-  return *this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Out_Fixed_Size_Argument_T<S>::Out_Fixed_Size_Argument_T (S & x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Out_Fixed_Size_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Ret_Fixed_Size_Argument_T<S>::Ret_Fixed_Size_Argument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Ret_Fixed_Size_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-template<typename S>
-ACE_INLINE
-S
-TAO::Ret_Fixed_Size_Argument_T<S>::excp (void)
-{
-  return this->x_;
-}
-
-template<typename S>
-ACE_INLINE
-S
-TAO::Ret_Fixed_Size_Argument_T<S>::retn (void)
-{
-  return this->x_;
-}
-
diff --git a/TAO/tao/Fixed_TypeCode.cpp b/TAO/tao/Fixed_TypeCode.cpp
deleted file mode 100644
index 7be6bfa5eb6..00000000000
--- a/TAO/tao/Fixed_TypeCode.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_TYPECODE_CPP
-#define TAO_FIXED_TYPECODE_CPP
-
-#include "tao/Fixed_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong) const
-{
-  // A tk_fixed TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->digits_) && (cdr << this->scale_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::UShort const tc_digits =
-    tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::UShort const tc_scale =
-    tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->digits_ == tc_digits
-          && this->scale_ == tc_scale);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                    ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_fixed TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_fixed TypeCodes have no name or member
-  // names, meaning that we can simply call _duplicate() on this
-  // TypeCode.
-
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Fixed<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->digits_;
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->scale_;
-}
-
-
-#endif  /* TAO_FIXED_TYPECODE_CPP */
diff --git a/TAO/tao/Fixed_TypeCode.h b/TAO/tao/Fixed_TypeCode.h
deleted file mode 100644
index d2a41df5dc6..00000000000
--- a/TAO/tao/Fixed_TypeCode.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_fixed @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_FIXED_TYPECODE_H
-#define TAO_FIXED_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Fixed
-     *
-     * @brief @c CORBA::TypeCode implementation for the OMG IDL @fixed
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for the OMG IDL @c
-     * fixed types.
-     */
-    template <class RefCountPolicy>
-    class Fixed
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Fixed (CORBA::UShort digits, CORBA::UShort scale);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_fixed
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// The number of significant digits.
-      CORBA::UShort const digits_;
-
-      /// The scale factor.
-      CORBA::UShort const scale_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Fixed_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Fixed_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_TYPECODE_H */
diff --git a/TAO/tao/Fixed_TypeCode.inl b/TAO/tao/Fixed_TypeCode.inl
deleted file mode 100644
index 9db9ca2b26d..00000000000
--- a/TAO/tao/Fixed_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
-                                             CORBA::UShort scale)
-  : CORBA::TypeCode (CORBA::tk_fixed)
-  , RefCountPolicy ()
-  , digits_ (digits)
-  , scale_ (scale)
-{
-}
diff --git a/TAO/tao/FlResource.mpc b/TAO/tao/FlResource.mpc
deleted file mode 100644
index 76aef1d5f33..00000000000
--- a/TAO/tao/FlResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_FlResource) : acelib, taolib, core, tao_output, taodefaults, ace_flreactor {
-
-  sharedname   = TAO_FlResource
-  dynamicflags += TAO_FLRESOURCE_BUILD_DLL
-
-  Source_Files {
-    FlResource_Factory.cpp
-    FlResource_Loader.cpp
-  }
-
-  Header_Files {
-    FlResource_Factory.h
-    FlResource_Loader.h
-    TAO_FlResource_Export.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp
deleted file mode 100644
index b0529d29a0e..00000000000
--- a/TAO/tao/FlResource_Factory.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//$Id$
-
-#include "FlResource_Factory.h"
-#include "debug.h"
-#include "ace/FlReactor.h"
-
-ACE_RCSID( TAO_FlResource,
-           FlResource_Factory,
-           "$Id$");
-
-namespace TAO
-{
-
-  FlResource_Factory::FlResource_Factory ():
-    reactor_impl_( 0 )
-  {
-  }
-
-  ACE_Reactor_Impl *
-  FlResource_Factory::reactor_impl (void)
-  {
-    // synchronized by external locks
-    if (!this->reactor_impl_)
-    {
-      ACE_NEW_RETURN (this->reactor_impl_,
-                      ACE_FlReactor (),
-                      0);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - ACE_FlReactor created \n"));
-    }
-
-    return this->reactor_impl_;
-  }
-}
diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h
deleted file mode 100644
index ab34c6ef503..00000000000
--- a/TAO/tao/FlResource_Factory.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   FlResource_Factory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-#ifndef TAO_FLRESOURCE_FACTORY_H
-#define TAO_FLRESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-#include "ace/FlReactor.h"
-#include "tao/TAO_FlResource_Export.h"
-#include "tao/GUIResource_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class FlResource_Factory
-   *
-   * @brief TAO_GUI_Resource_Factory for creating FlReactor.
-   *
-   * This factory is intended for creating FlReactor for ORB. This
-   * factory can be feed into ORB using
-   * TAO_ORB_Core::set_gui_resource_factory method which is usually
-   * done by TAO_FlResource_Loader.
-   */
-
-  class TAO_FlResource_Export FlResource_Factory : public GUIResource_Factory
-  {
-  public:
-
-    FlResource_Factory ();
-
-  protected:
-
-    /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
-
-  private:
-
-    /// Reactor created by this factory.
-    ACE_FlReactor *reactor_impl_;
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_FLRESOURCE_FACTORY_H */
diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp
deleted file mode 100644
index 13f01c7bef4..00000000000
--- a/TAO/tao/FlResource_Loader.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//$Id$
-#include "FlResource_Loader.h"
-#include "ORB_Core.h"
-#include "FlResource_Factory.h"
-
-ACE_RCSID( TAO_FlResource,
-           FlResource_Loader,
-           "$Id$");
-
-namespace TAO
-{
-
-  FlResource_Loader::FlResource_Loader ()
-  {
-    FlResource_Factory *tmp = 0;
-
-    ACE_NEW (tmp,
-             FlResource_Factory ());
-
-    TAO_ORB_Core::set_gui_resource_factory( tmp );
-  }
-
-  FlResource_Loader::~FlResource_Loader ()
-  {
-  }
-}
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h
deleted file mode 100644
index c56c2c5a39f..00000000000
--- a/TAO/tao/FlResource_Loader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   FlResource_Loader.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-
-#ifndef TAO_FLRESOURCE_LOADER_H
-#define TAO_FLRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-#include "tao/TAO_FlResource_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class FlResource_Loader
-   *
-   * @brief Loads TAO resources related with Fl.
-   *
-   * This class changes the default reactor implementation into
-   * ACE_FlReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
-   * User should create an instance of this class before ORB_init
-   * when the TAO server has has to be integrated within Fl event loop.
-   *
-   * Please notice, this class has to be created in the main Fl thread,
-   * because set_gui_resource_factory creates a variable in TSS. This way
-   * FlReactor is instantiated only in Qt event loop thread.
-   */
-  class TAO_FlResource_Export FlResource_Loader
-  {
-
-  public:
-    FlResource_Loader ( );
-
-    virtual ~FlResource_Loader ();
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_FLRESOURCE_LOADER_H */
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
deleted file mode 100644
index 8db59407329..00000000000
--- a/TAO/tao/FloatSeq.pidl
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- *
- * This file was used to generate the code in FloatSeq*.*
- * The command used to generate code is:
- *
- * tao_idl
- *   -o orig -Ge 1 -Sc -GA -SS -Sci
- *      -Wb,export_include=tao/TAO_Export.h
- *      -Wb,export_macro=TAO_Export
- *      -Wb,pre_include="ace/pre.h"
- *      -Wb,post_include="ace/post.h"
- *      FloatSeq.pidl
- *
- * and then:
- *
- * cp orig/FloatSeqC.{h,inl,cpp} .
- *
- * The code left in FloatSeqC.{h,inl,cpp} is ready for use.
- */
-// ================================================================
-
-
-#ifndef TAO_CORBA_FLOAT_SEQ_IDL
-#define TAO_CORBA_FLOAT_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<float> FloatSeq;
-};
-
-#endif  /* TAO_CORBA_FLOAT_SEQ_IDL */
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
deleted file mode 100644
index 8b0c9c2dc3c..00000000000
--- a/TAO/tao/FloatSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "FloatSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-#define _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_FloatSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_float,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_FloatSeq_0 =
-      &CORBA_FloatSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_FloatSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FloatSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/FloatSeq:1.0",
-    "FloatSeq",
-    &TAO::TypeCode::tc_CORBA_FloatSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FloatSeq =
-    &_tao_tc_CORBA_FloatSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::FloatSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert_copy (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FloatSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::FloatSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::extract (
-        _tao_any,
-        CORBA::FloatSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_FloatSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
deleted file mode 100644
index 9ef665733f4..00000000000
--- a/TAO/tao/FloatSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "FloatSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_FLOATSEQ_CS_)
-#define _CORBA_FLOATSEQ_CS_
-
-CORBA::FloatSeq::FloatSeq (void)
-{}
-
-CORBA::FloatSeq::FloatSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Float
-      >
-    (max)
-{}
-
-CORBA::FloatSeq::FloatSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Float * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Float
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::FloatSeq::FloatSeq (
-    const FloatSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Float
-      >
-    (seq)
-{}
-
-CORBA::FloatSeq::~FloatSeq (void)
-{}
-
-void CORBA::FloatSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  FloatSeq * _tao_tmp_pointer =
-    static_cast<FloatSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_FloatSeq_CPP_
-#define _TAO_CDR_OP_CORBA_FloatSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::FloatSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_float_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::FloatSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_float_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
deleted file mode 100644
index 84d50294951..00000000000
--- a/TAO/tao/FloatSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_FLOATSEQC_H_
-#define _TAO_IDL_ORIG_FLOATSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_FLOATSEQ_CH_)
-#define _CORBA_FLOATSEQ_CH_
-  
-  class FloatSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        FloatSeq,
-        CORBA::Float
-      >
-    FloatSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        FloatSeq,
-        FloatSeq_var,
-        CORBA::Float
-      >
-    FloatSeq_out;
-  
-  class TAO_Export FloatSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Float
-          >
-  {
-  public:
-    FloatSeq (void);
-    FloatSeq (CORBA::ULong max);
-    FloatSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Float* buffer, 
-        CORBA::Boolean release = 0
-      );
-    FloatSeq (const FloatSeq &);
-    ~FloatSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef FloatSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_FloatSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::FloatSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::FloatSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FloatSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::FloatSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_FloatSeq_H_
-#define _TAO_CDR_OP_CORBA_FloatSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::FloatSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::FloatSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/FloatSeqS.h b/TAO/tao/FloatSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/FloatSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
deleted file mode 100644
index 5d3e59a7e66..00000000000
--- a/TAO/tao/Flushing_Strategy.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Flushing_Strategy.h"
-
-ACE_RCSID (tao, 
-           Flushing_Strategy, 
-           "$Id$")
-
-TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
-{
-}
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
deleted file mode 100644
index 127fd743aee..00000000000
--- a/TAO/tao/Flushing_Strategy.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Flushing_Strategy.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_FLUSHING_STRATEGY_H
-#define TAO_FLUSHING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Time_Value;
-class TAO_Transport;
-class TAO_Queued_Message;
-
-/**
- * @class TAO_Flushing_Strategy
- *
- * @brief Define the interface for the flushing strategy, i.e. the
- *        algorithm that controls how does the ORB flush outgoing
- *        data.
- *
- * Please read the documentation in the TAO_Transport class to find
- * out more about the design of the outgoing data path.
- *
- * Some applications can block the current thread whenever they are
- * sending out data.  In those cases they can obtain better
- * performance by blocking in calls to write() than by participating
- * in the Leader/Followers protocol to shared the ORB Reactor.
- *
- * This strategy controls how does the ORB schedule and cancel
- * reactive I/O, if there is no reactive I/O the strategy is just a
- * no-op.
- *
- */
-class TAO_Export TAO_Flushing_Strategy
-{
-public:
-  /// Destructor
-  virtual ~TAO_Flushing_Strategy (void);
-
-  /// Schedule the transport argument to be flushed
-  virtual int schedule_output (TAO_Transport *transport) = 0;
-
-  /// Cancel all scheduled output for the transport argument
-  virtual int cancel_output (TAO_Transport *transport) = 0;
-
-  /// Wait until msg is sent out.  Potentially other messages are
-  /// flushed too, for example, because there are ahead in the queue.
-  virtual int flush_message (TAO_Transport *transport,
-                             TAO_Queued_Message *msg,
-                             ACE_Time_Value *max_wait_time) = 0;
-
-  /// Wait until the transport has no messages queued.
-  virtual int flush_transport (TAO_Transport *transport) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
deleted file mode 100644
index 5d569722cb1..00000000000
--- a/TAO/tao/GIOP.pidl
+++ /dev/null
@@ -1,60 +0,0 @@
-//$Id$
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   GIOP1_2.pidl
-//
-// = DESCRIPTION
-//   Some new data types included for GIOP 1.2
-//   This file was used to generate the code in
-//   GIOP*.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -GA -I.. -SS
-//          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="tao/TAO_Export.h"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          GIOP.pidl
-//
-// ================================================================
-
-#ifndef TAO_GIOP_PIDL
-#define TAO_GIOP_PIDL
-
-#include "IOP_IOR.pidl"
-
-#pragma prefix "omg.org"
-
-module GIOP
-{
-  typedef short AddressingDisposition;
-  const short KeyAddr = 0;
-  const short ProfileAddr = 1;
-  const short ReferenceAddr = 2;
-
-  struct Version
-  {
-    octet major;
-    octet minor;
-  };
-
-  struct IORAddressingInfo
-  {
-    unsigned long selected_profile_index;
-    IOP::IOR ior;
-  };
-
-  union TargetAddress switch (AddressingDisposition)
-  {
-    case KeyAddr: CORBA::OctetSeq object_key;
-    case ProfileAddr: IOP::TaggedProfile profile;
-    case ReferenceAddr: IORAddressingInfo ior;
-  };
-};
-
-#endif  /* TAO_GIOP_PIDL */
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
deleted file mode 100644
index 443880640c3..00000000000
--- a/TAO/tao/GIOPA.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "GIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/TypeCode_Case_T.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_AddressingDisposition (
-    CORBA::tk_alias,
-    "IDL:omg.org/GIOP/AddressingDisposition:1.0",
-    "AddressingDisposition",
-    &CORBA::_tc_short);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_AddressingDisposition =
-    &_tao_tc_GIOP_AddressingDisposition;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_Version[] =
-  {
-    { "major", &CORBA::_tc_octet },
-    { "minor", &CORBA::_tc_octet }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_Version (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/Version:1.0",
-    "Version",
-    _tao_fields_GIOP_Version,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Version =
-    &_tao_tc_GIOP_Version;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_IORAddressingInfo[] =
-  {
-    { "selected_profile_index", &CORBA::_tc_ulong },
-    { "ior", &IOP::_tc_IOR }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_IORAddressingInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/IORAddressingInfo:1.0",
-    "IORAddressingInfo",
-    _tao_fields_GIOP_IORAddressingInfo,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo =
-    &_tao_tc_GIOP_IORAddressingInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/union_typecode.cpp:47
-
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_2 (2, "ior", &GIOP::_tc_IORAddressingInfo);
-
-static TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const _tao_cases_GIOP_TargetAddress[] =
-  {
-    &_tao_cases_GIOP_TargetAddress_0,
-    &_tao_cases_GIOP_TargetAddress_1,
-    &_tao_cases_GIOP_TargetAddress_2
-    
-  };
-
-static TAO::TypeCode::Union<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Case<char const *,
-                                                CORBA::TypeCode_ptr const *> const * const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_TargetAddress (
-    "IDL:omg.org/GIOP/TargetAddress:1.0",
-    "TargetAddress",
-    &CORBA::_tc_short,
-    _tao_cases_GIOP_TargetAddress,
-    3, -1);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TargetAddress =
-    &_tao_tc_GIOP_TargetAddress;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::Version &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::Version *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::Version *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::Version *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::Version *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::Version>::extract (
-        _tao_any,
-        GIOP::Version::_tao_any_destructor,
-        GIOP::_tc_Version,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::IORAddressingInfo &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert_copy (
-      _tao_any,
-      GIOP::IORAddressingInfo::_tao_any_destructor,
-      GIOP::_tc_IORAddressingInfo,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert (
-      _tao_any,
-      GIOP::IORAddressingInfo::_tao_any_destructor,
-      GIOP::_tc_IORAddressingInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::IORAddressingInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract (
-        _tao_any,
-        GIOP::IORAddressingInfo::_tao_any_destructor,
-        GIOP::_tc_IORAddressingInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_union/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::TargetAddress &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert_copy (
-      _tao_any,
-      GIOP::TargetAddress::_tao_any_destructor,
-      GIOP::_tc_TargetAddress,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::TargetAddress *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert (
-      _tao_any,
-      GIOP::TargetAddress::_tao_any_destructor,
-      GIOP::_tc_TargetAddress,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::TargetAddress *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::TargetAddress *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::TargetAddress *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::extract (
-        _tao_any,
-        GIOP::TargetAddress::_tao_any_destructor,
-        GIOP::_tc_TargetAddress,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
deleted file mode 100644
index 5d0cf2e8415..00000000000
--- a/TAO/tao/GIOPC.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "GIOPC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "GIOPC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-GIOP::Version::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Version *_tao_tmp_pointer =
-    static_cast<Version *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-GIOP::IORAddressingInfo::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  IORAddressingInfo *_tao_tmp_pointer =
-    static_cast<IORAddressingInfo *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/union_cs.cpp:91
-
-GIOP::TargetAddress::TargetAddress (void)
-{
-  ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_));
-  ACE_OS::memset (&this->u_, 0, sizeof (this->u_));
-  this->disc_ = -32768;
-}
-
-GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
-{
-  this->disc_ = u.disc_;
-  switch (this->disc_)
-  {
-    case 0:
-    {
-      if (u.u_.object_key_ == 0)
-        {
-          this->u_.object_key_ = 0;
-        }
-      else
-        {
-          ACE_NEW (
-              this->u_.object_key_,
-              CORBA::OctetSeq (*u.u_.object_key_)
-            );
-        }
-    }
-    break;
-    case 1:
-    {
-      if (u.u_.profile_ == 0)
-        {
-          this->u_.profile_ = 0;
-        }
-      else
-        {
-          ACE_NEW (
-              this->u_.profile_,
-              IOP::TaggedProfile (*u.u_.profile_)
-            );
-        }
-    }
-    break;
-    case 2:
-    {
-      if (u.u_.ior_ == 0)
-        {
-          this->u_.ior_ = 0;
-        }
-      else
-        {
-          ACE_NEW (
-              this->u_.ior_,
-              GIOP::IORAddressingInfo (*u.u_.ior_)
-            );
-        }
-    }
-    break;
-    default:
-    break;
-  }
-}
-
-GIOP::TargetAddress::~TargetAddress (void)
-{
-  // Finalize.
-  this->_reset (this->disc_, 1);
-}
-
-void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TargetAddress *tmp =
-    static_cast<TargetAddress *> (_tao_void_pointer);
-  delete tmp;
-}
-
-GIOP::TargetAddress &
-GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
-{
-  if (&u == this)
-    {
-      return *this;
-    }
-  
-  this->_reset (u.disc_, 0);
-  this->disc_ = u.disc_;
-  
-  switch (this->disc_)
-  {
-    case 0:
-    {
-      if (u.u_.object_key_ == 0)
-        {
-          this->u_.object_key_ = 0;
-        }
-      else
-        {
-          ACE_NEW_RETURN (
-              this->u_.object_key_,
-              CORBA::OctetSeq (*u.u_.object_key_),
-              *this
-            );
-        }
-    }
-    break;
-    case 1:
-    {
-      if (u.u_.profile_ == 0)
-        {
-          this->u_.profile_ = 0;
-        }
-      else
-        {
-          ACE_NEW_RETURN (
-              this->u_.profile_,
-              IOP::TaggedProfile (*u.u_.profile_),
-              *this
-            );
-        }
-    }
-    break;
-    case 2:
-    {
-      if (u.u_.ior_ == 0)
-        {
-          this->u_.ior_ = 0;
-        }
-      else
-        {
-          ACE_NEW_RETURN (
-              this->u_.ior_,
-              GIOP::IORAddressingInfo (*u.u_.ior_),
-              *this
-            );
-        }
-    }
-    break;
-    default:
-    break;
-  }
-  
-  return *this;
-}
-
-// Reset method to reset old values of a union.
-void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
-{
-  switch (this->disc_)
-  {
-    
-    case 0:
-      delete this->u_.object_key_;
-      this->u_.object_key_ = 0;
-      break;
-    case 1:
-      delete this->u_.profile_;
-      this->u_.profile_ = 0;
-      break;
-    case 2:
-      delete this->u_.ior_;
-      this->u_.ior_ = 0;
-      break;
-    default:
-    break;
-  }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const GIOP::Version &_tao_aggregate
-  )
-{
-  return
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor));
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    GIOP::Version &_tao_aggregate
-  )
-{
-  return
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor));
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const GIOP::IORAddressingInfo &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.selected_profile_index) &&
-    (strm << _tao_aggregate.ior);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    GIOP::IORAddressingInfo &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.selected_profile_index) &&
-    (strm >> _tao_aggregate.ior);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/cdr_op_cs.cpp:67
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const GIOP::TargetAddress &_tao_union
-  )
-{
-  if ( !(strm << _tao_union._d ()) )
-    {
-      return false;
-    }
-  
-  CORBA::Boolean result = true;
-  
-  switch (_tao_union._d ())
-  {
-    case 0:
-      {
-        result = strm << _tao_union.object_key ();
-      }
-      break;
-    case 1:
-      {
-        result = strm << _tao_union.profile ();
-      }
-      break;
-    case 2:
-      {
-        result = strm << _tao_union.ior ();
-      }
-      break;
-    default:
-      break;
-  }
-  
-  return result;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    GIOP::TargetAddress &_tao_union
-  )
-{
-  CORBA::Short _tao_discriminant;
-  if ( !(strm >> _tao_discriminant) )
-    {
-      return false;
-    }
-  
-  CORBA::Boolean result = true;
-  
-  switch (_tao_discriminant)
-  {
-    case 0:
-      {
-        CORBA::OctetSeq _tao_union_tmp;
-        result = strm >> _tao_union_tmp;
-        
-        if (result)
-          {
-            _tao_union.object_key (_tao_union_tmp);
-            _tao_union._d (_tao_discriminant);
-          }
-      }
-      break;
-    case 1:
-      {
-        IOP::TaggedProfile _tao_union_tmp;
-        result = strm >> _tao_union_tmp;
-        
-        if (result)
-          {
-            _tao_union.profile (_tao_union_tmp);
-            _tao_union._d (_tao_discriminant);
-          }
-      }
-      break;
-    case 2:
-      {
-        GIOP::IORAddressingInfo _tao_union_tmp;
-        result = strm >> _tao_union_tmp;
-        
-        if (result)
-          {
-            _tao_union.ior (_tao_union_tmp);
-            _tao_union._d (_tao_discriminant);
-          }
-      }
-      break;
-    default:
-      _tao_union._d (_tao_discriminant);
-      break;
-  }
-  
-  return result;
-}
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
deleted file mode 100644
index 5fffb7df006..00000000000
--- a/TAO/tao/GIOPC.h
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_GIOPC_H_
-#define _TAO_IDL_ORIG_GIOPC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IOP_IORC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace GIOP
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short AddressingDisposition;
-  typedef CORBA::Short_out AddressingDisposition_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AddressingDisposition;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short KeyAddr = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ProfileAddr = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ReferenceAddr = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct Version;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        Version
-      >
-    Version_var;
-  
-  typedef
-    Version &
-    Version_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export Version
-  {
-    typedef Version_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::Octet major;
-    CORBA::Octet minor;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Version;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct IORAddressingInfo;
-  
-  typedef
-    TAO_Var_Var_T<
-        IORAddressingInfo
-      >
-    IORAddressingInfo_var;
-  
-  typedef
-    TAO_Out_T<
-        IORAddressingInfo,
-        IORAddressingInfo_var
-      >
-    IORAddressingInfo_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export IORAddressingInfo
-  {
-    typedef IORAddressingInfo_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::ULong selected_profile_index;
-    IOP::IOR ior;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  class TargetAddress;
-  
-  typedef
-    TAO_Var_Var_T<
-        TargetAddress
-      >
-    TargetAddress_var;
-  
-  typedef
-    TAO_Out_T<
-        TargetAddress,
-        TargetAddress_var
-      >
-    TargetAddress_out;
-
-#if !defined (_GIOP_TARGETADDRESS_CH_)
-#define _GIOP_TARGETADDRESS_CH_
-  
-  class TAO_Export TargetAddress
-  {
-  public:
-    TargetAddress (void);
-    TargetAddress (const TargetAddress &);
-    ~TargetAddress (void);
-    static void _tao_any_destructor (void*);
-    
-    TargetAddress &operator= (const TargetAddress &);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union/discriminant_ch.cpp:114
-    
-    void _d (CORBA::Short);
-    CORBA::Short _d (void) const;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union/union_ch.cpp:108
-    
-    typedef TargetAddress_var _var_type;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:514
-    
-    void object_key (const CORBA::OctetSeq &);
-    const CORBA::OctetSeq &object_key (void) const;
-    CORBA::OctetSeq &object_key (void);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:622
-    
-    void profile (const IOP::TaggedProfile &);
-    const IOP::TaggedProfile &profile (void) const;
-    IOP::TaggedProfile &profile (void);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union_branch/public_ch.cpp:622
-    
-    void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
-    const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
-    ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_union/union_ch.cpp:142
-    
-    void _default (void);
-  private:
-    CORBA::Short disc_;
-    CORBA::Short holder_;
-    
-    union
-    {
-      // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:412
-      CORBA::OctetSeq *object_key_;
-      // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:487
-      IOP::TaggedProfile *profile_;
-      // TAO_IDL - Generated from
-      // be\be_visitor_union_branch/private_ch.cpp:487
-      ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
-    } u_;
-    
-    // TAO extension - frees any allocated storage.
-    void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TargetAddress;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module GIOP
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::IORAddressingInfo &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::IORAddressingInfo &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "GIOPC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl
deleted file mode 100644
index 94f7dc88e6a..00000000000
--- a/TAO/tao/GIOPC.inl
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/union_ci.cpp:51
-
-// *************************************************************
-// Inline operations for union GIOP::TargetAddress
-// *************************************************************
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/discriminant_ci.cpp:164
-
-ACE_INLINE
-void 
-GIOP::TargetAddress::_default ()
-{
-  this->disc_ = -32768;
-}
-
-// Accessor to set the discriminant.
-ACE_INLINE
-void
-GIOP::TargetAddress::_d (CORBA::Short discval)
-{
-  this->disc_ = discval;
-}
-
-// Accessor to get the discriminant.
-ACE_INLINE
-CORBA::Short
-GIOP::TargetAddress::_d (void) const
-{
-  return this->disc_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:899
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::object_key (const CORBA::OctetSeq &val)
-{
-  // Set the discriminant value.
-  this->_reset (0, 0);
-  this->disc_ = 0;
-  ACE_NEW (
-      this->u_.object_key_,
-      CORBA::OctetSeq (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const CORBA::OctetSeq &
-GIOP::TargetAddress::object_key (void) const
-{
-  return *this->u_.object_key_;
-}
-
-// Read/write get method.
-ACE_INLINE
-CORBA::OctetSeq &
-GIOP::TargetAddress::object_key (void)
-{
-  return *this->u_.object_key_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1208
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
-{
-  // Set the discriminant value.
-  this->_reset (1, 0);
-  this->disc_ = 1;
-  ACE_NEW (
-      this->u_.profile_,
-      IOP::TaggedProfile (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const IOP::TaggedProfile &
-GIOP::TargetAddress::profile (void) const
-{
-  return *this->u_.profile_;
-}
-
-// Read/write get method.
-ACE_INLINE
-IOP::TaggedProfile &
-GIOP::TargetAddress::profile (void)
-{
-  return *this->u_.profile_;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_union_branch/public_ci.cpp:1208
-
-// Accessor to set the member.
-ACE_INLINE
-void
-GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
-{
-  // Set the discriminant value.
-  this->_reset (2, 0);
-  this->disc_ = 2;
-  ACE_NEW (
-      this->u_.ior_,
-      GIOP::IORAddressingInfo (val)
-    );
-}
-
-// Readonly get method.
-ACE_INLINE
-const GIOP::IORAddressingInfo &
-GIOP::TargetAddress::ior (void) const
-{
-  return *this->u_.ior_;
-}
-
-// Read/write get method.
-ACE_INLINE
-GIOP::IORAddressingInfo &
-GIOP::TargetAddress::ior (void)
-{
-  return *this->u_.ior_;
-}
diff --git a/TAO/tao/GIOPS.h b/TAO/tao/GIOPS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/GIOPS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/GIOPS_T.h b/TAO/tao/GIOPS_T.h
deleted file mode 100644
index 00b7bc96ea7..00000000000
--- a/TAO/tao/GIOPS_T.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:547
-
-#ifndef _TAO_IDL_ORIG_GIOPS_T_H_
-#define _TAO_IDL_ORIG_GIOPS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_GIOP
-{
-} // module GIOP
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1096
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
deleted file mode 100644
index 0095a74a692..00000000000
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ /dev/null
@@ -1,1564 +0,0 @@
-// $Id$
-
-#include "GIOP_Message_Base.h"
-#include "operation_details.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "TAO_Server_Request.h"
-#include "GIOP_Message_Locate_Header.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "LF_Strategy.h"
-#include "Request_Dispatcher.h"
-#include "Codeset_Manager.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           GIOP_Message_Base,
-           "$Id$")
-
-TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
-                                              size_t /*input_cdr_size*/)
-  : orb_core_ (orb_core)
-    , message_state_ ()
-    , out_stream_ (this->buffer_,
-                   sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */
-                   TAO_ENCAP_BYTE_ORDER,
-                   orb_core->output_cdr_buffer_allocator (),
-                   orb_core->output_cdr_dblock_allocator (),
-                   orb_core->output_cdr_msgblock_allocator (),
-                   orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                   TAO_DEF_GIOP_MAJOR,
-                   TAO_DEF_GIOP_MINOR)
-{
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  ACE_OS::memset(buffer_, 0, sizeof (buffer_));
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-}
-
-
-TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
-{
-}
-
-
-void
-TAO_GIOP_Message_Base::init (CORBA::Octet major,
-                             CORBA::Octet minor)
-{
-  // Set the giop version of the out stream
-  this->out_stream_.set_version (major,
-                                 minor);
-}
-
-TAO_OutputCDR &
-TAO_GIOP_Message_Base::out_stream (void)
-{
-  return this->out_stream_;
-}
-
-void
-TAO_GIOP_Message_Base::reset (void)
-{
-  // no-op
-}
-
-int
-TAO_GIOP_Message_Base::generate_request_header (
-    TAO_Operation_Details &op,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
-  )
-{
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  CORBA::Octet major, minor;
-
-  cdr.get_version (major, minor);
-
-  // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
-
-  // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_REQUEST,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")));
-        }
-
-      return -1;
-    }
-
-  // Now call the implementation for the rest of the header
-  if (!generator_parser->write_request_header (op,
-                                               spec,
-                                               cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing request header \n")));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Base::generate_locate_request_header (
-    TAO_Operation_Details &op,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
- )
-{
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  CORBA::Octet major, minor;
-
-  cdr.get_version (major, minor);
-
-  // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
-
-  // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")));
-
-      return -1;
-    }
-
-  // Now call the implementation for the rest of the header
-  if (!generator_parser->write_locate_request_header
-      (op.request_id (),
-       spec,
-       cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing locate request header \n")));
-
-
-      return -1;
-
-    }
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Base::generate_reply_header (
-    TAO_OutputCDR &cdr,
-    TAO_Pluggable_Reply_Params_Base &params
-  )
-{
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  CORBA::Octet major, minor;
-
-  cdr.get_version (major, minor);
-
-  // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
-
-  // Write the GIOP header first
-  if (!this->write_protocol_header (TAO_GIOP_REPLY,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")));
-
-      return -1;
-    }
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Now call the implementation for the rest of the header
-      int result =
-        generator_parser->write_reply_header (cdr,
-                                              params
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          if (TAO_debug_level > 4)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) Error in writing reply ")
-                        ACE_TEXT ("header\n")));
-
-          return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_GIOP_Message_Base::generate_reply_header");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Base::read_message (TAO_Transport * /*transport*/,
-                                     int /*block */,
-                                     ACE_Time_Value * /*max_wait_time*/)
-{
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
-{
-  // Ptr to first buffer.
-  char *buf = (char *) stream.buffer ();
-
-  // Length of all buffers.
-  size_t total_len =
-    stream.total_length ();
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g., IPSEC).
-
-  CORBA::ULong bodylen = static_cast <CORBA::ULong>
-                           (total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
-
-#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *(reinterpret_cast <CORBA::ULong *> (buf +
-                         TAO_GIOP_MESSAGE_SIZE_OFFSET)) = bodylen;
-#else
-  if (!stream.do_byte_swap ())
-    *(reinterpret_cast <CORBA::ULong *>
-                           (buf + TAO_GIOP_MESSAGE_SIZE_OFFSET)) = bodylen;
-  else
-    ACE_CDR::swap_4 (reinterpret_cast <char *> (&bodylen),
-                     buf + TAO_GIOP_MESSAGE_SIZE_OFFSET);
-#endif /* ACE_ENABLE_SWAP_ON_WRITE */
-
-  if (TAO_debug_level > 2)
-    {
-      // Check whether the output cdr stream is build up of multiple
-      // messageblocks. If so, consolidate them to one block that can be
-      // dumped
-      ACE_Message_Block* consolidated_block = 0;
-      if (stream.begin()->cont () != 0)
-        {
-          consolidated_block = new ACE_Message_Block;
-          ACE_CDR::consolidate (consolidated_block, stream.begin ());
-          buf = (char *) (consolidated_block->rd_ptr ());
-        }
-      ///
-      this->dump_msg ("send",
-                      reinterpret_cast <u_char *> (buf),
-                      total_len);
-
-      //
-      delete consolidated_block;
-      consolidated_block = 0;
-      //
-    }
-
-  return 0;
-}
-
-TAO_Pluggable_Message_Type
-TAO_GIOP_Message_Base::message_type (
-                         const TAO_GIOP_Message_State &msg_state) const
-{
-  // Convert to the right type of Pluggable Messaging message type.
-
-  switch (msg_state.message_type_)
-    {
-    case TAO_GIOP_REQUEST:
-      return TAO_PLUGGABLE_MESSAGE_REQUEST;
-    case TAO_GIOP_LOCATEREQUEST:
-      return TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST;
-
-    case TAO_GIOP_LOCATEREPLY:
-      return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY;
-    case TAO_GIOP_REPLY:
-      return TAO_PLUGGABLE_MESSAGE_REPLY;
-
-    case TAO_GIOP_CLOSECONNECTION:
-      return TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION;
-
-    case TAO_GIOP_FRAGMENT:
-      return TAO_PLUGGABLE_MESSAGE_FRAGMENT;
-
-    case TAO_GIOP_MESSAGERROR:
-    case TAO_GIOP_CANCELREQUEST:
-      // Does it happen?  why??
-    default:
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) %N:%l        message_type : ")
-                    ACE_TEXT ("wrong message.\n")));
-    }
-
-  return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
-}
-
-int
-TAO_GIOP_Message_Base::parse_incoming_messages (ACE_Message_Block &incoming)
-{
-  return this->message_state_.parse_message_header (incoming);
-}
-
-ssize_t
-TAO_GIOP_Message_Base::missing_data (ACE_Message_Block &incoming)
-{
-  // Actual message size including the header..
-  CORBA::ULong msg_size =
-    this->message_state_.message_size ();
-
-  size_t len = incoming.length ();
-
-  // If we have too many messages or if we have less than even a size
-  // of the GIOP header then ..
-  if (len > msg_size ||
-      len < TAO_GIOP_MESSAGE_HEADER_LEN)
-    {
-      return -1;
-    }
-  else if (len == msg_size)
-     return 0;
-
-   return msg_size - len;
-}
-
-
-int
-TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
-                                             TAO_Queued_Data *&qd)
-{
-  if (incoming.length () < TAO_GIOP_MESSAGE_HEADER_LEN)
-    {
-      if (incoming.length () > 0)
-        {
-          // Make a node which has a message block of the size of
-          // MESSAGE_HEADER_LEN.
-          qd =
-            this->make_queued_data (TAO_GIOP_MESSAGE_HEADER_LEN);
-
-          qd->msg_block_->copy (incoming.rd_ptr (),
-                                incoming.length ());
-          qd->missing_data_ = -1;
-        }
-      return 0;
-    }
-
-  TAO_GIOP_Message_State state;
-  if (state.parse_message_header (incoming) == -1)
-    {
-      return -1;
-    }
-
-  size_t copying_len = state.message_size ();
-
-  qd = this->make_queued_data (copying_len);
-
-  if (copying_len > incoming.length ())
-    {
-      qd->missing_data_ = copying_len - incoming.length ();
-
-      copying_len = incoming.length ();
-    }
-
-  qd->msg_block_->copy (incoming.rd_ptr (),
-                        copying_len);
-
-  incoming.rd_ptr (copying_len);
-  this->init_queued_data (qd, state);
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
-                                         ACE_Message_Block &incoming)
-{
-  // Look to see whether we had atleast parsed the GIOP header ...
-  if (qd->missing_data_ == -1)
-    {
-      // The data length that has been stuck in there during the last
-      // read ....
-      size_t len =
-        qd->msg_block_->length ();
-
-      // We know that we would have space for
-      // TAO_GIOP_MESSAGE_HEADER_LEN here.  So copy that much of data
-      // from the <incoming> into the message block in <qd>
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            TAO_GIOP_MESSAGE_HEADER_LEN - len);
-
-      // Move the rd_ptr () in the incoming message block..
-      incoming.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN - len);
-
-      TAO_GIOP_Message_State state;
-
-      // Parse the message header now...
-      if (state.parse_message_header (*qd->msg_block_) == -1)
-        return -1;
-
-      // Now grow the message block so that we can copy the rest of
-      // the data...
-      if (qd->msg_block_->space () < state.message_size ())
-        {
-          ACE_CDR::grow (qd->msg_block_,
-                         state.message_size ());
-        }
-
-      // Copy the pay load..
-      // Calculate the bytes that needs to be copied in the queue...
-      size_t copy_len = state.payload_size ();
-
-      // If the data that needs to be copied is more than that is
-      // available to us ..
-      if (copy_len > incoming.length ())
-        {
-          // Calculate the missing data..
-          qd->missing_data_ = copy_len - incoming.length ();
-
-          // Set the actual possible copy_len that is available...
-          copy_len = incoming.length ();
-        }
-      else
-        {
-          qd->missing_data_ = 0;
-        }
-
-      // ..now we are set to copy the right amount of data to the
-      // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
-
-      // Set the <rd_ptr> of the <incoming>..
-      incoming.rd_ptr (copy_len);
-
-      // Get the other details...
-      this->init_queued_data (qd, state);
-    }
-  else
-    {
-      // @@todo: Need to abstract this out to a seperate method...
-      size_t copy_len = qd->missing_data_;
-
-      if (copy_len > incoming.length ())
-        {
-          // Calculate the missing data..
-          qd->missing_data_ = copy_len - incoming.length ();
-
-          // Set the actual possible copy_len that is available...
-          copy_len = incoming.length ();
-        }
-
-      // Copy the right amount of data in to the node...
-      // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
-
-      // Set the <rd_ptr> of the <incoming>..
-      qd->msg_block_->rd_ptr (copy_len);
-
-    }
-
-  return 0;
-}
-
-void
-TAO_GIOP_Message_Base::get_message_data (TAO_Queued_Data *qd)
-{
-  // Get the message information
-  this->init_queued_data (qd, this->message_state_);
-
-  // Reset the message_state
-  this->message_state_.reset ();
-}
-
-int
-TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
-                                                TAO_Queued_Data *qd)
-{
-  // Set the upcall thread
-  this->orb_core_->lf_strategy ().set_upcall_thread (this->orb_core_->leader_follower ());
-
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  // Get the state information that we need to use
-  this->set_state (qd->major_version_,
-                   qd->minor_version_,
-                   generator_parser);
-
-  // A buffer that we will use to initialise the CDR stream
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
-#else
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-  // Initialze an output CDR on the stack
-  // NOTE: Don't jump to a conclusion as to why we are using the
-  // input_cdr and hence the  global pool here. These pools will move
-  // to the lanes anyway at some point of time. Further, it would have
-  // been awesome to have this in TSS. But for some reason the cloning
-  // that happens when the ORB gets flow controlled while writing a
-  // reply is messing things up. We crash horribly. Doing this adds a
-  // lock, we need to set things like this -- put stuff in TSS here
-  // and transfer to global memory when we get flow controlled. We
-  // need to work on the message block to get it right!
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        this->orb_core_->input_cdr_buffer_allocator (),
-                        this->orb_core_->input_cdr_dblock_allocator (),
-                        this->orb_core_->input_cdr_msgblock_allocator (),
-                        this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                        qd->major_version_,
-                        qd->minor_version_);
-
-  // Get the read and write positions before we steal data.
-  size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
-  rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
-
-  if (TAO_debug_level > 0)
-    this->dump_msg ("recv",
-                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
-                    qd->msg_block_->length ());
-
-
-  // Create a input CDR stream. We do the following
-  //  1 - If the incoming message block has a data block with a flag
-  //      DONT_DELETE  (for the data block) we create an input CDR
-  //      stream the same way.
-  //  2 - If the incoming message block had a datablock from heap just
-  //      use it by duplicating it and make the flag 0.
-  // NOTE: We use the same data block in which we read the message and
-  // we pass it on to the higher layers of the ORB. So we dont to any
-  // copies at all here. The same is also done in the higher layers.
-
-  ACE_Message_Block::Message_Flags flg = 0;
-  ACE_Data_Block *db = 0;
-
-  // Get the flag in the message block
-  flg = qd->msg_block_->self_flags ();
-
-  if (ACE_BIT_ENABLED (flg,
-                       ACE_Message_Block::DONT_DELETE))
-    {
-      // Use the same datablock
-      db = qd->msg_block_->data_block ();
-    }
-  else
-    {
-      // Use a duplicated datablock as the datablock has come off the
-      // heap.
-      db = qd->msg_block_->data_block ()->duplicate ();
-    }
-
-
-  TAO_InputCDR input_cdr (db,
-                          flg,
-                          rd_pos,
-                          wr_pos,
-                          qd->byte_order_,
-                          qd->major_version_,
-                          qd->minor_version_,
-                          this->orb_core_);
-
-  transport->assign_translators(&input_cdr,&output);
-
-  // We know we have some request message. Check whether it is a
-  // GIOP_REQUEST or GIOP_LOCATE_REQUEST to take action.
-
-  // Once we send the InputCDR stream we need to just forget about
-  // the stream and never touch that again for anything. We basically
-  // loose ownership of the data_block.
-
-  switch (qd->msg_type_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_REQUEST:
-      // Should be taken care by the state specific invocations. They
-      // could raise an exception or write things in the output CDR
-      // stream
-      return this->process_request (transport,
-                                    input_cdr,
-                                    output,
-                                    generator_parser);
-
-    case TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST:
-      return this->process_locate_request (transport,
-                                           input_cdr,
-                                           output,
-                                           generator_parser);
-    default:
-      return -1;
-    }
-}
-
-int
-TAO_GIOP_Message_Base::process_reply_message (
-    TAO_Pluggable_Reply_Params &params,
-    TAO_Queued_Data *qd)
-{
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  // Get the state information that we need to use
-  this->set_state (qd->major_version_,
-                   qd->minor_version_,
-                   generator_parser);
-
-  // Get the read and write positions before we steal data.
-  size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
-  rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN;
-
-  if (TAO_debug_level > 0)
-    this->dump_msg ("recv",
-                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
-                    qd->msg_block_->length ());
-
-
-  // Create a empty buffer on stack
-  // NOTE: We use the same data block in which we read the message and
-  // we pass it on to the higher layers of the ORB. So we dont to any
-  // copies at all here.
-  TAO_InputCDR input_cdr (qd->msg_block_->data_block (),
-                          ACE_Message_Block::DONT_DELETE,
-                          rd_pos,
-                          wr_pos,
-                          qd->byte_order_,
-                          qd->major_version_,
-                          qd->minor_version_,
-                          this->orb_core_);
-
-  // We know we have some reply message. Check whether it is a
-  // GIOP_REPLY or GIOP_LOCATE_REPLY to take action.
-
-  // Once we send the InputCDR stream we need to just forget about
-  // the stream and never touch that again for anything. We basically
-  // loose ownership of the data_block.
-  int retval = 0;
-
-  switch (qd->msg_type_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_REPLY:
-      // Should be taken care by the state specific parsing
-      retval =
-        generator_parser->parse_reply (input_cdr,
-                                       params);
-
-      break;
-    case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY:
-      retval =
-        generator_parser->parse_locate_reply (input_cdr,
-                                              params);
-      break;
-    default:
-      retval = -1;
-    }
-
-  if (retval == -1)
-    return retval;
-
-  params.input_cdr_ = &input_cdr;
-
-  retval =
-    params.transport_->tms ()->dispatch_reply (params);
-
-  if (retval == -1)
-    {
-      // Something really critical happened, we will forget about
-      // every reply on this connection.
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, "
-                    "dispatch reply failed\n",
-                    params.transport_->id ()));
-    }
-
-  return retval;
-}
-
-int
-TAO_GIOP_Message_Base::generate_exception_reply (
-    TAO_OutputCDR &cdr,
-    TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
-{
-  // A new try/catch block, but if something goes wrong now we have no
-  // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Make the GIOP & reply header.
-      this->generate_reply_header (cdr,
-                                   params);
-      x._tao_encode (cdr
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      // Now we know that while handling the error an other error
-      // happened -> no hope, close connection.
-
-      // Close the handle.
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
-                  ACE_TEXT ("generate_exception_reply ()\n")));
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type type,
-                                              TAO_OutputCDR &msg)
-{
-  // Reset the message type
-  // Reset the message type
-  msg.reset ();
-
-  CORBA::Octet header[12] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50  // 'P'
-  };
-
-  CORBA::Octet major, minor = 0;
-  msg.get_version (major, minor);
-
-  header[4] = major;
-  header[5] = minor;
-
-  // We are putting the byte order. But at a later date if we support
-  // fragmentation and when we want to use the other 6 bits in this
-  // octet we can have a virtual function do this for us as the
-  // version info , Bala
-  header[6] = (TAO_ENCAP_BYTE_ORDER ^ msg.do_byte_swap ());
-
-  header[7] = CORBA::Octet(type);
-
-  static int header_size = sizeof (header) / sizeof (header[0]);
-  msg.write_octet_array (header, header_size);
-
-  return msg.good_bit ();
-}
-
-int
-TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
-                                        TAO_InputCDR &cdr,
-                                        TAO_OutputCDR &output,
-                                        TAO_GIOP_Message_Generator_Parser *parser)
-{
-  // This will extract the request header, set <response_required>
-  // and <sync_with_server> as appropriate.
-  TAO_ServerRequest request (this,
-                             cdr,
-                             output,
-                             transport,
-                             this->orb_core_);
-
-  CORBA::ULong request_id = 0;
-  CORBA::Boolean response_required = 0;
-
-  int parse_error = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      parse_error =
-        parser->parse_request_header (request);
-
-      request.orb_core()->codeset_manager()->process_service_context(request);
-      transport->assign_translators(&cdr,&output);
-
-      // Throw an exception if the
-      if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                       CORBA::COMPLETED_NO));
-      request_id = request.request_id ();
-
-      response_required = request.response_expected ();
-
-      CORBA::Object_var forward_to;
-
-      // Do this before the reply is sent.
-      this->orb_core_->request_dispatcher ()->dispatch (
-          this->orb_core_,
-          request,
-          forward_to
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!CORBA::is_nil (forward_to.in ()))
-        {
-          // We should forward to another object...
-          TAO_Pluggable_Reply_Params_Base reply_params;
-          reply_params.request_id_ = request_id;
-          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
-          reply_params.svc_ctx_.length (0);
-
-          // Send back the reply service context.
-          reply_params.service_context_notowned (&request.reply_service_info ());
-
-          // Make the GIOP header and Reply header
-          this->generate_reply_header (output,
-                                       reply_params);
-
-          if (!(output << forward_to.in ()))
-            {
-              if (TAO_debug_level > 0)
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("TAO (%P|%t) ERROR: Unable to marshal ")
-                            ACE_TEXT ("forward reference.\n")));
-
-              return -1;
-            }
-
-          int result = transport->send_message (output,
-                                                0,
-                                                TAO_Transport::TAO_REPLY);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  // No exception but some kind of error, yet a
-                  // response is required.
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
-                              ACE_TEXT ("cannot send reply\n"),
-                              ACE_TEXT ("TAO_GIOP_Message_Base::process_request")));
-                }
-            }
-          return result;
-        }
-    }
-  // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
-    {
-      int result = 0;
-
-      if (response_required)
-        {
-          result = this->send_reply_exception (transport,
-                                               output,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &ACE_ANY_EXCEPTION);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_connector_request ()")));
-
-                  ACE_PRINT_EXCEPTION (
-                      ACE_ANY_EXCEPTION,
-                      "TAO_GIOP_Message_Base::process_request[1]");
-                }
-            }
-
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfortunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "TAO_GIOP_Message_Base::process_request[2]");
-        }
-
-      return result;
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.  If
-      // we have native exceptions but no support for them in the ORB
-      // we should still be able to catch it.  If we don't have native
-      // exceptions it couldn't have been raised in the first place!
-      int result = 0;
-
-      if (response_required)
-        {
-          CORBA::UNKNOWN exception (CORBA::SystemException::_tao_minor_code
-                                    (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
-                                    CORBA::COMPLETED_MAYBE);
-
-          result = this->send_reply_exception (transport,
-                                               output,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &exception);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ")
-                              ACE_TEXT ("%p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      exception,
-                      "TAO_GIOP_Message_Base::process_request[3]");
-                }
-            }
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfotunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t|%N|%l) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-        }
-
-      return result;
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
-                                               TAO_InputCDR &input,
-                                               TAO_OutputCDR &output,
-                                               TAO_GIOP_Message_Generator_Parser *parser)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_Locate_Request_Header locate_request (input,
-                                                 this->orb_core_);
-
-  TAO_GIOP_Locate_Status_Msg status_info;
-
-  // Defaulting.
-  status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-
-  CORBA::Boolean response_required = 1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int parse_error =
-        parser->parse_locate_header (locate_request);
-
-      if (parse_error != 0)
-        {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
-        }
-
-      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
-                              locate_request.object_key ().length (),
-                              locate_request.object_key ().get_buffer (),
-                              0);
-
-      // Set it to an error state
-      parse_error = 1;
-      CORBA::ULong req_id = locate_request.request_id ();
-
-      // We will send the reply. The ServerRequest class need not send
-      // the reply
-      CORBA::Boolean deferred_reply = 1;
-      TAO_ServerRequest server_request (this,
-                                        req_id,
-                                        response_required,
-                                        deferred_reply,
-                                        tmp_key,
-                                        "_non_existent",
-                                        output,
-                                        transport,
-                                        this->orb_core_,
-                                        parse_error);
-
-      if (parse_error != 0)
-        {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
-        }
-
-      CORBA::Object_var forward_to;
-
-      this->orb_core_->request_dispatcher ()->dispatch (
-          this->orb_core_,
-          server_request,
-          forward_to
-           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!CORBA::is_nil (forward_to.in ()))
-        {
-          status_info.status = TAO_GIOP_OBJECT_FORWARD;
-          status_info.forward_location_var = forward_to;
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                        ACE_TEXT ("called: forwarding\n")));
-        }
-      else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
-        {
-          // We got no exception, so the object is here.
-          status_info.status = TAO_GIOP_OBJECT_HERE;
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                        ACE_TEXT ("found\n")));
-        }
-      else
-        {
-          status_info.forward_location_var = server_request.forward_location ();
-
-          if (!CORBA::is_nil (status_info.forward_location_var.in ()))
-            {
-              status_info.status = TAO_GIOP_OBJECT_FORWARD;
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                          ACE_TEXT ("forwarding\n")));
-            }
-          else
-            {
-              // Normal exception, so the object is not here
-              status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                          ACE_TEXT ("not here\n")));
-            }
-        }
-    }
-
-  ACE_CATCHANY
-    {
-      // Normal exception, so the object is not here
-      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
-                    ACE_TEXT ("CORBA exception raised\n")));
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Normal exception, so the object is not here
-      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ")
-                    ACE_TEXT ("C++ exception raised\n")));
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  return this->make_send_locate_reply (transport,
-                                       locate_request,
-                                       status_info,
-                                       output,
-                                       parser);
-}
-
-int
-TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport,
-                                               TAO_GIOP_Locate_Request_Header &request,
-                                               TAO_GIOP_Locate_Status_Msg &status_info,
-                                               TAO_OutputCDR &output,
-                                               TAO_GIOP_Message_Generator_Parser *parser)
-{
-  // Note here we are making the Locate reply header which is *QUITE*
-  // different from the reply header made by the make_reply () call..
-  // Make the GIOP message header
-  this->write_protocol_header (TAO_GIOP_LOCATEREPLY,
-                               output);
-
-  // This writes the header & body
-  parser->write_locate_reply_mesg (output,
-                                   request.request_id (),
-                                   status_info);
-
-  // Send the message
-  int result = transport->send_message (output,
-                                        0,
-                                        TAO_Transport::TAO_REPLY);
-
-  // Print out message if there is an error
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
-                      ACE_TEXT ("TAO_GIOP_Message_Base::make_send_locate_reply")));
-        }
-    }
-
-  return result;
-}
-
-// Send an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive disconnect (at
-// the application level, if not at the level of TCP).
-//
-// NOTE that IIOP will still benefit from TCP's orderly disconnect.
-int
-TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
-{
-  const char
-    error_message [TAO_GIOP_MESSAGE_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    (CORBA::Octet) 1, // Use the lowest GIOP version
-    (CORBA::Octet) 0,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP_MESSAGERROR,
-    0, 0, 0, 0
-  };
-
-  // @@ Q: How does this works with GIOP lite?
-  //    A: It doesn't
-
-  this->dump_msg ("send_error",
-                  (const u_char *) error_message,
-                  TAO_GIOP_MESSAGE_HEADER_LEN);
-
-  ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
-                             ACE_Message_Block::MB_DATA,
-                             error_message,
-                             0,
-                             0,
-                             ACE_Message_Block::DONT_DELETE,
-                             0);
-  ACE_Message_Block message_block(&data_block,
-                                  ACE_Message_Block::DONT_DELETE);
-  message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
-
-  size_t bt;
-  int result = transport->send_message_block_chain (&message_block, bt);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u\n"),
-                    transport->id ()));
-    }
-
-  return result;
-}
-
-void
-TAO_GIOP_Message_Base::set_state (
-    CORBA::Octet def_major,
-    CORBA::Octet def_minor,
-    TAO_GIOP_Message_Generator_Parser *&gen_parser) const
-{
-  switch (def_major)
-    {
-    case 1:
-      switch (def_minor)
-        {
-        case 0:
-          gen_parser =
-            const_cast<TAO_GIOP_Message_Generator_Parser_10 *> (
-                                     &this->tao_giop_impl_.tao_giop_10);
-          break;
-        case 1:
-          gen_parser =
-            const_cast<TAO_GIOP_Message_Generator_Parser_11 *> (
-                                     &this->tao_giop_impl_.tao_giop_11);
-          break;
-        case 2:
-          gen_parser =
-            const_cast<TAO_GIOP_Message_Generator_Parser_12 *> (
-                                     &this->tao_giop_impl_.tao_giop_12);
-          break;
-        default:
-          break;
-        }
-      break;
-    default:
-      break;
-    }
-}
-
-
-// Server sends an "I'm shutting down now, any requests you've sent me
-// can be retried" message to the server.  The message is prefab, for
-// simplicity.
-//
-// NOTE: this is IIOP-specific though it doesn't look like it is.  It
-// relies on a TCP-ism: orderly disconnect, which doesn't exist in all
-// transport protocols.  Versions of GIOP atop some transport that's
-// lacking orderly disconnect must define some transport-specific
-// handshaking (e.g. the XNS/SPP handshake convention) in order to
-// know that the same transport semantics are provided when shutdown
-// is begun with messages "in flight". (IIOP doesn't report false
-// errors in the case of "clean shutdown", because it relies on
-// orderly disconnect as provided by TCP.  This quality of service is
-// required to write robust distributed systems.)
-
-void
-TAO_GIOP_Message_Base::
-  send_close_connection (const TAO_GIOP_Message_Version &version,
-                         TAO_Transport *transport,
-                         void *)
-{
-
-  // static CORBA::Octet
-  // I hate  this in every method. Till the time I figure out a way
-  // around  I will have them here hanging around.
-  const char close_message [TAO_GIOP_MESSAGE_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    version.major,
-    version.minor,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP_CLOSECONNECTION,
-    0, 0, 0, 0
-  };
-
-  // It's important that we use a reliable shutdown after we send this
-  // message, so we know it's received.
-  //
-  // @@ should recv and discard queued data for portability; note
-  // that this won't block (long) since we never set SO_LINGER
-
-  this->dump_msg ("send_close_connection",
-                  (const u_char *) close_message,
-                  TAO_GIOP_MESSAGE_HEADER_LEN);
-
-#if 0
-  // @@CJC I don't think we need this check b/c the transport's send()
-  // will simply return -1.  However, I guess we could create something
-  // like TAO_Tranport::is_closed() that returns whether the connection
-  // is already closed.  The problem with that, however, is that it's
-  // entirely possible that is_closed() could return TRUE, and then the
-  // transport could get closed down btw. the time it gets called and the
-  // time that the send actually occurs.
-  ACE_HANDLE which = transport->handle ();
-  if (which == ACE_INVALID_HANDLE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -"
-                    " connection already closed\n"));
-      return;
-    }
-#endif
-
-  ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
-                             ACE_Message_Block::MB_DATA,
-                             close_message,
-                             0,
-                             0,
-                             ACE_Message_Block::DONT_DELETE,
-                             0);
-  ACE_Message_Block message_block(&data_block);
-  message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
-
-  size_t bt;
-  int result = transport->send_message_block_chain (&message_block, bt);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) error closing connection %u, errno = %d\n",
-                    transport->id (), errno));
-    }
-
-  transport->close_connection ();
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) shut down transport, handle %d\n",
-              transport-> id ()));
-
-}
-
-
-int
-TAO_GIOP_Message_Base::send_reply_exception (
-    TAO_Transport *transport,
-    TAO_OutputCDR &output,
-    CORBA::ULong request_id,
-    IOP::ServiceContextList *svc_info,
-    CORBA::Exception *x
-  )
-{
-  TAO_Pluggable_Reply_Params_Base reply_params;
-  reply_params.request_id_ = request_id;
-  reply_params.svc_ctx_.length (0);
-
-  // We are going to send some data
-  reply_params.argument_flag_ = 1;
-
-  // Send back the service context we received.  (RTCORBA relies on
-  // this).
-  reply_params.service_context_notowned (svc_info);
-
-  reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
-
-  if (CORBA::SystemException::_downcast (x) != 0)
-    {
-      reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  if (this->generate_exception_reply (output,
-                                      reply_params,
-                                      *x) == -1)
-    return -1;
-
-  return transport->send_message (output,
-                                  0,
-                                  TAO_Transport::TAO_REPLY);
-}
-
-void
-TAO_GIOP_Message_Base::dump_msg (const char *label,
-                                 const u_char *ptr,
-                                 size_t len)
-{
-
-  if (TAO_debug_level >= 5)
-    {
-      static const char digits[] = "0123456789ABCD";
-      static const char *names[] =
-      {
-        "Request",
-        "Reply",
-        "CancelRequest",
-        "LocateRequest",
-        "LocateReply",
-        "CloseConnection",
-        "MessageError",
-        "Fragment"
-      };
-
-      // Message name.
-      const char *message_name = "UNKNOWN MESSAGE";
-      u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-      if (slot < sizeof (names) / sizeof (names[0]))
-        message_name = names[slot];
-
-      // Byte order.
-      int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
-
-      // Get the version info
-      CORBA::Octet major = ptr[TAO_GIOP_VERSION_MAJOR_OFFSET];
-      CORBA::Octet minor = ptr[TAO_GIOP_VERSION_MINOR_OFFSET];
-
-      // request/reply id.
-      CORBA::ULong tmp = 0;
-      CORBA::ULong *id = &tmp;
-      char *tmp_id = 0;
-
-      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
-          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
-        {
-          if (major == 1 && minor < 2)
-            {
-              // @@ Only works if ServiceContextList is empty....
-              tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN  + 4);
-            }
-          else
-            {
-              tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN);
-            }
-#if !defined (ACE_DISABLE_SWAP_ON_READ)
-      if (byte_order == TAO_ENCAP_BYTE_ORDER)
-        {
-          id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
-        }
-      else
-        {
-          ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id));
-        }
-#else
-      id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
-#endif /* ACE_DISABLE_SWAP_ON_READ */
-
-        }
-
-      // Print.
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - GIOP_Message_Base::dump_msg, "
-                  "%s GIOP v%c.%c msg, %d data bytes, %s endian, "
-                  "Type %s[%u]\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (label),
-                  digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
-                  digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
-                  len - TAO_GIOP_MESSAGE_HEADER_LEN ,
-                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"),
-                  ACE_TEXT_CHAR_TO_TCHAR(message_name),
-                  *id));
-
-      if (TAO_debug_level >= 10)
-        ACE_HEX_DUMP ((LM_DEBUG,
-                       (const char *) ptr,
-                       len,
-                       ACE_TEXT ("GIOP message")));
-    }
-}
-
-int
-TAO_GIOP_Message_Base::generate_locate_reply_header (
-    TAO_OutputCDR & /*cdr*/,
-    TAO_Pluggable_Reply_Params_Base & /*params*/)
-{
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Base::is_ready_for_bidirectional (TAO_OutputCDR &msg)
-{
-  // Get a parser for us
-  TAO_GIOP_Message_Generator_Parser *parser = 0;
-
-  CORBA::Octet major, minor = 0;
-
-  msg.get_version (major, minor);
-
-  // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   parser);
-
-  // We dont really know.. So ask the generator and parser objects that
-  // we know.
-  // @@ TODO: Need to make this faster, instead of making virtual
-  // call, try todo the check within this class
-  return parser->is_ready_for_bidirectional ();
-}
-
-
-TAO_Queued_Data *
-TAO_GIOP_Message_Base::make_queued_data (size_t sz)
-{
-  // Get a node for the queue..
-  TAO_Queued_Data *qd =
-    TAO_Queued_Data::make_queued_data (
-      this->orb_core_->transport_message_buffer_allocator ());
-
-  // @@todo: We have a similar method in Transport.cpp. Need to see how
-  // we can factor them out..
-  // Make a datablock for the size requested + something. The
-  // "something" is required because we are going to align the data
-  // block in the message block. During alignment we could loose some
-  // bytes. As we may not know how many bytes will be lost, we will
-  // allocate ACE_CDR::MAX_ALIGNMENT extra.
-  ACE_Data_Block *db =
-    this->orb_core_->create_input_cdr_data_block (sz +
-                                                  ACE_CDR::MAX_ALIGNMENT);
-
-  ACE_Allocator *alloc =
-    this->orb_core_->input_cdr_msgblock_allocator ();
-
-  ACE_Message_Block mb (db,
-                        0,
-                        alloc);
-
-  ACE_Message_Block *new_mb = mb.duplicate ();
-
-  ACE_CDR::mb_align (new_mb);
-
-  qd->msg_block_ = new_mb;
-
-
-  return qd;
-}
-
-size_t
-TAO_GIOP_Message_Base::header_length (void) const
-{
-  return TAO_GIOP_MESSAGE_HEADER_LEN;
-}
-
-size_t
-TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major,
-                                               CORBA::Octet minor) const
-{
-  TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
-
-  // Get the state information that we need to use
-  this->set_state (major,
-                   minor,
-                   generator_parser);
-
-  return generator_parser->fragment_header_length ();
-}
-
-void
-TAO_GIOP_Message_Base::init_queued_data (
-                               TAO_Queued_Data* qd,
-                               const TAO_GIOP_Message_State& state) const
-{
-  qd->byte_order_     = state.byte_order_;
-  qd->major_version_  = state.giop_version_.major;
-  qd->minor_version_  = state.giop_version_.minor;
-  qd->more_fragments_ = state.more_fragments_;
-  qd->request_id_     = state.request_id_;
-  qd->msg_type_       = this->message_type (state);
-}
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
deleted file mode 100644
index 52e0ff0fdad..00000000000
--- a/TAO/tao/GIOP_Message_Base.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-//
-// ===================================================================
-/**
- *  @file GIOP_Message_Base.h
- *
- *  $Id$
- *
- *  @author Initially Copyrighted by Sun Microsystems Inc., 1994-1995,
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_BASE_H
-#define TAO_GIOP_MESSAGE_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Pluggable_Messaging.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/GIOP_Message_Generator_Parser_Impl.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/GIOP_Message_State.h"
-#include "tao/CDR.h"
-
-class TAO_Pluggable_Reply_Params;
-class TAO_Queued_Data;
-
-/**
- * @class TAO_GIOP_Message_Base
- *
- * @brief Definitions of the GIOP specific stuff.
- *
- * This class will hold the specific details common to all the GIOP
- * versions. Some of them which are here may be shifted if things
- * start changing between versions. This class uses the
- * TAO_GIOP_Message_Reactive_Handler to read and parse messages.
- */
-
-class TAO_Export TAO_GIOP_Message_Base : public TAO_Pluggable_Messaging
-{
-public:
-  /// Constructor
-  TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
-                         size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
-
-  /// Dtor
-  virtual ~TAO_GIOP_Message_Base (void);
-
-  /// Initialize the underlying state object based on the @a major and
-  /// @a minor revision numbers
-  virtual void init (CORBA::Octet major,
-                     CORBA::Octet minor);
-
-  /// Reset the messaging the object
-  virtual void reset (void);
-
-  /// Write the RequestHeader in to the @a cdr stream. The underlying
-  /// implementation of the mesaging should do the right thing.
-  virtual int generate_request_header (TAO_Operation_Details &op,
-                                       TAO_Target_Specification &spec,
-                                       TAO_OutputCDR &cdr);
-
-  /// Write the RequestHeader in to the @a cdr stream.
-  virtual int generate_locate_request_header (
-      TAO_Operation_Details &op,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &cdr
-    );
-
-  /// Write the reply header
-  virtual int generate_reply_header (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params
-    );
-
-  /// This method reads the message on the connection. Returns 0 when
-  /// there is short read on the connection. Returns 1 when the full
-  /// message is read and handled. Returns -1 on errors. If @a block is
-  /// 1, then reply is read in a blocking manner.
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0);
-
-
-  /// Format the message. As we have not written the message length in
-  /// the header, we make use of this oppurtunity to insert and format
-  /// the message.
-  virtual int format_message (TAO_OutputCDR &cdr);
-
-  /// Parse the incoming messages..
-  ///
-  /// \return -1 There was some error parsing the GIOP header
-  /// \return 0  The GIOP header was parsed correctly
-  /// \return 1  There was not enough data in the message block to
-  ///            parse the header
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block);
-
-  /// Calculate the amount of data that is missing in the <incoming>
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &message_block);
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-   */
-  virtual int extract_next_message (ACE_Message_Block &incoming,
-                                    TAO_Queued_Data *&qd);
-
-  /// Check whether the node @a qd needs consolidation from @a incoming.
-  virtual int consolidate_node (TAO_Queued_Data *qd,
-                                ACE_Message_Block &incoming);
-
-  /// Get the details of the message parsed through the @a qd.
-  virtual void get_message_data (TAO_Queued_Data *qd);
-
-  /// Process the request message that we have received on the
-  /// connection
-  virtual int process_request_message (TAO_Transport *transport,
-                                       TAO_Queued_Data *qd);
-
-
-  /// Parse the reply message that we received and return the reply
-  /// information through @a reply_info
-  virtual int process_reply_message (
-      TAO_Pluggable_Reply_Params &reply_info,
-      TAO_Queued_Data *qd);
-
-  /// Generate a reply message with the exception @a ex.
-  virtual int generate_exception_reply (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
-    );
-
-  /// Header length
-  virtual size_t header_length (void) const;
-
-  /// The header length of a fragment
-  virtual size_t fragment_header_length (CORBA::Octet major,
-                                         CORBA::Octet minor) const;
-
-  virtual TAO_OutputCDR &out_stream (void);
-protected:
-
-  /// Processes the GIOP_REQUEST messages
-  int process_request (TAO_Transport *transport,
-                       TAO_InputCDR &input,
-                       TAO_OutputCDR &output,
-                       TAO_GIOP_Message_Generator_Parser *);
-
-  /// Processes the GIOP_LOCATE_REQUEST messages
-  int process_locate_request (TAO_Transport *transport,
-                              TAO_InputCDR &input,
-                              TAO_OutputCDR &output,
-                              TAO_GIOP_Message_Generator_Parser *);
-
-  /// Set the state
-  void set_state (CORBA::Octet major,
-                  CORBA::Octet minor,
-                  TAO_GIOP_Message_Generator_Parser *&) const;
-
-  /// Print out a debug messages..
-  void dump_msg (const char *label,
-                 const u_char *ptr,
-                 size_t len);
-
-  /// Get the message type. The return value would be one of the
-  /// following:
-  /// TAO_PLUGGABLE_MESSAGE_REQUEST,
-  /// TAO_PLUGGABLE_MESSAGE_REPLY,
-  /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
-  /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.
-  TAO_Pluggable_Message_Type message_type (
-                               const TAO_GIOP_Message_State &state) const;
-
-private:
-
-  /// Writes the GIOP header in to @a msg
-  /// @note If the GIOP header happens to change in the future, we can
-  /// push this method in to the generator_parser classes.
-  int write_protocol_header (TAO_GIOP_Message_Type t,
-                             TAO_OutputCDR &msg);
-
-  /// Make a GIOP_LOCATEREPLY and hand that over to the transport so
-  /// that it can be sent over the connection.
-  /// @note As on date 1.1 & 1.2 seem to have similar headers. Till an
-  /// unmanageable difference comes let them be implemented here.
-  int make_send_locate_reply (TAO_Transport *transport,
-                              TAO_GIOP_Locate_Request_Header &request,
-                              TAO_GIOP_Locate_Status_Msg &status,
-                              TAO_OutputCDR &output,
-                              TAO_GIOP_Message_Generator_Parser *);
-
-  /// Send error messages
-  int  send_error (TAO_Transport *transport);
-
-  /// Close a connection, first sending GIOP::CloseConnection.
-  void send_close_connection (const TAO_GIOP_Message_Version &version,
-                              TAO_Transport *transport,
-                              void *ctx);
-
-  /// We must send a LocateReply through @a transport, this request
-  /// resulted in some kind of exception.
-  int send_reply_exception (TAO_Transport *transport,
-                            TAO_OutputCDR &cdr,
-                            CORBA::ULong request_id,
-                            IOP::ServiceContextList *svc_info,
-                            CORBA::Exception *x);
-
-
-  /// Write the locate reply header
-  virtual int generate_locate_reply_header (
-      TAO_OutputCDR & /*cdr*/,
-      TAO_Pluggable_Reply_Params_Base & /*params*/);
-
-  /// Is the messaging object ready for processing BiDirectional
-  /// request/response?
-  virtual int is_ready_for_bidirectional (TAO_OutputCDR &msg);
-
-  /// Creates a new node for the queue with a message block in the
-  /// node of size @a sz.
-  TAO_Queued_Data *make_queued_data (size_t sz);
-
-  /// Initialize the TAO_Queued_Data from the relevant portions of
-  /// a GIOP_Message_State.
-  void init_queued_data (TAO_Queued_Data* qd,
-                         const TAO_GIOP_Message_State& state) const;
-
-private:
-  /// Cached ORB_Core pointer...
-  TAO_ORB_Core *orb_core_;
-
-  /// The message handler object that does reading and parsing of the
-  /// incoming messages
-  TAO_GIOP_Message_State message_state_;
-
-  /// All the implementations of GIOP message generator and parsers
-  TAO_GIOP_Message_Generator_Parser_Impl tao_giop_impl_;
-
-protected:
-  /// Buffer used for both the output and input CDR streams, this is
-  /// "safe" because we only one of the streams at a time.
-  char buffer_[ACE_CDR::DEFAULT_BUFSIZE];
-
-  /// Buffer where the request is placed.
-  TAO_OutputCDR out_stream_;
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_BASE_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
deleted file mode 100644
index cc5fc953b2c..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/GIOP_Message_Generator_Parser.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           GIOP_Message_Gen_Parser,
-           "$Id$")
-
-int
-TAO_GIOP_Message_Generator_Parser::parse_reply (
-    TAO_InputCDR &stream,
-    TAO_Pluggable_Reply_Params &params)
-{
-
-  // Read the request id
-  if (!stream.read_ulong (params.request_id_))
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply :")
-                      ACE_TEXT ("extracting request id\n")));
-        }
-    }
-
-  // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-
-  // Cannot handle LOCATION_FORWARD_PERM here
-  CORBA::ULong rep_stat = 0;
-  if (!stream.read_ulong (rep_stat))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, ")
-                    ACE_TEXT ("extracting reply status\n")));
-      return -1;
-    }
-
-
-  // Pass the right Pluggable interface code to the transport layer
-  switch (rep_stat)
-    {
-      // Request completed successfully
-    case TAO_GIOP_NO_EXCEPTION:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
-      break;
-
-      // Request terminated with user exception
-    case TAO_GIOP_USER_EXCEPTION:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION;
-      break;
-      // Request terminated with system exception
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION;
-      break;
-      // Reply is a location forward type
-    case TAO_GIOP_LOCATION_FORWARD:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
-      break;
-      // Reply is a location forward perm type
-      // @@For the time being the behaviour of the
-      // LOCATION_FORWARD_PERM would be similar to the
-      // LOCATION_FORWARD as there is a controversy surrounding the
-      // usage of this in the OMG.
-    case TAO_GIOP_LOCATION_FORWARD_PERM:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
-      break;
-      // Reply is a location forward type
-    case TAO_GIOP_NEEDS_ADDRESSING_MODE:
-      params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE;
-      break;
-    default:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%N|%l) Unknown reply status \n")));
-    }
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
-    TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params)
-{
-  // Read the request id
-  if (!cdr.read_ulong (params.request_id_))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t|%N|%l):parse_locate_reply, ")
-                    ACE_TEXT ("extracting request id\n")));
-
-      return -1;
-    }
-
-  // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-
-  // Cannot handle LOCATION_FORWARD_PERM here
-
-  // Please note here that we are NOT converting to the Pluggable
-  // messaging layer exception as this is GIOP specific. Not many
-  // messaging protocols have the locate_* messages.
-  if (!cdr.read_ulong (params.reply_status_))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO N|(%P|%t|l) parse_locate_reply, ")
-                    ACE_TEXT ("extracting reply  status\n")));
-
-      return -1;
-    }
-
-  return 0;
-
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional (void)
-{
-  return 0;
-}
-
-void
-TAO_GIOP_Message_Generator_Parser::marshal_reply_status (
-    TAO_OutputCDR &output,
-    TAO_Pluggable_Reply_Params_Base &reply
-  )
-{
-  switch (reply.reply_status_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
-      output.write_ulong (TAO_GIOP_NO_EXCEPTION);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-      output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-      output.write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-      output.write_ulong (TAO_GIOP_USER_EXCEPTION);
-      break;
-    default:
-      // Some other specific exception
-      output.write_ulong (reply.reply_status_);
-      break;
-    }
-}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
deleted file mode 100644
index f4d05a7ec7e..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   GIOP_Message_Generator_Parser.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_H
-#define TAO_GIOP_MESSAGE_GENERATOR_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Global_Macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-class TAO_Operation_Details;
-class TAO_Target_Specification;
-class TAO_OutputCDR;
-class TAO_InputCDR;
-class TAO_Pluggable_Reply_Params;
-class TAO_Pluggable_Reply_Params_Base;
-class TAO_GIOP_Locate_Status_Msg;
-class TAO_GIOP_Locate_Request_Header;
-class TAO_ServerRequest;
-
-/**
- * @class TAO_GIOP_Message_Generator_Parser
- *
- * @brief Base class for the GIOP Message generator and parser
- *
- * Version specific classes would inherit from this class. Strategy to
- * determine which version of the GIOP request have we received and
- * which version do we need to use to send messages.
- */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser
-{
-public:
-
-  virtual ~TAO_GIOP_Message_Generator_Parser (void) {}
-
-  /// Write the request header in to @a msg
-  virtual int write_request_header (
-      const TAO_Operation_Details &opdetails,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg) = 0;
-
-  /// Write the LocateRequest header
-  virtual int write_locate_request_header (
-      CORBA::ULong request_id,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg) = 0;
-
-  /// Write the reply header in to @a output
-  virtual int write_reply_header (
-      TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  /// Writes the locate _reply message in to the @a output
-  virtual int write_locate_reply_mesg (
-      TAO_OutputCDR &output,
-      CORBA::ULong request_id,
-      TAO_GIOP_Locate_Status_Msg &status) = 0;
-
-  /// Parse the Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_request_header (TAO_ServerRequest &) = 0;
-
-  /// Parse the Loacte Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &) = 0;
-
-  /// Parse the reply message
-  virtual int parse_reply (TAO_InputCDR &input,
-                           TAO_Pluggable_Reply_Params &params);
-
-  /// Parse the locate reply message from the server
-  virtual int parse_locate_reply (TAO_InputCDR &input,
-                                  TAO_Pluggable_Reply_Params &params);
-
-  /// Our versions
-  virtual CORBA::Octet major_version (void) = 0;
-  virtual CORBA::Octet minor_version (void) = 0;
-
-  /// Is the messaging object ready for processing BiDirectional
-  /// request/response?
-  virtual int is_ready_for_bidirectional (void);
-
-  /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const = 0;
-
-protected:
-
-  /// Marshall the reply status
-  void marshal_reply_status (TAO_OutputCDR &output,
-                             TAO_Pluggable_Reply_Params_Base &reply);
-
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
deleted file mode 100644
index c76d5b60b18..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ /dev/null
@@ -1,484 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/GIOP_Message_Generator_Parser_10.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/GIOP_Message_Locate_Header.h"
-#include "tao/operation_details.h"
-#include "tao/debug.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           GIOP_Message_Gen_Parser_10,
-           "$Id$")
-
-int
-TAO_GIOP_Message_Generator_Parser_10::write_request_header (
-    const TAO_Operation_Details &opdetails,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg)
-{
-  // Write the service context list
-  msg << opdetails.request_service_info ();
-
-  // The request ID
-  msg << opdetails.request_id ();
-
-  const CORBA::Octet response_flags = opdetails.response_flags ();
-
-  // Write the response flags
-  if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    {
-      msg << CORBA::Any::from_octet (1);
-    }
-  else
-    {
-      msg << CORBA::Any::from_octet (0);
-    }
-
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
-  // anyway.
-  const TAO::ObjectKey *key = spec.object_key ();
-
-  if (key)
-    {
-      // Put in the object key
-      msg << *key;
-    }
-  else
-    {
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
-        }
-      return 0;
-    }
-
-  msg.write_string (opdetails.opname_len (),
-                    opdetails.opname ());
-
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-
-  /***** This has been deprecated in the 2.4 spec ******/
-
-#if defined (TAO_PEER_REQUIRES_PRINCIPAL)
-
-  char username[BUFSIZ];
-  char *result =
-    ACE_OS::cuserid (username,
-                     BUFSIZ);
-
-  if (result != 0)
-    {
-      const CORBA::ULong username_size =
-        static_cast<CORBA::ULong> (ACE_OS::strlen (username));
-
-      CORBA::Octet *buffer =
-        CORBA::OctetSeq::allocbuf (username_size + 1);
-
-      ACE_OS::memcpy (buffer,
-                      username,
-                      username_size + 1);
-
-      req_principal.replace (username_size + 1,
-                             username_size + 1,
-                             buffer,
-                             1);
-    }
-
-#else
-
-  CORBA::OctetSeq req_principal (0);
-  req_principal.length (0);
-
-#endif /* TAO_PEER_REQUIRES_PRINCIPAL */
-
-  msg << req_principal;
-
-  return 1;
-}
-
-
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
-    CORBA::ULong request_id,
-    TAO_Target_Specification  &spec,
-    TAO_OutputCDR &msg)
-{
-  msg << request_id;
-
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
-  // anyway.
-  const TAO::ObjectKey *key = spec.object_key ();
-
-  if (key)
-    {
-      // Everything is fine
-      msg << *key;
-    }
-  else
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%N | %l) Unable to handle this request \n")));
-      return 0;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
-    TAO_OutputCDR &output,
-    TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Write the service context list.
-#if (TAO_HAS_MINIMUM_CORBA == 1)
-  output << reply.service_context_notowned ();
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-#else
-  if (reply.is_dsi_ == 0)
-    {
-      output << reply.service_context_notowned ();
-    }
-  else
-    {
-      // If lazy evaluation is enabled then we are going to insert an
-      // extra node at the end of the service context list, just to
-      // force the appropriate padding.
-      // But first we take it out any of them..
-      CORBA::ULong count = 0;
-      IOP::ServiceContextList &svc_ctx =
-        reply.service_context_notowned ();
-      CORBA::ULong l = svc_ctx.length ();
-      CORBA::ULong i;
-
-      for (i = 0; i != l; ++i)
-        {
-          if (svc_ctx[i].context_id == TAO_SVC_CONTEXT_ALIGN)
-            {
-              continue;
-            }
-
-          count++;
-        }
-
-      // Now increment it to account for the last dummy one...
-      count++;
-
-      // Now marshal the rest of the service context objects
-      output << count;
-      for (i = 0; i != l; ++i)
-        {
-          if (svc_ctx[i].context_id == TAO_SVC_CONTEXT_ALIGN)
-            {
-              continue;
-            }
-
-          output << svc_ctx[i];
-        }
-
-    }
-
-  if (reply.is_dsi_ == 1)
-    {
-      // @@ Much of this code is GIOP 1.1 specific and should be
-      ptrdiff_t target = reply.dsi_nvlist_align_;
-
-      ptrdiff_t current =
-        ptrdiff_t (output.current_alignment ()) % ACE_CDR::MAX_ALIGNMENT;
-
-      CORBA::ULong pad = 0;
-
-      if (target == 0)
-        {
-          // We want to generate adequate padding to start the request
-          // id on a 8 byte boundary, two cases:
-          // - If the dummy tag starts on a 4 byte boundary and the
-          //   dummy sequence has 0 elements then we have:
-          //   4:tag 8:sequence_length 4:sequence_body 4:request_id
-          //   8:payload
-          // - If the dummy tag starts on an 8 byte boundary, with 4
-          //   elements we get:
-          //   8:tag 4:sequence_length 8:sequence_body 4:request_id
-          //   8:payload
-          if (current != 0 && current <= ACE_CDR::LONG_ALIGN)
-            {
-              pad = 4;
-            }
-        }
-      else if (target != ACE_CDR::LONG_ALIGN)
-        {
-          // The situation reverses, we want to generate adequate
-          // padding to start the request id on a 4 byte boundary, two
-          // cases:
-          // - If the dummy tag starts on a 4 byte boundary and the
-          //   dummy sequence has 4 elements then we have:
-          //   4:tag 8:sequence_length 4:sequence_body 8:request_id
-          //   4:payload
-          // - If the dummy tag starts on an 8 byte boundary, with 0
-          //   elements we get:
-          //   8:tag 4:sequence_length 8:sequence_body 8:request_id
-          //   4:payload
-          if (current > ACE_CDR::LONG_ALIGN)
-            {
-              pad = 4;
-            }
-        }
-      else if (target == ACE_CDR::MAX_ALIGNMENT)
-        {
-          pad = 0;
-        }
-      else
-        {
-          // <target> can only have the values above
-          ACE_THROW_RETURN (CORBA::MARSHAL (),
-                            0);
-        }
-
-      output << CORBA::ULong (TAO_SVC_CONTEXT_ALIGN);
-      output << pad;
-
-      for (CORBA::ULong j = 0; j != pad; ++j)
-        {
-          output << ACE_OutputCDR::from_octet(0);
-        }
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Write the request ID
-  output.write_ulong (reply.request_id_);
-
-  // Write the reply status
-  this->marshal_reply_status (output,
-                              reply);
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::write_locate_reply_mesg (
-    TAO_OutputCDR &output,
-    CORBA::ULong request_id,
-    TAO_GIOP_Locate_Status_Msg &status_info
-  )
-{
-  // Make the header for the locate request
-  output.write_ulong (request_id);
-  output.write_ulong (status_info.status);
-
-  if (status_info.status == TAO_GIOP_OBJECT_FORWARD)
-    {
-      CORBA::Object_ptr object_ptr =
-        status_info.forward_location_var.in ();
-
-      if ((output << object_ptr) == 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((
-                  LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t|%N|%l) write_locate_reply_mesg-")
-                  ACE_TEXT (" cannot marshal object reference\n")
-                ));
-            }
-        }
-    }
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
-    TAO_ServerRequest &request)
-{
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-
-  // Get the input CDR in the request class
-  TAO_InputCDR & input = *request.incoming ();
-
-  IOP::ServiceContextList &service_info =
-    request.request_service_info ();
-
-  input >> service_info;
-
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
-
-  CORBA::ULong req_id;
-
-  // Get the rest of the request header ...
-  hdr_status = hdr_status && input.read_ulong (req_id);
-
-  request.request_id (req_id);
-
-  CORBA::Octet response_flags;
-  hdr_status = hdr_status && input.read_octet (response_flags);
-  request.response_expected ((response_flags != 0));
-
-  // This is not supported now in GIOP 1.1
-  request.sync_with_server (0);
-
-  // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-
-  hdr_status =
-    hdr_status && request.profile ().unmarshall_object_key (input);
-
-  // According to the CORBA 2.6.1 (and older) specification, the operation
-  // name is an IDL Identifier. Identifiers must be composed of ASCII letters,
-  // numbers, and underscores, starting with a letter. Based on this, and
-  // the fact that I could find no text explicitly requiring operation name
-  // translation, nor could others in the CORBA community, the operation name
-  // will not be translated regardless of the translation of other strings.
-  //
-  CORBA::ULong length = 0;
-  hdr_status = hdr_status && input.read_ulong (length);
-
-  if (hdr_status)
-    {
-      // Do not include NULL character at the end.
-      // @@ This is not getting demarshaled using the codeset
-      //    translators!
-
-      // Notice that there are no memory allocations involved
-      // here!
-      request.operation (input.rd_ptr (),
-                         length - 1,
-                         0 /* TAO_ServerRequest does NOT own string */);
-      hdr_status = input.skip_bytes (length);
-    }
-
-  if (hdr_status)
-    {
-      /**** This has been deprecated in 2.4 ****/
-      /*CORBA::Principal_var principal;
-
-      input >> principal.out ();
-
-      request.requesting_principal (principal.in ()); */
-
-      CORBA::OctetSeq oct_seq;
-      input >> oct_seq;
-      request.requesting_principal (oct_seq);
-      hdr_status = (CORBA::Boolean) input.good_bit ();
-    }
-
-
-  return hdr_status ? 0 : -1;
-}
-
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::parse_locate_header (
-    TAO_GIOP_Locate_Request_Header &request
-  )
-{
-  // Get the stream
-  TAO_InputCDR &msg = request.incoming_stream ();
-
-  CORBA::Boolean hdr_status = 1;
-
-  // Get the request id
-  CORBA::ULong req_id = 0;
-  hdr_status = msg.read_ulong (req_id);
-
-  // Store it in the Locate request classes
-  request.request_id (req_id);
-
-  // Get the object key
-  hdr_status =
-    hdr_status && request.profile ().unmarshall_object_key (msg);
-
-  return hdr_status ? 0 : -1;
-}
-
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::parse_reply (
-    TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params)
-
-{
-  // Read the service context list first
-  if ((cdr >> params.svc_ctx_) == 0)
-    {
-      if (TAO_debug_level >     0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) parse_reply, ")
-                    ACE_TEXT ("extracting context\n")));
-      return -1;
-    }
-
-  // Call the base class for further processing
-  if (TAO_GIOP_Message_Generator_Parser::parse_reply (cdr,
-                                                      params) == -1)
-    return -1;
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_10::parse_locate_reply (
-    TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
-{
-  if (TAO_GIOP_Message_Generator_Parser::parse_locate_reply (cdr,
-                                                             params) == -1)
-
-    return -1;
-
-  return 0;
-}
-
-CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_10::major_version (void)
-{
-  // Any harm in hardcoding??
-  return (CORBA::Octet) 1;
-}
-
-CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_10::minor_version (void)
-{
-  // Any harm in hardcoding??
-  return 0;
-}
-
-size_t
-TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const
-{
-  return 0;
-}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
deleted file mode 100644
index 848f83fffd2..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ /dev/null
@@ -1,94 +0,0 @@
-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   GIOP_Message_Generator_Parser_10.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H
-#define TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/GIOP_Message_Generator_Parser.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_GIOP_Message_State;
-
-/**
- * @class TAO_GIOP_Message_Generator_Parser_10
- *
- * @brief Implementation for GIOP v1.0
- *
- */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser_10:
-  public TAO_GIOP_Message_Generator_Parser
-{
-public:
-
-  /// Write the request header in to @a msg
-  virtual int write_request_header (
-      const TAO_Operation_Details &opdetails,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
-
-  /// Write the LocateRequest header
-  virtual int write_locate_request_header (
-      CORBA::ULong request_id,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
-
-  /// Write the reply header in to @a output
-  virtual int write_reply_header (
-      TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Writes the locate _reply message in to the @a output
-  virtual int write_locate_reply_mesg (
-      TAO_OutputCDR &output,
-      CORBA::ULong request_id,
-      TAO_GIOP_Locate_Status_Msg &status
-    );
-
-  /// Parse the Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_request_header (TAO_ServerRequest &);
-
-  /// Parse the LocateRequest Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &
-    );
-
-  /// Parse the reply message from the server
-  virtual int parse_reply (TAO_InputCDR &input,
-                           TAO_Pluggable_Reply_Params &params);
-
-    /// Parse the reply message from the server
-  virtual int parse_locate_reply (TAO_InputCDR &input,
-                                  TAO_Pluggable_Reply_Params &params);
-
-  /// Our versions
-  virtual CORBA::Octet major_version (void);
-  virtual CORBA::Octet minor_version (void);
-
-  /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const;
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
deleted file mode 100644
index 0d9bd94c60a..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "tao/GIOP_Message_Generator_Parser_11.h"
-
-ACE_RCSID (tao, 
-           GIOP_Message_Gen_Parser_11, 
-           "$Id$")
-
-CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_11::minor_version (void)
-{
-  return (CORBA::Octet) 1;
-}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h
deleted file mode 100644
index fd4232fe1b8..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   GIOP_Message_Generator_Parser_11.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H
-#define TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/GIOP_Message_Generator_Parser_10.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_GIOP_Message_Generator_Parser_11
- *
- * @brief Implementation for GIOP v1.1
- *
- *  This just derives from v1.0 class. It uses most of the methods in
- *  the 1.0 class.
- *
- */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser_11:
-  public TAO_GIOP_Message_Generator_Parser_10
-{
-public:
-
-  /// Our minor version
-  virtual CORBA::Octet minor_version (void);
-
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
deleted file mode 100644
index 411058acd2a..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-#include "tao/GIOP_Message_Generator_Parser_12.h"
-#include "tao/GIOPC.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/GIOP_Message_Locate_Header.h"
-#include "tao/operation_details.h"
-#include "tao/debug.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/GIOP_Message_State.h"  
-#include "tao/TAO_Server_Request.h"
-#include "tao/TAOC.h"
-#include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (tao,
-           GIOP_Message_Gen_Parser_12,
-           "$Id$")
-
-// This is used by GIOP1.2. This is to align the message body on a
-// 8-octet boundary. This is declared static so that it is in file
-// scope.
-static const size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8;
-
-int
-TAO_GIOP_Message_Generator_Parser_12::write_request_header (
-    const TAO_Operation_Details &opdetails,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg
-  )
-{
-  // First the request id
-  msg << opdetails.request_id ();
-
-  const CORBA::Octet response_flags = opdetails.response_flags ();
-
-  // Here are the Octet values for different policies
-  // '00000000' for SYNC_NONE
-  // '00000000' for SYNC_WITH_TRANSPORT
-  // '00000010' for SYNC_WITH_SERVER
-  // '00000011' for SYNC_WITH_TARGET
-  // '00000011' for regular two ways, but if they are invoked via a
-  // DII with INV_NO_RESPONSE flag set then we need to send '00000001'
-  //
-  // We have not implemented the policy INV_NO_RESPONSE for DII.
-  if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    msg << CORBA::Any::from_octet (3);
-  // Second the response flags
-  // Sync scope - ignored by server if request is not oneway.
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_NONE)
-           || response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
-           || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
-           || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
-    // No response required.
-    msg << CORBA::Any::from_octet (0);
-
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
-    // Return before dispatching to the servant
-    msg << CORBA::Any::from_octet (1);
-
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
-    // Return after dispatching servant.
-    msg << CORBA::Any::from_octet (3);
-  else
-    // Until more flags are defined by the OMG.
-    return 0;
-
-  // The reserved field
-  CORBA::Octet reserved[3] = {0, 0, 0};
-
-  msg.write_octet_array (reserved, 3);
-
-  if (this->marshall_target_spec (spec,
-                                  msg) == 0)
-    return 0;
-
-  // Write the operation name
-  msg.write_string (opdetails.opname_len (),
-                    opdetails.opname ());
-
-  // Write the service context list
-  msg << opdetails.request_service_info ();
-
-  // We align the pointer only if the operation has arguments.
-  if (opdetails.argument_flag ()
-      && msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
-    {
-      return 0;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header (
-    CORBA::ULong request_id,
-    TAO_Target_Specification    &spec,
-    TAO_OutputCDR &msg
-  )
-{
-  // Write the request id
-  msg << request_id;
-
-  // Write the target address
-  if (this->marshall_target_spec (spec,
-                                  msg) == 0)
-    return 0;
-
-  // I dont think we need to align the pointer to an 8 byte boundary
-  // here.
-  // We need to align the pointer
-  //  if (msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
-  //  return 0;
-
-  // Return success
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_12::write_reply_header (
-    TAO_OutputCDR & output,
-    TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Write the request ID
-  output.write_ulong (reply.request_id_);
-
-   // Write the reply status
-  if (reply.reply_status_ ==
-      TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM)
-    {
-      // Not sure when we will use this.
-      output.write_ulong (TAO_GIOP_LOCATION_FORWARD_PERM);
-    }
-  else if (reply.reply_status_ ==
-           TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE)
-    {
-      // Not sure when we will use this.
-      output.write_ulong (TAO_GIOP_LOC_NEEDS_ADDRESSING_MODE);
-    }
-  else
-    {
-      this->marshal_reply_status (output,
-                                  reply);
-    }
-
-#if (TAO_HAS_MINIMUM_CORBA == 1)
-  output << reply.service_context_notowned ();
-#else
-  if (reply.is_dsi_ == 0)
-    {
-      output << reply.service_context_notowned ();
-    }
-  else
-    {
-      IOP::ServiceContextList &svc_ctx =
-        reply.service_context_notowned ();
-      CORBA::ULong l = svc_ctx.length ();
-
-      // Now marshal the rest of the service context objects
-      output << l;
-
-      for (CORBA::ULong i = 0; i != l; ++i)
-        {
-          output << svc_ctx[i];
-        }
-
-    }
-#endif /*TAO_HAS_MINIMUM_CORBA */
-
-  if (reply.argument_flag_)
-    {
-      // If we have some data to be marshalled, then we align the
-      // pointer to a 8 byte boundary.  Else, we just leave it throu
-      if (output.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
-        {
-          return 0;
-        }
-    }
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg (
-    TAO_OutputCDR & output,
-    CORBA::ULong request_id,
-    TAO_GIOP_Locate_Status_Msg &status_info
-  )
-{
-  output.write_ulong (request_id);
-
-  // Make the header for the locate request
-  output.write_ulong (status_info.status);
-
-  // Note: We dont align the pointer to an 8 byte boundary for a
-  // locate reply body. This is due to an urgent issue raised by Michi
-  // in the OMG. I discussed this with Michi today (09/07/2001) and I
-  // learn that this has been passed. Hence the change..
-  /*
-  if (status_info.status == TAO_GIOP_OBJECT_FORWARD ||
-      status_info.status == TAO_GIOP_OBJECT_FORWARD_PERM)
-    {
-      // We have to send some data, so align the pointer
-      if (output.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
-        {
-          return 0;
-        }
-    }
-  */
-  switch (status_info.status)
-    {
-    case TAO_GIOP_OBJECT_FORWARD:
-
-      // More likely than not we will not have this in TAO
-    case TAO_GIOP_OBJECT_FORWARD_PERM:
-      {
-        CORBA::Object_ptr object_ptr =
-          status_info.forward_location_var.in ();
-
-        if ((output << object_ptr) == 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((
-                  LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t|%N|%l) write_locate_reply_mesg-")
-                  ACE_TEXT (" cannot marshal object reference\n")
-                ));
-            }
-        }
-      }
-      break;
-    case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
-    case TAO_GIOP_LOC_NEEDS_ADDRESSING_MODE:
-      // Do we do these in TAO??
-      // What to do here???? I dont really know. I have to do a survey
-      // of the specifications that uses this.
-      break;
-    default:
-      break;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
-    TAO_ServerRequest &request
-  )
-{
-  // Get the input CDR in the request class
-  TAO_InputCDR & input = *request.incoming ();
-
-  CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
-
-  CORBA::ULong req_id;
-  // Get the rest of the request header ...
-  hdr_status = hdr_status && input.read_ulong (req_id);
-
-  request.request_id (req_id);
-
-  CORBA::Octet response_flags;
-  hdr_status = hdr_status && input.read_octet (response_flags);
-
-  request.response_expected ((response_flags > 0));
-
-  // The high bit of the octet has been set if the SyncScope policy
-  // value is SYNC_WITH_SERVER.
-  request.sync_with_server ((response_flags == 1));
-
-  // Reserved field
-  input.skip_bytes (3);
-
-  // Unmarshal the target address field.
-  hdr_status =
-    hdr_status && request.profile ().unmarshall_target_address(input);
-
-  CORBA::ULong length = 0;
-  hdr_status = hdr_status && input.read_ulong (length);
-
-  if (hdr_status)
-    {
-      // Do not include NULL character at the end.
-      // @@ This is not getting demarshaled using the codeset
-      //    translators!
-
-      // Notice that there are no memory allocations involved
-      // here!
-
-      request.operation (input.rd_ptr (),
-                         length - 1,
-                         0 /* TAO_ServerRequest does NOT own string */);
-      hdr_status = input.skip_bytes (length);
-    }
-
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-  IOP::ServiceContextList &req_service_info =
-    request.request_service_info ();
-
-  input >> req_service_info;
-
-  // Check an process if BiDir contexts are available
-  if (request.orb_core ()->bidir_giop_policy ())
-    this->check_bidirectional_context (request);
-
-  if (input.length () > 0)
-    {
-      // Reset the read_ptr to an 8-byte boundary.
-      input.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
-    }
-
-  return hdr_status ? 0 : -1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::parse_locate_header (
-    TAO_GIOP_Locate_Request_Header &request
-  )
-{
-  // Get the stream .
-  TAO_InputCDR &msg = request.incoming_stream ();
-
-  CORBA::Boolean hdr_status = 1;
-
-  // Get the request id.
-  CORBA::ULong req_id = 0;
-  hdr_status = msg.read_ulong (req_id);
-
-  // Store it in the Locate request classes
-  request.request_id (req_id);
-
-  // Unmarshal the target address field.
-  hdr_status =
-    hdr_status && request.profile ().unmarshall_target_address(msg);
-
-  // Reset the pointer to an 8-byte bouns]dary
-  msg.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
-
-  return hdr_status ? 0 : -1;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_12::parse_reply (
-    TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
-{
-  if (TAO_GIOP_Message_Generator_Parser::parse_reply (cdr,
-                                                      params) == -1)
-
-    return -1;
-
-  if ((cdr >> params.svc_ctx_) == 0)
-    {
-      // if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) parse_reply, ")
-                    ACE_TEXT ("extracting context\n")));
-
-      return -1;
-    }
-
-  if (cdr.length () > 0)
-    {
-      // Align the read pointer on an 8-byte boundary
-      cdr.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
-    }
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_12::parse_locate_reply (
-    TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
-{
-  if (TAO_GIOP_Message_Generator_Parser::parse_locate_reply (cdr,
-                                                             params) == -1)
-
-    return -1;
-
-  // Note: We dont align the pointer to an 8 byte boundary for a
-  // locate reply body. This is due to an urgent issue raised by Michi
-  // in the OMG. I discussed this with Michi today (09/07/2001) and I
-  // learn that this has been passed. Hence the change..
-  /*if (cdr.length () > 0)
-    {
-      // Align the read pointer on an 8-byte boundary
-      cdr.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
-      }*/
-
-  return 0;
-}
-
-
-CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_12::major_version (void)
-{
-  return (CORBA::Octet) 1;
-}
-
-
-CORBA::Octet
-TAO_GIOP_Message_Generator_Parser_12::minor_version (void)
-{
-  return (CORBA::Octet) 2;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void)
-{
-  // We do support bidirectional
-  return 1;
-}
-
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg
-  )
-{
-  switch (spec.specifier ())
-    {
-    case TAO_Target_Specification::Key_Addr:
-      {
-        // As this is a union send in the discriminant first
-        msg << GIOP::KeyAddr;
-
-        // Get the object key
-        const TAO::ObjectKey *key = spec.object_key ();
-
-        if (key)
-          {
-            // Marshall in the object key
-            msg << *key;
-          }
-        else
-          {
-            if (TAO_debug_level)
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
-            return 0;
-          }
-        break;
-      }
-    case TAO_Target_Specification::Profile_Addr:
-      {
-        // As this is a union send in the discriminant first
-        msg << GIOP::ProfileAddr;
-
-        // Get the profile
-        const IOP::TaggedProfile *pfile = spec.profile ();
-
-        if (pfile)
-          {
-            // Marshall in the object key
-            msg << *pfile;
-          }
-        else
-          {
-            if (TAO_debug_level)
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
-            return 0;
-          }
-        break;
-      }
-    case TAO_Target_Specification::Reference_Addr:
-      {
-        // As this is a union send in the discriminant first
-        msg << GIOP::ReferenceAddr;
-
-        // Get the IOR
-        IOP::IOR *ior;
-        CORBA::ULong index = spec.iop_ior (ior);
-
-        if (ior)
-          {
-            // This is a struct IORAddressingInfo. So, marshall each
-            // member of the struct one after another in the order
-            // defined.
-            msg << index;
-            msg << *ior;
-          }
-        else
-          {
-            if (TAO_debug_level)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
-              }
-            return 0;
-          }
-        break;
-      }
-    default:
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
-        }
-      return 0;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Generator_Parser_12::check_bidirectional_context (
-    TAO_ServerRequest &request)
-{
-  TAO_Service_Context &service_context = request.request_service_context ();
-
-  // Check whether we have the BiDir service context info available in
-  // the ServiceContextList
-  if (service_context.is_service_id (IOP::BI_DIR_IIOP)
-      == 1)
-    {
-      return this->process_bidir_context (service_context,
-                                          request.transport ());
-    }
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_Generator_Parser_12::process_bidir_context (
-    TAO_Service_Context &service_context,
-    TAO_Transport *transport)
-{
-  // Get the context info
-  IOP::ServiceContext context;
-  context.context_id = IOP::BI_DIR_IIOP;
-
-  if (service_context.get_context (context) != 1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Context info not found \n")),
-                        -1);
-
-  TAO_InputCDR cdr (reinterpret_cast<const char*> (
-                      context.context_data.get_buffer ()),
-                    context.context_data.length ());
-
-  return transport->tear_listen_point_list (cdr);
-}
-
-size_t
-TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const
-{
-  return TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
-}
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
deleted file mode 100644
index 5fa4d531ba9..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   GIOP_Message_Generator_Parser_12.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H
-#define TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/GIOP_Message_Generator_Parser.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_GIOP_Message_State;
-class TAO_Service_Context;
-class TAO_Transport;
-
-/**
- * @class TAO_GIOP_Message_Generator_Parser_12
- *
- * @brief Implementation for GIOP v1.2
- *
- */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser_12:
-  public TAO_GIOP_Message_Generator_Parser
-{
-public:
-
-  /// Write the request header in to @a msg
-  virtual int write_request_header (
-      const TAO_Operation_Details &opdetails,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
-
-  /// Write the LocateRequest header
-  virtual int write_locate_request_header (
-      CORBA::ULong request_id,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg
-    );
-
-  /// Write the reply header in to @a output
-  virtual int write_reply_header (
-      TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Writes the locate _reply message in to the @a output
-  virtual int write_locate_reply_mesg (
-      TAO_OutputCDR &output,
-      CORBA::ULong request_id,
-      TAO_GIOP_Locate_Status_Msg &status
-    );
-
-  /// Parse the Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_request_header (TAO_ServerRequest &);
-
-  /// Parse the LocateRequest Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  virtual int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &
-    );
-
-  /// Parse the reply message
-  virtual int parse_reply (TAO_InputCDR &input,
-                           TAO_Pluggable_Reply_Params &params);
-
-  /// Parse the locate reply message
-  virtual int parse_locate_reply (TAO_InputCDR &input,
-                                  TAO_Pluggable_Reply_Params &params);
-
-  /// Our versions
-  virtual CORBA::Octet major_version (void);
-  virtual CORBA::Octet minor_version (void);
-
-  /// Is the messaging object ready for processing BiDirectional
-  /// request/response?
-  virtual int is_ready_for_bidirectional (void);
-
-  /// The header length of a fragment
-  virtual size_t fragment_header_length (void) const;
-
-private:
-
-  /// Marshall the TargetSpecification
-
-  /// This method may be required for other GIOP versiona coming out
-  /// later than 1.2. We need to share this method
-  int marshall_target_spec (TAO_Target_Specification &spec,
-                            TAO_OutputCDR &msg);
-
-  /// Check whether we have BiDirContext info available. If available
-  /// delegate  the responsibility on to the TAO_Transport classes to
-  /// initiate action.
-  /// @note At somepoint this may be needed for future versions of
-  /// GIOP and we may have to share this
-  int check_bidirectional_context (TAO_ServerRequest &);
-
-  /// Process the BiDirContext info that we have received.
-  int process_bidir_context (TAO_Service_Context &,
-                             TAO_Transport *transport);
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
deleted file mode 100644
index 37842a51970..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "tao/GIOP_Message_Generator_Parser_Impl.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           GIOP_Message_Generator_Parser_Impl, 
-           "$Id$")
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
deleted file mode 100644
index 9dd3e2cbf7c..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   GIOP_Message_Generator_Parser_Impl.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_GENERATOR_PARSER_IMPL_H
-#define TAO_GIOP_MESSAGE_GENERATOR_PARSER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/GIOP_Message_Generator_Parser_11.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/GIOP_Message_Generator_Parser_12.h"
-#include "tao/orbconf.h"
-
-/**
- * @class TAO_GIOP_Message_Generator_Parser_Impl
- *
- * @brief This class holds all the different GIOP message generators
- *  and parsers.
- *
- *  This class can be done away with if we want to use the svc.conf
- *  file to load the right GIOP protocol. But that would require some
- *  work as we need to make sure that we have the behaviours of lower
- *  versions in the higher versions.
- */
-
-class TAO_Export TAO_GIOP_Message_Generator_Parser_Impl
-{
-public:
-
-  /// Performs a check of the revision numbers
-  static CORBA::Boolean check_revision (CORBA::Octet incoming_major,
-                                        CORBA::Octet incoming_minor);
-
-  /// Version 1.0 of GIOP
-  TAO_GIOP_Message_Generator_Parser_10 tao_giop_10;
-
-  /// Version 1.1 of GIOP
-  TAO_GIOP_Message_Generator_Parser_11 tao_giop_11;
-
-  /// Version 1.2 of GIOP
-  TAO_GIOP_Message_Generator_Parser_12 tao_giop_12;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Generator_Parser_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_IMPL_H*/
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
deleted file mode 100644
index 19c5c70d086..00000000000
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-//$Id$
-
-ACE_INLINE CORBA::Boolean
-TAO_GIOP_Message_Generator_Parser_Impl::
-    check_revision (CORBA::Octet incoming_major,
-                    CORBA::Octet incoming_minor)
-{
-  CORBA::UShort version_as_whole_num = incoming_major << 8 | incoming_minor;
-  CORBA::UShort max_allowable_version = TAO_DEF_GIOP_MAJOR << 8 | TAO_DEF_GIOP_MINOR;
-
-  // If it's greater than the max, we know it's not allowed.
-  if (version_as_whole_num > max_allowable_version)
-    return 0;
-
-  // If it's less than the max, though, we still have to check for
-  // each explicit version and only allow the ones we know work.
-  switch (version_as_whole_num)
-    {
-    case 0x0100:
-    case 0x0101:
-    case 0x0102:
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
deleted file mode 100644
index d56e5a5dee0..00000000000
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ /dev/null
@@ -1,1687 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-#include "GIOP_Message_Lite.h"
-#include "debug.h"
-#include "TAOC.h"
-#include "ORB_Core.h"
-#include "operation_details.h"
-#include "TAO_Server_Request.h"
-#include "GIOP_Message_Locate_Header.h"
-#include "LF_Strategy.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "Codeset_Manager.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           GIOP_Message_Lite,
-           "$Id$")
-
-
-static const size_t TAO_GIOP_LITE_HEADER_LEN = 5;
-static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0;
-static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4;
-
-TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
-                                              size_t /*input_cdr_size*/)
-  : orb_core_ (orb_core),
-    message_type_ (0),
-    message_size_ (0),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER)
-{
-}
-
-
-TAO_GIOP_Message_Lite::~TAO_GIOP_Message_Lite (void)
-{
-}
-
-
-void
-TAO_GIOP_Message_Lite::init (CORBA::Octet,
-                             CORBA::Octet)
-{
-  return;
-}
-
-TAO_OutputCDR &
-TAO_GIOP_Message_Lite::out_stream (void)
-{
-  return this->cdr_;
-}
-
-void
-TAO_GIOP_Message_Lite::reset (void)
-{
-  this->message_type_ = 0;
-  this->message_size_ = 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::generate_request_header (
-    TAO_Operation_Details &op,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
-  )
-{
-  // Write the GIOPLite header first
-  if (!this->write_protocol_header (TAO_GIOP_REQUEST,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")));
-
-
-      return -1;
-    }
-
-  // Now call the implementation for the rest of the header
-  if (!this->write_request_header (op,
-                                   spec,
-                                   cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing request header \n")));
-
-      return -1;
-    }
-
-  return 0;
-
-}
-
-
-int
-TAO_GIOP_Message_Lite::generate_locate_request_header (
-    TAO_Operation_Details &op,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
- )
-{
-  // Write the GIOPLite header first
-  if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n")));
-        }
-
-      return -1;
-    }
-
-  // Now call the implementation for the rest of the header
-  if (!this->write_locate_request_header (op.request_id (),
-                                          spec,
-                                          cdr))
-    {
-      if (TAO_debug_level)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing locate request header \n")));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::generate_reply_header (
-    TAO_OutputCDR &cdr,
-    TAO_Pluggable_Reply_Params_Base &params
-  )
-{
-  // Write the GIOPLite header first
-  if (!this->write_protocol_header (TAO_GIOP_REPLY,
-                                    cdr))
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n")));
-        }
-
-      return -1;
-    }
-
-  // Now call the implementation for the rest of the header
-  if (!this->write_reply_header (cdr,
-                                 params))
-    {
-      if (TAO_debug_level > 4)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Error in writing reply header \n")));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::read_message (TAO_Transport * /*transport*/,
-                                     int /*block */,
-                                     ACE_Time_Value * /*max_wait_time*/)
-{
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
-{
-  // Get the header length
-  const size_t header_len = TAO_GIOP_LITE_HEADER_LEN ;
-
-  // Get the message size offset
-  const size_t offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET;
-
-  // Ptr to first buffer.
-  char *buf = (char *) stream.buffer ();
-
-  // Length of all buffers.
-  size_t total_len =
-    stream.total_length ();
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g., IPSEC).
-
-  CORBA::ULong bodylen = static_cast <CORBA::ULong> (total_len - header_len);
-
-#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *(reinterpret_cast <CORBA::ULong *> (buf + offset)) = bodylen;
-#else
-  if (!stream.do_byte_swap ())
-    *(reinterpret_cast <CORBA::ULong *>
-                           (buf + offset)) = bodylen;
-  else
-    ACE_CDR::swap_4 (reinterpret_cast <char *> (&bodylen),
-                     buf + offset);
-#endif /* ACE_ENABLE_SWAP_ON_WRITE */
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-  if (TAO_debug_level > 2)
-    {
-      // Check whether the output cdr stream is build up of multiple
-      // messageblocks. If so, consolidate them to one block that can be
-      // dumped
-      ACE_Message_Block* consolidated_block = 0;
-      if (stream.begin()->cont() != 0)
-        {
-          consolidated_block = new ACE_Message_Block;
-          ACE_CDR::consolidate(consolidated_block, stream.begin());
-          buf = (char *) (consolidated_block->rd_ptr ());
-        }
-      ///
-
-      this->dump_msg ("send",
-                      reinterpret_cast <u_char *> (buf),
-                      stream.length ());
-
-      //
-      delete consolidated_block;
-      consolidated_block = 0;
-      //
-    }
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
-{
-  // Make sure we have enough bytes in the header to read all
-  // of the information.
-  if (block.length () < TAO_GIOP_LITE_HEADER_LEN)
-    {
-      return 1;
-    }
-
-    // Get the read pointer
-  char *rd_ptr = block.rd_ptr ();
-
-  // We don't need to do this sort of copy. But some compilers (read it
-  // as SunCC) have a problem in deferencing from the
-  // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be
-  // on stack. So let us go ahead with this copying...
-  char buf [4];
-  buf[0] = *rd_ptr;
-  buf[1] = *(rd_ptr + 1);
-  buf[2] = *(rd_ptr + 2);
-  buf[3] = *(rd_ptr + 3);
-
-  CORBA::ULong x = 0;
-#if !defined (ACE_DISABLE_SWAP_ON_READ)
-  if (!(this->byte_order_ != TAO_ENCAP_BYTE_ORDER))
-    {
-      x = *(reinterpret_cast <ACE_CDR::ULong*> (buf));
-    }
-  else
-    {
-      ACE_CDR::swap_4 (buf, reinterpret_cast <char*> (&x));
-    }
-#else
-  x = *(reinterpret_cast <ACE_CDR::ULong*> (buf));
-#endif /* ACE_DISABLE_SWAP_ON_READ */
-
-  this->message_size_ = x;
-
-  // Get the message type.
-  this->message_type_ = rd_ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
-
-  return 0;
-}
-
-TAO_Pluggable_Message_Type
-TAO_GIOP_Message_Lite::message_type (void) const
-{
-  switch (this->message_type_)
-    {
-    case TAO_GIOP_REQUEST:
-      return TAO_PLUGGABLE_MESSAGE_REQUEST;
-    case TAO_GIOP_LOCATEREQUEST:
-      return TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST;
-
-    case TAO_GIOP_LOCATEREPLY:
-      return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY;
-    case TAO_GIOP_REPLY:
-      return TAO_PLUGGABLE_MESSAGE_REPLY;
-
-    case TAO_GIOP_CLOSECONNECTION:
-      return TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION;
-
-    case TAO_GIOP_CANCELREQUEST:
-    case TAO_GIOP_MESSAGERROR:
-    case TAO_GIOP_FRAGMENT:
-      // Never happens: why??
-    default:
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) %N:%l        message_type : ")
-                    ACE_TEXT ("wrong message.\n")));
-    }
-
-  // In case of some errors
-  return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
-}
-
-
-ssize_t
-TAO_GIOP_Message_Lite::missing_data (ACE_Message_Block &block)
-{
-    // Actual message size including the header..
-  CORBA::ULong msg_size =
-    this->message_size_ + TAO_GIOP_LITE_HEADER_LEN;
-
-  size_t len = block.length ();
-
-  if (len > msg_size)
-    {
-      return -1;
-     }
-  else if (len == msg_size)
-     return 0;
-
-   return msg_size - len;
-}
-
-
-int
-TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
-                                             TAO_Queued_Data *&qd)
-{
-  if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN)
-    {
-      if (incoming.length () > 0)
-        {
-          // Make a node which has a message block of the size of
-          // MESSAGE_HEADER_LEN.
-          qd =
-            this->make_queued_data (TAO_GIOP_LITE_HEADER_LEN);
-
-            qd->msg_block_->copy (incoming.rd_ptr (),
-                                  incoming.length ());
-          qd->missing_data_ = -1;
-        }
-      return 0;
-    }
-
-  if (this->parse_incoming_messages (incoming) == -1)
-    {
-      return -1;
-    }
-
-  size_t copying_len =
-    this->message_size_ + TAO_GIOP_LITE_HEADER_LEN;
-
-  qd = this->make_queued_data (copying_len);
-
-  if (copying_len > incoming.length ())
-    {
-      qd->missing_data_ = copying_len - incoming.length ();
-
-      copying_len = incoming.length ();
-    }
-
-  qd->msg_block_->copy (incoming.rd_ptr (),
-                        copying_len);
-
-  incoming.rd_ptr (copying_len);
-  this->init_queued_data (qd);
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd,
-                                         ACE_Message_Block &incoming)
-{
-  // Look to see whether we had atleast parsed the GIOP header ...
-  if (qd->missing_data_ == -1)
-    {
-      // The data length that has been stuck in there during the last
-      // read ....
-      size_t len =
-        qd->msg_block_->length ();
-
-      // We know that we would have space for
-      // TAO_GIOP_MESSAGE_HEADER_LEN here.  So copy that much of data
-      // from the <incoming> into the message block in <qd>
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            TAO_GIOP_LITE_HEADER_LEN - len);
-
-      // Move the rd_ptr () in the incoming message block..
-      incoming.rd_ptr (TAO_GIOP_LITE_HEADER_LEN - len);
-
-      // Parse the message header now...
-      if (this->parse_incoming_messages (*qd->msg_block_) == -1)
-        return -1;
-
-      // Now grow the message block so that we can copy the rest of
-      // the data...
-      ACE_CDR::grow (qd->msg_block_,
-                     this->message_size_ + TAO_GIOP_LITE_HEADER_LEN);
-
-      // Copy the pay load..
-
-      // Calculate the bytes that needs to be copied in the queue...
-      size_t copy_len = this->message_size_;
-
-      // If the data that needs to be copied is more than that is
-      // available to us ..
-      if (copy_len > incoming.length ())
-        {
-          // Calculate the missing data..
-          qd->missing_data_ = copy_len - incoming.length ();
-
-          // Set the actual possible copy_len that is available...
-          copy_len = incoming.length ();
-        }
-      else
-        {
-          qd->missing_data_ = 0;
-        }
-
-      // ..now we are set to copy the right amount of data to the
-      // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
-
-      // Set the <rd_ptr> of the <incoming>..
-      incoming.rd_ptr (copy_len);
-
-      // Get the other details...
-      this->init_queued_data (qd);
-    }
-  else
-    {
-      // @@todo: Need to abstract this out to a seperate method...
-      size_t copy_len = qd->missing_data_;
-
-      if (copy_len > incoming.length ())
-        {
-          // Calculate the missing data..
-          qd->missing_data_ = copy_len - incoming.length ();
-
-          // Set the actual possible copy_len that is available...
-          copy_len = incoming.length ();
-        }
-
-      // Copy the right amount of data in to the node...
-      // node..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            copy_len);
-
-      // Set the <rd_ptr> of the <incoming>..
-      qd->msg_block_->rd_ptr (copy_len);
-
-    }
-
-  return 0;
-}
-
-
-void
-TAO_GIOP_Message_Lite::get_message_data (TAO_Queued_Data *qd)
-{
-  // Get the message information
-  this->init_queued_data (qd);
-
-  // Reset the message_state
-  this->reset ();
-}
-
-int
-TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
-                                                TAO_Queued_Data *qd)
-{
-  // Set the upcall thread
-  this->orb_core_->lf_strategy ().set_upcall_thread (
-      this->orb_core_->leader_follower ());
-
-  // A buffer that we will use to initialise the CDR stream
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-
-#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  (void) ACE_OS::memset (repbuf,
-                         '\0',
-                         sizeof repbuf);
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-  // Initialze an output CDR on the stack
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        this->orb_core_->output_cdr_buffer_allocator (),
-                        this->orb_core_->output_cdr_dblock_allocator (),
-                        this->orb_core_->output_cdr_msgblock_allocator (),
-                        this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                        qd->major_version_,
-                        qd->minor_version_);
-
-  transport->assign_translators(0,&output);
-
-  // Get the read and write positions before we steal data.
-  size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
-  rd_pos += TAO_GIOP_LITE_HEADER_LEN;
-
-  if (TAO_debug_level > 0)
-    this->dump_msg ("recv",
-                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
-                    qd->msg_block_->length ());
-
-
-  // Create a input CDR stream.
-  // NOTE: We use the same data block in which we read the message and
-  // we pass it on to the higher layers of the ORB. So we dont to any
-  // copies at all here. The same is also done in the higher layers.
-
-  TAO_InputCDR input_cdr (qd->msg_block_->data_block (),
-                          ACE_Message_Block::DONT_DELETE,
-                          rd_pos,
-                          wr_pos,
-                          qd->byte_order_,
-                          qd->major_version_,
-                          qd->minor_version_,
-                          this->orb_core_);
-
-
-  // We know we have some request message. Check whether it is a
-  // GIOP_REQUEST or GIOP_LOCATE_REQUEST to take action.
-  switch (qd->msg_type_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_REQUEST:
-      // Should be taken care by the state specific invocations. They
-      // could raise an exception or write things in the output CDR
-      // stream
-      return this->process_request (transport,
-                                    input_cdr,
-                                    output);
-    case TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST:
-      return this->process_locate_request (transport,
-                                           input_cdr,
-                                           output);
-    default:
-      return -1;
-    }
-}
-
-int
-TAO_GIOP_Message_Lite::process_reply_message (
-    TAO_Pluggable_Reply_Params &params,
-    TAO_Queued_Data *qd
-  )
-{
-
-
-  // Get the read and write positions before we steal data.
-  size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base ();
-  size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base ();
-  rd_pos += TAO_GIOP_LITE_HEADER_LEN;
-
-  if (TAO_debug_level > 0)
-    this->dump_msg ("recv",
-                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
-                    qd->msg_block_->length ());
-
-
-  // Create a empty buffer on stack
-  // NOTE: We use the same data block in which we read the message and
-  // we pass it on to the higher layers of the ORB. So we dont to any
-  // copies at all here. The same is also done in the higher layers.
-  TAO_InputCDR input_cdr (qd->msg_block_->data_block (),
-                          ACE_Message_Block::DONT_DELETE,
-                          rd_pos,
-                          wr_pos,
-                          qd->byte_order_,
-                          qd->major_version_,
-                          qd->minor_version_,
-                          this->orb_core_);
-
-  // Reset the message state. Now, we are ready for the next nested
-  // upcall if any.
-  // this->message_handler_.reset (0);
-
-  // We know we have some reply message. Check whether it is a
-  // GIOP_REPLY or GIOP_LOCATE_REPLY to take action.
-
-  // Once we send the InputCDR stream we need to just forget about
-  // the stream and never touch that again for anything. We basically
-  // loose ownership of the data_block.
-
-  // We know we have some reply message. Check whether it is a
-  // GIOP_REPLY or GIOP_LOCATE_REPLY to take action.
-  switch (qd->msg_type_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_REPLY:
-      // Should be taken care by the state specific parsing
-      return this->parse_reply (input_cdr,
-                                params);
-    case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY:
-      // We call parse_reply () here because, the message format for
-      // the LOCATEREPLY & REPLY are same.
-      return this->parse_reply (input_cdr,
-                                params);
-    default:
-      return -1;
-    }
-}
-
-int
-TAO_GIOP_Message_Lite::generate_exception_reply (
-    TAO_OutputCDR &cdr,
-    TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
-{
-  // A new try/catch block, but if something goes wrong now we have no
-  // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Make the GIOP & reply header. They are version specific.
-      this->write_reply_header (cdr,
-                                params);
-      x._tao_encode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      // Now we know that while handling the error an other error
-      // happened -> no hope, close connection.
-
-      // Close the handle.
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
-                  ACE_TEXT ("generate_exception_reply ()\n")));
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::write_protocol_header (
-    TAO_GIOP_Message_Type type,
-    TAO_OutputCDR &msg)
-{
-  // Reset the message type
-  msg.reset ();
-
-  // @@ Bala: this is something to think harder about:  right now we
-  // leave the space to store the length, and later we set it, but the
-  // way we do it is CDR specific...  Maybe the XXXStream classes
-  // should support a 'save your current position' method that returns
-  // a 'Mememto' (check the GoF book), later the CDR stream could be
-  // restored to that state, and the size written to it.
-  // @@ Then again, i don't know how would that work with fragments
-  // (eventually we may want TAO to generate fragments), or protocols
-  // based on chunking....
-  //
-  // Write a dummy <size> later it is set to the right value...  @@
-  CORBA::ULong size = 0;
-  msg.write_ulong (size);
-
-  msg.write_octet ((CORBA::Octet) type);
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
-                                        TAO_InputCDR &cdr,
-                                        TAO_OutputCDR &output)
-{
-  // This will extract the request header, set <response_required>
-  // and <sync_with_server> as appropriate.
-  TAO_ServerRequest request (this,
-                             cdr,
-                             output,
-                             transport,
-                             this->orb_core_);
-
-  CORBA::ULong request_id = 0;
-  CORBA::Boolean response_required = 0;
-
-  int parse_error = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      parse_error =
-        this->parse_request_header (request);
-
-      request.orb_core()->codeset_manager()->process_service_context(request);
-      transport->assign_translators(&cdr,&output);
-
-      // Throw an exception if the
-      if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                       CORBA::COMPLETED_NO));
-      request_id = request.request_id ();
-
-      response_required = request.response_expected ();
-
-      CORBA::Object_var forward_to;
-
-      // Do this before the reply is sent.
-      this->orb_core_->adapter_registry ()->dispatch (request.object_key (),
-                                                      request,
-                                                      forward_to
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!CORBA::is_nil (forward_to.in ()))
-        {
-          // We should forward to another object...
-          TAO_Pluggable_Reply_Params reply_params (transport);
-          reply_params.request_id_ = request_id;
-          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
-          reply_params.svc_ctx_.length (0);
-
-          // Send back the reply service context list.
-          reply_params.service_context_notowned (&request.reply_service_info ());
-
-          // Make the GIOP header and Reply header
-          this->generate_reply_header (output,
-                                       reply_params);
-
-          if (!(output << forward_to.in ()))
-            {
-              if (TAO_debug_level > 0)
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("TAO (%P|%t) ERROR: Unable to marshal ")
-                            ACE_TEXT ("forward reference.\n")));
-
-              return -1;
-            }
-
-          int result = transport->send_message (output);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  // No exception but some kind of error, yet a
-                  // response is required.
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
-                              ACE_TEXT ("cannot send reply\n"),
-                              ACE_TEXT ("TAO_GIOP_Message_Lite::process_request")));
-                }
-            }
-          return result;
-        }
-    }
-  // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
-    {
-      int result = 0;
-
-      if (response_required)
-        {
-          result = this->send_reply_exception (transport,
-                                               this->orb_core_,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &ACE_ANY_EXCEPTION);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      ACE_ANY_EXCEPTION,
-                      "TAO_GIOP_Message_Lite::process_request[2]");
-                }
-            }
-
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfortunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO: ");
-        }
-
-      return result;
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.  If
-      // we have native exceptions but no support for them in the ORB
-      // we should still be able to catch it.  If we don't have native
-      // exceptions it couldn't have been raised in the first place!
-      int result = 0;
-
-      if (response_required)
-        {
-          CORBA::UNKNOWN exception (
-              CORBA::SystemException::_tao_minor_code (
-                  TAO_UNHANDLED_SERVER_CXX_EXCEPTION,
-                  0
-                ),
-              CORBA::COMPLETED_MAYBE
-            );
-
-          result = this->send_reply_exception (transport,
-                                               this->orb_core_,
-                                               request_id,
-                                               &request.reply_service_info (),
-                                               &exception);
-          if (result == -1)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_request[3], ")
-                              ACE_TEXT ("%p: ")
-                              ACE_TEXT ("cannot send exception\n"),
-                              ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      exception,
-                      "TAO_GIOP_Message_Lite::process_request[3]");
-                }
-            }
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfotunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t|%N|%l) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-        }
-
-      return result;
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
-                                               TAO_InputCDR &input,
-                                               TAO_OutputCDR &output)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_Locate_Request_Header locate_request (input,
-                                                 this->orb_core_);
-
-  TAO_GIOP_Locate_Status_Msg status_info;
-
-  // Defaulting.
-  status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-
-  CORBA::Boolean response_required = 1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      int parse_error =
-        this->parse_locate_header (locate_request);
-
-      if (parse_error != 0)
-        {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
-        }
-
-      // Execute a fake request to find out if the object is there or
-      // if the POA can activate it on demand...
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-      TAO_OutputCDR dummy_output (repbuf,
-                                  sizeof repbuf);
-      // This output CDR is not used!
-
-      TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
-                              locate_request.object_key ().length (),
-                              locate_request.object_key ().get_buffer (),
-                              0);
-
-      // Set it to an error state
-      parse_error = 1;
-      CORBA::ULong req_id = locate_request.request_id ();
-
-      // We will send the reply. The ServerRequest class need not send
-      // the reply
-      CORBA::Boolean deferred_reply = 1;
-      TAO_ServerRequest server_request (this,
-                                        req_id,
-                                        response_required,
-                                        deferred_reply,
-                                        tmp_key,
-                                        "_non_existent",
-                                        dummy_output,
-                                        transport,
-                                        this->orb_core_,
-                                        parse_error);
-
-      if (parse_error != 0)
-        {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
-        }
-
-      CORBA::Object_var forward_to;
-
-      this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (),
-                                                      server_request,
-                                                      forward_to
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!CORBA::is_nil (forward_to.in ()))
-        {
-          status_info.status = TAO_GIOP_OBJECT_FORWARD;
-          status_info.forward_location_var = forward_to;
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
-                      ACE_TEXT ("called: forwarding\n")));
-        }
-      else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
-        {
-          // We got no exception, so the object is here.
-          status_info.status = TAO_GIOP_OBJECT_HERE;
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
-                        ACE_TEXT ("found\n")));
-        }
-      else
-        {
-          status_info.forward_location_var = server_request.forward_location ();
-
-          if (!CORBA::is_nil (status_info.forward_location_var.in ()))
-            {
-              status_info.status = TAO_GIOP_OBJECT_FORWARD;
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
-                          ACE_TEXT ("forwarding\n")));
-            }
-          else
-            {
-              // Normal exception, so the object is not here
-              status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ")
-                          ACE_TEXT ("not here\n")));
-            }
-        }
-    }
-
-  ACE_CATCHANY
-    {
-      // Normal exception, so the object is not here
-      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ")
-                    ACE_TEXT ("CORBA exception raised\n")));
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Normal exception, so the object is not here
-      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ")
-                    ACE_TEXT ("C++ exception raised\n")));
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  return this->make_send_locate_reply (transport,
-                                       output,
-                                       locate_request,
-                                       status_info);
-}
-
-
-int
-TAO_GIOP_Message_Lite::make_send_locate_reply (
-    TAO_Transport *transport,
-    TAO_OutputCDR &output,
-    TAO_GIOP_Locate_Request_Header &request,
-    TAO_GIOP_Locate_Status_Msg &status_info
-  )
-{
-  // Note here we are making the Locate reply header which is *QUITE*
-  // different from the reply header made by the make_reply () call..
-  // Make the GIOP message header
-  this->write_protocol_header (TAO_GIOP_LOCATEREPLY,
-                               output);
-
-  // This writes the header & body
-  this->write_locate_reply_mesg (output,
-                                 request.request_id (),
-                                 status_info);
-
-  // Send the message
-  int result = transport->send_message (output);
-
-  // Print out message if there is an error
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
-                      ACE_TEXT ("TAO_GIOP_Message_Lite::make_send_locate_reply")));
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr,
-                                    TAO_Pluggable_Reply_Params &params)
-{
-
-  // Read the request id
-  if (!cdr.read_ulong (params.request_id_))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t|%N|%l) : ")
-                      ACE_TEXT ("TAO_GIOP_Message_Lite::parse_reply, ")
-                      ACE_TEXT ("extracting request id\n")));
-        }
-
-      return -1;
-    }
-
-  CORBA::ULong rep_stat = 0;
-
-  // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-  // CAnnot handle LOCATION_FORWARD_PERM here
-  if (!cdr.read_ulong (rep_stat))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t|%N|%l) : ")
-                      ACE_TEXT ("TAO_GIOP_Message_Lite::parse_reply, ")
-                      ACE_TEXT ("extracting reply status\n")));
-        }
-
-      return -1;
-    }
-
-  // Pass the right Pluggable interface code to the transport layer
-  switch (rep_stat)
-    {
-      // Request completed successfully
-    case TAO_GIOP_NO_EXCEPTION:
-      params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
-      break;
-
-      // Request terminated with user exception
-    case TAO_GIOP_USER_EXCEPTION:
-      params.reply_status_ = TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION;
-      break;
-      // Request terminated with system exception
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-      params.reply_status_ = TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION;
-      break;
-      // Reply is a location forward type
-    case TAO_GIOP_LOCATION_FORWARD:
-      params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
-      break;
-    default:
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%N|%l) Unknown reply status \n")));
-        }
-    }
-
-  params.input_cdr_= &cdr;
-
-  if ( params.transport_->tms ()->dispatch_reply (params) == -1)
-    {
-      // Something really critical happened, we will forget about
-      // every reply on this connection.
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - GIOP_Message_Lite[%d]::process_parsed_messages, "
-                    "dispatch reply failed\n",
-                    params.transport_->id ()));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-
-
-int
-TAO_GIOP_Message_Lite::write_reply_header (
-    TAO_OutputCDR &output,
-    TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Write the GIOP Lite header first
-  this->write_protocol_header (TAO_GIOP_REPLY,
-                               output);
-
-  // Write the request ID
-  output.write_ulong (reply.request_id_);
-
-  // Write the reply status
-  switch (reply.reply_status_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
-      output.write_ulong (TAO_GIOP_NO_EXCEPTION);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-      output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-      output.write_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-      output.write_ulong (TAO_GIOP_USER_EXCEPTION);
-      break;
-    default:
-      // Some other specifc exception
-      output.write_ulong (reply.reply_status_);
-      break;
-    }
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Lite::write_request_header (
-    const TAO_Operation_Details &opdetails,
-    TAO_Target_Specification &spec,
-     TAO_OutputCDR &out_stream
-   )
-{
-  out_stream << opdetails.request_id ();
-
-  const CORBA::Octet response_flags = opdetails.response_flags ();
-
-  // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented.
-  if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    {
-      out_stream << CORBA::Any::from_octet (1);
-    }
-  // Sync scope - ignored by server if request is not oneway.
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
-           || response_flags == CORBA::Octet (Messaging::SYNC_NONE)
-           || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
-           || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
-    {
-      // No response required.
-      out_stream << CORBA::Any::from_octet (0);
-    }
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
-    {
-      // Return before dispatching servant.  We're also setting the high
-      // bit here. This is a temporary fix until the rest of GIOP 1.2 is
-      // implemented in TAO.
-      out_stream << CORBA::Any::from_octet (129);
-    }
-  else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
-    {
-      // Return after dispatching servant.
-      out_stream << CORBA::Any::from_octet (3);
-    }
-  else
-    {
-      // Until more flags are defined by the OMG.
-      return 0;
-    }
-
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
-  // anyway.
-  const TAO::ObjectKey *key = spec.object_key ();
-
-  if (key != 0)
-    {
-      // Put in the object key
-      out_stream << *key;
-    }
-    else
-    {
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((
-              LM_DEBUG,
-              ACE_TEXT ("(%N |%l) Unable to handle this request \n")
-            ));
-        }
-
-      return 0;
-    }
-
-  out_stream.write_string (opdetails.opname_len (),
-                           opdetails.opname ());
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_Lite::write_locate_request_header (
-    CORBA::ULong request_id,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg
-  )
-{
-  msg << request_id;
-
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
-  // anyway.
-  const TAO::ObjectKey *key = spec.object_key ();
-
-  if (key)
-    {
-      // Put in the object key
-      msg << *key;
-    }
-    else
-    {
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((
-              LM_DEBUG,
-              ACE_TEXT ("(%N |%l) Unable to handle this request \n")
-            ));
-        }
-
-      return 0;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request)
-{
-  // Get the input CDR in the request class
-  TAO_InputCDR & input = *request.incoming ();
-
-  CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
-
-  CORBA::ULong req_id;
-
-  // Get the rest of the request header ...
-  hdr_status = hdr_status && input.read_ulong (req_id);
-
-  request.request_id (req_id);
-
-   CORBA::Octet response_flags;
-  hdr_status = hdr_status && input.read_octet (response_flags);
-  request.response_expected ((response_flags != 0));
-
-   // The high bit of the octet has been set if the SyncScope policy
-  // value is SYNC_WITH_SERVER. This is a temporary hack until all
-  // of GIOP 1.2 is in place. Then we can check the version in the
-  // message header instead.
-  request.sync_with_server ((response_flags == 129));
-
-    // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-  CORBA::Long key_length = 0;
-  hdr_status = hdr_status && input.read_long (key_length);
-
-  if (hdr_status)
-    {
-      request.object_key ().replace (key_length, key_length,
-                                     (CORBA::Octet*)input.rd_ptr (),
-                                     0);
-      input.skip_bytes (key_length);
-    }
-
-  if (input.char_translator () == 0)
-    {
-      CORBA::ULong length = 0;
-      hdr_status = hdr_status && input.read_ulong (length);
-
-      if (hdr_status)
-        {
-          // Do not include NULL character at the end.
-          // @@ This is not getting demarshaled using the codeset
-          //    translators!
-
-          // Notice that there are no memory allocations involved
-          // here!
-
-          request.operation (input.rd_ptr (),
-                             length - 1,
-                             0 /* TAO_ServerRequest does NOT own string */);
-
-          hdr_status = input.skip_bytes (length);
-        }
-    }
-  else
-    {
-      // @@ We could optimize for this case too, i.e. do in-place
-      //    demarshaling of the string... But there is an issue
-      //    pending on the OMG as to whether the operation should be
-      //    sent in the connection negotiated codeset or always in
-      //    ISO8859-1.
-      CORBA::String_var tmp;
-      hdr_status = hdr_status && input.read_string (tmp.inout ());
-
-      request.operation (tmp._retn (),
-                         0,
-                         1 /* TAO_ServerRequest owns string */);
-    }
-
-  return hdr_status ? 0 : -1;
-}
-
-int
-TAO_GIOP_Message_Lite::parse_locate_header (
-    TAO_GIOP_Locate_Request_Header &request
-  )
-{
-  // Get the stream.
-  TAO_InputCDR &msg = request.incoming_stream ();
-
-  CORBA::Boolean hdr_status = 1;
-
-  // Get the request id.
-  CORBA::ULong req_id = 0;
-  hdr_status = msg.read_ulong (req_id);
-
-  // Store it in the Locate request classes.
-  request.request_id (req_id);
-
-  TAO::ObjectKey &object_key =
-    request.object_key ();
-
-  // Note that here there are no unions and so no problems.
-  hdr_status = hdr_status && (msg >> object_key);
-
-  return hdr_status ? 0 : -1;
-}
-
-int
-TAO_GIOP_Message_Lite::send_reply_exception (
-    TAO_Transport *transport,
-    TAO_ORB_Core* orb_core,
-    CORBA::ULong request_id,
-    IOP::ServiceContextList *svc_info,
-    CORBA::Exception *x
-  )
-{
-  // Create a new output CDR stream
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-
-#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  (void) ACE_OS::memset (repbuf,
-                         '\0',
-                         sizeof repbuf);
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        orb_core->output_cdr_buffer_allocator (),
-                        orb_core->output_cdr_dblock_allocator (),
-                        orb_core->output_cdr_msgblock_allocator (),
-                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-  transport->assign_translators(0,&output);
-
-  // Make the GIOP & reply header. They are version specific.
-  TAO_Pluggable_Reply_Params reply_params (transport);
-  reply_params.request_id_ = request_id;
-  reply_params.svc_ctx_.length (0);
-
-  // Send back the service context we received.  (RTCORBA relies on
-  // this).
-  reply_params.service_context_notowned (svc_info);
-
-  // A new try/catch block, but if something goes wrong now we have no
-  // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Write the exception.
-      reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
-
-      if (CORBA::SystemException::_downcast (x) != 0)
-        {
-          reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
-        }
-
-      // Make the GIOP & reply header. They are version specific.
-      this->write_reply_header (output,
-                                reply_params);
-
-
-      x->_tao_encode (output ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      // Now we know that while handling the error an other error
-      // happened -> no hope, close connection.
-
-      // Close the handle.
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception on transport %u: %p\n"),
-                  transport->id (),
-                  ACE_TEXT ("send_reply_exception ()")));
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return transport->send_message (output);
-}
-
-
-int
-TAO_GIOP_Message_Lite::write_locate_reply_mesg (
-    TAO_OutputCDR & output,
-    CORBA::ULong request_id,
-    TAO_GIOP_Locate_Status_Msg &status_info
-  )
-{
-  // Note here we are making the Locate reply header which is *QUITE*
-  // different from the reply header made by the make_reply () call..
-
-  // Make the GIOP message header
-  this->write_protocol_header (TAO_GIOP_LOCATEREPLY,
-                               output);
-
-  // Make the header for the locate request
-  output.write_ulong (request_id);
-  output.write_ulong (status_info.status);
-
-  if (status_info.status == TAO_GIOP_OBJECT_FORWARD)
-    {
-      CORBA::Object_ptr object_ptr = status_info.forward_location_var.in ();
-
-      if ((output << object_ptr) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t|%N|%l) make_locate_reply-")
-                        ACE_TEXT ("cannot marshal object reference\n")));
-        }
-    }
-
-  return 1;
-}
-
-// Send an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive disconnect (at
-// the application level, if not at the level of TCP).
-//
-// NOTE that IIOPLite will still benefit from TCP's orderly disconnect.
-int
-TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport)
-{
-  const char error_message [TAO_GIOP_LITE_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    TAO_GIOP_MESSAGERROR,
-    0, 0, 0, 0
-  };
-
-  this->dump_msg ("send_error",
-                  (const u_char *) error_message,
-                  TAO_GIOP_LITE_HEADER_LEN);
-
-  ACE_Data_Block data_block (TAO_GIOP_LITE_HEADER_LEN,
-                             ACE_Message_Block::MB_DATA,
-                             error_message,
-                             0,
-                             0,
-                             ACE_Message_Block::DONT_DELETE,
-                             0);
-  ACE_Message_Block message_block(&data_block);
-  message_block.wr_ptr (TAO_GIOP_LITE_HEADER_LEN);
-
-  size_t bt;
-  int result = transport->send_message_block_chain (&message_block,
-                                                    bt);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((
-              LM_DEBUG,
-              ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u, errno = %d\n"),
-              transport->id (), errno
-            ));
-        }
-    }
-
-  return result;
-}
-
-void
-TAO_GIOP_Message_Lite::dump_msg (const char *label,
-                                 const u_char *ptr,
-                                 size_t len)
-{
-  if (TAO_debug_level >= 5)
-    {
-      static const char *names [] =
-      {
-        "Request",
-        "Reply",
-        "CancelRequest",
-        "LocateRequest",
-        "LocateReply",
-        "CloseConnection",
-        "MessageError",
-        "Fragment"
-      };
-
-      // Message name.
-      const char *message_name = "UNKNOWN MESSAGE";
-      u_long slot = ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
-
-      if (slot < sizeof (names)/sizeof(names[0]))
-        {
-          message_name = names [slot];
-        }
-
-      // Byte order.
-      int byte_order = TAO_ENCAP_BYTE_ORDER;
-
-      // request/reply id.
-      CORBA::ULong tmp = 0;
-      CORBA::ULong *id = &tmp;
-
-      if (ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
-          ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
-        {
-          // We are not sure where the read pointer is pointing
-          // to. So, try to align teh pointer to a 4 byte boundary.
-          char *buf = ACE_ptr_align_binary (ptr + TAO_GIOP_LITE_HEADER_LEN, 4);
-
-          id = reinterpret_cast <CORBA::ULong *> (buf);
-        }
-
-      // Print.
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P | %t):%s GIOP lite msg, ")
-                  ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(label),
-                  len - TAO_GIOP_LITE_HEADER_LEN,
-                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"),
-                  ACE_TEXT_CHAR_TO_TCHAR (message_name),
-                  *id));
-
-      if (TAO_debug_level >= 10)
-        ACE_HEX_DUMP ((LM_DEBUG,
-                       (const char *) ptr,
-                       len,
-                       ACE_TEXT ("GIOP lite message")));
-    }
-}
-
-TAO_Queued_Data *
-TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
-{
-  // Get a node for the queue..
-  TAO_Queued_Data *qd =
-    TAO_Queued_Data::make_queued_data ();
-
-  // Make a datablock for the size requested + something. The
-  // "something" is required because we are going to align the data
-  // block in the message block. During alignment we could loose some
-  // bytes. As we may not know how many bytes will be lost, we will
-  // allocate ACE_CDR::MAX_ALIGNMENT extra.
-  ACE_Data_Block *db =
-    this->orb_core_->create_input_cdr_data_block (sz +
-                                                  ACE_CDR::MAX_ALIGNMENT);
-
-  ACE_Allocator *alloc =
-    this->orb_core_->input_cdr_msgblock_allocator ();
-
-  ACE_Message_Block mb (db,
-                        0,
-                        alloc);
-
-  ACE_Message_Block *new_mb = mb.duplicate ();
-
-  ACE_CDR::mb_align (new_mb);
-
-  qd->msg_block_ = new_mb;
-
-  return qd;
-}
-
-int
-TAO_GIOP_Message_Lite::generate_locate_reply_header (
-    TAO_OutputCDR & /*cdr*/,
-    TAO_Pluggable_Reply_Params_Base & /*params*/)
-{
-  return 0;
-}
-
-
-int
-TAO_GIOP_Message_Lite::is_ready_for_bidirectional (TAO_OutputCDR & )
-{
-  // No we dont support..
-  return 0;
-}
-
-size_t
-TAO_GIOP_Message_Lite::header_length (void) const
-{
-  return TAO_GIOP_LITE_HEADER_LEN;
-}
-
-size_t
-TAO_GIOP_Message_Lite::fragment_header_length (CORBA::Octet,
-                                               CORBA::Octet) const
-{
-  return 0;
-}
-
-void
-TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const
-{
-  qd->byte_order_    = TAO_ENCAP_BYTE_ORDER;
-  qd->major_version_ = TAO_DEF_GIOP_MAJOR;
-  qd->minor_version_ = TAO_DEF_GIOP_MINOR;
-  qd->msg_type_      = this->message_type ();
-}
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
deleted file mode 100644
index 8ddaa6ef89b..00000000000
--- a/TAO/tao/GIOP_Message_Lite.h
+++ /dev/null
@@ -1,279 +0,0 @@
-// -*- C++ -*-
-//
-// ===================================================================
-/**
- *  @file GIOP_Message_Lite.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_GIOP_MESSAGE_LITE_H
-#define TAO_GIOP_MESSAGE_LITE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Pluggable_Messaging.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-class TAO_Operation_Details;
-class TAO_Pluggable_Reply_Params;
-class TAO_GIOP_Locate_Request_Header;
-class TAO_Queued_Data;
-class TAO_ServerRequest;
-class TAO_GIOP_Message_Version;
-
-/**
- * @class TAO_GIOP_Message_Lite
- *
- * @brief Definitions of GIOPLite specific stuff
- *
- * This protocol is a modified version of GIOP. This is more suited
- * for homogenous platforms.
- */
-
-class TAO_Export TAO_GIOP_Message_Lite : public TAO_Pluggable_Messaging
-{
-public:
-
-  /// Constructor
-  TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core,
-                         size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE);
-
-  /// Dtor
-  virtual ~TAO_GIOP_Message_Lite (void);
-
-  /// Initialize the object -- this is a dummy for GIOPlite
-  virtual void init (CORBA::Octet, CORBA::Octet);
-
-  /// Reset the messaging the object
-  virtual void reset (void);
-
-  /// Write the RequestHeader in to the @a cdr stream. The underlying
-  /// implementation of the mesaging should do the right thing.
-  virtual int generate_request_header (TAO_Operation_Details &op,
-                                       TAO_Target_Specification &spec,
-                                       TAO_OutputCDR &cdr);
-
-  /// Write the RequestHeader in to the @a cdr stream.
-  virtual int generate_locate_request_header (
-      TAO_Operation_Details &op,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &cdr);
-
-  /// Write the reply header
-  virtual int generate_reply_header (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params
-    );
-
-  /// Dummy method to ..
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0);
-
-
-  /// Format the message. As we have not written the message length in
-  /// the header, we make use of this oppurtunity to insert and format
-  /// the message.
-  virtual int format_message (TAO_OutputCDR &cdr);
-
-  /// Parse the incoming messages..
-  ///
-  /// \return -1 There was some error parsing the GIOP header
-  /// \return 0  The GIOP header was parsed correctly
-  /// \return 1  There was not enough data in the message block to
-  ///            parse the header
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block);
-
-  /// Get the message type. The return value would be one of the
-  /// following:
-  /// TAO_PLUGGABLE_MESSAGE_REQUEST,
-  /// TAO_PLUGGABLE_MESSAGE_REPLY,
-  /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
-  /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.
-  TAO_Pluggable_Message_Type message_type (void) const;
-
-
-  /// Calculate the amount of data that is missing in the <incoming>
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &message_block);
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-   */
-  virtual int extract_next_message (ACE_Message_Block &incoming,
-                                    TAO_Queued_Data *&qd);
-
-  /// Check whether the node @a qd needs consolidation from @a incoming
-  virtual int consolidate_node (TAO_Queued_Data *qd,
-                                ACE_Message_Block &incoming);
-
-  /// Get the details of the message parsed through the <qd>.
-  virtual void get_message_data (TAO_Queued_Data *qd);
-
-  /// Process the request message that we have received on the
-  /// connection
-  virtual int process_request_message (TAO_Transport *transport,
-                                       TAO_Queued_Data *qd);
-
-  /// Parse the reply message that we received and return the reply
-  /// information through @a reply_info
-  virtual int process_reply_message (
-      TAO_Pluggable_Reply_Params &reply_info,
-      TAO_Queued_Data *qd);
-
-  /// Generate a reply message with the exception @a ex.
-  virtual int generate_exception_reply (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
-    );
-
-private:
-
-  /// Writes the GIOP header in to @a msg
-  /// @note If the GIOP header happens to change in the future, we can
-  /// push this method in to the generator_parser classes.
-  int write_protocol_header (TAO_GIOP_Message_Type t,
-                             TAO_OutputCDR &msg);
-
-  /// Processes the GIOP_REQUEST messages
-  int process_request (TAO_Transport *transport,
-                       TAO_InputCDR &input,
-                       TAO_OutputCDR &output);
-
-  /// Processes the GIOP_LOCATE_REQUEST messages
-  int process_locate_request (TAO_Transport *transport,
-                              TAO_InputCDR &input,
-                              TAO_OutputCDR &output);
-
-  /// Make a GIOP_LOCATEREPLY and hand that over to the transport so
-  /// that it can be sent over the connection.
-  /// @note As on date 1.1 & 1.2 seem to have similar headers. Till an
-  /// unmanageable difference comes let them be implemented here.
-  int make_send_locate_reply (TAO_Transport *transport,
-                              TAO_OutputCDR &output,
-                              TAO_GIOP_Locate_Request_Header &request,
-                              TAO_GIOP_Locate_Status_Msg &status);
-
-  /// Send error messages
-  int  send_error (TAO_Transport *transport);
-
-  /// Close a connection, first sending GIOP::CloseConnection.
-  void send_close_connection (const TAO_GIOP_Message_Version &version,
-                              TAO_Transport *transport,
-                              void *ctx);
-
-  /// We must send a LocateReply through @a transport, this request
-  /// resulted in some kind of exception.
-  int send_reply_exception (TAO_Transport *transport,
-                            TAO_ORB_Core* orb_core,
-                            CORBA::ULong request_id,
-                            IOP::ServiceContextList *svc_info,
-                            CORBA::Exception *x);
-
-  /// Print out a debug messages..
-  void dump_msg (const char *label,
-                 const u_char *ptr,
-                 size_t len);
-
-  TAO_Queued_Data *make_queued_data (size_t sz);
-
-  /// Write the locate reply header
-  virtual int generate_locate_reply_header (
-      TAO_OutputCDR & /*cdr*/,
-      TAO_Pluggable_Reply_Params_Base & /*params*/);
-
-  /// Is the messaging object ready for processing BiDirectional
-  /// request/response?
-  virtual int is_ready_for_bidirectional (TAO_OutputCDR &msg);
-
-  /// Header length
-  virtual size_t header_length (void) const;
-
-  /// Fragment header length
-  virtual size_t fragment_header_length (CORBA::Octet major,
-                                         CORBA::Octet minor) const;
-
-  virtual TAO_OutputCDR &out_stream (void);
-
-private:
-
-  /// Write the request header in to <msg>
-  int write_request_header (
-      const TAO_Operation_Details &opdetails,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg);
-
-  /// Write the LocateRequest header
-  int write_locate_request_header (
-      CORBA::ULong request_id,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &msg);
-
-  /// Write the reply header in to <output>
-  int write_reply_header (
-      TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Writes the locate _reply message in to the <output>
-  int write_locate_reply_mesg (
-      TAO_OutputCDR &output,
-      CORBA::ULong request_id,
-      TAO_GIOP_Locate_Status_Msg &status);
-
-  /// Parse the Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  int parse_request_header (TAO_ServerRequest &);
-
-  /// Parse the Loacte Request Header from the incoming stream. This will do a
-  /// version specific parsing of the incoming Request header
-  int parse_locate_header (
-      TAO_GIOP_Locate_Request_Header &);
-
-  /// Parse the reply message
-  int parse_reply (TAO_InputCDR &input,
-                   TAO_Pluggable_Reply_Params &params);
-
-  /// Parse the locate reply message from the server
-  int parse_locate_reply (TAO_InputCDR &input,
-                          TAO_Pluggable_Reply_Params &params);
-
-  /// Initialize the relevant portions of a TAO_Queued_Data
-  void init_queued_data (TAO_Queued_Data* qd) const;
-
-private:
-
-  /// Our copy of the ORB core...
-  TAO_ORB_Core *orb_core_;
-
-  /// The message type that we are going to process..
-  CORBA::Octet message_type_;
-
-  /// The pay load size
-  CORBA::ULong message_size_;
-
-  // The byte order..
-  // NOTE: GIOP lite cannot work between heterogenous platforms..
-  CORBA::Octet byte_order_;
-
-  TAO_OutputCDR cdr_;
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_LITE_H*/
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
deleted file mode 100644
index 089da5d7a71..00000000000
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//$Id$
-#include "tao/GIOP_Message_Locate_Header.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Locate_Header.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           GIOP_Message_Headers, 
-           "$Id$")
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
deleted file mode 100644
index 89600c8ec1b..00000000000
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     GIOP_Message_Locate_Header.h
- *
- *  $Id$
- *
- *   Some assorted GIOP structure mappings
- *
- *
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_GIOP_MESSAGE_LOCATE_HEADER_H
-#define TAO_GIOP_MESSAGE_LOCATE_HEADER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Tagged_Profile.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_GIOP_Locate_Request_Header
- *
- * @brief Location service support
- */
-class TAO_Export TAO_GIOP_Locate_Request_Header
-{
-public:
-
-  /// Constructor
-  TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg,
-                                  TAO_ORB_Core *core);
-
-  /// Set the id
-  void request_id (CORBA::ULong id);
-
-  /// Get the request id
-  CORBA::ULong request_id (void);
-
-  /// Get the object_key in read mode..
-  const TAO::ObjectKey &object_key (void) const;
-
-  /// Get the object_key in read/write mode..
-  TAO::ObjectKey &object_key (void);
-
-  /// Get the reference to the underlying profile
-  TAO_Tagged_Profile &profile (void);
-
-  /// Get the CDR stream for read/write
-  TAO_InputCDR &incoming_stream (void);
-
-private:
-  /// Request id
-  CORBA::ULong request_id_;
-
-  /// Profile info.
-  TAO_Tagged_Profile profile_;
-
-  /// Object Key
-  TAO::ObjectKey object_key_;
-
-  /// Incoming CDR stream
-  TAO_InputCDR *incoming_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Locate_Header.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_LOCATE_HEADER_H*/
diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i
deleted file mode 100644
index 8b8025c4603..00000000000
--- a/TAO/tao/GIOP_Message_Locate_Header.i
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//$Id$
-
-ACE_INLINE
-TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg,
-                                                                TAO_ORB_Core *orb)
-  : request_id_ (0),
-    profile_ (orb),
-    incoming_ (&msg)
-{
-}
-
-ACE_INLINE void
-TAO_GIOP_Locate_Request_Header::request_id (CORBA::ULong id)
-{
-  this->request_id_ = id;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_GIOP_Locate_Request_Header::request_id (void)
-{
-  return this->request_id_;
-}
-
-ACE_INLINE const TAO::ObjectKey &
-TAO_GIOP_Locate_Request_Header::object_key (void) const
-{
-  return this->profile_.object_key ();
-}
-
-ACE_INLINE TAO::ObjectKey &
-TAO_GIOP_Locate_Request_Header::object_key (void)
-{
-  return this->profile_.object_key ();
-}
-
-ACE_INLINE TAO_Tagged_Profile &
-TAO_GIOP_Locate_Request_Header::profile (void)
-{
-  return this->profile_;
-}
-
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Locate_Request_Header::incoming_stream (void)
-{
-  return *this->incoming_;
-}
-
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
deleted file mode 100644
index 6100e1fb4fe..00000000000
--- a/TAO/tao/GIOP_Message_State.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// $Id$
-
-#include "tao/GIOP_Message_State.h"
-#include "tao/debug.h"
-#include "tao/GIOP_Message_Base.h"
-
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_State.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           GIOP_Message_State,
-           "$Id$")
-
-TAO_GIOP_Message_State::TAO_GIOP_Message_State (void)
-  : giop_version_ (TAO_DEF_GIOP_MAJOR,
-                   TAO_DEF_GIOP_MINOR),
-    byte_order_ (0),
-    message_type_ (0),
-    message_size_ (0),
-    request_id_ (0),
-    more_fragments_ (0),
-    missing_data_ (0)
-{
-}
-
-
-int
-TAO_GIOP_Message_State::parse_message_header (ACE_Message_Block &incoming)
-{
-  if (incoming.length () >= TAO_GIOP_MESSAGE_HEADER_LEN)
-    {
-      // Parse the GIOP header
-      return this->parse_message_header_i (incoming);
-    }
-
-  // One indicates that we didn't have enough data in the message to
-  // parse the header
-  return 1;
-}
-
-int
-TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
-{
-  if (TAO_debug_level > 8)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - GIOP_Message_State::parse_message_header_i\n"
-                  ));
-    }
-
-  // Grab the rd_ptr_ from the message block..
-  char *buf = incoming.rd_ptr ();
-
-  // Parse the magic bytes first
-  if (this->parse_magic_bytes (buf) == -1)
-    {
-      return -1;
-    }
-
-  // Get the version information
-  if (this->get_version_info (buf) == -1)
-    return -1;
-
-  // Get the byte order information...
-  if (this->get_byte_order_info (buf) == -1)
-    return -1;
-
-  // Get the message type
-  this->message_type_ = buf[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-
-  // Get the size of the message..
-  this->get_payload_size (buf);
-
-  if (this->message_size_ == 0)
-    {
-      if (this->message_type_ == TAO_GIOP_MESSAGERROR)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) -"
-                          "GIOP_MESSAGE_ERROR received \n"));
-            }
-          return 0;
-        }
-      else
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - "
-                        "Message of  size zero recd. \n"));
-          return -1;
-        }
-    }
-
-  // Get the request id
-  return this->parse_fragment_header (buf, incoming.length ());
-}
-
-
-
-
-int
-TAO_GIOP_Message_State::parse_magic_bytes (char *buf)
-{
-  // The values are hard-coded to support non-ASCII platforms.
-  if (!(buf [0] == 0x47      // 'G'
-        && buf [1] == 0x49   // 'I'
-        && buf [2] == 0x4f   // 'O'
-        && buf [3] == 0x50)) // 'P'
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - bad header, ")
-                    ACE_TEXT ("magic word [%2.2x,%2.2x,%2.2x,%2.2x]\n"),
-                    buf[0],
-                    buf[1],
-                    buf[2],
-                    buf[3]));
-      return -1;
-    }
-
- return 0;
-}
-
-int
-TAO_GIOP_Message_State::get_version_info (char *buf)
-{
-  if (TAO_debug_level > 8)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - GIOP_Message_State::get_version_info\n"));
-    }
-
-  // We have a GIOP message on hand. Get its revision numbers
-  CORBA::Octet incoming_major =
-    buf[TAO_GIOP_VERSION_MAJOR_OFFSET];
-  CORBA::Octet incoming_minor =
-    buf[TAO_GIOP_VERSION_MINOR_OFFSET];
-
-  // Check the revision information
-  if (TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
-          incoming_major,
-          incoming_minor) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - bad version <%d.%d>\n"),
-                      incoming_major, incoming_minor));
-        }
-
-      return -1;
-    }
-
-  // Set the version
-  this->giop_version_.minor = incoming_minor;
-  this->giop_version_.major = incoming_major;
-
-  return 0;
-}
-
-int
-TAO_GIOP_Message_State::get_byte_order_info (char *buf)
-{
-  if (TAO_debug_level > 8)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n"));
-    }
-
-    // Let us be specific that this is for 1.0
-  if (this->giop_version_.minor == 0 &&
-      this->giop_version_.major == 1)
-    {
-      this->byte_order_ =
-        buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET];
-
-      if (this->byte_order_ != 0 &&
-          this->byte_order_ != 1)
-        {
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, "
-                          "invalid byte order <%d> for version <1.0>\n",
-                          this->byte_order_));
-            }
-          return -1;
-        }
-    }
-  else
-    {
-      // Read the byte ORDER
-      this->byte_order_ =
-        (CORBA::Octet) (buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET]& 0x01);
-
-      // Read the fragment bit
-      this->more_fragments_ =
-        (CORBA::Octet) (buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET]& 0x02);
-
-      if ((buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & ~0x3) != 0)
-        {
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - invalid flags for <%d> ")
-                          ACE_TEXT ("for version <%d %d> \n"),
-                          buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET],
-                          this->giop_version_.major,
-                          this->giop_version_.minor));
-            }
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-void
-TAO_GIOP_Message_State::get_payload_size (char *rd_ptr)
-{
-  // Move the read pointer
-  rd_ptr += TAO_GIOP_MESSAGE_SIZE_OFFSET;
-
-  this->message_size_ =  this->read_ulong (rd_ptr);
-}
-
-
-
-int
-TAO_GIOP_Message_State::parse_fragment_header (const char *buf,
-                                               size_t length)
-{
-  // By this point we are doubly sure that we have a more or less
-  // valid GIOP message with a valid major revision number.
-  if ((this->giop_version_.major > 1 || this->giop_version_.minor >= 2) &&
-      (this->more_fragments_ || this->message_type_ == TAO_GIOP_FRAGMENT))
-    {
-      static const size_t len =
-        TAO_GIOP_MESSAGE_HEADER_LEN + TAO_GIOP_MESSAGE_FRAGMENT_HEADER;
-
-      // If there is not enough data in the header to get the request
-      // id, then we need to indicate that by returning 1.
-      if (length < len)
-        return 1;
-
-      // Fragmented message in GIOP 1.2 should have a fragment header
-      // following the GIOP header.
-      buf += TAO_GIOP_MESSAGE_HEADER_LEN;
-      this->request_id_ = this->read_ulong (buf);
-    }
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
-{
-  CORBA::ULong x = 0;
-
-  // We don't need to do this sort of copy. But some compilers (read it
-  // as SunCC) have a problem in deferencing from the
-  // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be
-  // on stack. So let us go ahead with this copying...
-  char buf [4];
-  buf[0] = *rd_ptr;
-  buf[1] = *(rd_ptr + 1);
-  buf[2] = *(rd_ptr + 2);
-  buf[3] = *(rd_ptr + 3);
-
-#if !defined (ACE_DISABLE_SWAP_ON_READ)
-  if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER))
-    {
-      x = *reinterpret_cast<ACE_CDR::ULong*> (buf);
-    }
-  else
-    {
-      ACE_CDR::swap_4 (buf, reinterpret_cast<char*> (&x));
-    }
-#else
-  x = *reinterpret_cast<ACE_CDR::ULong*> (buf);
-#endif /* ACE_DISABLE_SWAP_ON_READ */
-
-  return x;
-}
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
deleted file mode 100644
index 16d9c11d14c..00000000000
--- a/TAO/tao/GIOP_Message_State.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     GIOP_Message_State.h
- *
- *  $Id$
- *
- *   GIOP utility definitions
- *
- *
- *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
- *  @author  Carlos O' Ryan <coryan@uci.edu>
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-#ifndef TAO_GIOP_MESSAGE_STATE_H
-#define TAO_GIOP_MESSAGE_STATE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/GIOP_Message_Version.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-class TAO_GIOP_Message_Base;
-
-/**
- * @class TAO_GIOP_Message_State
- *
- * @brief Generic definitions for Message States.
- *
- *  This helps to establish the state of the incoming messages.
- */
-
-class TAO_Export TAO_GIOP_Message_State
-{
-public:
-
-  /// Ctor
-  TAO_GIOP_Message_State (void);
-
-  /// Parse the message header.
-  ///
-  /// \return -1 There was some error parsing the GIOP header
-  /// \return 0  The GIOP header was parsed correctly
-  /// \return 1  There was not enough data in the message block to
-  ///            parse the header
-  int parse_message_header (ACE_Message_Block &incoming);
-
-  /// Return the message size
-  CORBA::ULong message_size (void) const;
-
-  /// Return the message size
-  CORBA::ULong payload_size (void) const;
-
-  /// Return the byte order information
-  CORBA::Octet byte_order (void) const;
-
-  /// Reset the state..
-  void reset (void);
-
-private:
-
-  friend class TAO_GIOP_Message_Base;
-
-  /// Parse the message header.
-  int parse_message_header_i (ACE_Message_Block &incoming);
-
-  /// Checks for the magic word 'GIOP' in the start of the incoing
-  /// stream
-  int parse_magic_bytes (char *buf);
-
-  /// Extracts the version information from the incoming
-  /// stream. Performs a check for  whether the version information is
-  /// right and sets the information in the <state>
-  int get_version_info (char *buf);
-
-  /// Extracts the byte order information from the incoming
-  /// stream. Performs a check for  whether the byte order information
-  /// right and sets the information in the <state>
-  int get_byte_order_info (char *buf);
-
-  /// Gets the size of the payload and set the size in the <state>
-  void get_payload_size (char *buf);
-
-  /// Parses the GIOP FRAGMENT_HEADER  information from the incoming
-  /// stream.
-  int parse_fragment_header (const char *buf,
-                             size_t length);
-
-  /// Read the unsigned long from the buffer. The <buf> should just
-  /// point to the next 4 bytes data that represent the ULong
-  CORBA::ULong read_ulong (const char *buf);
-
-private:
-  // GIOP version information..
-  TAO_GIOP_Message_Version giop_version_;
-
-  /// 0 = big, 1 = little
-  CORBA::Octet byte_order_;
-
-  /// MsgType above
-  CORBA::Octet message_type_;
-
-  /// in byte_order!
-  CORBA::ULong message_size_;
-
-  /// Request Id from the Fragment header
-  CORBA::ULong request_id_;
-
-  /// (Requests and Replys)
-  /// A value of zero indicates that this message does not have any
-  /// fragments.  A value of non-zero indicates that it does have
-  /// fragments.
-  CORBA::Octet more_fragments_;
-
-  /// Missing data
-  CORBA::ULong missing_data_;
-};
-
-
-const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12;
-const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8;
-const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
-const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
-const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
-const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
-const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_State.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_MESSAGE_STATE_H*/
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
deleted file mode 100644
index fe076bee689..00000000000
--- a/TAO/tao/GIOP_Message_State.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//$Id$
-
-ACE_INLINE CORBA::ULong
-TAO_GIOP_Message_State::message_size (void) const
-{
-  CORBA::ULong len =
-    this->message_size_ + TAO_GIOP_MESSAGE_HEADER_LEN;
-
-  return len;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_GIOP_Message_State::payload_size (void) const
-{
-  return this->message_size_;
-}
-
-ACE_INLINE CORBA::Octet
-TAO_GIOP_Message_State::byte_order (void) const
-{
-  return this->byte_order_;
-}
-
-ACE_INLINE void
-TAO_GIOP_Message_State::reset (void)
-{
-  this->message_type_ = 0;
-  this->message_size_ = 0;
-  this->more_fragments_ = 0;
-  this->request_id_ = 0;
-  this->missing_data_ = 0;
-}
-
-#if 0
-ACE_INLINE int
-TAO_GIOP_Message_State::message_fragmented (void)
-{
-  if (this->more_fragments)
-    return 1;
-
-  return 0;
-}
-
-
-
-ACE_INLINE CORBA::Boolean
-TAO_GIOP_Message_State::header_received (void) const
-{
-  return this->message_size != 0;
-}
-
-#endif
diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp
deleted file mode 100644
index 78a90520dcf..00000000000
--- a/TAO/tao/GIOP_Message_Version.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//$Id$
-# include "GIOP_Message_Version.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Version.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           GIOP_Message_Version, 
-           "$Id$")
diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h
deleted file mode 100644
index 0c3f4dc9c55..00000000000
--- a/TAO/tao/GIOP_Message_Version.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     GIOP_Message_Version.h
- *
- *  $Id$
- *
- *   GIOP Version utility class definition
- *
- *
- *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
- *  @author  Carlos O' Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_GIOP_MESSAGE_VERSION_H
-#define TAO_GIOP_MESSAGE_VERSION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_GIOP_Message_Version
- *
- * @brief Major and Minor version number of the Inter-ORB Protocol.
- */
-class TAO_Export TAO_GIOP_Message_Version
-{
-public:
-
-  /// Major version number
-  CORBA::Octet major;
-
-  /// Minor version number
-  CORBA::Octet minor;
-
-  /// Copy constructor
-  TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src);
-
-  /// Default constructor.
-  TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR,
-                            CORBA::Octet min = TAO_DEF_GIOP_MINOR);
-
-  /// Destructor.
-  ~TAO_GIOP_Message_Version (void);
-
-  /// Explicitly set the major and minor version.
-  void set_version (CORBA::Octet maj, CORBA::Octet min);
-
-  /// Copy operator.
-  TAO_GIOP_Message_Version &operator= (const TAO_GIOP_Message_Version &src);
-
-  /// Equality operator
-  bool operator== (const TAO_GIOP_Message_Version &src);
-  bool operator!= (const TAO_GIOP_Message_Version &src);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Version.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_VERSION_H */
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
deleted file mode 100644
index 216e29f5424..00000000000
--- a/TAO/tao/GIOP_Message_Version.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-ACE_INLINE
-TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (
-    const TAO_GIOP_Message_Version &src)
-  : major (src.major),
-    minor (src.minor)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj,
-                                                    CORBA::Octet min)
-  : major (maj),
-    minor (min)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Message_Version::~TAO_GIOP_Message_Version (void)
-{
-}
-
-ACE_INLINE TAO_GIOP_Message_Version &
-TAO_GIOP_Message_Version::operator= (
-    const TAO_GIOP_Message_Version &src)
-{
-  if (this == &src)
-    return *this;
-
-  this->major = src.major;
-  this->minor = src.minor;
-  return *this;
-}
-
-
-ACE_INLINE void
-TAO_GIOP_Message_Version::set_version (CORBA::Octet maj,
-                                       CORBA::Octet min)
-{
-  this->major = maj;
-  this->minor = min;
-}
-
-ACE_INLINE bool
-TAO_GIOP_Message_Version::operator== (
-    const TAO_GIOP_Message_Version &src)
-{
-  return this->major == src.major && this->minor == src.minor;
-}
-
-ACE_INLINE bool
-TAO_GIOP_Message_Version::operator!= (
-    const TAO_GIOP_Message_Version &src)
-{
-  return !(*this == src);
-}
diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp
deleted file mode 100644
index 464eaa8430e..00000000000
--- a/TAO/tao/GIOP_Utils.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-#include "tao/GIOP_Utils.h"
-#include "tao/debug.h"
-#include "tao/Transport.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (tao,
-           GIOP_Utils,
-           "$Id$")
-
-int
-TAO_GIOP_Utils::
-  read_bytes_input (TAO_Transport *transport,
-                    TAO_InputCDR &input,
-                    CORBA::ULong read_size,
-                    ACE_Time_Value *value)
-{
-  // Grow the size of CDR stream
-  if (input.grow (read_size) == -1)
-    return -1;
-
-  // Read until all the header is received.  There should be no
-  // problems with locking, the header is only a few bytes so they
-  // should all be available on the socket, otherwise there is a
-  // problem with the underlying transport, in which case we have more
-  // problems than just this small loop.
-  char *buf = input.rd_ptr ();
-  ssize_t n = 0;
-
-  for (int t = read_size;
-       t != 0;
-       t -= n)
-    {
-      n = transport->recv (buf, t, value);
-      if (n == -1)
-        return -1;
-      else if (n == 0) // @@ TODO && errno != EWOULDBLOCK)
-        return -1;
-      buf += n;
-    }
-
-  return 1;
-}
-
-
-ssize_t
-TAO_GIOP_Utils::read_buffer (TAO_Transport *transport,
-                             char *buf,
-                             size_t len,
-                             ACE_Time_Value *max_wait_time)
-{
-  ssize_t bytes_read = transport->recv (buf, len, max_wait_time);
-
-  if (bytes_read <= 0 && TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t|%N|%l) - %p,\n")
-                ACE_TEXT ("              transport = %d, ")
-                ACE_TEXT ("bytes = %d, len = %d\n"),
-                ACE_TEXT ("read_buffer"),
-                transport->id (),
-                bytes_read,
-                len));
-
-  if (bytes_read == -1 && errno == ECONNRESET)
-    {
-      // @@ Is this OK??
-
-      // We got a connection reset (TCP RSET) from the other side,
-      // i.e., they didn't initiate a proper shutdown.
-      //
-      // Make it look like things are OK to the upper layer.
-      bytes_read = 0;
-      errno = 0;
-    }
-
-  return bytes_read;
-}
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
deleted file mode 100644
index b3d3ff167b3..00000000000
--- a/TAO/tao/GIOP_Utils.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     GIOP_Utils.h
- *
- *  $Id$
- *
- *   GIOP utility definitions
- *
- *
- *  @author  Chris Cleeland <cleeland@cs.wustl.edu>
- *  @author  Carlos O' Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_GIOP_UTILS_H
-#define TAO_GIOP_UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IOP_IORC.h"
-
-class TAO_Transport;
-class ACE_Time_Value;
-
-/**
- * All GIOP messages include a header and message type.  Not
- * really a message type, but needed to bring that information
- * back somehow.
- */
-typedef enum GIOP_Messages
-{
-  // = GIOP message types.
-  TAO_GIOP_REQUEST = 0,                // sent by client.
-  TAO_GIOP_REPLY = 1,                  // by server.
-  TAO_GIOP_CANCELREQUEST = 2,          // by client.
-  TAO_GIOP_LOCATEREQUEST = 3,          // by client.
-  TAO_GIOP_LOCATEREPLY = 4,
-  TAO_GIOP_CLOSECONNECTION = 5,
-  TAO_GIOP_MESSAGERROR = 6,           // by both.
-  TAO_GIOP_FRAGMENT = 7                // by both.
-}TAO_GIOP_Message_Type;
-
-
-typedef enum GIOP_LocateStatusType
-{
-  TAO_GIOP_UNKNOWN_OBJECT,
-  TAO_GIOP_OBJECT_HERE,
-  TAO_GIOP_OBJECT_FORWARD,
-  TAO_GIOP_OBJECT_FORWARD_PERM,      //GIOP1.2
-  TAO_GIOP_LOC_SYSTEM_EXCEPTION,     // GIOP1.2
-  TAO_GIOP_LOC_NEEDS_ADDRESSING_MODE //GIOP 1.2
-}TAO_GIOP_Locate_Status_Type;
-
-/**
- * @class TAO_GIOP_Locate_Status_Msg
- *
- * @brief Hold the relevant information for every type of Locate mesg.
- *
- * This class is there to hold the relevant info for different
- * types of locate status messages. As on date we dont know much
- * about other mesg types other than OBJECT_FORWARD. This clss can
- * be clearly defined as time progresses.
- */
-class TAO_Export TAO_GIOP_Locate_Status_Msg
-{
-public:
-  /// The value will need to be used when the Message type is
-  /// TAO_GIOP_OBJECT_FORWARD
-  CORBA::Object_var forward_location_var;
-
-  /// Stype of Locate status message
-  ///@@ Other mesg types.
-  TAO_GIOP_Locate_Status_Type status;
-};
-
-
-typedef enum GIOP_ReplyStatusType
-{
-  /// Request completed successfully
-  TAO_GIOP_NO_EXCEPTION,
-
-  /// Request terminated with user exception
-  TAO_GIOP_USER_EXCEPTION,
-
-  /// Request terminated with system exception
-  TAO_GIOP_SYSTEM_EXCEPTION,
-
-  /// Reply is a location forward type
-  TAO_GIOP_LOCATION_FORWARD,
-
-  /// GIOP 1.2, Reply is a location forward perm type..
-  TAO_GIOP_LOCATION_FORWARD_PERM,
-
-  /// GIOP1.2,
-  TAO_GIOP_NEEDS_ADDRESSING_MODE
-
-} TAO_GIOP_Reply_Status_Type;
-
-
-/**
- * @class TAO_GIOP_ReplyHeader
- *
- * @brief This class embodies the header of a GIOP reply.
- * @@Not used. Could be used in future
- */
-class TAO_Export TAO_GIOP_ReplyHeader
-{
-public:
-  /// Information
-  IOP::ServiceContextList service_info;
-
-  /// Unique identifier of the request for which this is a reply.
-  CORBA::ULong request_id;
-
-  /// Status of the reply (see above enum).
-  TAO_GIOP_Reply_Status_Type reply_status;
-};
-
-/**
- * @class TAO_GIOP_Utils
- *
- * @brief Utility class that has some commonly used methods for both GIOP
- * Base  & GIOP lite
- */
-class TAO_Export TAO_GIOP_Utils
-{
-public:
-  static int read_bytes_input (TAO_Transport *transport,
-                               TAO_InputCDR &cdr,
-                               CORBA::ULong buf_size,
-                               ACE_Time_Value *value = 0);
-
-  static ssize_t read_buffer (TAO_Transport *transport,
-                              char *buf,
-                              size_t len,
-                              ACE_Time_Value *max_wait_time = 0);
-};
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GIOP_UTILS_H */
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
deleted file mode 100644
index ae586a57a99..00000000000
--- a/TAO/tao/GUIResource_Factory.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//$Id$
-#include "tao/GUIResource_Factory.h"
-#include "ace/Reactor.h"
-#include "tao/debug.h"
-
-namespace TAO
-{
-  GUIResource_Factory::GUIResource_Factory ():
-    dynamically_allocated_reactor_ (0)
-  {
-  }
-
-  GUIResource_Factory::~GUIResource_Factory ()
-  {
-  }
-
-  ACE_Reactor *
-  GUIResource_Factory::get_reactor (void)
-  {
-    // @@Marek, do we need a lock here??
-    // @Bala, I suppose we don't need locking for any
-    //   reasonable use case as this
-    //   factory is intended to be a variable in TSS.
-    //   I can imagine that    someone may try to use it in distinct
-    //   threads, though I do not know
-    //   what for. Nevertheless, just for a case  I sync the creation of reactor.
-    //   I think, that double checked locking is
-    //   not necessary, because the performance is not an issue here.
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-    ACE_Reactor *reactor = 0;
-    ACE_NEW_RETURN (reactor,
-                    ACE_Reactor (this->reactor_impl (), 1),
-                    0);
-
-    if (reactor->initialized () == 0)
-    {
-      delete reactor;
-      reactor = 0;
-    }
-    else
-      this->dynamically_allocated_reactor_ = 1;
-
-    return reactor;
-  }
-
-  void
-  GUIResource_Factory::reclaim_reactor (ACE_Reactor *reactor)
-  {
-    ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ );
-
-    if (this->dynamically_allocated_reactor_ == 1)
-      delete reactor;
-  }
-}
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
deleted file mode 100644
index 0d85ab6b2d1..00000000000
--- a/TAO/tao/GUIResource_Factory.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   GUIResource_Factory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-
-#ifndef TAO_GUI_RESOURCE_FACTORY_H
-#define TAO_GUI_RESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//forwards
-class ACE_Reactor_Impl;
-class ACE_Reactor;
-
-namespace TAO
-{
-  /** Abstract base class for the GUI resource factory.
-   *
-   * This base class for resource factories which provide
-   * GUIReactors integrated with specific GUI
-   * event loop. In general, children of this class reimplement
-   * reactor_impl method where specific
-   * GUIReactor is created. GUIResource_Factory are usually
-   * created by GUIResource_Loader subclasses.
-   * Children of this class will be held in TSS by the ORB Core.
-   */
-  class TAO_Export GUIResource_Factory
-  {
-  public:
-
-    GUIResource_Factory ();
-
-    virtual ~GUIResource_Factory ();
-
-    /** Create ACE_Reactor using allocate_reactor_impl.
-     * Please note that this call is NOT synchronized. Left to the
-     * higher level versions to synchronize access.
-     */
-    virtual ACE_Reactor *get_reactor (void) ;
-
-    /** Reclaim the reactor if allocated by this factory.
-     * Please note that this call is NOT synchronized. Left to the
-     * higher level versions to synchronize access.
-     */
-    virtual void reclaim_reactor (ACE_Reactor *);
-
-  protected:
-
-    /** Create or return current reactor instance.
-     * Please note that this call is NOT synchronized. Left to the
-     * get_reactor to synchronize access.
-     */
-    virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
-
-  private:
-
-    /**
-     * Flag that is set to 1 if the reactor obtained from the
-     * get_reactor() method is dynamically allocated.  If this flag is
-     * set to 1, then the reclaim_reactor() method with call the delete
-     * operator on the given reactor.  This flag is necessary to make
-     * sure that a reactor not allocated by the default resource factory
-     * is not reclaimed by the default resource factory.  Such a
-     * situation can occur when a resource factory derived from the
-     * default one overrides the get_reactor() method but does not
-     * override the reclaim_reactor() method.
-     */
-    int dynamically_allocated_reactor_;
-
-    /// for internal locking.
-    TAO_SYNCH_MUTEX lock_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GUI_RESOURCE_FACTORY_H*/
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
deleted file mode 100644
index 308c3515373..00000000000
--- a/TAO/tao/IFR_Client.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_IFR_Client
-  dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
-
-  Source_Files {
-    IFR_Client
-  }
-
-  Header_Files {
-    IFR_Client
-  }
-
-  Inline_Files {
-    IFR_Client
-  }
-
-  Template_Files {
-    IFR_Client
-  }
-
-  Resource_Files {
-    IFR_Client
-  }
-
-  PIDL_Files {
-    IFR_Client
-  }
-
-  Pkgconfig_Files {
-    IFR_Client/TAO_IFR_Client.pc.in
-  }
-}
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
deleted file mode 100644
index 5d20d202585..00000000000
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ /dev/null
@@ -1,398 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file IFR_Base.pidl
- *
- * $Id$
- *
- * This file was used to generate the code in IFR_BaseC.{h,i,cpp}.
- * The original file Interface.idl was split into four pieces, to
- * keep the generated files to a manageable size and reduce build
- * time. This IDL file contains the abstract base interfaces of
- * the IFR as well as many of the non-interface data types used
- * by all other IFR interfaces.
- *
- * The command used to generate code from this IDL file is:
- *
- *   tao_idl -GA -Ge 1 -Sc -I../.. \
- *        -Wb,export_macro=TAO_IFR_Client_Export \
- *        -Wb,export_include=ifr_client_export.h \
- *        -Wb,pre_include="ace/pre.h" \
- *        -Wb,post_include="ace/post.h" \
- *        IFR_Base.pidl
- *
- * Only the stub files are used in the TAO_IFR_Client library. The
- * skeleton files can be deleted from this directory.
- *
- * No patching of the generated stub files is necessary.
- *
- * To generate the skeleton files for the IFR Service, the command is:
- *
- *   tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
- *        -Wb,pre_include="ace/pre.h" \
- *        -Wb,post_include="ace/post.h" \
- *        IFR_Base.pidl
- *
- * The only modification necessary to the skelton files is to
- * change
- *
- * #include "IFR_BaseC.h"
- *
- * to
- *
- * #include "tao/IFR_Client/IFR_BaseC.h"
- *
- * in IFR_BaseS.h. The stub files may be deleted from the IFRService
- * directory.
- *
- */
-
-#ifndef _IFR_BASE_IDL_
-#define _IFR_BASE_IDL_
-
-#include <orb_types.pidl>
-#include <Typecode_types.pidl>
-
-module CORBA
-{
-  typeprefix CORBA "omg.org";
-
-  typedef string ScopedName;
-
-  enum DefinitionKind
-  {
-    dk_none,
-    dk_all,
-    dk_Attribute,
-    dk_Constant,
-    dk_Exception,
-    dk_Interface,
-    dk_Module,
-    dk_Operation,
-    dk_Typedef,
-    dk_Alias,
-    dk_Struct,
-    dk_Union,
-    dk_Enum,
-    dk_Primitive,
-    dk_String,
-    dk_Sequence,
-    dk_Array,
-    dk_Repository,
-    dk_Wstring,
-    dk_Fixed,
-    dk_Value,
-    dk_ValueBox,
-    dk_ValueMember,
-    dk_Native,
-    dk_AbstractInterface,
-    dk_LocalInterface,
-    dk_Component,
-    dk_Home,
-    dk_Factory,
-    dk_Finder,
-    dk_Emits,
-    dk_Publishes,
-    dk_Consumes,
-    dk_Provides,
-    dk_Uses,
-    dk_Event
-  };
-
-  interface IRObject
-  {
-    // read interface
-    readonly attribute DefinitionKind def_kind;
-
-    // write interface
-    void destroy ();
-  };
-
-  typedef string VersionSpec;
-
-  interface Contained;
-  interface Repository;
-  interface Container;
-
-  interface Contained : IRObject
-  {
-    // read/write interface
-    attribute RepositoryId id;
-    attribute Identifier name;
-    attribute VersionSpec version;
-
-    // read interface
-    readonly attribute Container defined_in;
-    readonly attribute ScopedName absolute_name;
-    readonly attribute Repository containing_repository;
-
-    struct Description
-    {
-      DefinitionKind kind;
-      any value;
-    };
-
-    Description describe ();
-
-    // write interface
-    void move (
-        in Container new_container,
-        in Identifier new_name,
-        in VersionSpec new_version
-      );
-  };
-
-  interface ModuleDef;
-  interface ConstantDef;
-  interface IDLType;
-  interface StructDef;
-  interface UnionDef;
-  interface EnumDef;
-  interface AliasDef;
-
-  interface InterfaceDef;
-  typedef sequence<InterfaceDef> InterfaceDefSeq;
-
-  interface ExceptionDef;
-  interface NativeDef;
-
-  interface ValueDef;
-  typedef sequence<ValueDef> ValueDefSeq;
-
-  interface ValueBoxDef;
-
-  interface AbstractInterfaceDef;
-  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
-
-  interface LocalInterfaceDef;
-  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
-
-  interface ExtInterfaceDef;
-  typedef sequence <ExtInterfaceDef> ExtInterfaceDefSeq;
-
-  interface ExtValueDef;
-  typedef sequence <ExtValueDef> ExtValueDefSeq;
-
-  interface ExtAbstractInterfaceDef;
-  typedef sequence <ExtAbstractInterfaceDef>
-
-  ExtAbstractInterfaceDefSeq;
-  interface ExtLocalInterfaceDef;
-
-  typedef sequence <ExtLocalInterfaceDef>
-  ExtLocalInterfaceDefSeq;
-
-  typedef sequence <Contained> ContainedSeq;
-
-  struct StructMember
-  {
-    Identifier name;
-    TypeCode type;
-    IDLType type_def;
-  };
-
-  typedef sequence <StructMember> StructMemberSeq;
-
-  struct Initializer
-  {
-    StructMemberSeq members;
-    Identifier name;
-  };
-
-  typedef sequence <Initializer> InitializerSeq;
-
-  struct ExceptionDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-  };
-
-  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
-
-  struct ExtInitializer
-  {
-    StructMemberSeq members;
-    ExcDescriptionSeq exceptions;
-    Identifier name;
-  };
-
-  typedef sequence <ExtInitializer> ExtInitializerSeq;
-
-  struct UnionMember
-  {
-    Identifier name;
-    any label;
-    TypeCode type;
-    IDLType type_def;
-  };
-
-  typedef sequence <UnionMember> UnionMemberSeq;
-  typedef sequence <Identifier> EnumMemberSeq;
-
-  interface Container : IRObject
-  {
-    // read interface
-    Contained lookup (
-        in ScopedName search_name
-      );
-    ContainedSeq contents (
-        in DefinitionKind limit_type,
-        in boolean exclude_inherited
-      );
-    ContainedSeq lookup_name (
-        in Identifier search_name,
-        in long levels_to_search,
-        in DefinitionKind limit_type,
-        in boolean exclude_inherited
-      );
-    struct Description
-    {
-      Contained contained_object;
-      DefinitionKind kind;
-      any value;
-    };
-
-    typedef sequence<Description> DescriptionSeq;
-
-    DescriptionSeq describe_contents (
-        in DefinitionKind limit_type,
-        in boolean exclude_inherited,
-        in long max_returned_objs
-      );
-
-    // write interface
-
-    ModuleDef create_module (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version
-      );
-
-    ConstantDef create_constant (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType type,
-        in any value
-      );
-
-    StructDef create_struct (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in StructMemberSeq members
-      );
-
-    UnionDef create_union (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType discriminator_type,
-        in UnionMemberSeq members
-      );
-
-    EnumDef create_enum (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in EnumMemberSeq members
-      );
-
-    AliasDef create_alias (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType original_type
-      );
-
-    InterfaceDef create_interface (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in InterfaceDefSeq base_interfaces
-      );
-
-    ValueDef create_value (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in boolean is_custom,
-        in boolean is_abstract,
-        in ValueDef base_value,
-        in boolean is_truncatable,
-        in ValueDefSeq abstract_base_values,
-        in InterfaceDefSeq supported_interfaces,
-        in InitializerSeq initializers
-      );
-
-    ValueBoxDef create_value_box(
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType original_type_def
-      );
-
-    ExceptionDef create_exception(
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in StructMemberSeq members
-      );
-
-    NativeDef create_native(
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version
-      );
-
-    AbstractInterfaceDef create_abstract_interface (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in AbstractInterfaceDefSeq base_interfaces
-      );
-
-    LocalInterfaceDef create_local_interface (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in InterfaceDefSeq base_interfaces
-      );
-
-    ExtValueDef create_ext_value (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in boolean is_custom,
-	in boolean is_abstract,
-	in ValueDef base_value,
-	in boolean is_truncatable,
-	in ValueDefSeq abstract_base_values,
-	in InterfaceDefSeq supported_interfaces,
-	in ExtInitializerSeq initializers
-      );
-  };
-
-  interface IDLType : IRObject
-  {
-    readonly attribute TypeCode type;
-  };
-
-  interface TypedefDef : Contained, IDLType
-  {
-  };
-
-  struct TypeDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-  };
-};
-
-#endif /* _IFR_BASE_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_BaseA.cpp b/TAO/tao/IFR_Client/IFR_BaseA.cpp
deleted file mode 100644
index 1ad270a8b88..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseA.cpp
+++ /dev/null
@@ -1,2979 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ScopedName (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ScopedName:1.0",
-    "ScopedName",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ScopedName =
-    &_tao_tc_CORBA_ScopedName;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_DefinitionKind[] =
-  {
-    "dk_none",
-    "dk_all",
-    "dk_Attribute",
-    "dk_Constant",
-    "dk_Exception",
-    "dk_Interface",
-    "dk_Module",
-    "dk_Operation",
-    "dk_Typedef",
-    "dk_Alias",
-    "dk_Struct",
-    "dk_Union",
-    "dk_Enum",
-    "dk_Primitive",
-    "dk_String",
-    "dk_Sequence",
-    "dk_Array",
-    "dk_Repository",
-    "dk_Wstring",
-    "dk_Fixed",
-    "dk_Value",
-    "dk_ValueBox",
-    "dk_ValueMember",
-    "dk_Native",
-    "dk_AbstractInterface",
-    "dk_LocalInterface",
-    "dk_Component",
-    "dk_Home",
-    "dk_Factory",
-    "dk_Finder",
-    "dk_Emits",
-    "dk_Publishes",
-    "dk_Consumes",
-    "dk_Provides",
-    "dk_Uses",
-    "dk_Event"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DefinitionKind (
-    "IDL:omg.org/CORBA/DefinitionKind:1.0",
-    "DefinitionKind",
-    _tao_enumerators_CORBA_DefinitionKind,
-    36);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
-    &_tao_tc_CORBA_DefinitionKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IRObject (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IRObject:1.0",
-    "IRObject");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IRObject =
-    &_tao_tc_CORBA_IRObject;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_VersionSpec (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/VersionSpec:1.0",
-    "VersionSpec",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_VersionSpec =
-    &_tao_tc_CORBA_VersionSpec;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
-  {
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Contained/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Contained_Description,
-    2);
-  
-::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
-  &_tao_tc_CORBA_Contained_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Contained:1.0",
-    "Contained");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Contained =
-    &_tao_tc_CORBA_Contained;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_InterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
-      &CORBA_InterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
-    "InterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
-    &_tao_tc_CORBA_InterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
-      &CORBA_ValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueDefSeq:1.0",
-    "ValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
-    &_tao_tc_CORBA_ValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
-      &CORBA_AbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
-    "AbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_AbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_LocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
-      &CORBA_LocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
-    "LocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
-    &_tao_tc_CORBA_LocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
-      &CORBA_ExtInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
-    "ExtInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
-      &CORBA_ExtValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
-    "ExtValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
-    &_tao_tc_CORBA_ExtValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
-      &CORBA_ExtAbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
-    "ExtAbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtLocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtLocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
-      &CORBA_ExtLocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
-    "ExtLocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtLocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContainedSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Contained,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
-      &CORBA_ContainedSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContainedSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContainedSeq:1.0",
-    "ContainedSeq",
-    &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
-    &_tao_tc_CORBA_ContainedSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/StructMember:1.0",
-    "StructMember",
-    _tao_fields_CORBA_StructMember,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMember =
-    &_tao_tc_CORBA_StructMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StructMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_StructMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
-      &CORBA_StructMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StructMemberSeq:1.0",
-    "StructMemberSeq",
-    &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
-    &_tao_tc_CORBA_StructMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Initializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Initializer:1.0",
-    "Initializer",
-    _tao_fields_CORBA_Initializer,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Initializer =
-    &_tao_tc_CORBA_Initializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Initializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
-      &CORBA_InitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InitializerSeq:1.0",
-    "InitializerSeq",
-    &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
-    &_tao_tc_CORBA_InitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExceptionDescription:1.0",
-    "ExceptionDescription",
-    _tao_fields_CORBA_ExceptionDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
-    &_tao_tc_CORBA_ExceptionDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExcDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
-      &CORBA_ExcDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
-    "ExcDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
-    &_tao_tc_CORBA_ExcDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtInitializer:1.0",
-    "ExtInitializer",
-    _tao_fields_CORBA_ExtInitializer,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
-    &_tao_tc_CORBA_ExtInitializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInitializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
-      &CORBA_ExtInitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
-    "ExtInitializerSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
-    &_tao_tc_CORBA_ExtInitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "label", &CORBA::_tc_any },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/UnionMember:1.0",
-    "UnionMember",
-    _tao_fields_CORBA_UnionMember,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMember =
-    &_tao_tc_CORBA_UnionMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UnionMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_UnionMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
-      &CORBA_UnionMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
-    "UnionMemberSeq",
-    &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
-    &_tao_tc_CORBA_UnionMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_EnumMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Identifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
-      &CORBA_EnumMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
-    "EnumMemberSeq",
-    &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
-    &_tao_tc_CORBA_EnumMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
-  {
-    { "contained_object", &CORBA::_tc_Contained },
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Container/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Container_Description,
-    3);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
-  &_tao_tc_CORBA_Container_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_Container_DescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::Container::_tc_Description,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
-      &CORBA_Container_DescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_DescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
-    "DescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
-  &_tao_tc_CORBA_Container_DescriptionSeq;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Container =
-    &_tao_tc_CORBA_Container;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IDLType (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IDLType:1.0",
-    "IDLType");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IDLType =
-    &_tao_tc_CORBA_IDLType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypedefDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/TypedefDef:1.0",
-    "TypedefDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypedefDef =
-    &_tao_tc_CORBA_TypedefDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/TypeDescription:1.0",
-    "TypeDescription",
-    _tao_fields_CORBA_TypeDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypeDescription =
-    &_tao_tc_CORBA_TypeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DefinitionKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
-      _tao_any,
-      CORBA::_tc_DefinitionKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DefinitionKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
-        _tao_any,
-        CORBA::_tc_DefinitionKind,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IRObject>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr _tao_elem
-  )
-{
-  CORBA::IRObject_ptr _tao_objptr =
-    CORBA::IRObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IRObject>::insert (
-      _tao_any,
-      CORBA::IRObject::_tao_any_destructor,
-      CORBA::_tc_IRObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IRObject>::extract (
-        _tao_any,
-        CORBA::IRObject::_tao_any_destructor,
-        CORBA::_tc_IRObject,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Contained>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr _tao_elem
-  )
-{
-  CORBA::Contained_ptr _tao_objptr =
-    CORBA::Contained::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Contained>::insert (
-      _tao_any,
-      CORBA::Contained::_tao_any_destructor,
-      CORBA::_tc_Contained,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Contained>::extract (
-        _tao_any,
-        CORBA::Contained::_tao_any_destructor,
-        CORBA::_tc_Contained,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Contained::Description &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert_copy (
-      _tao_any,
-      CORBA::Contained::Description::_tao_any_destructor,
-      CORBA::Contained::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained::Description *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert (
-      _tao_any,
-      CORBA::Contained::Description::_tao_any_destructor,
-      CORBA::Contained::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Contained::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
-        _tao_any,
-        CORBA::Contained::Description::_tao_any_destructor,
-        CORBA::Contained::_tc_Description,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::InterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
-        _tao_any,
-        CORBA::ValueDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AbstractInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LocalInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtValueDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtValueDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtValueDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAbstractInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtLocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtLocalInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContainedSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert (
-      _tao_any,
-      CORBA::ContainedSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ContainedSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::extract (
-        _tao_any,
-        CORBA::ContainedSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
-      _tao_any,
-      CORBA::StructMember::_tao_any_destructor,
-      CORBA::_tc_StructMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert (
-      _tao_any,
-      CORBA::StructMember::_tao_any_destructor,
-      CORBA::_tc_StructMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
-        _tao_any,
-        CORBA::StructMember::_tao_any_destructor,
-        CORBA::_tc_StructMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
-        _tao_any,
-        CORBA::StructMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Initializer &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
-      _tao_any,
-      CORBA::Initializer::_tao_any_destructor,
-      CORBA::_tc_Initializer,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Initializer *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert (
-      _tao_any,
-      CORBA::Initializer::_tao_any_destructor,
-      CORBA::_tc_Initializer,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Initializer *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Initializer *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Initializer *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
-        _tao_any,
-        CORBA::Initializer::_tao_any_destructor,
-        CORBA::_tc_Initializer,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InitializerSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
-        _tao_any,
-        CORBA::InitializerSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExceptionDescription::_tao_any_destructor,
-      CORBA::_tc_ExceptionDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert (
-      _tao_any,
-      CORBA::ExceptionDescription::_tao_any_destructor,
-      CORBA::_tc_ExceptionDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExceptionDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::extract (
-        _tao_any,
-        CORBA::ExceptionDescription::_tao_any_destructor,
-        CORBA::_tc_ExceptionDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExcDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ExcDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInitializer &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert_copy (
-      _tao_any,
-      CORBA::ExtInitializer::_tao_any_destructor,
-      CORBA::_tc_ExtInitializer,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInitializer *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert (
-      _tao_any,
-      CORBA::ExtInitializer::_tao_any_destructor,
-      CORBA::_tc_ExtInitializer,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInitializer *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInitializer *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInitializer *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::extract (
-        _tao_any,
-        CORBA::ExtInitializer::_tao_any_destructor,
-        CORBA::_tc_ExtInitializer,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInitializerSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtInitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInitializerSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert (
-      _tao_any,
-      CORBA::ExtInitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInitializerSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInitializerSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::extract (
-        _tao_any,
-        CORBA::ExtInitializerSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
-      _tao_any,
-      CORBA::UnionMember::_tao_any_destructor,
-      CORBA::_tc_UnionMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert (
-      _tao_any,
-      CORBA::UnionMember::_tao_any_destructor,
-      CORBA::_tc_UnionMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
-        _tao_any,
-        CORBA::UnionMember::_tao_any_destructor,
-        CORBA::_tc_UnionMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
-        _tao_any,
-        CORBA::UnionMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::EnumMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
-        _tao_any,
-        CORBA::EnumMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr _tao_elem
-  )
-{
-  CORBA::Container_ptr _tao_objptr =
-    CORBA::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Container>::insert (
-      _tao_any,
-      CORBA::Container::_tao_any_destructor,
-      CORBA::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Container>::extract (
-        _tao_any,
-        CORBA::Container::_tao_any_destructor,
-        CORBA::_tc_Container,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::Description &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert_copy (
-      _tao_any,
-      CORBA::Container::Description::_tao_any_destructor,
-      CORBA::Container::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::Description *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert (
-      _tao_any,
-      CORBA::Container::Description::_tao_any_destructor,
-      CORBA::Container::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
-        _tao_any,
-        CORBA::Container::Description::_tao_any_destructor,
-        CORBA::Container::_tc_Description,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::DescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
-        _tao_any,
-        CORBA::Container::DescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IDLType>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr _tao_elem
-  )
-{
-  CORBA::IDLType_ptr _tao_objptr =
-    CORBA::IDLType::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IDLType>::insert (
-      _tao_any,
-      CORBA::IDLType::_tao_any_destructor,
-      CORBA::_tc_IDLType,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IDLType>::extract (
-        _tao_any,
-        CORBA::IDLType::_tao_any_destructor,
-        CORBA::_tc_IDLType,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypedefDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr _tao_elem
-  )
-{
-  CORBA::TypedefDef_ptr _tao_objptr =
-    CORBA::TypedefDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
-      _tao_any,
-      CORBA::TypedefDef::_tao_any_destructor,
-      CORBA::_tc_TypedefDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
-        _tao_any,
-        CORBA::TypedefDef::_tao_any_destructor,
-        CORBA::_tc_TypedefDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::TypeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
-      _tao_any,
-      CORBA::TypeDescription::_tao_any_destructor,
-      CORBA::_tc_TypeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert (
-      _tao_any,
-      CORBA::TypeDescription::_tao_any_destructor,
-      CORBA::_tc_TypeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::TypeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
-        _tao_any,
-        CORBA::TypeDescription::_tao_any_destructor,
-        CORBA::_tc_TypeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
deleted file mode 100644
index d33177a1829..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ /dev/null
@@ -1,5555 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IFR_BaseC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.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/Any_Arg_Traits.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "IFR_BaseC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::DefinitionKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Contained>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Contained_ptr,
-            CORBA::Contained_var,
-            CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::Contained::Description>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Contained::Description,
-            CORBA::Contained::Description_var,
-            CORBA::Contained::Description_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_CS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Repository>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Repository_ptr,
-            CORBA::Repository_var,
-            CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Container>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Container_ptr,
-            CORBA::Container_var,
-            CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::Container::DescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Container::DescriptionSeq,
-            CORBA::Container::DescriptionSeq_var,
-            CORBA::Container::DescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_CS_)
-#define _CORBA_MODULEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ModuleDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ModuleDef_ptr,
-            CORBA::ModuleDef_var,
-            CORBA::ModuleDef_out,
-            TAO::Objref_Traits<CORBA::ModuleDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_CS_)
-#define _CORBA_CONSTANTDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ConstantDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ConstantDef_ptr,
-            CORBA::ConstantDef_var,
-            CORBA::ConstantDef_out,
-            TAO::Objref_Traits<CORBA::ConstantDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::IDLType>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::IDLType_ptr,
-            CORBA::IDLType_var,
-            CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::StructDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::StructDef_ptr,
-            CORBA::StructDef_var,
-            CORBA::StructDef_out,
-            TAO::Objref_Traits<CORBA::StructDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_UNIONDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::UnionDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::UnionDef_ptr,
-            CORBA::UnionDef_var,
-            CORBA::UnionDef_out,
-            TAO::Objref_Traits<CORBA::UnionDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_CS_)
-#define _CORBA_ENUMDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::EnumDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::EnumDef_ptr,
-            CORBA::EnumDef_var,
-            CORBA::EnumDef_out,
-            TAO::Objref_Traits<CORBA::EnumDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_CS_)
-#define _CORBA_ALIASDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::AliasDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::AliasDef_ptr,
-            CORBA::AliasDef_var,
-            CORBA::AliasDef_out,
-            TAO::Objref_Traits<CORBA::AliasDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDefSeq,
-            CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ExceptionDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ExceptionDef_ptr,
-            CORBA::ExceptionDef_var,
-            CORBA::ExceptionDef_out,
-            TAO::Objref_Traits<CORBA::ExceptionDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_NATIVEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::NativeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::NativeDef_ptr,
-            CORBA::NativeDef_var,
-            CORBA::NativeDef_out,
-            TAO::Objref_Traits<CORBA::NativeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueDef_ptr,
-            CORBA::ValueDef_var,
-            CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ValueDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDefSeq,
-            CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEBOXDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ValueBoxDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueBoxDef_ptr,
-            CORBA::ValueBoxDef_var,
-            CORBA::ValueBoxDef_out,
-            TAO::Objref_Traits<CORBA::ValueBoxDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::AbstractInterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::AbstractInterfaceDef_ptr,
-            CORBA::AbstractInterfaceDef_var,
-            CORBA::AbstractInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::AbstractInterfaceDefSeq,
-            CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::LocalInterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::LocalInterfaceDef_ptr,
-            CORBA::LocalInterfaceDef_var,
-            CORBA::LocalInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ExtValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ExtValueDef_ptr,
-            CORBA::ExtValueDef_var,
-            CORBA::ExtValueDef_out,
-            TAO::Objref_Traits<CORBA::ExtValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ContainedSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ContainedSeq,
-            CORBA::ContainedSeq_var,
-            CORBA::ContainedSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::StructMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StructMemberSeq,
-            CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InitializerSeq,
-            CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExtInitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtInitializerSeq,
-            CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::UnionMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::UnionMemberSeq,
-            CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::EnumMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::EnumMemberSeq,
-            CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::IRObject.
-
-CORBA::IRObject_ptr
-TAO::Objref_Traits<CORBA::IRObject>::duplicate (
-    CORBA::IRObject_ptr p
-  )
-{
-  return CORBA::IRObject::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::IRObject>::release (
-    CORBA::IRObject_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::IRObject_ptr
-TAO::Objref_Traits<CORBA::IRObject>::nil (void)
-{
-  return CORBA::IRObject::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::IRObject>::marshal (
-    CORBA::IRObject_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::DefinitionKind CORBA::IRObject::def_kind (
-    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_IRObject_Proxy_Broker_ == 0)
-    {
-      CORBA_IRObject_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::DefinitionKind>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_def_kind",
-      13,
-      this->the_TAO_IRObject_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 CORBA::IRObject::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_IRObject_Proxy_Broker_ == 0)
-    {
-      CORBA_IRObject_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_IRObject_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::IRObject::IRObject (void)
- : the_TAO_IRObject_Proxy_Broker_ (0)
-{
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-void
-CORBA::IRObject::CORBA_IRObject_setup_collocation ()
-{
-  if (::CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_IRObject_Proxy_Broker_ =
-        ::CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-CORBA::IRObject::~IRObject (void)
-{}
-
-void 
-CORBA::IRObject::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IRObject *_tao_tmp_pointer =
-    static_cast<IRObject *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::IRObject_ptr
-CORBA::IRObject::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<IRObject>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/IRObject:1.0",
-        CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::IRObject_ptr
-CORBA::IRObject::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<IRObject>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/IRObject:1.0",
-        CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::IRObject_ptr
-CORBA::IRObject::_duplicate (IRObject_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::IRObject::_tao_release (IRObject_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::IRObject::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::IRObject::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/IRObject:1.0";
-}
-
-CORBA::Boolean
-CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Contained.
-
-CORBA::Contained_ptr
-TAO::Objref_Traits<CORBA::Contained>::duplicate (
-    CORBA::Contained_ptr p
-  )
-{
-  return CORBA::Contained::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Contained>::release (
-    CORBA::Contained_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Contained_ptr
-TAO::Objref_Traits<CORBA::Contained>::nil (void)
-{
-  return CORBA::Contained::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Contained>::marshal (
-    CORBA::Contained_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-char * CORBA::Contained::id (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::RepositoryId>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_id",
-      7,
-      this->the_TAO_Contained_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 CORBA::Contained::id (
-    const char * id
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_id",
-      7,
-      this->the_TAO_Contained_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 * CORBA::Contained::name (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Identifier>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_name",
-      9,
-      this->the_TAO_Contained_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 CORBA::Contained::name (
-    const char * name
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_name
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_name",
-      9,
-      this->the_TAO_Contained_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 * CORBA::Contained::version (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::VersionSpec>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_version",
-      12,
-      this->the_TAO_Contained_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 CORBA::Contained::version (
-    const char * version
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_version
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_version",
-      12,
-      this->the_TAO_Contained_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
-
-::CORBA::Container_ptr CORBA::Contained::defined_in (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Container>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_defined_in",
-      15,
-      this->the_TAO_Contained_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
-
-char * CORBA::Contained::absolute_name (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ScopedName>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_absolute_name",
-      18,
-      this->the_TAO_Contained_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
-
-::CORBA::Repository_ptr CORBA::Contained::containing_repository (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Repository>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_containing_repository",
-      26,
-      this->the_TAO_Contained_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_structure/structure_cs.cpp:66
-
-void 
-CORBA::Contained::Description::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Description *_tao_tmp_pointer =
-    static_cast<Description *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Contained::Description * CORBA::Contained::describe (
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Contained::Description>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe",
-      8,
-      this->the_TAO_Contained_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 CORBA::Contained::move (
-    ::CORBA::Container_ptr new_container,
-    const char * new_name,
-    const char * new_version
-    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_Contained_Proxy_Broker_ == 0)
-    {
-      CORBA_Contained_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Container>::in_arg_val _tao_new_container (new_container);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_new_container,
-      &_tao_new_name,
-      &_tao_new_version
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "move",
-      4,
-      this->the_TAO_Contained_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Contained::Contained (void)
- : the_TAO_Contained_Proxy_Broker_ (0)
-{
-  this->CORBA_Contained_setup_collocation ();
-}
-
-void
-CORBA::Contained::CORBA_Contained_setup_collocation ()
-{
-  if (::CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Contained_Proxy_Broker_ =
-        ::CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-CORBA::Contained::~Contained (void)
-{}
-
-void 
-CORBA::Contained::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Contained *_tao_tmp_pointer =
-    static_cast<Contained *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Contained_ptr
-CORBA::Contained::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Contained>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Contained:1.0",
-        CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Contained_ptr
-CORBA::Contained::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Contained>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Contained:1.0",
-        CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Contained_ptr
-CORBA::Contained::_duplicate (Contained_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Contained::_tao_release (Contained_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Contained::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::Contained::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Contained:1.0";
-}
-
-CORBA::Boolean
-CORBA::Contained::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
-#define _CORBA_INTERFACEDEFSEQ_CS_
-
-CORBA::InterfaceDefSeq::InterfaceDefSeq (void)
-{}
-
-CORBA::InterfaceDefSeq::InterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::InterfaceDefSeq::InterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::InterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::InterfaceDefSeq::InterfaceDefSeq (
-    const InterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::InterfaceDefSeq::~InterfaceDefSeq (void)
-{}
-
-void CORBA::InterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  InterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<InterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_VALUEDEFSEQ_CS_)
-#define _CORBA_VALUEDEFSEQ_CS_
-
-CORBA::ValueDefSeq::ValueDefSeq (void)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
-      >
-    (max)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ValueDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (
-    const ValueDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
-      >
-    (seq)
-{}
-
-CORBA::ValueDefSeq::~ValueDefSeq (void)
-{}
-
-void CORBA::ValueDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ValueDefSeq * _tao_tmp_pointer =
-    static_cast<ValueDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::AbstractInterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
-    const AbstractInterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::AbstractInterfaceDefSeq::~AbstractInterfaceDefSeq (void)
-{}
-
-void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  AbstractInterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<AbstractInterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CS_
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::LocalInterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
-    const LocalInterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::LocalInterfaceDefSeq::~LocalInterfaceDefSeq (void)
-{}
-
-void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  LocalInterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<LocalInterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTINTERFACEDEFSEQ_CS_
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtInterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
-    const ExtInterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::ExtInterfaceDefSeq::~ExtInterfaceDefSeq (void)
-{}
-
-void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtInterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<ExtInterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTVALUEDEFSEQ_CS_)
-#define _CORBA_EXTVALUEDEFSEQ_CS_
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (void)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
-      >
-    (max)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtValueDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (
-    const ExtValueDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
-      >
-    (seq)
-{}
-
-CORBA::ExtValueDefSeq::~ExtValueDefSeq (void)
-{}
-
-void CORBA::ExtValueDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtValueDefSeq * _tao_tmp_pointer =
-    static_cast<ExtValueDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtAbstractInterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
-    const ExtAbstractInterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::~ExtAbstractInterfaceDefSeq (void)
-{}
-
-void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtAbstractInterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<ExtAbstractInterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CS_
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
-      >
-    (max)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtLocalInterfaceDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
-    const ExtLocalInterfaceDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
-      >
-    (seq)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::~ExtLocalInterfaceDefSeq (void)
-{}
-
-void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtLocalInterfaceDefSeq * _tao_tmp_pointer =
-    static_cast<ExtLocalInterfaceDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_CONTAINEDSEQ_CS_)
-#define _CORBA_CONTAINEDSEQ_CS_
-
-CORBA::ContainedSeq::ContainedSeq (void)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
-      >
-    (max)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Contained_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (
-    const ContainedSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
-      >
-    (seq)
-{}
-
-CORBA::ContainedSeq::~ContainedSeq (void)
-{}
-
-void CORBA::ContainedSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ContainedSeq * _tao_tmp_pointer =
-    static_cast<ContainedSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::StructMember::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  StructMember *_tao_tmp_pointer =
-    static_cast<StructMember *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CS_)
-#define _CORBA_STRUCTMEMBERSEQ_CS_
-
-CORBA::StructMemberSeq::StructMemberSeq (void)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::StructMember
-      >
-    (max)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::StructMember * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::StructMember
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (
-    const StructMemberSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::StructMember
-      >
-    (seq)
-{}
-
-CORBA::StructMemberSeq::~StructMemberSeq (void)
-{}
-
-void CORBA::StructMemberSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  StructMemberSeq * _tao_tmp_pointer =
-    static_cast<StructMemberSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::Initializer::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Initializer *_tao_tmp_pointer =
-    static_cast<Initializer *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_INITIALIZERSEQ_CS_)
-#define _CORBA_INITIALIZERSEQ_CS_
-
-CORBA::InitializerSeq::InitializerSeq (void)
-{}
-
-CORBA::InitializerSeq::InitializerSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Initializer
-      >
-    (max)
-{}
-
-CORBA::InitializerSeq::InitializerSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Initializer * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Initializer
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::InitializerSeq::InitializerSeq (
-    const InitializerSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Initializer
-      >
-    (seq)
-{}
-
-CORBA::InitializerSeq::~InitializerSeq (void)
-{}
-
-void CORBA::InitializerSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  InitializerSeq * _tao_tmp_pointer =
-    static_cast<InitializerSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ExceptionDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ExceptionDescription *_tao_tmp_pointer =
-    static_cast<ExceptionDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CS_
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
-      >
-    (max)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
-    const ExcDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
-      >
-    (seq)
-{}
-
-CORBA::ExcDescriptionSeq::~ExcDescriptionSeq (void)
-{}
-
-void CORBA::ExcDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExcDescriptionSeq * _tao_tmp_pointer =
-    static_cast<ExcDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ExtInitializer::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ExtInitializer *_tao_tmp_pointer =
-    static_cast<ExtInitializer *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ_CS_)
-#define _CORBA_EXTINITIALIZERSEQ_CS_
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (void)
-{}
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
-      >
-    (max)
-{}
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtInitializer * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (
-    const ExtInitializerSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
-      >
-    (seq)
-{}
-
-CORBA::ExtInitializerSeq::~ExtInitializerSeq (void)
-{}
-
-void CORBA::ExtInitializerSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtInitializerSeq * _tao_tmp_pointer =
-    static_cast<ExtInitializerSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::UnionMember::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  UnionMember *_tao_tmp_pointer =
-    static_cast<UnionMember *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CS_)
-#define _CORBA_UNIONMEMBERSEQ_CS_
-
-CORBA::UnionMemberSeq::UnionMemberSeq (void)
-{}
-
-CORBA::UnionMemberSeq::UnionMemberSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
-      >
-    (max)
-{}
-
-CORBA::UnionMemberSeq::UnionMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UnionMember * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::UnionMemberSeq::UnionMemberSeq (
-    const UnionMemberSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
-      >
-    (seq)
-{}
-
-CORBA::UnionMemberSeq::~UnionMemberSeq (void)
-{}
-
-void CORBA::UnionMemberSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  UnionMemberSeq * _tao_tmp_pointer =
-    static_cast<UnionMemberSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
-#define _CORBA_ENUMMEMBERSEQ_CS_
-
-CORBA::EnumMemberSeq::EnumMemberSeq (void)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (
-    const EnumMemberSeq &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-CORBA::EnumMemberSeq::~EnumMemberSeq (void)
-{}
-
-void CORBA::EnumMemberSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  EnumMemberSeq * _tao_tmp_pointer =
-    static_cast<EnumMemberSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Container.
-
-CORBA::Container_ptr
-TAO::Objref_Traits<CORBA::Container>::duplicate (
-    CORBA::Container_ptr p
-  )
-{
-  return CORBA::Container::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Container>::release (
-    CORBA::Container_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Container_ptr
-TAO::Objref_Traits<CORBA::Container>::nil (void)
-{
-  return CORBA::Container::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Container>::marshal (
-    CORBA::Container_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Contained_ptr CORBA::Container::lookup (
-    const char * search_name
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_search_name
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "lookup",
-      6,
-      this->the_TAO_Container_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
-
-::CORBA::ContainedSeq * CORBA::Container::contents (
-    ::CORBA::DefinitionKind limit_type,
-    ::CORBA::Boolean exclude_inherited
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_limit_type,
-      &_tao_exclude_inherited
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "contents",
-      8,
-      this->the_TAO_Container_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
-
-::CORBA::ContainedSeq * CORBA::Container::lookup_name (
-    const char * search_name,
-    ::CORBA::Long levels_to_search,
-    ::CORBA::DefinitionKind limit_type,
-    ::CORBA::Boolean exclude_inherited
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
-  TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_search_name,
-      &_tao_levels_to_search,
-      &_tao_limit_type,
-      &_tao_exclude_inherited
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "lookup_name",
-      11,
-      this->the_TAO_Container_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_structure/structure_cs.cpp:66
-
-void 
-CORBA::Container::Description::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Description *_tao_tmp_pointer =
-    static_cast<Description *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
-
-CORBA::Container::DescriptionSeq::DescriptionSeq (void)
-{}
-
-CORBA::Container::DescriptionSeq::DescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
-      >
-    (max)
-{}
-
-CORBA::Container::DescriptionSeq::DescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Container::Description * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::Container::DescriptionSeq::DescriptionSeq (
-    const DescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
-      >
-    (seq)
-{}
-
-CORBA::Container::DescriptionSeq::~DescriptionSeq (void)
-{}
-
-void CORBA::Container::DescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  DescriptionSeq * _tao_tmp_pointer =
-    static_cast<DescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
-    ::CORBA::DefinitionKind limit_type,
-    ::CORBA::Boolean exclude_inherited,
-    ::CORBA::Long max_returned_objs
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
-  TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_limit_type,
-      &_tao_exclude_inherited,
-      &_tao_max_returned_objs
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "describe_contents",
-      17,
-      this->the_TAO_Container_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
-
-::CORBA::ModuleDef_ptr CORBA::Container::create_module (
-    const char * id,
-    const char * name,
-    const char * version
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ModuleDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "create_module",
-      13,
-      this->the_TAO_Container_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
-
-::CORBA::ConstantDef_ptr CORBA::Container::create_constant (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    const ::CORBA::Any & value
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ConstantDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_value
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_constant",
-      15,
-      this->the_TAO_Container_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
-
-::CORBA::StructDef_ptr CORBA::Container::create_struct (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::StructMemberSeq & members
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::StructDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_struct",
-      13,
-      this->the_TAO_Container_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
-
-::CORBA::UnionDef_ptr CORBA::Container::create_union (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr discriminator_type,
-    const ::CORBA::UnionMemberSeq & members
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::UnionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_discriminator_type,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_union",
-      12,
-      this->the_TAO_Container_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
-
-::CORBA::EnumDef_ptr CORBA::Container::create_enum (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::EnumMemberSeq & members
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::EnumDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_enum",
-      11,
-      this->the_TAO_Container_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
-
-::CORBA::AliasDef_ptr CORBA::Container::create_alias (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr original_type
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::AliasDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_original_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_alias",
-      12,
-      this->the_TAO_Container_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
-
-::CORBA::InterfaceDef_ptr CORBA::Container::create_interface (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::InterfaceDefSeq & base_interfaces
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_base_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_interface",
-      16,
-      this->the_TAO_Container_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
-
-::CORBA::ValueDef_ptr CORBA::Container::create_value (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::Boolean is_custom,
-    ::CORBA::Boolean is_abstract,
-    ::CORBA::ValueDef_ptr base_value,
-    ::CORBA::Boolean is_truncatable,
-    const ::CORBA::ValueDefSeq & abstract_base_values,
-    const ::CORBA::InterfaceDefSeq & supported_interfaces,
-    const ::CORBA::InitializerSeq & initializers
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_is_custom,
-      &_tao_is_abstract,
-      &_tao_base_value,
-      &_tao_is_truncatable,
-      &_tao_abstract_base_values,
-      &_tao_supported_interfaces,
-      &_tao_initializers
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      11,
-      "create_value",
-      12,
-      this->the_TAO_Container_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
-
-::CORBA::ValueBoxDef_ptr CORBA::Container::create_value_box (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr original_type_def
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueBoxDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_original_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_value_box",
-      16,
-      this->the_TAO_Container_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
-
-::CORBA::ExceptionDef_ptr CORBA::Container::create_exception (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::StructMemberSeq & members
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExceptionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_exception",
-      16,
-      this->the_TAO_Container_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
-
-::CORBA::NativeDef_ptr CORBA::Container::create_native (
-    const char * id,
-    const char * name,
-    const char * version
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::NativeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "create_native",
-      13,
-      this->the_TAO_Container_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
-
-::CORBA::AbstractInterfaceDef_ptr CORBA::Container::create_abstract_interface (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_base_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_abstract_interface",
-      25,
-      this->the_TAO_Container_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
-
-::CORBA::LocalInterfaceDef_ptr CORBA::Container::create_local_interface (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::InterfaceDefSeq & base_interfaces
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::LocalInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_base_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_local_interface",
-      22,
-      this->the_TAO_Container_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
-
-::CORBA::ExtValueDef_ptr CORBA::Container::create_ext_value (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::Boolean is_custom,
-    ::CORBA::Boolean is_abstract,
-    ::CORBA::ValueDef_ptr base_value,
-    ::CORBA::Boolean is_truncatable,
-    const ::CORBA::ValueDefSeq & abstract_base_values,
-    const ::CORBA::InterfaceDefSeq & supported_interfaces,
-    const ::CORBA::ExtInitializerSeq & initializers
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_is_custom,
-      &_tao_is_abstract,
-      &_tao_base_value,
-      &_tao_is_truncatable,
-      &_tao_abstract_base_values,
-      &_tao_supported_interfaces,
-      &_tao_initializers
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      11,
-      "create_ext_value",
-      16,
-      this->the_TAO_Container_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::Container::Container (void)
- : the_TAO_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_Container_setup_collocation ();
-}
-
-void
-CORBA::Container::CORBA_Container_setup_collocation ()
-{
-  if (::CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Container_Proxy_Broker_ =
-        ::CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-CORBA::Container::~Container (void)
-{}
-
-void 
-CORBA::Container::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Container *_tao_tmp_pointer =
-    static_cast<Container *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Container_ptr
-CORBA::Container::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Container>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Container:1.0",
-        CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Container_ptr
-CORBA::Container::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Container>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Container:1.0",
-        CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Container_ptr
-CORBA::Container::_duplicate (Container_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Container::_tao_release (Container_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Container::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::Container::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Container:1.0";
-}
-
-CORBA::Boolean
-CORBA::Container::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::IDLType.
-
-CORBA::IDLType_ptr
-TAO::Objref_Traits<CORBA::IDLType>::duplicate (
-    CORBA::IDLType_ptr p
-  )
-{
-  return CORBA::IDLType::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::IDLType>::release (
-    CORBA::IDLType_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::IDLType_ptr
-TAO::Objref_Traits<CORBA::IDLType>::nil (void)
-{
-  return CORBA::IDLType::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::IDLType>::marshal (
-    CORBA::IDLType_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::IDLType::type (
-    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_IDLType_Proxy_Broker_ == 0)
-    {
-      CORBA_IDLType_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type",
-      9,
-      this->the_TAO_IDLType_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::IDLType::IDLType (void)
- : the_TAO_IDLType_Proxy_Broker_ (0)
-{
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-void
-CORBA::IDLType::CORBA_IDLType_setup_collocation ()
-{
-  if (::CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_IDLType_Proxy_Broker_ =
-        ::CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-CORBA::IDLType::~IDLType (void)
-{}
-
-void 
-CORBA::IDLType::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IDLType *_tao_tmp_pointer =
-    static_cast<IDLType *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::IDLType_ptr
-CORBA::IDLType::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<IDLType>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/IDLType:1.0",
-        CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::IDLType_ptr
-CORBA::IDLType::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<IDLType>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/IDLType:1.0",
-        CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::IDLType_ptr
-CORBA::IDLType::_duplicate (IDLType_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::IDLType::_tao_release (IDLType_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::IDLType::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::IDLType::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/IDLType:1.0";
-}
-
-CORBA::Boolean
-CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::TypedefDef.
-
-CORBA::TypedefDef_ptr
-TAO::Objref_Traits<CORBA::TypedefDef>::duplicate (
-    CORBA::TypedefDef_ptr p
-  )
-{
-  return CORBA::TypedefDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::TypedefDef>::release (
-    CORBA::TypedefDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::TypedefDef_ptr
-TAO::Objref_Traits<CORBA::TypedefDef>::nil (void)
-{
-  return CORBA::TypedefDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::TypedefDef>::marshal (
-    CORBA::TypedefDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::TypedefDef::TypedefDef (void)
- : the_TAO_TypedefDef_Proxy_Broker_ (0)
-{
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-void
-CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation ()
-{
-  if (::CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_TypedefDef_Proxy_Broker_ =
-        ::CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::TypedefDef::~TypedefDef (void)
-{}
-
-void 
-CORBA::TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TypedefDef *_tao_tmp_pointer =
-    static_cast<TypedefDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::TypedefDef_ptr
-CORBA::TypedefDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<TypedefDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/TypedefDef:1.0",
-        CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::TypedefDef_ptr
-CORBA::TypedefDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<TypedefDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/TypedefDef:1.0",
-        CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::TypedefDef_ptr
-CORBA::TypedefDef::_duplicate (TypedefDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::TypedefDef::_tao_release (TypedefDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::TypedefDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::TypedefDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/TypedefDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::TypeDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  TypeDescription *_tao_tmp_pointer =
-    static_cast<TypeDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::DefinitionKind _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::DefinitionKind & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::DefinitionKind> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IRObject_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IRObject_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::IRObject RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Contained::Description &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.kind) &&
-    (strm << _tao_aggregate.value);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Contained::Description &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.kind) &&
-    (strm >> _tao_aggregate.value);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Contained_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Contained_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::Contained RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ValueDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AbstractInterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AbstractInterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LocalInterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LocalInterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtInterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtInterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtValueDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtValueDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtLocalInterfaceDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ContainedSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ContainedSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::Contained>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ContainedSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructMember &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    CORBA::Object::marshal (
-        _tao_aggregate.type_def.in (),
-        strm
-      );
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructMember &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_
-#define _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructMemberSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Initializer &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.members) &&
-    (strm << _tao_aggregate.name.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Initializer &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.members) &&
-    (strm >> _tao_aggregate.name.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_InitializerSeq_CPP_
-#define _TAO_CDR_OP_CORBA_InitializerSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InitializerSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InitializerSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_InitializerSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExcDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExcDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtInitializer &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.members) &&
-    (strm << _tao_aggregate.exceptions) &&
-    (strm << _tao_aggregate.name.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtInitializer &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.members) &&
-    (strm >> _tao_aggregate.exceptions) &&
-    (strm >> _tao_aggregate.name.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtInitializerSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtInitializerSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionMember &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.label) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    CORBA::Object::marshal (
-        _tao_aggregate.type_def.in (),
-        strm
-      );
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionMember &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.label) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_
-#define _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionMemberSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_
-#define _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::EnumMemberSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::EnumMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container::Description &_tao_aggregate
-  )
-{
-  return
-    CORBA::Object::marshal (
-        _tao_aggregate.contained_object.in (),
-        strm
-      ) &&
-    (strm << _tao_aggregate.kind) &&
-    (strm << _tao_aggregate.value);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container::Description &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.contained_object.out ()) &&
-    (strm >> _tao_aggregate.kind) &&
-    (strm >> _tao_aggregate.value);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container::DescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container::DescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::Container RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IDLType_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IDLType_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::IDLType RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::TypedefDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::TypedefDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::TypedefDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::TypeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::TypeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ());
-}
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
deleted file mode 100644
index 2b8edf46575..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ /dev/null
@@ -1,3745 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
-#define _TAO_IDL_ORIG_IFR_BASEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ifr_client_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/orb_typesC.h"
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ScopedName;
-  typedef CORBA::String_var ScopedName_var;
-  typedef CORBA::String_out ScopedName_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ScopedName;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum DefinitionKind
-  {
-    dk_none,
-    dk_all,
-    dk_Attribute,
-    dk_Constant,
-    dk_Exception,
-    dk_Interface,
-    dk_Module,
-    dk_Operation,
-    dk_Typedef,
-    dk_Alias,
-    dk_Struct,
-    dk_Union,
-    dk_Enum,
-    dk_Primitive,
-    dk_String,
-    dk_Sequence,
-    dk_Array,
-    dk_Repository,
-    dk_Wstring,
-    dk_Fixed,
-    dk_Value,
-    dk_ValueBox,
-    dk_ValueMember,
-    dk_Native,
-    dk_AbstractInterface,
-    dk_LocalInterface,
-    dk_Component,
-    dk_Home,
-    dk_Factory,
-    dk_Finder,
-    dk_Emits,
-    dk_Publishes,
-    dk_Consumes,
-    dk_Provides,
-    dk_Uses,
-    dk_Event
-  };
-  
-  typedef DefinitionKind &DefinitionKind_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_DefinitionKind;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_IROBJECT__VAR_OUT_CH_)
-#define _CORBA_IROBJECT__VAR_OUT_CH_
-  
-  class IRObject;
-  typedef IRObject *IRObject_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IRObject
-      >
-    IRObject_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IRObject
-      >
-    IRObject_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_IROBJECT_CH_)
-#define _CORBA_IROBJECT_CH_
-  
-  class TAO_IFR_Client_Export IRObject
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<IRObject>;
-    typedef IRObject_ptr _ptr_type;
-    typedef IRObject_var _var_type;
-    
-    // The static operations.
-    static IRObject_ptr _duplicate (IRObject_ptr obj);
-    
-    static void _tao_release (IRObject_ptr obj);
-    
-    static IRObject_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IRObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IRObject_ptr _nil (void)
-    {
-      return static_cast<IRObject_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::DefinitionKind def_kind (
-        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 destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    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_IRObject_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    IRObject (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_IRObject_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    IRObject (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    IRObject (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~IRObject (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IRObject (const IRObject &);
-    
-    void operator= (const IRObject &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IRObject;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * VersionSpec;
-  typedef CORBA::String_var VersionSpec_var;
-  typedef CORBA::String_out VersionSpec_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_VersionSpec;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CONTAINED__VAR_OUT_CH_)
-#define _CORBA_CONTAINED__VAR_OUT_CH_
-  
-  class Contained;
-  typedef Contained *Contained_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Contained
-      >
-    Contained_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Contained
-      >
-    Contained_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
-#define _CORBA_REPOSITORY__VAR_OUT_CH_
-  
-  class Repository;
-  typedef Repository *Repository_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Repository
-      >
-    Repository_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Repository
-      >
-    Repository_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CONTAINER__VAR_OUT_CH_)
-#define _CORBA_CONTAINER__VAR_OUT_CH_
-  
-  class Container;
-  typedef Container *Container_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Container
-      >
-    Container_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Container
-      >
-    Container_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_CONTAINED_CH_)
-#define _CORBA_CONTAINED_CH_
-  
-  class TAO_IFR_Client_Export Contained
-    : public virtual ::CORBA::IRObject
-  {
-  public:
-    friend class TAO::Narrow_Utils<Contained>;
-    typedef Contained_ptr _ptr_type;
-    typedef Contained_var _var_type;
-    
-    // The static operations.
-    static Contained_ptr _duplicate (Contained_ptr obj);
-    
-    static void _tao_release (Contained_ptr obj);
-    
-    static Contained_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Contained_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Contained_ptr _nil (void)
-    {
-      return static_cast<Contained_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * id (
-        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 id (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * name (
-        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 name (
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * version (
-        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 version (
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Container_ptr defined_in (
-        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 * absolute_name (
-        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 ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct Description;
-    
-    typedef
-      TAO_Var_Var_T<
-          Description
-        >
-      Description_var;
-    
-    typedef
-      TAO_Out_T<
-          Description,
-          Description_var
-        >
-      Description_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export Description
-    {
-      typedef Description_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
-      CORBA::Any value;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_Description;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Contained::Description * describe (
-        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 move (
-        ::CORBA::Container_ptr new_container,
-        const char * new_name,
-        const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    Contained (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_Contained_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    Contained (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    Contained (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~Contained (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Contained (const Contained &);
-    
-    void operator= (const Contained &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Contained;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
-#define _CORBA_MODULEDEF__VAR_OUT_CH_
-  
-  class ModuleDef;
-  typedef ModuleDef *ModuleDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ModuleDef
-      >
-    ModuleDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ModuleDef
-      >
-    ModuleDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
-#define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-  
-  class ConstantDef;
-  typedef ConstantDef *ConstantDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ConstantDef
-      >
-    ConstantDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ConstantDef
-      >
-    ConstantDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_)
-#define _CORBA_IDLTYPE__VAR_OUT_CH_
-  
-  class IDLType;
-  typedef IDLType *IDLType_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IDLType
-      >
-    IDLType_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IDLType
-      >
-    IDLType_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
-#define _CORBA_STRUCTDEF__VAR_OUT_CH_
-  
-  class StructDef;
-  typedef StructDef *StructDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        StructDef
-      >
-    StructDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        StructDef
-      >
-    StructDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
-#define _CORBA_UNIONDEF__VAR_OUT_CH_
-  
-  class UnionDef;
-  typedef UnionDef *UnionDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        UnionDef
-      >
-    UnionDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        UnionDef
-      >
-    UnionDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
-#define _CORBA_ENUMDEF__VAR_OUT_CH_
-  
-  class EnumDef;
-  typedef EnumDef *EnumDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        EnumDef
-      >
-    EnumDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        EnumDef
-      >
-    EnumDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
-#define _CORBA_ALIASDEF__VAR_OUT_CH_
-  
-  class AliasDef;
-  typedef AliasDef *AliasDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AliasDef
-      >
-    AliasDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AliasDef
-      >
-    AliasDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-  
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        InterfaceDef
-      >
-    InterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        InterfaceDef
-      >
-    InterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
-#define _CORBA_INTERFACEDEFSEQ_CH_
-  
-  class InterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        InterfaceDefSeq,
-        TAO_Object_Manager<
-            InterfaceDef,
-            InterfaceDef_var
-          >
-      >
-    InterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        InterfaceDefSeq,
-        InterfaceDefSeq_var,
-        TAO_Object_Manager<
-            InterfaceDef,
-            InterfaceDef_var
-          >
-      >
-    InterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export InterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            InterfaceDef,
-            InterfaceDef_var
-          >
-  {
-  public:
-    InterfaceDefSeq (void);
-    InterfaceDefSeq (CORBA::ULong max);
-    InterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        InterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    InterfaceDefSeq (const InterfaceDefSeq &);
-    ~InterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef InterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
-#define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-  
-  class ExceptionDef;
-  typedef ExceptionDef *ExceptionDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExceptionDef
-      >
-    ExceptionDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExceptionDef
-      >
-    ExceptionDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
-#define _CORBA_NATIVEDEF__VAR_OUT_CH_
-  
-  class NativeDef;
-  typedef NativeDef *NativeDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        NativeDef
-      >
-    NativeDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        NativeDef
-      >
-    NativeDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
-#define _CORBA_VALUEDEF__VAR_OUT_CH_
-  
-  class ValueDef;
-  typedef ValueDef *ValueDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ValueDef
-      >
-    ValueDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ValueDef
-      >
-    ValueDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_VALUEDEFSEQ_CH_)
-#define _CORBA_VALUEDEFSEQ_CH_
-  
-  class ValueDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ValueDefSeq,
-        TAO_Object_Manager<
-            ValueDef,
-            ValueDef_var
-          >
-      >
-    ValueDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ValueDefSeq,
-        ValueDefSeq_var,
-        TAO_Object_Manager<
-            ValueDef,
-            ValueDef_var
-          >
-      >
-    ValueDefSeq_out;
-  
-  class TAO_IFR_Client_Export ValueDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ValueDef,
-            ValueDef_var
-          >
-  {
-  public:
-    ValueDefSeq (void);
-    ValueDefSeq (CORBA::ULong max);
-    ValueDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ValueDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ValueDefSeq (const ValueDefSeq &);
-    ~ValueDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ValueDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
-#define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-  
-  class ValueBoxDef;
-  typedef ValueBoxDef *ValueBoxDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ValueBoxDef
-      >
-    ValueBoxDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ValueBoxDef
-      >
-    ValueBoxDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
-  class AbstractInterfaceDef;
-  typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AbstractInterfaceDef
-      >
-    AbstractInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AbstractInterfaceDef
-      >
-    AbstractInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-  
-  class AbstractInterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        AbstractInterfaceDefSeq,
-        TAO_Object_Manager<
-            AbstractInterfaceDef,
-            AbstractInterfaceDef_var
-          >
-      >
-    AbstractInterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        AbstractInterfaceDefSeq,
-        AbstractInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            AbstractInterfaceDef,
-            AbstractInterfaceDef_var
-          >
-      >
-    AbstractInterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            AbstractInterfaceDef,
-            AbstractInterfaceDef_var
-          >
-  {
-  public:
-    AbstractInterfaceDefSeq (void);
-    AbstractInterfaceDefSeq (CORBA::ULong max);
-    AbstractInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        AbstractInterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
-    ~AbstractInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef AbstractInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-  
-  class LocalInterfaceDef;
-  typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        LocalInterfaceDef
-      >
-    LocalInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        LocalInterfaceDef
-      >
-    LocalInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-  
-  class LocalInterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        LocalInterfaceDefSeq,
-        TAO_Object_Manager<
-            LocalInterfaceDef,
-            LocalInterfaceDef_var
-          >
-      >
-    LocalInterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        LocalInterfaceDefSeq,
-        LocalInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            LocalInterfaceDef,
-            LocalInterfaceDef_var
-          >
-      >
-    LocalInterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export LocalInterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            LocalInterfaceDef,
-            LocalInterfaceDef_var
-          >
-  {
-  public:
-    LocalInterfaceDefSeq (void);
-    LocalInterfaceDefSeq (CORBA::ULong max);
-    LocalInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        LocalInterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
-    ~LocalInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef LocalInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtInterfaceDef;
-  typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtInterfaceDef
-      >
-    ExtInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtInterfaceDef
-      >
-    ExtInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTINTERFACEDEFSEQ_CH_
-  
-  class ExtInterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExtInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtInterfaceDef,
-            ExtInterfaceDef_var
-          >
-      >
-    ExtInterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExtInterfaceDefSeq,
-        ExtInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtInterfaceDef,
-            ExtInterfaceDef_var
-          >
-      >
-    ExtInterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export ExtInterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ExtInterfaceDef,
-            ExtInterfaceDef_var
-          >
-  {
-  public:
-    ExtInterfaceDefSeq (void);
-    ExtInterfaceDefSeq (CORBA::ULong max);
-    ExtInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtInterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
-    ~ExtInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-  
-  class ExtValueDef;
-  typedef ExtValueDef *ExtValueDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtValueDef
-      >
-    ExtValueDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtValueDef
-      >
-    ExtValueDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
-#define _CORBA_EXTVALUEDEFSEQ_CH_
-  
-  class ExtValueDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExtValueDefSeq,
-        TAO_Object_Manager<
-            ExtValueDef,
-            ExtValueDef_var
-          >
-      >
-    ExtValueDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExtValueDefSeq,
-        ExtValueDefSeq_var,
-        TAO_Object_Manager<
-            ExtValueDef,
-            ExtValueDef_var
-          >
-      >
-    ExtValueDefSeq_out;
-  
-  class TAO_IFR_Client_Export ExtValueDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ExtValueDef,
-            ExtValueDef_var
-          >
-  {
-  public:
-    ExtValueDefSeq (void);
-    ExtValueDefSeq (CORBA::ULong max);
-    ExtValueDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtValueDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtValueDefSeq (const ExtValueDefSeq &);
-    ~ExtValueDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtValueDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtAbstractInterfaceDef;
-  typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtAbstractInterfaceDef
-      >
-    ExtAbstractInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtAbstractInterfaceDef
-      >
-    ExtAbstractInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-  
-  class ExtAbstractInterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExtAbstractInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtAbstractInterfaceDef,
-            ExtAbstractInterfaceDef_var
-          >
-      >
-    ExtAbstractInterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExtAbstractInterfaceDefSeq,
-        ExtAbstractInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtAbstractInterfaceDef,
-            ExtAbstractInterfaceDef_var
-          >
-      >
-    ExtAbstractInterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ExtAbstractInterfaceDef,
-            ExtAbstractInterfaceDef_var
-          >
-  {
-  public:
-    ExtAbstractInterfaceDefSeq (void);
-    ExtAbstractInterfaceDefSeq (CORBA::ULong max);
-    ExtAbstractInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtAbstractInterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
-    ~ExtAbstractInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtAbstractInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtLocalInterfaceDef;
-  typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtLocalInterfaceDef
-      >
-    ExtLocalInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtLocalInterfaceDef
-      >
-    ExtLocalInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-  
-  class ExtLocalInterfaceDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExtLocalInterfaceDefSeq,
-        TAO_Object_Manager<
-            ExtLocalInterfaceDef,
-            ExtLocalInterfaceDef_var
-          >
-      >
-    ExtLocalInterfaceDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExtLocalInterfaceDefSeq,
-        ExtLocalInterfaceDefSeq_var,
-        TAO_Object_Manager<
-            ExtLocalInterfaceDef,
-            ExtLocalInterfaceDef_var
-          >
-      >
-    ExtLocalInterfaceDefSeq_out;
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ExtLocalInterfaceDef,
-            ExtLocalInterfaceDef_var
-          >
-  {
-  public:
-    ExtLocalInterfaceDefSeq (void);
-    ExtLocalInterfaceDefSeq (CORBA::ULong max);
-    ExtLocalInterfaceDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtLocalInterfaceDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
-    ~ExtLocalInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtLocalInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_CONTAINEDSEQ_CH_)
-#define _CORBA_CONTAINEDSEQ_CH_
-  
-  class ContainedSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ContainedSeq,
-        TAO_Object_Manager<
-            Contained,
-            Contained_var
-          >
-      >
-    ContainedSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ContainedSeq,
-        ContainedSeq_var,
-        TAO_Object_Manager<
-            Contained,
-            Contained_var
-          >
-      >
-    ContainedSeq_out;
-  
-  class TAO_IFR_Client_Export ContainedSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            Contained,
-            Contained_var
-          >
-  {
-  public:
-    ContainedSeq (void);
-    ContainedSeq (CORBA::ULong max);
-    ContainedSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Contained_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ContainedSeq (const ContainedSeq &);
-    ~ContainedSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ContainedSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContainedSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct StructMember;
-  
-  typedef
-    TAO_Var_Var_T<
-        StructMember
-      >
-    StructMember_var;
-  
-  typedef
-    TAO_Out_T<
-        StructMember,
-        StructMember_var
-      >
-    StructMember_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export StructMember
-  {
-    typedef StructMember_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    CORBA::TypeCode_var type;
-    CORBA::IDLType_var type_def;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMember;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
-#define _CORBA_STRUCTMEMBERSEQ_CH_
-  
-  class StructMemberSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        StructMemberSeq,
-        StructMember
-      >
-    StructMemberSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        StructMemberSeq,
-        StructMemberSeq_var,
-        StructMember
-      >
-    StructMemberSeq_out;
-  
-  class TAO_IFR_Client_Export StructMemberSeq
-    : public
-        TAO_Unbounded_Sequence<
-            StructMember
-          >
-  {
-  public:
-    StructMemberSeq (void);
-    StructMemberSeq (CORBA::ULong max);
-    StructMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        StructMember* buffer, 
-        CORBA::Boolean release = 0
-      );
-    StructMemberSeq (const StructMemberSeq &);
-    ~StructMemberSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef StructMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMemberSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct Initializer;
-  
-  typedef
-    TAO_Var_Var_T<
-        Initializer
-      >
-    Initializer_var;
-  
-  typedef
-    TAO_Out_T<
-        Initializer,
-        Initializer_var
-      >
-    Initializer_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export Initializer
-  {
-    typedef Initializer_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::StructMemberSeq members;
-    TAO_String_Manager name;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Initializer;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_INITIALIZERSEQ_CH_)
-#define _CORBA_INITIALIZERSEQ_CH_
-  
-  class InitializerSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        InitializerSeq,
-        Initializer
-      >
-    InitializerSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        InitializerSeq,
-        InitializerSeq_var,
-        Initializer
-      >
-    InitializerSeq_out;
-  
-  class TAO_IFR_Client_Export InitializerSeq
-    : public
-        TAO_Unbounded_Sequence<
-            Initializer
-          >
-  {
-  public:
-    InitializerSeq (void);
-    InitializerSeq (CORBA::ULong max);
-    InitializerSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Initializer* buffer, 
-        CORBA::Boolean release = 0
-      );
-    InitializerSeq (const InitializerSeq &);
-    ~InitializerSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef InitializerSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InitializerSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ExceptionDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ExceptionDescription
-      >
-    ExceptionDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ExceptionDescription,
-        ExceptionDescription_var
-      >
-    ExceptionDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ExceptionDescription
-  {
-    typedef ExceptionDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CH_
-  
-  class ExcDescriptionSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ExcDescriptionSeq,
-        ExceptionDescription
-      >
-    ExcDescriptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ExcDescriptionSeq,
-        ExcDescriptionSeq_var,
-        ExceptionDescription
-      >
-    ExcDescriptionSeq_out;
-  
-  class TAO_IFR_Client_Export ExcDescriptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ExceptionDescription
-          >
-  {
-  public:
-    ExcDescriptionSeq (void);
-    ExcDescriptionSeq (CORBA::ULong max);
-    ExcDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDescription* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExcDescriptionSeq (const ExcDescriptionSeq &);
-    ~ExcDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExcDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ExtInitializer;
-  
-  typedef
-    TAO_Var_Var_T<
-        ExtInitializer
-      >
-    ExtInitializer_var;
-  
-  typedef
-    TAO_Out_T<
-        ExtInitializer,
-        ExtInitializer_var
-      >
-    ExtInitializer_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ExtInitializer
-  {
-    typedef ExtInitializer_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::StructMemberSeq members;
-    CORBA::ExcDescriptionSeq exceptions;
-    TAO_String_Manager name;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializer;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
-#define _CORBA_EXTINITIALIZERSEQ_CH_
-  
-  class ExtInitializerSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ExtInitializerSeq,
-        ExtInitializer
-      >
-    ExtInitializerSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ExtInitializerSeq,
-        ExtInitializerSeq_var,
-        ExtInitializer
-      >
-    ExtInitializerSeq_out;
-  
-  class TAO_IFR_Client_Export ExtInitializerSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ExtInitializer
-          >
-  {
-  public:
-    ExtInitializerSeq (void);
-    ExtInitializerSeq (CORBA::ULong max);
-    ExtInitializerSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtInitializer* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtInitializerSeq (const ExtInitializerSeq &);
-    ~ExtInitializerSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtInitializerSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct UnionMember;
-  
-  typedef
-    TAO_Var_Var_T<
-        UnionMember
-      >
-    UnionMember_var;
-  
-  typedef
-    TAO_Out_T<
-        UnionMember,
-        UnionMember_var
-      >
-    UnionMember_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export UnionMember
-  {
-    typedef UnionMember_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    CORBA::Any label;
-    CORBA::TypeCode_var type;
-    CORBA::IDLType_var type_def;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMember;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
-#define _CORBA_UNIONMEMBERSEQ_CH_
-  
-  class UnionMemberSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        UnionMemberSeq,
-        UnionMember
-      >
-    UnionMemberSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        UnionMemberSeq,
-        UnionMemberSeq_var,
-        UnionMember
-      >
-    UnionMemberSeq_out;
-  
-  class TAO_IFR_Client_Export UnionMemberSeq
-    : public
-        TAO_Unbounded_Sequence<
-            UnionMember
-          >
-  {
-  public:
-    UnionMemberSeq (void);
-    UnionMemberSeq (CORBA::ULong max);
-    UnionMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UnionMember* buffer, 
-        CORBA::Boolean release = 0
-      );
-    UnionMemberSeq (const UnionMemberSeq &);
-    ~UnionMemberSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef UnionMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
-#define _CORBA_ENUMMEMBERSEQ_CH_
-  
-  class EnumMemberSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        EnumMemberSeq,
-        TAO_SeqElem_String_Manager
-      >
-    EnumMemberSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        EnumMemberSeq,
-        EnumMemberSeq_var,
-        TAO_SeqElem_String_Manager
-      >
-    EnumMemberSeq_out;
-  
-  class TAO_IFR_Client_Export EnumMemberSeq
-    : public
-        TAO_Unbounded_String_Sequence
-  {
-  public:
-    EnumMemberSeq (void);
-    EnumMemberSeq (CORBA::ULong max);
-    EnumMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    EnumMemberSeq (const EnumMemberSeq &);
-    ~EnumMemberSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef EnumMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_CONTAINER_CH_)
-#define _CORBA_CONTAINER_CH_
-  
-  class TAO_IFR_Client_Export Container
-    : public virtual ::CORBA::IRObject
-  {
-  public:
-    friend class TAO::Narrow_Utils<Container>;
-    typedef Container_ptr _ptr_type;
-    typedef Container_var _var_type;
-    
-    // The static operations.
-    static Container_ptr _duplicate (Container_ptr obj);
-    
-    static void _tao_release (Container_ptr obj);
-    
-    static Container_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Container_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Container_ptr _nil (void)
-    {
-      return static_cast<Container_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Contained_ptr lookup (
-        const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ContainedSeq * contents (
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ContainedSeq * lookup_name (
-        const char * search_name,
-        ::CORBA::Long levels_to_search,
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct Description;
-    
-    typedef
-      TAO_Var_Var_T<
-          Description
-        >
-      Description_var;
-    
-    typedef
-      TAO_Out_T<
-          Description,
-          Description_var
-        >
-      Description_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export Description
-    {
-      typedef Description_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
-      ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
-      CORBA::Any value;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_Description;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-    
-    class DescriptionSeq;
-    
-    typedef
-      TAO_VarSeq_Var_T<
-          DescriptionSeq,
-          Description
-        >
-      DescriptionSeq_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          DescriptionSeq,
-          DescriptionSeq_var,
-          Description
-        >
-      DescriptionSeq_out;
-    
-    class TAO_IFR_Client_Export DescriptionSeq
-      : public
-          TAO_Unbounded_Sequence<
-              Description
-            >
-    {
-    public:
-      DescriptionSeq (void);
-      DescriptionSeq (CORBA::ULong max);
-      DescriptionSeq (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          Description* buffer, 
-          CORBA::Boolean release = 0
-        );
-      DescriptionSeq (const DescriptionSeq &);
-      ~DescriptionSeq (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef DescriptionSeq_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_DescriptionSeq;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Container::DescriptionSeq * describe_contents (
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited,
-        ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ModuleDef_ptr create_module (
-        const char * id,
-        const char * name,
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ConstantDef_ptr create_constant (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::StructDef_ptr create_struct (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::UnionDef_ptr create_union (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr discriminator_type,
-        const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::EnumDef_ptr create_enum (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::AliasDef_ptr create_alias (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InterfaceDef_ptr create_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ValueDef_ptr create_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::Boolean is_custom,
-        ::CORBA::Boolean is_abstract,
-        ::CORBA::ValueDef_ptr base_value,
-        ::CORBA::Boolean is_truncatable,
-        const ::CORBA::ValueDefSeq & abstract_base_values,
-        const ::CORBA::InterfaceDefSeq & supported_interfaces,
-        const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ValueBoxDef_ptr create_value_box (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExceptionDef_ptr create_exception (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::NativeDef_ptr create_native (
-        const char * id,
-        const char * name,
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::Boolean is_custom,
-        ::CORBA::Boolean is_abstract,
-        ::CORBA::ValueDef_ptr base_value,
-        ::CORBA::Boolean is_truncatable,
-        const ::CORBA::ValueDefSeq & abstract_base_values,
-        const ::CORBA::InterfaceDefSeq & supported_interfaces,
-        const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    Container (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_Container_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    Container (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    Container (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~Container (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Container (const Container &);
-    
-    void operator= (const Container &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_IDLTYPE_CH_)
-#define _CORBA_IDLTYPE_CH_
-  
-  class TAO_IFR_Client_Export IDLType
-    : public virtual ::CORBA::IRObject
-  {
-  public:
-    friend class TAO::Narrow_Utils<IDLType>;
-    typedef IDLType_ptr _ptr_type;
-    typedef IDLType_var _var_type;
-    
-    // The static operations.
-    static IDLType_ptr _duplicate (IDLType_ptr obj);
-    
-    static void _tao_release (IDLType_ptr obj);
-    
-    static IDLType_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IDLType_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IDLType_ptr _nil (void)
-    {
-      return static_cast<IDLType_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    IDLType (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_IDLType_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    IDLType (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    IDLType (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~IDLType (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IDLType (const IDLType &);
-    
-    void operator= (const IDLType &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IDLType;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_)
-#define _CORBA_TYPEDEFDEF__VAR_OUT_CH_
-  
-  class TypedefDef;
-  typedef TypedefDef *TypedefDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        TypedefDef
-      >
-    TypedefDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        TypedefDef
-      >
-    TypedefDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_TYPEDEFDEF_CH_)
-#define _CORBA_TYPEDEFDEF_CH_
-  
-  class TAO_IFR_Client_Export TypedefDef
-    : public virtual ::CORBA::Contained,
-      public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<TypedefDef>;
-    typedef TypedefDef_ptr _ptr_type;
-    typedef TypedefDef_var _var_type;
-    
-    // The static operations.
-    static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-    
-    static void _tao_release (TypedefDef_ptr obj);
-    
-    static TypedefDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TypedefDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TypedefDef_ptr _nil (void)
-    {
-      return static_cast<TypedefDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    TypedefDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_TypedefDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    TypedefDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    TypedefDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~TypedefDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    TypedefDef (const TypedefDef &);
-    
-    void operator= (const TypedefDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypedefDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct TypeDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        TypeDescription
-      >
-    TypeDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        TypeDescription,
-        TypeDescription_var
-      >
-    TypeDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export TypeDescription
-  {
-    typedef TypeDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypeDescription;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_IROBJECT__TRAITS_CH_)
-#define _CORBA_IROBJECT__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IRObject>
-  {
-    static ::CORBA::IRObject_ptr duplicate (
-        ::CORBA::IRObject_ptr
-      );
-    static void release (
-        ::CORBA::IRObject_ptr
-      );
-    static ::CORBA::IRObject_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::IRObject_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED__TRAITS_CH_)
-#define _CORBA_CONTAINED__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Contained>
-  {
-    static ::CORBA::Contained_ptr duplicate (
-        ::CORBA::Contained_ptr
-      );
-    static void release (
-        ::CORBA::Contained_ptr
-      );
-    static ::CORBA::Contained_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Contained_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__TRAITS_CH_)
-#define _CORBA_CONTAINER__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Container>
-  {
-    static ::CORBA::Container_ptr duplicate (
-        ::CORBA::Container_ptr
-      );
-    static void release (
-        ::CORBA::Container_ptr
-      );
-    static ::CORBA::Container_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Container_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__TRAITS_CH_)
-#define _CORBA_IDLTYPE__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IDLType>
-  {
-    static ::CORBA::IDLType_ptr duplicate (
-        ::CORBA::IDLType_ptr
-      );
-    static void release (
-        ::CORBA::IDLType_ptr
-      );
-    static ::CORBA::IDLType_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::IDLType_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_)
-#define _CORBA_TYPEDEFDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::TypedefDef>
-  {
-    static ::CORBA::TypedefDef_ptr duplicate (
-        ::CORBA::TypedefDef_ptr
-      );
-    static void release (
-        ::CORBA::TypedefDef_ptr
-      );
-    static ::CORBA::TypedefDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::TypedefDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Contained::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained::Description *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Contained::Description *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AbstractInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AbstractInterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::LocalInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LocalInterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContainedSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContainedSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMember *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMemberSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Initializer &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Initializer*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Initializer *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Initializer *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InitializerSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InitializerSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InitializerSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InitializerSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExcDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializer &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializer*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInitializer *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializer *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializerSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializerSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInitializerSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializerSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMember *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMemberSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::EnumMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::EnumMemberSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container::Description *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::Description *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::DescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::DescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container::DescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::DescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IDLType_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypedefDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::TypeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::TypeDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained::Description &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::NativeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::NativeDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AbstractInterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AbstractInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AbstractInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::LocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::LocalInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::LocalInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtValueDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtValueDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAbstractInterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtAbstractInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtAbstractInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtLocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtLocalInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtLocalInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ContainedSeq_H_
-#define _TAO_CDR_OP_CORBA_ContainedSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ContainedSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ContainedSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructMember &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_StructMemberSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StructMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::StructMemberSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Initializer &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Initializer &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_InitializerSeq_H_
-#define _TAO_CDR_OP_CORBA_InitializerSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InitializerSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::InitializerSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_InitializerSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInitializer &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInitializer &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtInitializerSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtInitializerSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionMember &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::UnionMemberSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_EnumMemberSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::EnumMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumMemberSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container::Description &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container::DescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::Container::DescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IDLType_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IDLType_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypedefDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypedefDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "IFR_BaseC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl
deleted file mode 100644
index 8b69d04033d..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseC.inl
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_IROBJECT___CI_)
-#define _CORBA_IROBJECT___CI_
-
-ACE_INLINE
-CORBA::IRObject::IRObject (
-    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_IRObject_Proxy_Broker_ (0)
-{
-  this->CORBA_IRObject_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::IRObject::IRObject (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_IRObject_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONTAINED___CI_)
-#define _CORBA_CONTAINED___CI_
-
-ACE_INLINE
-CORBA::Contained::Contained (
-    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_Contained_Proxy_Broker_ (0)
-{
-  this->CORBA_Contained_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Contained::Contained (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Contained_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONTAINER___CI_)
-#define _CORBA_CONTAINER___CI_
-
-ACE_INLINE
-CORBA::Container::Container (
-    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_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_Container_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Container::Container (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_IDLTYPE___CI_)
-#define _CORBA_IDLTYPE___CI_
-
-ACE_INLINE
-CORBA::IDLType::IDLType (
-    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_IDLType_Proxy_Broker_ (0)
-{
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::IDLType::IDLType (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_IDLType_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_TYPEDEFDEF___CI_)
-#define _CORBA_TYPEDEFDEF___CI_
-
-ACE_INLINE
-CORBA::TypedefDef::TypedefDef (
-    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_TypedefDef_Proxy_Broker_ (0)
-{
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::TypedefDef::TypedefDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_TypedefDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
deleted file mode 100644
index 910bbfc9646..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ /dev/null
@@ -1,1230 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:398
-
-#ifndef _TAO_IDL_ORIG_IFR_BASES_H_
-#define _TAO_IDL_ORIG_IFR_BASES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "IFR_BaseC.h"
-#include "tao/orb_typesS.h"
-#include "tao/Typecode_typesS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-
-  class IRObject;
-  typedef IRObject *IRObject_ptr;
-
-
-  class TAO_IFR_Client_Export IRObject
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    IRObject (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::IRObject _stub_type;
-    typedef ::CORBA::IRObject_ptr _stub_ptr_type;
-    typedef ::CORBA::IRObject_var _stub_var_type;
-
-    IRObject (const IRObject& rhs);
-    virtual ~IRObject (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::CORBA::IRObject *_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::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_def_kind_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-
-  class Contained;
-  typedef Contained *Contained_ptr;
-
-
-  class TAO_IFR_Client_Export Contained
-    : public virtual POA_CORBA::IRObject
-  {
-  protected:
-    Contained (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::Contained _stub_type;
-    typedef ::CORBA::Contained_ptr _stub_ptr_type;
-    typedef ::CORBA::Contained_var _stub_var_type;
-
-    Contained (const Contained& rhs);
-    virtual ~Contained (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::CORBA::Contained *_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 char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_id_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual void id (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_id_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual void name (
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_version_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual void version (
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_version_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_defined_in_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_absolute_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_containing_repository_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual void move (
-        ::CORBA::Container_ptr new_container,
-        const char * new_name,
-        const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void move_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void
-    _get_def_kind_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-
-  class Container;
-  typedef Container *Container_ptr;
-
-
-  class TAO_IFR_Client_Export Container
-    : public virtual POA_CORBA::IRObject
-  {
-  protected:
-    Container (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::Container _stub_type;
-    typedef ::CORBA::Container_ptr _stub_ptr_type;
-    typedef ::CORBA::Container_var _stub_var_type;
-
-    Container (const Container& rhs);
-    virtual ~Container (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::CORBA::Container *_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::Contained_ptr lookup (
-        const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ContainedSeq * contents (
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void contents_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ContainedSeq * lookup_name (
-        const char * search_name,
-        ::CORBA::Long levels_to_search,
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::Container::DescriptionSeq * describe_contents (
-        ::CORBA::DefinitionKind limit_type,
-        ::CORBA::Boolean exclude_inherited,
-        ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_contents_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ModuleDef_ptr create_module (
-        const char * id,
-        const char * name,
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_module_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ConstantDef_ptr create_constant (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_constant_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::StructDef_ptr create_struct (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_struct_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::UnionDef_ptr create_union (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr discriminator_type,
-        const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_union_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::EnumDef_ptr create_enum (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_enum_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::AliasDef_ptr create_alias (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_alias_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::InterfaceDef_ptr create_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_interface_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ValueDef_ptr create_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::Boolean is_custom,
-        ::CORBA::Boolean is_abstract,
-        ::CORBA::ValueDef_ptr base_value,
-        ::CORBA::Boolean is_truncatable,
-        const ::CORBA::ValueDefSeq & abstract_base_values,
-        const ::CORBA::InterfaceDefSeq & supported_interfaces,
-        const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_value_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ValueBoxDef_ptr create_value_box (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_value_box_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ExceptionDef_ptr create_exception (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_exception_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::NativeDef_ptr create_native (
-        const char * id,
-        const char * name,
-        const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_native_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_abstract_interface_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_local_interface_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::ExtValueDef_ptr create_ext_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::Boolean is_custom,
-        ::CORBA::Boolean is_abstract,
-        ::CORBA::ValueDef_ptr base_value,
-        ::CORBA::Boolean is_truncatable,
-        const ::CORBA::ValueDefSeq & abstract_base_values,
-        const ::CORBA::InterfaceDefSeq & supported_interfaces,
-        const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_ext_value_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void
-    _get_def_kind_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-
-  class IDLType;
-  typedef IDLType *IDLType_ptr;
-
-
-  class TAO_IFR_Client_Export IDLType
-    : public virtual POA_CORBA::IRObject
-  {
-  protected:
-    IDLType (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::IDLType _stub_type;
-    typedef ::CORBA::IDLType_ptr _stub_ptr_type;
-    typedef ::CORBA::IDLType_var _stub_var_type;
-
-    IDLType (const IDLType& rhs);
-    virtual ~IDLType (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::CORBA::IDLType *_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::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void
-    _get_def_kind_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-
-  class TypedefDef;
-  typedef TypedefDef *TypedefDef_ptr;
-
-
-  class TAO_IFR_Client_Export TypedefDef
-    : public virtual POA_CORBA::Contained,
-      public virtual POA_CORBA::IDLType
-  {
-  protected:
-    TypedefDef (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::TypedefDef _stub_type;
-    typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
-    typedef ::CORBA::TypedefDef_var _stub_var_type;
-
-    TypedefDef (const TypedefDef& rhs);
-    virtual ~TypedefDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::CORBA::TypedefDef *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    static void
-    _get_def_kind_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_id_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _set_id_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _set_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_version_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _set_version_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_defined_in_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_absolute_name_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_containing_repository_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    describe_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
-
-    static void
-    move_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static void
-    _get_type_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  };
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1005
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
deleted file mode 100644
index 6eb0b37463e..00000000000
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ /dev/null
@@ -1,428 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Basic.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_BasicC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains the concrete base interfaces of
-//   the IFR, except for fixed types, valuetypes and CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -I../.. \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Basic.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Basic.pidl
-//
-//   The only modification necessary to the skeleton files is to
-//   change
-//
-//   #include "IFR_BasicC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_BasicC.h"
-//
-//   in IFR_BasicS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
-
-#ifndef _IFR_BASIC_IDL_
-#define _IFR_BASIC_IDL_
-
-#include "tao/IFR_Client/IFR_Base.pidl"
-#include "ParameterMode.pidl"
-
-module CORBA
-{
-  typeprefix CORBA "omg.org";
-
-  interface PrimitiveDef;
-  interface StringDef;
-  interface SequenceDef;
-  interface ArrayDef;
-  interface WstringDef;
-  interface FixedDef;
-
-  enum PrimitiveKind
-  {
-    pk_null,
-    pk_void,
-    pk_short,
-    pk_long,
-    pk_ushort,
-    pk_ulong,
-    pk_float,
-    pk_double,
-    pk_boolean,
-    pk_char,
-    pk_octet,
-    pk_any,
-    pk_TypeCode,
-    pk_Principal,
-    pk_string,
-    pk_objref,
-    pk_longlong,
-    pk_ulonglong,
-    pk_longdouble,
-    pk_wchar,
-    pk_wstring,
-    pk_value_base
-  };
-
-  interface Repository : Container
-  {
-    // read interface
-    Contained lookup_id (
-        in RepositoryId search_id
-      );
-    TypeCode get_canonical_typecode (
-        in TypeCode tc
-      );
-    PrimitiveDef get_primitive (
-        in PrimitiveKind kind
-      );
-    // write interface
-    StringDef create_string (
-        in unsigned long bound
-      );
-    WstringDef create_wstring (
-        in unsigned long bound
-      );
-    SequenceDef create_sequence (
-        in unsigned long bound,
-        in IDLType element_type
-      );
-    ArrayDef create_array (
-        in unsigned long length,
-        in IDLType element_type
-      );
-    FixedDef create_fixed (
-        in unsigned short digits,
-        in short scale
-      );
-  };
-
-  interface ModuleDef : Container, Contained
-  {
-  };
-
-  struct ModuleDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-  };
-
-  interface ConstantDef : Contained
-  {
-    readonly attribute TypeCode type;
-    attribute IDLType type_def;
-    attribute any value;
-  };
-
-  struct ConstantDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-    any value;
-  };
-
-  interface StructDef : TypedefDef, Container
-  {
-    attribute StructMemberSeq members;
-  };
-
-  interface UnionDef : TypedefDef, Container
-  {
-    readonly attribute TypeCode discriminator_type;
-    attribute IDLType discriminator_type_def;
-    attribute UnionMemberSeq members;
-  };
-
-  interface EnumDef : TypedefDef
-  {
-    attribute EnumMemberSeq members;
-  };
-
-  interface AliasDef : TypedefDef
-  {
-    attribute IDLType original_type_def;
-  };
-
-  interface NativeDef : TypedefDef
-  {
-  };
-
-  interface PrimitiveDef: IDLType
-  {
-    readonly attribute PrimitiveKind kind;
-  };
-
-  interface StringDef : IDLType
-  {
-    attribute unsigned long bound;
-  };
-
-  interface WstringDef : IDLType
-  {
-    attribute unsigned long bound;
-  };
-
-  interface SequenceDef : IDLType
-  {
-    attribute unsigned long bound;
-    readonly attribute TypeCode element_type;
-    attribute IDLType element_type_def;
-  };
-
-  interface ArrayDef : IDLType
-  {
-  attribute unsigned long length;
-  readonly attribute TypeCode element_type;
-  attribute IDLType element_type_def;
-  };
-
-  interface ExceptionDef : Contained, Container
-  {
-    readonly attribute TypeCode type;
-    attribute StructMemberSeq members;
-  };
-
-  typedef sequence <ExceptionDef> ExceptionDefSeq;
-
-  enum AttributeMode
-  {
-    ATTR_NORMAL,
-    ATTR_READONLY
-  };
-
-  interface AttributeDef : Contained
-  {
-    readonly attribute TypeCode type;
-    attribute IDLType type_def;
-    attribute AttributeMode mode;
-  };
-
-  struct AttributeDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-    AttributeMode mode;
-  };
-
-  struct ExtAttributeDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-    AttributeMode mode;
-    ExcDescriptionSeq get_exceptions;
-    ExcDescriptionSeq put_exceptions;
-  };
-
-  interface ExtAttributeDef : AttributeDef
-  {
-    // read/write interface
-    attribute ExcDescriptionSeq get_exceptions;
-    attribute ExcDescriptionSeq set_exceptions;
-    // read interface
-    ExtAttributeDescription describe_attribute ();
-  };
-
-  enum OperationMode
-  {
-    OP_NORMAL,
-    OP_ONEWAY
-  };
-
-// Already defined in corbafwd.h, included from orb.idl
-/*
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-*/
-  struct ParameterDescription
-  {
-    Identifier name;
-    TypeCode type;
-    IDLType type_def;
-    ParameterMode mode;
-  };
-
-  typedef sequence <ParameterDescription> ParDescriptionSeq;
-  typedef Identifier ContextIdentifier;
-  typedef sequence <ContextIdentifier> ContextIdSeq;
-
-  interface OperationDef : Contained
-  {
-    readonly attribute TypeCode result;
-    attribute IDLType result_def;
-    attribute ParDescriptionSeq params;
-    attribute OperationMode mode;
-    attribute ContextIdSeq contexts;
-    attribute ExceptionDefSeq exceptions;
-  };
-
-  struct OperationDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode result;
-    OperationMode mode;
-    ContextIdSeq contexts;
-    ParDescriptionSeq parameters;
-    ExcDescriptionSeq exceptions;
-  };
-
-  typedef sequence <RepositoryId> RepositoryIdSeq;
-  typedef sequence <OperationDescription> OpDescriptionSeq;
-  typedef sequence <AttributeDescription> AttrDescriptionSeq;
-  typedef sequence <ExtAttributeDescription> ExtAttrDescriptionSeq;
-
-  interface InterfaceDef : Container,
-			   Contained,
-			   IDLType
-  {
-    // read/write interface
-    attribute InterfaceDefSeq base_interfaces;
-    // read interface
-    boolean is_a (
-        in RepositoryId interface_id
-      );
-
-    struct FullInterfaceDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      OpDescriptionSeq operations;
-      AttrDescriptionSeq attributes;
-      RepositoryIdSeq base_interfaces;
-      TypeCode type;
-    };
-
-    FullInterfaceDescription describe_interface ();
-
-    // write interface
-    AttributeDef create_attribute (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType type,
-        in AttributeMode mode
-      );
-    OperationDef create_operation (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType result,
-        in OperationMode mode,
-        in ParDescriptionSeq params,
-        in ExceptionDefSeq exceptions,
-        in ContextIdSeq contexts
-      );
-  };
-
-  struct InterfaceDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    RepositoryIdSeq base_interfaces;
-  };
-
-  interface InterfaceAttrExtension
-  {
-    // read interface
-    struct ExtFullInterfaceDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      OpDescriptionSeq operations;
-      ExtAttrDescriptionSeq attributes;
-      RepositoryIdSeq base_interfaces;
-      TypeCode type;
-    };
-
-    ExtFullInterfaceDescription describe_ext_interface ();
-
-    // write interface
-    ExtAttributeDef create_ext_attribute (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in IDLType type,
-	in AttributeMode mode,
-	in ExceptionDefSeq get_exceptions,
-	in ExceptionDefSeq set_exceptions
-      );
-  };
-
-  interface ExtInterfaceDef : InterfaceDef,
-			      InterfaceAttrExtension
-  {
-  };
-
-  interface AbstractInterfaceDef : InterfaceDef
-  {
-  };
-
-  interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
-				      InterfaceAttrExtension
-  {
-  };
-
-  interface LocalInterfaceDef : InterfaceDef
-  {
-  };
-
-  interface ExtLocalInterfaceDef : LocalInterfaceDef,
-				   InterfaceAttrExtension
-  {
-  };
-};
-
-#endif /* _IFR_BASIC_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.cpp b/TAO/tao/IFR_Client/IFR_BasicA.cpp
deleted file mode 100644
index fb92aa67a5d..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicA.cpp
+++ /dev/null
@@ -1,3626 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BasicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_PrimitiveKind[] =
-  {
-    "pk_null",
-    "pk_void",
-    "pk_short",
-    "pk_long",
-    "pk_ushort",
-    "pk_ulong",
-    "pk_float",
-    "pk_double",
-    "pk_boolean",
-    "pk_char",
-    "pk_octet",
-    "pk_any",
-    "pk_TypeCode",
-    "pk_Principal",
-    "pk_string",
-    "pk_objref",
-    "pk_longlong",
-    "pk_ulonglong",
-    "pk_longdouble",
-    "pk_wchar",
-    "pk_wstring",
-    "pk_value_base"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveKind (
-    "IDL:omg.org/CORBA/PrimitiveKind:1.0",
-    "PrimitiveKind",
-    _tao_enumerators_CORBA_PrimitiveKind,
-    22);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveKind =
-    &_tao_tc_CORBA_PrimitiveKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Repository =
-    &_tao_tc_CORBA_Repository;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-    &_tao_tc_CORBA_ModuleDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ModuleDescription:1.0",
-    "ModuleDescription",
-    _tao_fields_CORBA_ModuleDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDescription =
-    &_tao_tc_CORBA_ModuleDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstantDef:1.0",
-    "ConstantDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDef =
-    &_tao_tc_CORBA_ConstantDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ConstantDescription:1.0",
-    "ConstantDescription",
-    _tao_fields_CORBA_ConstantDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDescription =
-    &_tao_tc_CORBA_ConstantDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StructDef:1.0",
-    "StructDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructDef =
-    &_tao_tc_CORBA_StructDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/UnionDef:1.0",
-    "UnionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionDef =
-    &_tao_tc_CORBA_UnionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/EnumDef:1.0",
-    "EnumDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumDef =
-    &_tao_tc_CORBA_EnumDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AliasDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AliasDef:1.0",
-    "AliasDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AliasDef =
-    &_tao_tc_CORBA_AliasDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_NativeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/NativeDef:1.0",
-    "NativeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_NativeDef =
-    &_tao_tc_CORBA_NativeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/PrimitiveDef:1.0",
-    "PrimitiveDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveDef =
-    &_tao_tc_CORBA_PrimitiveDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StringDef:1.0",
-    "StringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringDef =
-    &_tao_tc_CORBA_StringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WstringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/WstringDef:1.0",
-    "WstringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WstringDef =
-    &_tao_tc_CORBA_WstringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SequenceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/SequenceDef:1.0",
-    "SequenceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SequenceDef =
-    &_tao_tc_CORBA_SequenceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ArrayDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ArrayDef:1.0",
-    "ArrayDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ArrayDef =
-    &_tao_tc_CORBA_ArrayDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExceptionDef:1.0",
-    "ExceptionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDef =
-    &_tao_tc_CORBA_ExceptionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExceptionDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExceptionDefSeq_0 =
-      &CORBA_ExceptionDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
-    "ExceptionDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq =
-    &_tao_tc_CORBA_ExceptionDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_AttributeMode[] =
-  {
-    "ATTR_NORMAL",
-    "ATTR_READONLY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeMode (
-    "IDL:omg.org/CORBA/AttributeMode:1.0",
-    "AttributeMode",
-    _tao_enumerators_CORBA_AttributeMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeMode =
-    &_tao_tc_CORBA_AttributeMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AttributeDef:1.0",
-    "AttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDef =
-    &_tao_tc_CORBA_AttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/AttributeDescription:1.0",
-    "AttributeDescription",
-    _tao_fields_CORBA_AttributeDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDescription =
-    &_tao_tc_CORBA_AttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode },
-    { "get_exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "put_exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
-    "ExtAttributeDescription",
-    _tao_fields_CORBA_ExtAttributeDescription,
-    8);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription =
-    &_tao_tc_CORBA_ExtAttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
-    "ExtAttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef =
-    &_tao_tc_CORBA_ExtAttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_OperationMode[] =
-  {
-    "OP_NORMAL",
-    "OP_ONEWAY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationMode (
-    "IDL:omg.org/CORBA/OperationMode:1.0",
-    "OperationMode",
-    _tao_enumerators_CORBA_OperationMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationMode =
-    &_tao_tc_CORBA_OperationMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ParameterDescription:1.0",
-    "ParameterDescription",
-    _tao_fields_CORBA_ParameterDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterDescription =
-    &_tao_tc_CORBA_ParameterDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ParDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ParameterDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
-      &CORBA_ParDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
-    "ParDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
-    &_tao_tc_CORBA_ParDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdentifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdentifier:1.0",
-    "ContextIdentifier",
-    &CORBA::_tc_Identifier);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
-    &_tao_tc_CORBA_ContextIdentifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContextIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ContextIdentifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
-      &CORBA_ContextIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdSeq:1.0",
-    "ContextIdSeq",
-    &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
-    &_tao_tc_CORBA_ContextIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/OperationDef:1.0",
-    "OperationDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDef =
-    &_tao_tc_CORBA_OperationDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "result", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_OperationMode },
-    { "contexts", &CORBA::_tc_ContextIdSeq },
-    { "parameters", &CORBA::_tc_ParDescriptionSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/OperationDescription:1.0",
-    "OperationDescription",
-    _tao_fields_CORBA_OperationDescription,
-    9);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDescription =
-    &_tao_tc_CORBA_OperationDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_RepositoryIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_RepositoryId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
-      &CORBA_RepositoryIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
-    "RepositoryIdSeq",
-    &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
-    &_tao_tc_CORBA_RepositoryIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OpDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_OperationDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
-      &CORBA_OpDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OpDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
-    "OpDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
-    &_tao_tc_CORBA_OpDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
-      &CORBA_AttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
-    "AttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
-    &_tao_tc_CORBA_AttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
-      &CORBA_ExtAttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
-    "ExtAttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
-    &_tao_tc_CORBA_ExtAttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
-    "FullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceDef:1.0",
-    "InterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
-    &_tao_tc_CORBA_InterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDescription:1.0",
-    "InterfaceDescription",
-    _tao_fields_CORBA_InterfaceDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
-    &_tao_tc_CORBA_InterfaceDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
-    "ExtFullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
-    "InterfaceAttrExtension");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
-    &_tao_tc_CORBA_InterfaceAttrExtension;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
-    "ExtInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
-    &_tao_tc_CORBA_ExtInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
-    "AbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
-    &_tao_tc_CORBA_AbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
-    "ExtAbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
-    "LocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
-    &_tao_tc_CORBA_LocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
-    "ExtLocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
-    &_tao_tc_CORBA_ExtLocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::insert (
-      _tao_any,
-      CORBA::_tc_PrimitiveKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PrimitiveKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
-        _tao_any,
-        CORBA::_tc_PrimitiveKind,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr _tao_elem
-  )
-{
-  CORBA::Repository_ptr _tao_objptr =
-    CORBA::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Repository>::insert (
-      _tao_any,
-      CORBA::Repository::_tao_any_destructor,
-      CORBA::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Repository_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Repository>::extract (
-        _tao_any,
-        CORBA::Repository::_tao_any_destructor,
-        CORBA::_tc_Repository,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ModuleDef_ptr _tao_objptr =
-    CORBA::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ModuleDef::_tao_any_destructor,
-      CORBA::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
-        _tao_any,
-        CORBA::ModuleDef::_tao_any_destructor,
-        CORBA::_tc_ModuleDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
-      _tao_any,
-      CORBA::ModuleDescription::_tao_any_destructor,
-      CORBA::_tc_ModuleDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert (
-      _tao_any,
-      CORBA::ModuleDescription::_tao_any_destructor,
-      CORBA::_tc_ModuleDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ModuleDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
-        _tao_any,
-        CORBA::ModuleDescription::_tao_any_destructor,
-        CORBA::_tc_ModuleDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstantDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr _tao_elem
-  )
-{
-  CORBA::ConstantDef_ptr _tao_objptr =
-    CORBA::ConstantDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
-      _tao_any,
-      CORBA::ConstantDef::_tao_any_destructor,
-      CORBA::_tc_ConstantDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
-        _tao_any,
-        CORBA::ConstantDef::_tao_any_destructor,
-        CORBA::_tc_ConstantDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
-      _tao_any,
-      CORBA::ConstantDescription::_tao_any_destructor,
-      CORBA::_tc_ConstantDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert (
-      _tao_any,
-      CORBA::ConstantDescription::_tao_any_destructor,
-      CORBA::_tc_ConstantDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ConstantDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
-        _tao_any,
-        CORBA::ConstantDescription::_tao_any_destructor,
-        CORBA::_tc_ConstantDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StructDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr _tao_elem
-  )
-{
-  CORBA::StructDef_ptr _tao_objptr =
-    CORBA::StructDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StructDef>::insert (
-      _tao_any,
-      CORBA::StructDef::_tao_any_destructor,
-      CORBA::_tc_StructDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StructDef>::extract (
-        _tao_any,
-        CORBA::StructDef::_tao_any_destructor,
-        CORBA::_tc_StructDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::UnionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr _tao_elem
-  )
-{
-  CORBA::UnionDef_ptr _tao_objptr =
-    CORBA::UnionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
-      _tao_any,
-      CORBA::UnionDef::_tao_any_destructor,
-      CORBA::_tc_UnionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
-        _tao_any,
-        CORBA::UnionDef::_tao_any_destructor,
-        CORBA::_tc_UnionDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::EnumDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr _tao_elem
-  )
-{
-  CORBA::EnumDef_ptr _tao_objptr =
-    CORBA::EnumDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
-      _tao_any,
-      CORBA::EnumDef::_tao_any_destructor,
-      CORBA::_tc_EnumDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
-        _tao_any,
-        CORBA::EnumDef::_tao_any_destructor,
-        CORBA::_tc_EnumDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AliasDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr _tao_elem
-  )
-{
-  CORBA::AliasDef_ptr _tao_objptr =
-    CORBA::AliasDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
-      _tao_any,
-      CORBA::AliasDef::_tao_any_destructor,
-      CORBA::_tc_AliasDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
-        _tao_any,
-        CORBA::AliasDef::_tao_any_destructor,
-        CORBA::_tc_AliasDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::NativeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr _tao_elem
-  )
-{
-  CORBA::NativeDef_ptr _tao_objptr =
-    CORBA::NativeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
-      _tao_any,
-      CORBA::NativeDef::_tao_any_destructor,
-      CORBA::_tc_NativeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
-        _tao_any,
-        CORBA::NativeDef::_tao_any_destructor,
-        CORBA::_tc_NativeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PrimitiveDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr _tao_elem
-  )
-{
-  CORBA::PrimitiveDef_ptr _tao_objptr =
-    CORBA::PrimitiveDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
-      _tao_any,
-      CORBA::PrimitiveDef::_tao_any_destructor,
-      CORBA::_tc_PrimitiveDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
-        _tao_any,
-        CORBA::PrimitiveDef::_tao_any_destructor,
-        CORBA::_tc_PrimitiveDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr _tao_elem
-  )
-{
-  CORBA::StringDef_ptr _tao_objptr =
-    CORBA::StringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StringDef>::insert (
-      _tao_any,
-      CORBA::StringDef::_tao_any_destructor,
-      CORBA::_tc_StringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StringDef>::extract (
-        _tao_any,
-        CORBA::StringDef::_tao_any_destructor,
-        CORBA::_tc_StringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::WstringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr _tao_elem
-  )
-{
-  CORBA::WstringDef_ptr _tao_objptr =
-    CORBA::WstringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
-      _tao_any,
-      CORBA::WstringDef::_tao_any_destructor,
-      CORBA::_tc_WstringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
-        _tao_any,
-        CORBA::WstringDef::_tao_any_destructor,
-        CORBA::_tc_WstringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::SequenceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr _tao_elem
-  )
-{
-  CORBA::SequenceDef_ptr _tao_objptr =
-    CORBA::SequenceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
-      _tao_any,
-      CORBA::SequenceDef::_tao_any_destructor,
-      CORBA::_tc_SequenceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
-        _tao_any,
-        CORBA::SequenceDef::_tao_any_destructor,
-        CORBA::_tc_SequenceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ArrayDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr _tao_elem
-  )
-{
-  CORBA::ArrayDef_ptr _tao_objptr =
-    CORBA::ArrayDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
-      _tao_any,
-      CORBA::ArrayDef::_tao_any_destructor,
-      CORBA::_tc_ArrayDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
-        _tao_any,
-        CORBA::ArrayDef::_tao_any_destructor,
-        CORBA::_tc_ArrayDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExceptionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr _tao_elem
-  )
-{
-  CORBA::ExceptionDef_ptr _tao_objptr =
-    CORBA::ExceptionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
-      _tao_any,
-      CORBA::ExceptionDef::_tao_any_destructor,
-      CORBA::_tc_ExceptionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
-        _tao_any,
-        CORBA::ExceptionDef::_tao_any_destructor,
-        CORBA::_tc_ExceptionDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExceptionDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
-        _tao_any,
-        CORBA::ExceptionDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
-      _tao_any,
-      CORBA::_tc_AttributeMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
-        _tao_any,
-        CORBA::_tc_AttributeMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr _tao_elem
-  )
-{
-  CORBA::AttributeDef_ptr _tao_objptr =
-    CORBA::AttributeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
-      _tao_any,
-      CORBA::AttributeDef::_tao_any_destructor,
-      CORBA::_tc_AttributeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
-        _tao_any,
-        CORBA::AttributeDef::_tao_any_destructor,
-        CORBA::_tc_AttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
-      _tao_any,
-      CORBA::AttributeDescription::_tao_any_destructor,
-      CORBA::_tc_AttributeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert (
-      _tao_any,
-      CORBA::AttributeDescription::_tao_any_destructor,
-      CORBA::_tc_AttributeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttributeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
-        _tao_any,
-        CORBA::AttributeDescription::_tao_any_destructor,
-        CORBA::_tc_AttributeDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAttributeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExtAttributeDescription::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert (
-      _tao_any,
-      CORBA::ExtAttributeDescription::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAttributeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAttributeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::extract (
-        _tao_any,
-        CORBA::ExtAttributeDescription::_tao_any_destructor,
-        CORBA::_tc_ExtAttributeDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtAttributeDef_ptr _tao_objptr =
-    CORBA::ExtAttributeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtAttributeDef>::insert (
-      _tao_any,
-      CORBA::ExtAttributeDef::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
-        _tao_any,
-        CORBA::ExtAttributeDef::_tao_any_destructor,
-        CORBA::_tc_ExtAttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
-      _tao_any,
-      CORBA::_tc_OperationMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
-        _tao_any,
-        CORBA::_tc_OperationMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
-      _tao_any,
-      CORBA::ParameterDescription::_tao_any_destructor,
-      CORBA::_tc_ParameterDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert (
-      _tao_any,
-      CORBA::ParameterDescription::_tao_any_destructor,
-      CORBA::_tc_ParameterDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParameterDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
-        _tao_any,
-        CORBA::ParameterDescription::_tao_any_destructor,
-        CORBA::_tc_ParameterDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ParDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ContextIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
-        _tao_any,
-        CORBA::ContextIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::OperationDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr _tao_elem
-  )
-{
-  CORBA::OperationDef_ptr _tao_objptr =
-    CORBA::OperationDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
-      _tao_any,
-      CORBA::OperationDef::_tao_any_destructor,
-      CORBA::_tc_OperationDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
-        _tao_any,
-        CORBA::OperationDef::_tao_any_destructor,
-        CORBA::_tc_OperationDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OperationDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
-      _tao_any,
-      CORBA::OperationDescription::_tao_any_destructor,
-      CORBA::_tc_OperationDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert (
-      _tao_any,
-      CORBA::OperationDescription::_tao_any_destructor,
-      CORBA::_tc_OperationDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OperationDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
-        _tao_any,
-        CORBA::OperationDescription::_tao_any_destructor,
-        CORBA::_tc_OperationDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::RepositoryIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
-        _tao_any,
-        CORBA::RepositoryIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OpDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::OpDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttrDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::AttrDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttrDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAttrDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAttrDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::InterfaceDef_ptr _tao_objptr =
-    CORBA::InterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
-      _tao_any,
-      CORBA::InterfaceDef::_tao_any_destructor,
-      CORBA::_tc_InterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::_tao_any_destructor,
-        CORBA::_tc_InterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDescription::_tao_any_destructor,
-      CORBA::_tc_InterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceDescription::_tao_any_destructor,
-      CORBA::_tc_InterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDescription::_tao_any_destructor,
-        CORBA::_tc_InterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr _tao_elem
-  )
-{
-  CORBA::InterfaceAttrExtension_ptr _tao_objptr =
-    CORBA::InterfaceAttrExtension::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::insert (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::_tao_any_destructor,
-      CORBA::_tc_InterfaceAttrExtension,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::extract (
-        _tao_any,
-        CORBA::InterfaceAttrExtension::_tao_any_destructor,
-        CORBA::_tc_InterfaceAttrExtension,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-        CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::AbstractInterfaceDef_ptr _tao_objptr =
-    CORBA::AbstractInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_AbstractInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_AbstractInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtAbstractInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtAbstractInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtAbstractInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtAbstractInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::LocalInterfaceDef_ptr _tao_objptr =
-    CORBA::LocalInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_LocalInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_LocalInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtLocalInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtLocalInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtLocalInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtLocalInterfaceDef,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
deleted file mode 100644
index 30d2cbf70ba..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ /dev/null
@@ -1,9921 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IFR_BasicC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.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/Any_Arg_Traits.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "IFR_BasicC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Contained>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Contained_ptr,
-            CORBA::Contained_var,
-            CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::IDLType>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::IDLType_ptr,
-            CORBA::IDLType_var,
-            CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDef::FullInterfaceDescription,
-            CORBA::InterfaceDef::FullInterfaceDescription_var,
-            CORBA::InterfaceDef::FullInterfaceDescription_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDefSeq,
-            CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::StructMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StructMemberSeq,
-            CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExcDescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExcDescriptionSeq,
-            CORBA::ExcDescriptionSeq_var,
-            CORBA::ExcDescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::UnionMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::UnionMemberSeq,
-            CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::EnumMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::EnumMemberSeq,
-            CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::PrimitiveDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::PrimitiveDef_ptr,
-            CORBA::PrimitiveDef_var,
-            CORBA::PrimitiveDef_out,
-            TAO::Objref_Traits<CORBA::PrimitiveDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRINGDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::StringDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::StringDef_ptr,
-            CORBA::StringDef_var,
-            CORBA::StringDef_out,
-            TAO::Objref_Traits<CORBA::StringDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_CS_)
-#define _CORBA_SEQUENCEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::SequenceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::SequenceDef_ptr,
-            CORBA::SequenceDef_var,
-            CORBA::SequenceDef_out,
-            TAO::Objref_Traits<CORBA::SequenceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_CS_)
-#define _CORBA_ARRAYDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ArrayDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ArrayDef_ptr,
-            CORBA::ArrayDef_var,
-            CORBA::ArrayDef_out,
-            TAO::Objref_Traits<CORBA::ArrayDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_WSTRINGDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::WstringDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::WstringDef_ptr,
-            CORBA::WstringDef_var,
-            CORBA::WstringDef_out,
-            TAO::Objref_Traits<CORBA::WstringDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_CS_)
-#define _CORBA_FIXEDDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::FixedDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::FixedDef_ptr,
-            CORBA::FixedDef_var,
-            CORBA::FixedDef_out,
-            TAO::Objref_Traits<CORBA::FixedDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::PrimitiveKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExceptionDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExceptionDefSeq,
-            CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::AttributeMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::AttributeMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::AttributeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::AttributeDef_ptr,
-            CORBA::AttributeDef_var,
-            CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExtAttributeDescription>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtAttributeDescription,
-            CORBA::ExtAttributeDescription_var,
-            CORBA::ExtAttributeDescription_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ExtAttributeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ExtAttributeDef_ptr,
-            CORBA::ExtAttributeDef_var,
-            CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::OperationMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::OperationMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ParDescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ParDescriptionSeq,
-            CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ContextIdSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ContextIdSeq,
-            CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::OperationDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::OperationDef_ptr,
-            CORBA::OperationDef_var,
-            CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Repository.
-
-CORBA::Repository_ptr
-TAO::Objref_Traits<CORBA::Repository>::duplicate (
-    CORBA::Repository_ptr p
-  )
-{
-  return CORBA::Repository::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Repository>::release (
-    CORBA::Repository_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Repository_ptr
-TAO::Objref_Traits<CORBA::Repository>::nil (void)
-{
-  return CORBA::Repository::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Repository>::marshal (
-    CORBA::Repository_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Contained_ptr CORBA::Repository::lookup_id (
-    const char * search_id
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_search_id
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "lookup_id",
-      9,
-      this->the_TAO_Repository_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
-
-CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
-    ::CORBA::TypeCode_ptr tc
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc (tc);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_tc
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "get_canonical_typecode",
-      22,
-      this->the_TAO_Repository_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
-
-::CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
-    ::CORBA::PrimitiveKind kind
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_kind
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "get_primitive",
-      13,
-      this->the_TAO_Repository_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
-
-::CORBA::StringDef_ptr CORBA::Repository::create_string (
-    ::CORBA::ULong bound
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::StringDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "create_string",
-      13,
-      this->the_TAO_Repository_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
-
-::CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
-    ::CORBA::ULong bound
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::WstringDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "create_wstring",
-      14,
-      this->the_TAO_Repository_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
-
-::CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
-    ::CORBA::ULong bound,
-    ::CORBA::IDLType_ptr element_type
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::SequenceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound,
-      &_tao_element_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "create_sequence",
-      15,
-      this->the_TAO_Repository_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
-
-::CORBA::ArrayDef_ptr CORBA::Repository::create_array (
-    ::CORBA::ULong length,
-    ::CORBA::IDLType_ptr element_type
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ArrayDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_length,
-      &_tao_element_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "create_array",
-      12,
-      this->the_TAO_Repository_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
-
-::CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
-    ::CORBA::UShort digits,
-    ::CORBA::Short scale
-    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_Repository_Proxy_Broker_ == 0)
-    {
-      CORBA_Repository_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::FixedDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
-  TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_digits,
-      &_tao_scale
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "create_fixed",
-      12,
-      this->the_TAO_Repository_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::Repository::Repository (void)
- : the_TAO_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_Repository_setup_collocation ();
-}
-
-void
-CORBA::Repository::CORBA_Repository_setup_collocation ()
-{
-  if (::CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Repository_Proxy_Broker_ =
-        ::CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Container_setup_collocation ();
-}
-
-CORBA::Repository::~Repository (void)
-{}
-
-void 
-CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Repository *_tao_tmp_pointer =
-    static_cast<Repository *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Repository_ptr
-CORBA::Repository::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Repository>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Repository:1.0",
-        CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Repository_ptr
-CORBA::Repository::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Repository>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Repository:1.0",
-        CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Repository_ptr
-CORBA::Repository::_duplicate (Repository_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Repository::_tao_release (Repository_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Repository::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Repository:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::Repository::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Repository:1.0";
-}
-
-CORBA::Boolean
-CORBA::Repository::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ModuleDef.
-
-CORBA::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ModuleDef>::duplicate (
-    CORBA::ModuleDef_ptr p
-  )
-{
-  return CORBA::ModuleDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ModuleDef>::release (
-    CORBA::ModuleDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ModuleDef>::nil (void)
-{
-  return CORBA::ModuleDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ModuleDef>::marshal (
-    CORBA::ModuleDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ModuleDef::ModuleDef (void)
- : the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ModuleDef_setup_collocation ();
-}
-
-void
-CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ModuleDef_Proxy_Broker_ =
-        ::CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Container_setup_collocation ();
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ModuleDef::~ModuleDef (void)
-{}
-
-void 
-CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ModuleDef *_tao_tmp_pointer =
-    static_cast<ModuleDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ModuleDef_ptr
-CORBA::ModuleDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ModuleDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ModuleDef:1.0",
-        CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ModuleDef_ptr
-CORBA::ModuleDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ModuleDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ModuleDef:1.0",
-        CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ModuleDef_ptr
-CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ModuleDef::_tao_release (ModuleDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ModuleDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ModuleDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ModuleDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ModuleDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ModuleDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ModuleDescription *_tao_tmp_pointer =
-    static_cast<ModuleDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ConstantDef.
-
-CORBA::ConstantDef_ptr
-TAO::Objref_Traits<CORBA::ConstantDef>::duplicate (
-    CORBA::ConstantDef_ptr p
-  )
-{
-  return CORBA::ConstantDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ConstantDef>::release (
-    CORBA::ConstantDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ConstantDef_ptr
-TAO::Objref_Traits<CORBA::ConstantDef>::nil (void)
-{
-  return CORBA::ConstantDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ConstantDef>::marshal (
-    CORBA::ConstantDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::ConstantDef::type (
-    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_ConstantDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstantDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type",
-      9,
-      this->the_TAO_ConstantDef_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
-
-::CORBA::IDLType_ptr CORBA::ConstantDef::type_def (
-    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_ConstantDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstantDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type_def",
-      13,
-      this->the_TAO_ConstantDef_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 CORBA::ConstantDef::type_def (
-    ::CORBA::IDLType_ptr type_def
-    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_ConstantDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstantDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_type_def",
-      13,
-      this->the_TAO_ConstantDef_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
-
-CORBA::Any * CORBA::ConstantDef::value (
-    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_ConstantDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstantDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::Any>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_value",
-      10,
-      this->the_TAO_ConstantDef_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 CORBA::ConstantDef::value (
-    const ::CORBA::Any & value
-    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_ConstantDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ConstantDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_value
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_value",
-      10,
-      this->the_TAO_ConstantDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ConstantDef::ConstantDef (void)
- : the_TAO_ConstantDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstantDef_setup_collocation ();
-}
-
-void
-CORBA::ConstantDef::CORBA_ConstantDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ConstantDef_Proxy_Broker_ =
-        ::CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ConstantDef::~ConstantDef (void)
-{}
-
-void 
-CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ConstantDef *_tao_tmp_pointer =
-    static_cast<ConstantDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ConstantDef_ptr
-CORBA::ConstantDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConstantDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ConstantDef:1.0",
-        CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ConstantDef_ptr
-CORBA::ConstantDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConstantDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ConstantDef:1.0",
-        CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ConstantDef_ptr
-CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ConstantDef::_tao_release (ConstantDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ConstantDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ConstantDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstantDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ConstantDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ConstantDescription *_tao_tmp_pointer =
-    static_cast<ConstantDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::StructDef.
-
-CORBA::StructDef_ptr
-TAO::Objref_Traits<CORBA::StructDef>::duplicate (
-    CORBA::StructDef_ptr p
-  )
-{
-  return CORBA::StructDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::StructDef>::release (
-    CORBA::StructDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::StructDef_ptr
-TAO::Objref_Traits<CORBA::StructDef>::nil (void)
-{
-  return CORBA::StructDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::StructDef>::marshal (
-    CORBA::StructDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::StructMemberSeq * CORBA::StructDef::members (
-    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_StructDef_Proxy_Broker_ == 0)
-    {
-      CORBA_StructDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_members",
-      12,
-      this->the_TAO_StructDef_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 CORBA::StructDef::members (
-    const ::CORBA::StructMemberSeq & members
-    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_StructDef_Proxy_Broker_ == 0)
-    {
-      CORBA_StructDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_members",
-      12,
-      this->the_TAO_StructDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::StructDef::StructDef (void)
- : the_TAO_StructDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StructDef_setup_collocation ();
-}
-
-void
-CORBA::StructDef::CORBA_StructDef_setup_collocation ()
-{
-  if (::CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_StructDef_Proxy_Broker_ =
-        ::CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-  this->CORBA_Container_setup_collocation ();
-}
-
-CORBA::StructDef::~StructDef (void)
-{}
-
-void 
-CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  StructDef *_tao_tmp_pointer =
-    static_cast<StructDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::StructDef_ptr
-CORBA::StructDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<StructDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/StructDef:1.0",
-        CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::StructDef_ptr
-CORBA::StructDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<StructDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/StructDef:1.0",
-        CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::StructDef_ptr
-CORBA::StructDef::_duplicate (StructDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::StructDef::_tao_release (StructDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::StructDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/StructDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::StructDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/StructDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::UnionDef.
-
-CORBA::UnionDef_ptr
-TAO::Objref_Traits<CORBA::UnionDef>::duplicate (
-    CORBA::UnionDef_ptr p
-  )
-{
-  return CORBA::UnionDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::UnionDef>::release (
-    CORBA::UnionDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::UnionDef_ptr
-TAO::Objref_Traits<CORBA::UnionDef>::nil (void)
-{
-  return CORBA::UnionDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::UnionDef>::marshal (
-    CORBA::UnionDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
-    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_UnionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_UnionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_discriminator_type",
-      23,
-      this->the_TAO_UnionDef_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
-
-::CORBA::IDLType_ptr CORBA::UnionDef::discriminator_type_def (
-    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_UnionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_UnionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_discriminator_type_def",
-      27,
-      this->the_TAO_UnionDef_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 CORBA::UnionDef::discriminator_type_def (
-    ::CORBA::IDLType_ptr discriminator_type_def
-    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_UnionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_UnionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_discriminator_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_discriminator_type_def",
-      27,
-      this->the_TAO_UnionDef_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
-
-::CORBA::UnionMemberSeq * CORBA::UnionDef::members (
-    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_UnionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_UnionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_members",
-      12,
-      this->the_TAO_UnionDef_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 CORBA::UnionDef::members (
-    const ::CORBA::UnionMemberSeq & members
-    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_UnionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_UnionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_members",
-      12,
-      this->the_TAO_UnionDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::UnionDef::UnionDef (void)
- : the_TAO_UnionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_UnionDef_setup_collocation ();
-}
-
-void
-CORBA::UnionDef::CORBA_UnionDef_setup_collocation ()
-{
-  if (::CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_UnionDef_Proxy_Broker_ =
-        ::CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-  this->CORBA_Container_setup_collocation ();
-}
-
-CORBA::UnionDef::~UnionDef (void)
-{}
-
-void 
-CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UnionDef *_tao_tmp_pointer =
-    static_cast<UnionDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::UnionDef_ptr
-CORBA::UnionDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<UnionDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/UnionDef:1.0",
-        CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::UnionDef_ptr
-CORBA::UnionDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<UnionDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/UnionDef:1.0",
-        CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::UnionDef_ptr
-CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::UnionDef::_tao_release (UnionDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::UnionDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/UnionDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::UnionDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/UnionDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::EnumDef.
-
-CORBA::EnumDef_ptr
-TAO::Objref_Traits<CORBA::EnumDef>::duplicate (
-    CORBA::EnumDef_ptr p
-  )
-{
-  return CORBA::EnumDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::EnumDef>::release (
-    CORBA::EnumDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::EnumDef_ptr
-TAO::Objref_Traits<CORBA::EnumDef>::nil (void)
-{
-  return CORBA::EnumDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::EnumDef>::marshal (
-    CORBA::EnumDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::EnumMemberSeq * CORBA::EnumDef::members (
-    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_EnumDef_Proxy_Broker_ == 0)
-    {
-      CORBA_EnumDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_members",
-      12,
-      this->the_TAO_EnumDef_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 CORBA::EnumDef::members (
-    const ::CORBA::EnumMemberSeq & members
-    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_EnumDef_Proxy_Broker_ == 0)
-    {
-      CORBA_EnumDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_members",
-      12,
-      this->the_TAO_EnumDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::EnumDef::EnumDef (void)
- : the_TAO_EnumDef_Proxy_Broker_ (0)
-{
-  this->CORBA_EnumDef_setup_collocation ();
-}
-
-void
-CORBA::EnumDef::CORBA_EnumDef_setup_collocation ()
-{
-  if (::CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_EnumDef_Proxy_Broker_ =
-        ::CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-CORBA::EnumDef::~EnumDef (void)
-{}
-
-void 
-CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EnumDef *_tao_tmp_pointer =
-    static_cast<EnumDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::EnumDef_ptr
-CORBA::EnumDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EnumDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/EnumDef:1.0",
-        CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::EnumDef_ptr
-CORBA::EnumDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EnumDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/EnumDef:1.0",
-        CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::EnumDef_ptr
-CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::EnumDef::_tao_release (EnumDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::EnumDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/EnumDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::EnumDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/EnumDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::AliasDef.
-
-CORBA::AliasDef_ptr
-TAO::Objref_Traits<CORBA::AliasDef>::duplicate (
-    CORBA::AliasDef_ptr p
-  )
-{
-  return CORBA::AliasDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::AliasDef>::release (
-    CORBA::AliasDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::AliasDef_ptr
-TAO::Objref_Traits<CORBA::AliasDef>::nil (void)
-{
-  return CORBA::AliasDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::AliasDef>::marshal (
-    CORBA::AliasDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::IDLType_ptr CORBA::AliasDef::original_type_def (
-    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_AliasDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AliasDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_original_type_def",
-      22,
-      this->the_TAO_AliasDef_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 CORBA::AliasDef::original_type_def (
-    ::CORBA::IDLType_ptr original_type_def
-    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_AliasDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AliasDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_original_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_original_type_def",
-      22,
-      this->the_TAO_AliasDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::AliasDef::AliasDef (void)
- : the_TAO_AliasDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AliasDef_setup_collocation ();
-}
-
-void
-CORBA::AliasDef::CORBA_AliasDef_setup_collocation ()
-{
-  if (::CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_AliasDef_Proxy_Broker_ =
-        ::CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-CORBA::AliasDef::~AliasDef (void)
-{}
-
-void 
-CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AliasDef *_tao_tmp_pointer =
-    static_cast<AliasDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::AliasDef_ptr
-CORBA::AliasDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AliasDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AliasDef:1.0",
-        CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AliasDef_ptr
-CORBA::AliasDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AliasDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AliasDef:1.0",
-        CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AliasDef_ptr
-CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::AliasDef::_tao_release (AliasDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::AliasDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/AliasDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::AliasDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AliasDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::NativeDef.
-
-CORBA::NativeDef_ptr
-TAO::Objref_Traits<CORBA::NativeDef>::duplicate (
-    CORBA::NativeDef_ptr p
-  )
-{
-  return CORBA::NativeDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::NativeDef>::release (
-    CORBA::NativeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::NativeDef_ptr
-TAO::Objref_Traits<CORBA::NativeDef>::nil (void)
-{
-  return CORBA::NativeDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::NativeDef>::marshal (
-    CORBA::NativeDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::NativeDef::NativeDef (void)
- : the_TAO_NativeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_NativeDef_setup_collocation ();
-}
-
-void
-CORBA::NativeDef::CORBA_NativeDef_setup_collocation ()
-{
-  if (::CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_NativeDef_Proxy_Broker_ =
-        ::CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-CORBA::NativeDef::~NativeDef (void)
-{}
-
-void 
-CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NativeDef *_tao_tmp_pointer =
-    static_cast<NativeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::NativeDef_ptr
-CORBA::NativeDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<NativeDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/NativeDef:1.0",
-        CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::NativeDef_ptr
-CORBA::NativeDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<NativeDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/NativeDef:1.0",
-        CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::NativeDef_ptr
-CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::NativeDef::_tao_release (NativeDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::NativeDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/NativeDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::NativeDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/NativeDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::PrimitiveDef.
-
-CORBA::PrimitiveDef_ptr
-TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate (
-    CORBA::PrimitiveDef_ptr p
-  )
-{
-  return CORBA::PrimitiveDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::PrimitiveDef>::release (
-    CORBA::PrimitiveDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::PrimitiveDef_ptr
-TAO::Objref_Traits<CORBA::PrimitiveDef>::nil (void)
-{
-  return CORBA::PrimitiveDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal (
-    CORBA::PrimitiveDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::PrimitiveKind CORBA::PrimitiveDef::kind (
-    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_PrimitiveDef_Proxy_Broker_ == 0)
-    {
-      CORBA_PrimitiveDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_kind",
-      9,
-      this->the_TAO_PrimitiveDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::PrimitiveDef::PrimitiveDef (void)
- : the_TAO_PrimitiveDef_Proxy_Broker_ (0)
-{
-  this->CORBA_PrimitiveDef_setup_collocation ();
-}
-
-void
-CORBA::PrimitiveDef::CORBA_PrimitiveDef_setup_collocation ()
-{
-  if (::CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-        ::CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::PrimitiveDef::~PrimitiveDef (void)
-{}
-
-void 
-CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PrimitiveDef *_tao_tmp_pointer =
-    static_cast<PrimitiveDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<PrimitiveDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/PrimitiveDef:1.0",
-        CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<PrimitiveDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/PrimitiveDef:1.0",
-        CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::PrimitiveDef::_tao_release (PrimitiveDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::PrimitiveDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::StringDef.
-
-CORBA::StringDef_ptr
-TAO::Objref_Traits<CORBA::StringDef>::duplicate (
-    CORBA::StringDef_ptr p
-  )
-{
-  return CORBA::StringDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::StringDef>::release (
-    CORBA::StringDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::StringDef_ptr
-TAO::Objref_Traits<CORBA::StringDef>::nil (void)
-{
-  return CORBA::StringDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::StringDef>::marshal (
-    CORBA::StringDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::ULong CORBA::StringDef::bound (
-    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_StringDef_Proxy_Broker_ == 0)
-    {
-      CORBA_StringDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_bound",
-      10,
-      this->the_TAO_StringDef_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 CORBA::StringDef::bound (
-    ::CORBA::ULong bound
-    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_StringDef_Proxy_Broker_ == 0)
-    {
-      CORBA_StringDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_bound",
-      10,
-      this->the_TAO_StringDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::StringDef::StringDef (void)
- : the_TAO_StringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StringDef_setup_collocation ();
-}
-
-void
-CORBA::StringDef::CORBA_StringDef_setup_collocation ()
-{
-  if (::CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_StringDef_Proxy_Broker_ =
-        ::CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::StringDef::~StringDef (void)
-{}
-
-void 
-CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  StringDef *_tao_tmp_pointer =
-    static_cast<StringDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::StringDef_ptr
-CORBA::StringDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<StringDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/StringDef:1.0",
-        CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::StringDef_ptr
-CORBA::StringDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<StringDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/StringDef:1.0",
-        CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::StringDef_ptr
-CORBA::StringDef::_duplicate (StringDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::StringDef::_tao_release (StringDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::StringDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/StringDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::StringDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/StringDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::WstringDef.
-
-CORBA::WstringDef_ptr
-TAO::Objref_Traits<CORBA::WstringDef>::duplicate (
-    CORBA::WstringDef_ptr p
-  )
-{
-  return CORBA::WstringDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::WstringDef>::release (
-    CORBA::WstringDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::WstringDef_ptr
-TAO::Objref_Traits<CORBA::WstringDef>::nil (void)
-{
-  return CORBA::WstringDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::WstringDef>::marshal (
-    CORBA::WstringDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::ULong CORBA::WstringDef::bound (
-    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_WstringDef_Proxy_Broker_ == 0)
-    {
-      CORBA_WstringDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_bound",
-      10,
-      this->the_TAO_WstringDef_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 CORBA::WstringDef::bound (
-    ::CORBA::ULong bound
-    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_WstringDef_Proxy_Broker_ == 0)
-    {
-      CORBA_WstringDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_bound",
-      10,
-      this->the_TAO_WstringDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::WstringDef::WstringDef (void)
- : the_TAO_WstringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_WstringDef_setup_collocation ();
-}
-
-void
-CORBA::WstringDef::CORBA_WstringDef_setup_collocation ()
-{
-  if (::CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_WstringDef_Proxy_Broker_ =
-        ::CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::WstringDef::~WstringDef (void)
-{}
-
-void 
-CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  WstringDef *_tao_tmp_pointer =
-    static_cast<WstringDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::WstringDef_ptr
-CORBA::WstringDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<WstringDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/WstringDef:1.0",
-        CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::WstringDef_ptr
-CORBA::WstringDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<WstringDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/WstringDef:1.0",
-        CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::WstringDef_ptr
-CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::WstringDef::_tao_release (WstringDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::WstringDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/WstringDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::WstringDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/WstringDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::SequenceDef.
-
-CORBA::SequenceDef_ptr
-TAO::Objref_Traits<CORBA::SequenceDef>::duplicate (
-    CORBA::SequenceDef_ptr p
-  )
-{
-  return CORBA::SequenceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::SequenceDef>::release (
-    CORBA::SequenceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::SequenceDef_ptr
-TAO::Objref_Traits<CORBA::SequenceDef>::nil (void)
-{
-  return CORBA::SequenceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::SequenceDef>::marshal (
-    CORBA::SequenceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::ULong CORBA::SequenceDef::bound (
-    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_SequenceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_SequenceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_bound",
-      10,
-      this->the_TAO_SequenceDef_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 CORBA::SequenceDef::bound (
-    ::CORBA::ULong bound
-    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_SequenceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_SequenceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_bound
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_bound",
-      10,
-      this->the_TAO_SequenceDef_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
-
-CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
-    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_SequenceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_SequenceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_element_type",
-      17,
-      this->the_TAO_SequenceDef_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
-
-::CORBA::IDLType_ptr CORBA::SequenceDef::element_type_def (
-    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_SequenceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_SequenceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_element_type_def",
-      21,
-      this->the_TAO_SequenceDef_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 CORBA::SequenceDef::element_type_def (
-    ::CORBA::IDLType_ptr element_type_def
-    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_SequenceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_SequenceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_element_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_element_type_def",
-      21,
-      this->the_TAO_SequenceDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::SequenceDef::SequenceDef (void)
- : the_TAO_SequenceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_SequenceDef_setup_collocation ();
-}
-
-void
-CORBA::SequenceDef::CORBA_SequenceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_SequenceDef_Proxy_Broker_ =
-        ::CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::SequenceDef::~SequenceDef (void)
-{}
-
-void 
-CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  SequenceDef *_tao_tmp_pointer =
-    static_cast<SequenceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::SequenceDef_ptr
-CORBA::SequenceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<SequenceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/SequenceDef:1.0",
-        CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::SequenceDef_ptr
-CORBA::SequenceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<SequenceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/SequenceDef:1.0",
-        CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::SequenceDef_ptr
-CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::SequenceDef::_tao_release (SequenceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::SequenceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::SequenceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/SequenceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ArrayDef.
-
-CORBA::ArrayDef_ptr
-TAO::Objref_Traits<CORBA::ArrayDef>::duplicate (
-    CORBA::ArrayDef_ptr p
-  )
-{
-  return CORBA::ArrayDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ArrayDef>::release (
-    CORBA::ArrayDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ArrayDef_ptr
-TAO::Objref_Traits<CORBA::ArrayDef>::nil (void)
-{
-  return CORBA::ArrayDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ArrayDef>::marshal (
-    CORBA::ArrayDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::ULong CORBA::ArrayDef::length (
-    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_ArrayDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ArrayDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_length",
-      11,
-      this->the_TAO_ArrayDef_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 CORBA::ArrayDef::length (
-    ::CORBA::ULong length
-    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_ArrayDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ArrayDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_length
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_length",
-      11,
-      this->the_TAO_ArrayDef_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
-
-CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
-    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_ArrayDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ArrayDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_element_type",
-      17,
-      this->the_TAO_ArrayDef_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
-
-::CORBA::IDLType_ptr CORBA::ArrayDef::element_type_def (
-    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_ArrayDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ArrayDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_element_type_def",
-      21,
-      this->the_TAO_ArrayDef_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 CORBA::ArrayDef::element_type_def (
-    ::CORBA::IDLType_ptr element_type_def
-    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_ArrayDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ArrayDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_element_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_element_type_def",
-      21,
-      this->the_TAO_ArrayDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ArrayDef::ArrayDef (void)
- : the_TAO_ArrayDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ArrayDef_setup_collocation ();
-}
-
-void
-CORBA::ArrayDef::CORBA_ArrayDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ArrayDef_Proxy_Broker_ =
-        ::CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::ArrayDef::~ArrayDef (void)
-{}
-
-void 
-CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ArrayDef *_tao_tmp_pointer =
-    static_cast<ArrayDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ArrayDef_ptr
-CORBA::ArrayDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ArrayDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ArrayDef:1.0",
-        CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ArrayDef_ptr
-CORBA::ArrayDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ArrayDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ArrayDef:1.0",
-        CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ArrayDef_ptr
-CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ArrayDef::_tao_release (ArrayDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ArrayDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ArrayDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ArrayDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExceptionDef.
-
-CORBA::ExceptionDef_ptr
-TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate (
-    CORBA::ExceptionDef_ptr p
-  )
-{
-  return CORBA::ExceptionDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExceptionDef>::release (
-    CORBA::ExceptionDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExceptionDef_ptr
-TAO::Objref_Traits<CORBA::ExceptionDef>::nil (void)
-{
-  return CORBA::ExceptionDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
-    CORBA::ExceptionDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
-    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_ExceptionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExceptionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type",
-      9,
-      this->the_TAO_ExceptionDef_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
-
-::CORBA::StructMemberSeq * CORBA::ExceptionDef::members (
-    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_ExceptionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExceptionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_members",
-      12,
-      this->the_TAO_ExceptionDef_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 CORBA::ExceptionDef::members (
-    const ::CORBA::StructMemberSeq & members
-    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_ExceptionDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExceptionDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_members
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_members",
-      12,
-      this->the_TAO_ExceptionDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ExceptionDef::ExceptionDef (void)
- : the_TAO_ExceptionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExceptionDef_setup_collocation ();
-}
-
-void
-CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExceptionDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-  this->CORBA_Container_setup_collocation ();
-}
-
-CORBA::ExceptionDef::~ExceptionDef (void)
-{}
-
-void 
-CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionDef *_tao_tmp_pointer =
-    static_cast<ExceptionDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExceptionDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExceptionDef:1.0",
-        CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExceptionDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExceptionDef:1.0",
-        CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExceptionDef::_tao_release (ExceptionDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExceptionDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExceptionDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExceptionDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ_CS_
-
-CORBA::ExceptionDefSeq::ExceptionDefSeq (void)
-{}
-
-CORBA::ExceptionDefSeq::ExceptionDefSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
-      >
-    (max)
-{}
-
-CORBA::ExceptionDefSeq::ExceptionDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDef_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExceptionDefSeq::ExceptionDefSeq (
-    const ExceptionDefSeq &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
-      >
-    (seq)
-{}
-
-CORBA::ExceptionDefSeq::~ExceptionDefSeq (void)
-{}
-
-void CORBA::ExceptionDefSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExceptionDefSeq * _tao_tmp_pointer =
-    static_cast<ExceptionDefSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::AttributeDef.
-
-CORBA::AttributeDef_ptr
-TAO::Objref_Traits<CORBA::AttributeDef>::duplicate (
-    CORBA::AttributeDef_ptr p
-  )
-{
-  return CORBA::AttributeDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::AttributeDef>::release (
-    CORBA::AttributeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::AttributeDef_ptr
-TAO::Objref_Traits<CORBA::AttributeDef>::nil (void)
-{
-  return CORBA::AttributeDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::AttributeDef>::marshal (
-    CORBA::AttributeDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::AttributeDef::type (
-    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_AttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type",
-      9,
-      this->the_TAO_AttributeDef_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
-
-::CORBA::IDLType_ptr CORBA::AttributeDef::type_def (
-    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_AttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type_def",
-      13,
-      this->the_TAO_AttributeDef_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 CORBA::AttributeDef::type_def (
-    ::CORBA::IDLType_ptr type_def
-    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_AttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_type_def",
-      13,
-      this->the_TAO_AttributeDef_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
-
-::CORBA::AttributeMode CORBA::AttributeDef::mode (
-    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_AttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::AttributeMode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_mode",
-      9,
-      this->the_TAO_AttributeDef_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 CORBA::AttributeDef::mode (
-    ::CORBA::AttributeMode mode
-    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_AttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_AttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_mode
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_mode",
-      9,
-      this->the_TAO_AttributeDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::AttributeDef::AttributeDef (void)
- : the_TAO_AttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AttributeDef_setup_collocation ();
-}
-
-void
-CORBA::AttributeDef::CORBA_AttributeDef_setup_collocation ()
-{
-  if (::CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_AttributeDef_Proxy_Broker_ =
-        ::CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::AttributeDef::~AttributeDef (void)
-{}
-
-void 
-CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AttributeDef *_tao_tmp_pointer =
-    static_cast<AttributeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::AttributeDef_ptr
-CORBA::AttributeDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AttributeDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AttributeDef:1.0",
-        CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AttributeDef_ptr
-CORBA::AttributeDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AttributeDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AttributeDef:1.0",
-        CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AttributeDef_ptr
-CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::AttributeDef::_tao_release (AttributeDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::AttributeDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::AttributeDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AttributeDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::AttributeDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  AttributeDescription *_tao_tmp_pointer =
-    static_cast<AttributeDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ExtAttributeDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ExtAttributeDescription *_tao_tmp_pointer =
-    static_cast<ExtAttributeDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExtAttributeDef.
-
-CORBA::ExtAttributeDef_ptr
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate (
-    CORBA::ExtAttributeDef_ptr p
-  )
-{
-  return CORBA::ExtAttributeDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::release (
-    CORBA::ExtAttributeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExtAttributeDef_ptr
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::nil (void)
-{
-  return CORBA::ExtAttributeDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal (
-    CORBA::ExtAttributeDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ExcDescriptionSeq * CORBA::ExtAttributeDef::get_exceptions (
-    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_ExtAttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtAttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_get_exceptions",
-      19,
-      this->the_TAO_ExtAttributeDef_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 CORBA::ExtAttributeDef::get_exceptions (
-    const ::CORBA::ExcDescriptionSeq & get_exceptions
-    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_ExtAttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtAttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_get_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_get_exceptions",
-      19,
-      this->the_TAO_ExtAttributeDef_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
-
-::CORBA::ExcDescriptionSeq * CORBA::ExtAttributeDef::set_exceptions (
-    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_ExtAttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtAttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_set_exceptions",
-      19,
-      this->the_TAO_ExtAttributeDef_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 CORBA::ExtAttributeDef::set_exceptions (
-    const ::CORBA::ExcDescriptionSeq & set_exceptions
-    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_ExtAttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtAttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_set_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_set_exceptions",
-      19,
-      this->the_TAO_ExtAttributeDef_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
-
-::CORBA::ExtAttributeDescription * CORBA::ExtAttributeDef::describe_attribute (
-    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_ExtAttributeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtAttributeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtAttributeDescription>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe_attribute",
-      18,
-      this->the_TAO_ExtAttributeDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ExtAttributeDef::ExtAttributeDef (void)
- : the_TAO_ExtAttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAttributeDef_setup_collocation ();
-}
-
-void
-CORBA::ExtAttributeDef::CORBA_ExtAttributeDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_AttributeDef_setup_collocation ();
-}
-
-CORBA::ExtAttributeDef::~ExtAttributeDef (void)
-{}
-
-void 
-CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtAttributeDef *_tao_tmp_pointer =
-    static_cast<ExtAttributeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtAttributeDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
-        CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtAttributeDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
-        CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExtAttributeDef::_tao_release (ExtAttributeDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExtAttributeDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExtAttributeDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExtAttributeDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ParameterDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ParameterDescription *_tao_tmp_pointer =
-    static_cast<ParameterDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ_CS_
-
-CORBA::ParDescriptionSeq::ParDescriptionSeq (void)
-{}
-
-CORBA::ParDescriptionSeq::ParDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
-      >
-    (max)
-{}
-
-CORBA::ParDescriptionSeq::ParDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ParameterDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ParDescriptionSeq::ParDescriptionSeq (
-    const ParDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
-      >
-    (seq)
-{}
-
-CORBA::ParDescriptionSeq::~ParDescriptionSeq (void)
-{}
-
-void CORBA::ParDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ParDescriptionSeq * _tao_tmp_pointer =
-    static_cast<ParDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CS_)
-#define _CORBA_CONTEXTIDSEQ_CS_
-
-CORBA::ContextIdSeq::ContextIdSeq (void)
-{}
-
-CORBA::ContextIdSeq::ContextIdSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-CORBA::ContextIdSeq::ContextIdSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::ContextIdSeq::ContextIdSeq (
-    const ContextIdSeq &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-CORBA::ContextIdSeq::~ContextIdSeq (void)
-{}
-
-void CORBA::ContextIdSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ContextIdSeq * _tao_tmp_pointer =
-    static_cast<ContextIdSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::OperationDef.
-
-CORBA::OperationDef_ptr
-TAO::Objref_Traits<CORBA::OperationDef>::duplicate (
-    CORBA::OperationDef_ptr p
-  )
-{
-  return CORBA::OperationDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::OperationDef>::release (
-    CORBA::OperationDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::OperationDef_ptr
-TAO::Objref_Traits<CORBA::OperationDef>::nil (void)
-{
-  return CORBA::OperationDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::OperationDef>::marshal (
-    CORBA::OperationDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::OperationDef::result (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_result",
-      11,
-      this->the_TAO_OperationDef_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
-
-::CORBA::IDLType_ptr CORBA::OperationDef::result_def (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_result_def",
-      15,
-      this->the_TAO_OperationDef_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 CORBA::OperationDef::result_def (
-    ::CORBA::IDLType_ptr result_def
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_result_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_result_def",
-      15,
-      this->the_TAO_OperationDef_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
-
-::CORBA::ParDescriptionSeq * CORBA::OperationDef::params (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_params",
-      11,
-      this->the_TAO_OperationDef_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 CORBA::OperationDef::params (
-    const ::CORBA::ParDescriptionSeq & params
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_params
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_params",
-      11,
-      this->the_TAO_OperationDef_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
-
-::CORBA::OperationMode CORBA::OperationDef::mode (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::OperationMode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_mode",
-      9,
-      this->the_TAO_OperationDef_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 CORBA::OperationDef::mode (
-    ::CORBA::OperationMode mode
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_mode
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_mode",
-      9,
-      this->the_TAO_OperationDef_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
-
-::CORBA::ContextIdSeq * CORBA::OperationDef::contexts (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_contexts",
-      13,
-      this->the_TAO_OperationDef_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 CORBA::OperationDef::contexts (
-    const ::CORBA::ContextIdSeq & contexts
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_contexts
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_contexts",
-      13,
-      this->the_TAO_OperationDef_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
-
-::CORBA::ExceptionDefSeq * CORBA::OperationDef::exceptions (
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_exceptions",
-      15,
-      this->the_TAO_OperationDef_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 CORBA::OperationDef::exceptions (
-    const ::CORBA::ExceptionDefSeq & exceptions
-    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_OperationDef_Proxy_Broker_ == 0)
-    {
-      CORBA_OperationDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_exceptions",
-      15,
-      this->the_TAO_OperationDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::OperationDef::OperationDef (void)
- : the_TAO_OperationDef_Proxy_Broker_ (0)
-{
-  this->CORBA_OperationDef_setup_collocation ();
-}
-
-void
-CORBA::OperationDef::CORBA_OperationDef_setup_collocation ()
-{
-  if (::CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_OperationDef_Proxy_Broker_ =
-        ::CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::OperationDef::~OperationDef (void)
-{}
-
-void 
-CORBA::OperationDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  OperationDef *_tao_tmp_pointer =
-    static_cast<OperationDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::OperationDef_ptr
-CORBA::OperationDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<OperationDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/OperationDef:1.0",
-        CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::OperationDef_ptr
-CORBA::OperationDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<OperationDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/OperationDef:1.0",
-        CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::OperationDef_ptr
-CORBA::OperationDef::_duplicate (OperationDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::OperationDef::_tao_release (OperationDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::OperationDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/OperationDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::OperationDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/OperationDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::OperationDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  OperationDescription *_tao_tmp_pointer =
-    static_cast<OperationDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
-#define _CORBA_REPOSITORYIDSEQ_CS_
-
-CORBA::RepositoryIdSeq::RepositoryIdSeq (void)
-{}
-
-CORBA::RepositoryIdSeq::RepositoryIdSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-CORBA::RepositoryIdSeq::RepositoryIdSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::RepositoryIdSeq::RepositoryIdSeq (
-    const RepositoryIdSeq &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-CORBA::RepositoryIdSeq::~RepositoryIdSeq (void)
-{}
-
-void CORBA::RepositoryIdSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  RepositoryIdSeq * _tao_tmp_pointer =
-    static_cast<RepositoryIdSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
-#define _CORBA_OPDESCRIPTIONSEQ_CS_
-
-CORBA::OpDescriptionSeq::OpDescriptionSeq (void)
-{}
-
-CORBA::OpDescriptionSeq::OpDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
-      >
-    (max)
-{}
-
-CORBA::OpDescriptionSeq::OpDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::OperationDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::OpDescriptionSeq::OpDescriptionSeq (
-    const OpDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
-      >
-    (seq)
-{}
-
-CORBA::OpDescriptionSeq::~OpDescriptionSeq (void)
-{}
-
-void CORBA::OpDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  OpDescriptionSeq * _tao_tmp_pointer =
-    static_cast<OpDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
-
-CORBA::AttrDescriptionSeq::AttrDescriptionSeq (void)
-{}
-
-CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
-      >
-    (max)
-{}
-
-CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::AttributeDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
-    const AttrDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
-      >
-    (seq)
-{}
-
-CORBA::AttrDescriptionSeq::~AttrDescriptionSeq (void)
-{}
-
-void CORBA::AttrDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  AttrDescriptionSeq * _tao_tmp_pointer =
-    static_cast<AttrDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ_CS_
-
-CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (void)
-{}
-
-CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
-      >
-    (max)
-{}
-
-CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtAttributeDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
-    const ExtAttrDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
-      >
-    (seq)
-{}
-
-CORBA::ExtAttrDescriptionSeq::~ExtAttrDescriptionSeq (void)
-{}
-
-void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExtAttrDescriptionSeq * _tao_tmp_pointer =
-    static_cast<ExtAttrDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::InterfaceDef.
-
-CORBA::InterfaceDef_ptr
-TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate (
-    CORBA::InterfaceDef_ptr p
-  )
-{
-  return CORBA::InterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::InterfaceDef>::release (
-    CORBA::InterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::InterfaceDef_ptr
-TAO::Objref_Traits<CORBA::InterfaceDef>::nil (void)
-{
-  return CORBA::InterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::InterfaceDef>::marshal (
-    CORBA::InterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceDefSeq * CORBA::InterfaceDef::base_interfaces (
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_base_interfaces",
-      20,
-      this->the_TAO_InterfaceDef_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 CORBA::InterfaceDef::base_interfaces (
-    const ::CORBA::InterfaceDefSeq & base_interfaces
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_base_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_base_interfaces",
-      20,
-      this->the_TAO_InterfaceDef_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
-
-CORBA::Boolean CORBA::InterfaceDef::is_a (
-    const char * interface_id
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_interface_id
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "is_a",
-      4,
-      this->the_TAO_InterfaceDef_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_structure/structure_cs.cpp:66
-
-void 
-CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  FullInterfaceDescription *_tao_tmp_pointer =
-    static_cast<FullInterfaceDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_interface (
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe_interface",
-      18,
-      this->the_TAO_InterfaceDef_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
-
-::CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    ::CORBA::AttributeMode mode
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_mode
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_attribute",
-      16,
-      this->the_TAO_InterfaceDef_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
-
-::CORBA::OperationDef_ptr CORBA::InterfaceDef::create_operation (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr result,
-    ::CORBA::OperationMode mode,
-    const ::CORBA::ParDescriptionSeq & params,
-    const ::CORBA::ExceptionDefSeq & exceptions,
-    const ::CORBA::ContextIdSeq & contexts
-    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_InterfaceDef_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_result,
-      &_tao_mode,
-      &_tao_params,
-      &_tao_exceptions,
-      &_tao_contexts
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      9,
-      "create_operation",
-      16,
-      this->the_TAO_InterfaceDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::InterfaceDef::InterfaceDef (void)
- : the_TAO_InterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_InterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Container_setup_collocation ();
-  this->CORBA_Contained_setup_collocation ();
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::InterfaceDef::~InterfaceDef (void)
-{}
-
-void 
-CORBA::InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InterfaceDef *_tao_tmp_pointer =
-    static_cast<InterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<InterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/InterfaceDef:1.0",
-        CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<InterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/InterfaceDef:1.0",
-        CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::InterfaceDef::_tao_release (InterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::InterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::InterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::InterfaceDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  InterfaceDescription *_tao_tmp_pointer =
-    static_cast<InterfaceDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::InterfaceAttrExtension.
-
-CORBA::InterfaceAttrExtension_ptr
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate (
-    CORBA::InterfaceAttrExtension_ptr p
-  )
-{
-  return CORBA::InterfaceAttrExtension::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release (
-    CORBA::InterfaceAttrExtension_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::InterfaceAttrExtension_ptr
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::nil (void)
-{
-  return CORBA::InterfaceAttrExtension::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal (
-    CORBA::InterfaceAttrExtension_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ExtFullInterfaceDescription *_tao_tmp_pointer =
-    static_cast<ExtFullInterfaceDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * CORBA::InterfaceAttrExtension::describe_ext_interface (
-    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_InterfaceAttrExtension_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceAttrExtension_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe_ext_interface",
-      22,
-      this->the_TAO_InterfaceAttrExtension_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
-
-::CORBA::ExtAttributeDef_ptr CORBA::InterfaceAttrExtension::create_ext_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    ::CORBA::AttributeMode mode,
-    const ::CORBA::ExceptionDefSeq & get_exceptions,
-    const ::CORBA::ExceptionDefSeq & set_exceptions
-    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_InterfaceAttrExtension_Proxy_Broker_ == 0)
-    {
-      CORBA_InterfaceAttrExtension_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_mode,
-      &_tao_get_exceptions,
-      &_tao_set_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      8,
-      "create_ext_attribute",
-      20,
-      this->the_TAO_InterfaceAttrExtension_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::InterfaceAttrExtension::InterfaceAttrExtension (void)
- : the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-void
-CORBA::InterfaceAttrExtension::CORBA_InterfaceAttrExtension_setup_collocation ()
-{
-  if (::CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ =
-        ::CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
-{}
-
-void 
-CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InterfaceAttrExtension *_tao_tmp_pointer =
-    static_cast<InterfaceAttrExtension *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<InterfaceAttrExtension>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
-        CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<InterfaceAttrExtension>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
-        CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension::_duplicate (InterfaceAttrExtension_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::InterfaceAttrExtension::_tao_release (InterfaceAttrExtension_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::InterfaceAttrExtension::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::InterfaceAttrExtension::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0";
-}
-
-CORBA::Boolean
-CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExtInterfaceDef.
-
-CORBA::ExtInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate (
-    CORBA::ExtInterfaceDef_ptr p
-  )
-{
-  return CORBA::ExtInterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release (
-    CORBA::ExtInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExtInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::nil (void)
-{
-  return CORBA::ExtInterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal (
-    CORBA::ExtInterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
- : the_TAO_ExtInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtInterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExtInterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_InterfaceDef_setup_collocation ();
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
-{}
-
-void 
-CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtInterfaceDef *_tao_tmp_pointer =
-    static_cast<ExtInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtInterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
-        CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtInterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
-        CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef::_duplicate (ExtInterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExtInterfaceDef::_tao_release (ExtInterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExtInterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExtInterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExtInterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::AbstractInterfaceDef.
-
-CORBA::AbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate (
-    CORBA::AbstractInterfaceDef_ptr p
-  )
-{
-  return CORBA::AbstractInterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release (
-    CORBA::AbstractInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::AbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::nil (void)
-{
-  return CORBA::AbstractInterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal (
-    CORBA::AbstractInterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
- : the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AbstractInterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_InterfaceDef_setup_collocation ();
-}
-
-CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
-{}
-
-void 
-CORBA::AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AbstractInterfaceDef *_tao_tmp_pointer =
-    static_cast<AbstractInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AbstractInterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
-        CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<AbstractInterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
-        CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef::_duplicate (AbstractInterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::AbstractInterfaceDef::_tao_release (AbstractInterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::AbstractInterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExtAbstractInterfaceDef.
-
-CORBA::ExtAbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate (
-    CORBA::ExtAbstractInterfaceDef_ptr p
-  )
-{
-  return CORBA::ExtAbstractInterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release (
-    CORBA::ExtAbstractInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExtAbstractInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::nil (void)
-{
-  return CORBA::ExtAbstractInterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal (
-    CORBA::ExtAbstractInterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
- : the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAbstractInterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_AbstractInterfaceDef_setup_collocation ();
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
-{}
-
-void 
-CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtAbstractInterfaceDef *_tao_tmp_pointer =
-    static_cast<ExtAbstractInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtAbstractInterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
-        CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtAbstractInterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
-        CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef::_duplicate (ExtAbstractInterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExtAbstractInterfaceDef::_tao_release (ExtAbstractInterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExtAbstractInterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::LocalInterfaceDef.
-
-CORBA::LocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate (
-    CORBA::LocalInterfaceDef_ptr p
-  )
-{
-  return CORBA::LocalInterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release (
-    CORBA::LocalInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::LocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::nil (void)
-{
-  return CORBA::LocalInterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal (
-    CORBA::LocalInterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
- : the_TAO_LocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_LocalInterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_LocalInterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_InterfaceDef_setup_collocation ();
-}
-
-CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
-{}
-
-void 
-CORBA::LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  LocalInterfaceDef *_tao_tmp_pointer =
-    static_cast<LocalInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<LocalInterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
-        CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<LocalInterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
-        CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef::_duplicate (LocalInterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::LocalInterfaceDef::_tao_release (LocalInterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::LocalInterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::LocalInterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExtLocalInterfaceDef.
-
-CORBA::ExtLocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate (
-    CORBA::ExtLocalInterfaceDef_ptr p
-  )
-{
-  return CORBA::ExtLocalInterfaceDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release (
-    CORBA::ExtLocalInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExtLocalInterfaceDef_ptr
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::nil (void)
-{
-  return CORBA::ExtLocalInterfaceDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal (
-    CORBA::ExtLocalInterfaceDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
- : the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtLocalInterfaceDef_setup_collocation ();
-}
-
-void
-CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_LocalInterfaceDef_setup_collocation ();
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
-{}
-
-void 
-CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtLocalInterfaceDef *_tao_tmp_pointer =
-    static_cast<ExtLocalInterfaceDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtLocalInterfaceDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
-        CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtLocalInterfaceDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
-        CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef::_duplicate (ExtLocalInterfaceDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExtLocalInterfaceDef::_tao_release (ExtLocalInterfaceDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExtLocalInterfaceDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::PrimitiveKind _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::PrimitiveKind & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::PrimitiveKind> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Repository_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Repository_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::Repository RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ModuleDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ModuleDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ModuleDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ModuleDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ModuleDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ConstantDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ConstantDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ConstantDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ConstantDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.value);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ConstantDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.value);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::StructDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::UnionDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::EnumDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::EnumDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::EnumDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AliasDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AliasDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::AliasDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::NativeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::NativeDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::NativeDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PrimitiveDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PrimitiveDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::PrimitiveDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StringDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::StringDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WstringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::WstringDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::WstringDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::SequenceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::SequenceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::SequenceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ArrayDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ArrayDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ArrayDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExceptionDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDefSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDefSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::AttributeMode _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::AttributeMode & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::AttributeMode> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttributeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttributeDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::AttributeDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttributeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.mode);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttributeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.mode);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtAttributeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    (strm << _tao_aggregate.mode) &&
-    (strm << _tao_aggregate.get_exceptions) &&
-    (strm << _tao_aggregate.put_exceptions);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtAttributeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.mode) &&
-    (strm >> _tao_aggregate.get_exceptions) &&
-    (strm >> _tao_aggregate.put_exceptions);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtAttributeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtAttributeDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExtAttributeDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::OperationMode _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::OperationMode & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::OperationMode> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ParameterDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    CORBA::Object::marshal (
-        _tao_aggregate.type_def.in (),
-        strm
-      ) &&
-    (strm << _tao_aggregate.mode);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ParameterDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ()) &&
-    (strm >> _tao_aggregate.mode);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ParDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ParDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ContextIdSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ContextIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OperationDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OperationDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::OperationDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OperationDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.result.in ()) &&
-    (strm << _tao_aggregate.mode) &&
-    (strm << _tao_aggregate.contexts) &&
-    (strm << _tao_aggregate.parameters) &&
-    (strm << _tao_aggregate.exceptions);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OperationDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.result.out ()) &&
-    (strm >> _tao_aggregate.mode) &&
-    (strm >> _tao_aggregate.contexts) &&
-    (strm >> _tao_aggregate.parameters) &&
-    (strm >> _tao_aggregate.exceptions);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_
-#define _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::RepositoryIdSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::RepositoryIdSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OpDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OpDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttrDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttrDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtAttrDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtAttrDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.base_interfaces) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.base_interfaces) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::InterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.base_interfaces);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.base_interfaces);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.base_interfaces) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.base_interfaces) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceAttrExtension_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceAttrExtension_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::InterfaceAttrExtension RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtInterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExtInterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AbstractInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AbstractInterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::AbstractInterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtAbstractInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtAbstractInterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExtAbstractInterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LocalInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LocalInterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::LocalInterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtLocalInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtLocalInterfaceDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExtLocalInterfaceDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
deleted file mode 100644
index 31ebfd4e2c4..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ /dev/null
@@ -1,5684 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IFR_BASICC_H_
-#define _TAO_IDL_ORIG_IFR_BASICC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ifr_client_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IFR_Client/IFR_BaseC.h"
-#include "tao/ParameterModeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_PRIMITIVEDEF__VAR_OUT_CH_)
-#define _CORBA_PRIMITIVEDEF__VAR_OUT_CH_
-  
-  class PrimitiveDef;
-  typedef PrimitiveDef *PrimitiveDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PrimitiveDef
-      >
-    PrimitiveDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PrimitiveDef
-      >
-    PrimitiveDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_STRINGDEF__VAR_OUT_CH_)
-#define _CORBA_STRINGDEF__VAR_OUT_CH_
-  
-  class StringDef;
-  typedef StringDef *StringDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        StringDef
-      >
-    StringDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        StringDef
-      >
-    StringDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_SEQUENCEDEF__VAR_OUT_CH_)
-#define _CORBA_SEQUENCEDEF__VAR_OUT_CH_
-  
-  class SequenceDef;
-  typedef SequenceDef *SequenceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        SequenceDef
-      >
-    SequenceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        SequenceDef
-      >
-    SequenceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ARRAYDEF__VAR_OUT_CH_)
-#define _CORBA_ARRAYDEF__VAR_OUT_CH_
-  
-  class ArrayDef;
-  typedef ArrayDef *ArrayDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ArrayDef
-      >
-    ArrayDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ArrayDef
-      >
-    ArrayDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_WSTRINGDEF__VAR_OUT_CH_)
-#define _CORBA_WSTRINGDEF__VAR_OUT_CH_
-  
-  class WstringDef;
-  typedef WstringDef *WstringDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        WstringDef
-      >
-    WstringDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        WstringDef
-      >
-    WstringDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
-#define _CORBA_FIXEDDEF__VAR_OUT_CH_
-  
-  class FixedDef;
-  typedef FixedDef *FixedDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        FixedDef
-      >
-    FixedDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        FixedDef
-      >
-    FixedDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum PrimitiveKind
-  {
-    pk_null,
-    pk_void,
-    pk_short,
-    pk_long,
-    pk_ushort,
-    pk_ulong,
-    pk_float,
-    pk_double,
-    pk_boolean,
-    pk_char,
-    pk_octet,
-    pk_any,
-    pk_TypeCode,
-    pk_Principal,
-    pk_string,
-    pk_objref,
-    pk_longlong,
-    pk_ulonglong,
-    pk_longdouble,
-    pk_wchar,
-    pk_wstring,
-    pk_value_base
-  };
-  
-  typedef PrimitiveKind &PrimitiveKind_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveKind;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
-#define _CORBA_REPOSITORY__VAR_OUT_CH_
-  
-  class Repository;
-  typedef Repository *Repository_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Repository
-      >
-    Repository_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Repository
-      >
-    Repository_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_REPOSITORY_CH_)
-#define _CORBA_REPOSITORY_CH_
-  
-  class TAO_IFR_Client_Export Repository
-    : public virtual ::CORBA::Container
-  {
-  public:
-    friend class TAO::Narrow_Utils<Repository>;
-    typedef Repository_ptr _ptr_type;
-    typedef Repository_var _var_type;
-    
-    // The static operations.
-    static Repository_ptr _duplicate (Repository_ptr obj);
-    
-    static void _tao_release (Repository_ptr obj);
-    
-    static Repository_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Repository_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Repository_ptr _nil (void)
-    {
-      return static_cast<Repository_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Contained_ptr lookup_id (
-        const char * search_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr get_canonical_typecode (
-        ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PrimitiveDef_ptr get_primitive (
-        ::CORBA::PrimitiveKind kind
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::StringDef_ptr create_string (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::WstringDef_ptr create_wstring (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::SequenceDef_ptr create_sequence (
-        ::CORBA::ULong bound,
-        ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ArrayDef_ptr create_array (
-        ::CORBA::ULong length,
-        ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::FixedDef_ptr create_fixed (
-        ::CORBA::UShort digits,
-        ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    Repository (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_Repository_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    Repository (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    Repository (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~Repository (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Repository (const Repository &);
-    
-    void operator= (const Repository &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
-#define _CORBA_MODULEDEF__VAR_OUT_CH_
-  
-  class ModuleDef;
-  typedef ModuleDef *ModuleDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ModuleDef
-      >
-    ModuleDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ModuleDef
-      >
-    ModuleDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_MODULEDEF_CH_)
-#define _CORBA_MODULEDEF_CH_
-  
-  class TAO_IFR_Client_Export ModuleDef
-    : public virtual ::CORBA::Container,
-      public virtual ::CORBA::Contained
-  {
-  public:
-    friend class TAO::Narrow_Utils<ModuleDef>;
-    typedef ModuleDef_ptr _ptr_type;
-    typedef ModuleDef_var _var_type;
-    
-    // The static operations.
-    static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-    
-    static void _tao_release (ModuleDef_ptr obj);
-    
-    static ModuleDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ModuleDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ModuleDef_ptr _nil (void)
-    {
-      return static_cast<ModuleDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ModuleDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ModuleDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ModuleDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ModuleDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ModuleDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ModuleDef (const ModuleDef &);
-    
-    void operator= (const ModuleDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ModuleDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ModuleDescription
-      >
-    ModuleDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ModuleDescription,
-        ModuleDescription_var
-      >
-    ModuleDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ModuleDescription
-  {
-    typedef ModuleDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
-#define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-  
-  class ConstantDef;
-  typedef ConstantDef *ConstantDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ConstantDef
-      >
-    ConstantDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ConstantDef
-      >
-    ConstantDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_CONSTANTDEF_CH_)
-#define _CORBA_CONSTANTDEF_CH_
-  
-  class TAO_IFR_Client_Export ConstantDef
-    : public virtual ::CORBA::Contained
-  {
-  public:
-    friend class TAO::Narrow_Utils<ConstantDef>;
-    typedef ConstantDef_ptr _ptr_type;
-    typedef ConstantDef_var _var_type;
-    
-    // The static operations.
-    static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
-    
-    static void _tao_release (ConstantDef_ptr obj);
-    
-    static ConstantDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConstantDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConstantDef_ptr _nil (void)
-    {
-      return static_cast<ConstantDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        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 ::CORBA::IDLType_ptr type_def (
-        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 type_def (
-        ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * value (
-        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 value (
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ConstantDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ConstantDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ConstantDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ConstantDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ConstantDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ConstantDef (const ConstantDef &);
-    
-    void operator= (const ConstantDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ConstantDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ConstantDescription
-      >
-    ConstantDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ConstantDescription,
-        ConstantDescription_var
-      >
-    ConstantDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ConstantDescription
-  {
-    typedef ConstantDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::Any value;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
-#define _CORBA_STRUCTDEF__VAR_OUT_CH_
-  
-  class StructDef;
-  typedef StructDef *StructDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        StructDef
-      >
-    StructDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        StructDef
-      >
-    StructDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_STRUCTDEF_CH_)
-#define _CORBA_STRUCTDEF_CH_
-  
-  class TAO_IFR_Client_Export StructDef
-    : public virtual ::CORBA::TypedefDef,
-      public virtual ::CORBA::Container
-  {
-  public:
-    friend class TAO::Narrow_Utils<StructDef>;
-    typedef StructDef_ptr _ptr_type;
-    typedef StructDef_var _var_type;
-    
-    // The static operations.
-    static StructDef_ptr _duplicate (StructDef_ptr obj);
-    
-    static void _tao_release (StructDef_ptr obj);
-    
-    static StructDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StructDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StructDef_ptr _nil (void)
-    {
-      return static_cast<StructDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::StructMemberSeq * members (
-        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 members (
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    StructDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_StructDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    StructDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    StructDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~StructDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    StructDef (const StructDef &);
-    
-    void operator= (const StructDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
-#define _CORBA_UNIONDEF__VAR_OUT_CH_
-  
-  class UnionDef;
-  typedef UnionDef *UnionDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        UnionDef
-      >
-    UnionDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        UnionDef
-      >
-    UnionDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_UNIONDEF_CH_)
-#define _CORBA_UNIONDEF_CH_
-  
-  class TAO_IFR_Client_Export UnionDef
-    : public virtual ::CORBA::TypedefDef,
-      public virtual ::CORBA::Container
-  {
-  public:
-    friend class TAO::Narrow_Utils<UnionDef>;
-    typedef UnionDef_ptr _ptr_type;
-    typedef UnionDef_var _var_type;
-    
-    // The static operations.
-    static UnionDef_ptr _duplicate (UnionDef_ptr obj);
-    
-    static void _tao_release (UnionDef_ptr obj);
-    
-    static UnionDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UnionDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UnionDef_ptr _nil (void)
-    {
-      return static_cast<UnionDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr discriminator_type (
-        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 ::CORBA::IDLType_ptr discriminator_type_def (
-        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 discriminator_type_def (
-        ::CORBA::IDLType_ptr discriminator_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::UnionMemberSeq * members (
-        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 members (
-        const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    UnionDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_UnionDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    UnionDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    UnionDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~UnionDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    UnionDef (const UnionDef &);
-    
-    void operator= (const UnionDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
-#define _CORBA_ENUMDEF__VAR_OUT_CH_
-  
-  class EnumDef;
-  typedef EnumDef *EnumDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        EnumDef
-      >
-    EnumDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        EnumDef
-      >
-    EnumDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_ENUMDEF_CH_)
-#define _CORBA_ENUMDEF_CH_
-  
-  class TAO_IFR_Client_Export EnumDef
-    : public virtual ::CORBA::TypedefDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<EnumDef>;
-    typedef EnumDef_ptr _ptr_type;
-    typedef EnumDef_var _var_type;
-    
-    // The static operations.
-    static EnumDef_ptr _duplicate (EnumDef_ptr obj);
-    
-    static void _tao_release (EnumDef_ptr obj);
-    
-    static EnumDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static EnumDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static EnumDef_ptr _nil (void)
-    {
-      return static_cast<EnumDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::EnumMemberSeq * members (
-        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 members (
-        const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    EnumDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_EnumDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    EnumDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    EnumDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~EnumDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    EnumDef (const EnumDef &);
-    
-    void operator= (const EnumDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
-#define _CORBA_ALIASDEF__VAR_OUT_CH_
-  
-  class AliasDef;
-  typedef AliasDef *AliasDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AliasDef
-      >
-    AliasDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AliasDef
-      >
-    AliasDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_ALIASDEF_CH_)
-#define _CORBA_ALIASDEF_CH_
-  
-  class TAO_IFR_Client_Export AliasDef
-    : public virtual ::CORBA::TypedefDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<AliasDef>;
-    typedef AliasDef_ptr _ptr_type;
-    typedef AliasDef_var _var_type;
-    
-    // The static operations.
-    static AliasDef_ptr _duplicate (AliasDef_ptr obj);
-    
-    static void _tao_release (AliasDef_ptr obj);
-    
-    static AliasDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AliasDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AliasDef_ptr _nil (void)
-    {
-      return static_cast<AliasDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::IDLType_ptr original_type_def (
-        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 original_type_def (
-        ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    AliasDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_AliasDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    AliasDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    AliasDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~AliasDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    AliasDef (const AliasDef &);
-    
-    void operator= (const AliasDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AliasDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
-#define _CORBA_NATIVEDEF__VAR_OUT_CH_
-  
-  class NativeDef;
-  typedef NativeDef *NativeDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        NativeDef
-      >
-    NativeDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        NativeDef
-      >
-    NativeDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_NATIVEDEF_CH_)
-#define _CORBA_NATIVEDEF_CH_
-  
-  class TAO_IFR_Client_Export NativeDef
-    : public virtual ::CORBA::TypedefDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<NativeDef>;
-    typedef NativeDef_ptr _ptr_type;
-    typedef NativeDef_var _var_type;
-    
-    // The static operations.
-    static NativeDef_ptr _duplicate (NativeDef_ptr obj);
-    
-    static void _tao_release (NativeDef_ptr obj);
-    
-    static NativeDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static NativeDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static NativeDef_ptr _nil (void)
-    {
-      return static_cast<NativeDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    NativeDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_NativeDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    NativeDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    NativeDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~NativeDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    NativeDef (const NativeDef &);
-    
-    void operator= (const NativeDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_NativeDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_PRIMITIVEDEF_CH_)
-#define _CORBA_PRIMITIVEDEF_CH_
-  
-  class TAO_IFR_Client_Export PrimitiveDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<PrimitiveDef>;
-    typedef PrimitiveDef_ptr _ptr_type;
-    typedef PrimitiveDef_var _var_type;
-    
-    // The static operations.
-    static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
-    
-    static void _tao_release (PrimitiveDef_ptr obj);
-    
-    static PrimitiveDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PrimitiveDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PrimitiveDef_ptr _nil (void)
-    {
-      return static_cast<PrimitiveDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PrimitiveKind kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    PrimitiveDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_PrimitiveDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    PrimitiveDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    PrimitiveDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~PrimitiveDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PrimitiveDef (const PrimitiveDef &);
-    
-    void operator= (const PrimitiveDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_STRINGDEF_CH_)
-#define _CORBA_STRINGDEF_CH_
-  
-  class TAO_IFR_Client_Export StringDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<StringDef>;
-    typedef StringDef_ptr _ptr_type;
-    typedef StringDef_var _var_type;
-    
-    // The static operations.
-    static StringDef_ptr _duplicate (StringDef_ptr obj);
-    
-    static void _tao_release (StringDef_ptr obj);
-    
-    static StringDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StringDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StringDef_ptr _nil (void)
-    {
-      return static_cast<StringDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong bound (
-        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 bound (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    StringDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_StringDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    StringDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    StringDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~StringDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    StringDef (const StringDef &);
-    
-    void operator= (const StringDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StringDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_WSTRINGDEF_CH_)
-#define _CORBA_WSTRINGDEF_CH_
-  
-  class TAO_IFR_Client_Export WstringDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<WstringDef>;
-    typedef WstringDef_ptr _ptr_type;
-    typedef WstringDef_var _var_type;
-    
-    // The static operations.
-    static WstringDef_ptr _duplicate (WstringDef_ptr obj);
-    
-    static void _tao_release (WstringDef_ptr obj);
-    
-    static WstringDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static WstringDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static WstringDef_ptr _nil (void)
-    {
-      return static_cast<WstringDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong bound (
-        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 bound (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    WstringDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_WstringDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    WstringDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    WstringDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~WstringDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    WstringDef (const WstringDef &);
-    
-    void operator= (const WstringDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_WstringDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_SEQUENCEDEF_CH_)
-#define _CORBA_SEQUENCEDEF_CH_
-  
-  class TAO_IFR_Client_Export SequenceDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<SequenceDef>;
-    typedef SequenceDef_ptr _ptr_type;
-    typedef SequenceDef_var _var_type;
-    
-    // The static operations.
-    static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
-    
-    static void _tao_release (SequenceDef_ptr obj);
-    
-    static SequenceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SequenceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SequenceDef_ptr _nil (void)
-    {
-      return static_cast<SequenceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong bound (
-        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 bound (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr element_type (
-        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 ::CORBA::IDLType_ptr element_type_def (
-        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 element_type_def (
-        ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    SequenceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_SequenceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    SequenceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    SequenceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~SequenceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    SequenceDef (const SequenceDef &);
-    
-    void operator= (const SequenceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_SequenceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_ARRAYDEF_CH_)
-#define _CORBA_ARRAYDEF_CH_
-  
-  class TAO_IFR_Client_Export ArrayDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<ArrayDef>;
-    typedef ArrayDef_ptr _ptr_type;
-    typedef ArrayDef_var _var_type;
-    
-    // The static operations.
-    static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
-    
-    static void _tao_release (ArrayDef_ptr obj);
-    
-    static ArrayDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ArrayDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ArrayDef_ptr _nil (void)
-    {
-      return static_cast<ArrayDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong length (
-        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 length (
-        ::CORBA::ULong length
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr element_type (
-        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 ::CORBA::IDLType_ptr element_type_def (
-        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 element_type_def (
-        ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ArrayDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ArrayDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ArrayDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ArrayDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ArrayDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ArrayDef (const ArrayDef &);
-    
-    void operator= (const ArrayDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ArrayDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
-#define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-  
-  class ExceptionDef;
-  typedef ExceptionDef *ExceptionDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExceptionDef
-      >
-    ExceptionDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExceptionDef
-      >
-    ExceptionDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXCEPTIONDEF_CH_)
-#define _CORBA_EXCEPTIONDEF_CH_
-  
-  class TAO_IFR_Client_Export ExceptionDef
-    : public virtual ::CORBA::Contained,
-      public virtual ::CORBA::Container
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExceptionDef>;
-    typedef ExceptionDef_ptr _ptr_type;
-    typedef ExceptionDef_var _var_type;
-    
-    // The static operations.
-    static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
-    
-    static void _tao_release (ExceptionDef_ptr obj);
-    
-    static ExceptionDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExceptionDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExceptionDef_ptr _nil (void)
-    {
-      return static_cast<ExceptionDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        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 ::CORBA::StructMemberSeq * members (
-        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 members (
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExceptionDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExceptionDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExceptionDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExceptionDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExceptionDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExceptionDef (const ExceptionDef &);
-    
-    void operator= (const ExceptionDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ_CH_
-  
-  class ExceptionDefSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExceptionDefSeq,
-        TAO_Object_Manager<
-            ExceptionDef,
-            ExceptionDef_var
-          >
-      >
-    ExceptionDefSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExceptionDefSeq,
-        ExceptionDefSeq_var,
-        TAO_Object_Manager<
-            ExceptionDef,
-            ExceptionDef_var
-          >
-      >
-    ExceptionDefSeq_out;
-  
-  class TAO_IFR_Client_Export ExceptionDefSeq
-    : public
-        TAO_Unbounded_Object_Sequence<
-            ExceptionDef,
-            ExceptionDef_var
-          >
-  {
-  public:
-    ExceptionDefSeq (void);
-    ExceptionDefSeq (CORBA::ULong max);
-    ExceptionDefSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDef_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExceptionDefSeq (const ExceptionDefSeq &);
-    ~ExceptionDefSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExceptionDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum AttributeMode
-  {
-    ATTR_NORMAL,
-    ATTR_READONLY
-  };
-  
-  typedef AttributeMode &AttributeMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeMode;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ATTRIBUTEDEF__VAR_OUT_CH_)
-#define _CORBA_ATTRIBUTEDEF__VAR_OUT_CH_
-  
-  class AttributeDef;
-  typedef AttributeDef *AttributeDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AttributeDef
-      >
-    AttributeDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AttributeDef
-      >
-    AttributeDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_ATTRIBUTEDEF_CH_)
-#define _CORBA_ATTRIBUTEDEF_CH_
-  
-  class TAO_IFR_Client_Export AttributeDef
-    : public virtual ::CORBA::Contained
-  {
-  public:
-    friend class TAO::Narrow_Utils<AttributeDef>;
-    typedef AttributeDef_ptr _ptr_type;
-    typedef AttributeDef_var _var_type;
-    
-    // The static operations.
-    static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
-    
-    static void _tao_release (AttributeDef_ptr obj);
-    
-    static AttributeDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AttributeDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AttributeDef_ptr _nil (void)
-    {
-      return static_cast<AttributeDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        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 ::CORBA::IDLType_ptr type_def (
-        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 type_def (
-        ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::AttributeMode mode (
-        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 mode (
-        ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    AttributeDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_AttributeDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    AttributeDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    AttributeDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~AttributeDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    AttributeDef (const AttributeDef &);
-    
-    void operator= (const AttributeDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct AttributeDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        AttributeDescription
-      >
-    AttributeDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        AttributeDescription,
-        AttributeDescription_var
-      >
-    AttributeDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export AttributeDescription
-  {
-    typedef AttributeDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::AttributeMode mode;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ExtAttributeDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ExtAttributeDescription
-      >
-    ExtAttributeDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ExtAttributeDescription,
-        ExtAttributeDescription_var
-      >
-    ExtAttributeDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ExtAttributeDescription
-  {
-    typedef ExtAttributeDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::AttributeMode mode;
-    CORBA::ExcDescriptionSeq get_exceptions;
-    CORBA::ExcDescriptionSeq put_exceptions;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_
-  
-  class ExtAttributeDef;
-  typedef ExtAttributeDef *ExtAttributeDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtAttributeDef
-      >
-    ExtAttributeDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtAttributeDef
-      >
-    ExtAttributeDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF_CH_)
-#define _CORBA_EXTATTRIBUTEDEF_CH_
-  
-  class TAO_IFR_Client_Export ExtAttributeDef
-    : public virtual ::CORBA::AttributeDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExtAttributeDef>;
-    typedef ExtAttributeDef_ptr _ptr_type;
-    typedef ExtAttributeDef_var _var_type;
-    
-    // The static operations.
-    static ExtAttributeDef_ptr _duplicate (ExtAttributeDef_ptr obj);
-    
-    static void _tao_release (ExtAttributeDef_ptr obj);
-    
-    static ExtAttributeDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtAttributeDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtAttributeDef_ptr _nil (void)
-    {
-      return static_cast<ExtAttributeDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
-        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 get_exceptions (
-        const ::CORBA::ExcDescriptionSeq & get_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
-        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 set_exceptions (
-        const ::CORBA::ExcDescriptionSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExtAttributeDescription * describe_attribute (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExtAttributeDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExtAttributeDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExtAttributeDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExtAttributeDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExtAttributeDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExtAttributeDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExtAttributeDef (const ExtAttributeDef &);
-    
-    void operator= (const ExtAttributeDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum OperationMode
-  {
-    OP_NORMAL,
-    OP_ONEWAY
-  };
-  
-  typedef OperationMode &OperationMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationMode;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ParameterDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ParameterDescription
-      >
-    ParameterDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ParameterDescription,
-        ParameterDescription_var
-      >
-    ParameterDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ParameterDescription
-  {
-    typedef ParameterDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    CORBA::TypeCode_var type;
-    CORBA::IDLType_var type_def;
-    CORBA::ParameterMode mode;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParameterDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ_CH_
-  
-  class ParDescriptionSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ParDescriptionSeq,
-        ParameterDescription
-      >
-    ParDescriptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ParDescriptionSeq,
-        ParDescriptionSeq_var,
-        ParameterDescription
-      >
-    ParDescriptionSeq_out;
-  
-  class TAO_IFR_Client_Export ParDescriptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ParameterDescription
-          >
-  {
-  public:
-    ParDescriptionSeq (void);
-    ParDescriptionSeq (CORBA::ULong max);
-    ParDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ParameterDescription* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ParDescriptionSeq (const ParDescriptionSeq &);
-    ~ParDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ParDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ContextIdentifier;
-  typedef CORBA::String_var ContextIdentifier_var;
-  typedef CORBA::String_out ContextIdentifier_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdentifier;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CH_)
-#define _CORBA_CONTEXTIDSEQ_CH_
-  
-  class ContextIdSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ContextIdSeq,
-        TAO_SeqElem_String_Manager
-      >
-    ContextIdSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ContextIdSeq,
-        ContextIdSeq_var,
-        TAO_SeqElem_String_Manager
-      >
-    ContextIdSeq_out;
-  
-  class TAO_IFR_Client_Export ContextIdSeq
-    : public
-        TAO_Unbounded_String_Sequence
-  {
-  public:
-    ContextIdSeq (void);
-    ContextIdSeq (CORBA::ULong max);
-    ContextIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    ContextIdSeq (const ContextIdSeq &);
-    ~ContextIdSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ContextIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_OPERATIONDEF__VAR_OUT_CH_)
-#define _CORBA_OPERATIONDEF__VAR_OUT_CH_
-  
-  class OperationDef;
-  typedef OperationDef *OperationDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        OperationDef
-      >
-    OperationDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        OperationDef
-      >
-    OperationDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_OPERATIONDEF_CH_)
-#define _CORBA_OPERATIONDEF_CH_
-  
-  class TAO_IFR_Client_Export OperationDef
-    : public virtual ::CORBA::Contained
-  {
-  public:
-    friend class TAO::Narrow_Utils<OperationDef>;
-    typedef OperationDef_ptr _ptr_type;
-    typedef OperationDef_var _var_type;
-    
-    // The static operations.
-    static OperationDef_ptr _duplicate (OperationDef_ptr obj);
-    
-    static void _tao_release (OperationDef_ptr obj);
-    
-    static OperationDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static OperationDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static OperationDef_ptr _nil (void)
-    {
-      return static_cast<OperationDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr result (
-        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 ::CORBA::IDLType_ptr result_def (
-        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 result_def (
-        ::CORBA::IDLType_ptr result_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ParDescriptionSeq * params (
-        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 params (
-        const ::CORBA::ParDescriptionSeq & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OperationMode mode (
-        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 mode (
-        ::CORBA::OperationMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ContextIdSeq * contexts (
-        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 contexts (
-        const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExceptionDefSeq * exceptions (
-        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 exceptions (
-        const ::CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    OperationDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_OperationDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    OperationDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    OperationDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~OperationDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    OperationDef (const OperationDef &);
-    
-    void operator= (const OperationDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct OperationDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        OperationDescription
-      >
-    OperationDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        OperationDescription,
-        OperationDescription_var
-      >
-    OperationDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export OperationDescription
-  {
-    typedef OperationDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var result;
-    CORBA::OperationMode mode;
-    CORBA::ContextIdSeq contexts;
-    CORBA::ParDescriptionSeq parameters;
-    CORBA::ExcDescriptionSeq exceptions;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
-#define _CORBA_REPOSITORYIDSEQ_CH_
-  
-  class RepositoryIdSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        RepositoryIdSeq,
-        TAO_SeqElem_String_Manager
-      >
-    RepositoryIdSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        RepositoryIdSeq,
-        RepositoryIdSeq_var,
-        TAO_SeqElem_String_Manager
-      >
-    RepositoryIdSeq_out;
-  
-  class TAO_IFR_Client_Export RepositoryIdSeq
-    : public
-        TAO_Unbounded_String_Sequence
-  {
-  public:
-    RepositoryIdSeq (void);
-    RepositoryIdSeq (CORBA::ULong max);
-    RepositoryIdSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    RepositoryIdSeq (const RepositoryIdSeq &);
-    ~RepositoryIdSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef RepositoryIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ_CH_
-  
-  class OpDescriptionSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        OpDescriptionSeq,
-        OperationDescription
-      >
-    OpDescriptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        OpDescriptionSeq,
-        OpDescriptionSeq_var,
-        OperationDescription
-      >
-    OpDescriptionSeq_out;
-  
-  class TAO_IFR_Client_Export OpDescriptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            OperationDescription
-          >
-  {
-  public:
-    OpDescriptionSeq (void);
-    OpDescriptionSeq (CORBA::ULong max);
-    OpDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        OperationDescription* buffer, 
-        CORBA::Boolean release = 0
-      );
-    OpDescriptionSeq (const OpDescriptionSeq &);
-    ~OpDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef OpDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CH_
-  
-  class AttrDescriptionSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        AttrDescriptionSeq,
-        AttributeDescription
-      >
-    AttrDescriptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        AttrDescriptionSeq,
-        AttrDescriptionSeq_var,
-        AttributeDescription
-      >
-    AttrDescriptionSeq_out;
-  
-  class TAO_IFR_Client_Export AttrDescriptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            AttributeDescription
-          >
-  {
-  public:
-    AttrDescriptionSeq (void);
-    AttrDescriptionSeq (CORBA::ULong max);
-    AttrDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        AttributeDescription* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AttrDescriptionSeq (const AttrDescriptionSeq &);
-    ~AttrDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef AttrDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ_CH_
-  
-  class ExtAttrDescriptionSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ExtAttrDescriptionSeq,
-        ExtAttributeDescription
-      >
-    ExtAttrDescriptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ExtAttrDescriptionSeq,
-        ExtAttrDescriptionSeq_var,
-        ExtAttributeDescription
-      >
-    ExtAttrDescriptionSeq_out;
-  
-  class TAO_IFR_Client_Export ExtAttrDescriptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ExtAttributeDescription
-          >
-  {
-  public:
-    ExtAttrDescriptionSeq (void);
-    ExtAttrDescriptionSeq (CORBA::ULong max);
-    ExtAttrDescriptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtAttributeDescription* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &);
-    ~ExtAttrDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExtAttrDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-  
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        InterfaceDef
-      >
-    InterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        InterfaceDef
-      >
-    InterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_INTERFACEDEF_CH_)
-#define _CORBA_INTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export InterfaceDef
-    : public virtual ::CORBA::Container,
-      public virtual ::CORBA::Contained,
-      public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<InterfaceDef>;
-    typedef InterfaceDef_ptr _ptr_type;
-    typedef InterfaceDef_var _var_type;
-    
-    // The static operations.
-    static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
-    
-    static void _tao_release (InterfaceDef_ptr obj);
-    
-    static InterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static InterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static InterfaceDef_ptr _nil (void)
-    {
-      return static_cast<InterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InterfaceDefSeq * base_interfaces (
-        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 base_interfaces (
-        const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_a (
-        const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct FullInterfaceDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          FullInterfaceDescription
-        >
-      FullInterfaceDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          FullInterfaceDescription,
-          FullInterfaceDescription_var
-        >
-      FullInterfaceDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export FullInterfaceDescription
-    {
-      typedef FullInterfaceDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_FullInterfaceDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        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 ::CORBA::AttributeDef_ptr create_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OperationDef_ptr create_operation (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr result,
-        ::CORBA::OperationMode mode,
-        const ::CORBA::ParDescriptionSeq & params,
-        const ::CORBA::ExceptionDefSeq & exceptions,
-        const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    InterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_InterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    InterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    InterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~InterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    InterfaceDef (const InterfaceDef &);
-    
-    void operator= (const InterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct InterfaceDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        InterfaceDescription
-      >
-    InterfaceDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        InterfaceDescription,
-        InterfaceDescription_var
-      >
-    InterfaceDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export InterfaceDescription
-  {
-    typedef InterfaceDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::RepositoryIdSeq base_interfaces;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_)
-#define _CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_
-  
-  class InterfaceAttrExtension;
-  typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        InterfaceAttrExtension
-      >
-    InterfaceAttrExtension_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        InterfaceAttrExtension
-      >
-    InterfaceAttrExtension_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION_CH_)
-#define _CORBA_INTERFACEATTREXTENSION_CH_
-  
-  class TAO_IFR_Client_Export InterfaceAttrExtension
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<InterfaceAttrExtension>;
-    typedef InterfaceAttrExtension_ptr _ptr_type;
-    typedef InterfaceAttrExtension_var _var_type;
-    
-    // The static operations.
-    static InterfaceAttrExtension_ptr _duplicate (InterfaceAttrExtension_ptr obj);
-    
-    static void _tao_release (InterfaceAttrExtension_ptr obj);
-    
-    static InterfaceAttrExtension_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static InterfaceAttrExtension_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static InterfaceAttrExtension_ptr _nil (void)
-    {
-      return static_cast<InterfaceAttrExtension_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct ExtFullInterfaceDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          ExtFullInterfaceDescription
-        >
-      ExtFullInterfaceDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          ExtFullInterfaceDescription,
-          ExtFullInterfaceDescription_var
-        >
-      ExtFullInterfaceDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export ExtFullInterfaceDescription
-    {
-      typedef ExtFullInterfaceDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ExtFullInterfaceDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        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 ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        ::CORBA::AttributeMode mode,
-        const ::CORBA::ExceptionDefSeq & get_exceptions,
-        const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_InterfaceAttrExtension_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    InterfaceAttrExtension (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_InterfaceAttrExtension_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    InterfaceAttrExtension (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    InterfaceAttrExtension (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~InterfaceAttrExtension (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    InterfaceAttrExtension (const InterfaceAttrExtension &);
-    
-    void operator= (const InterfaceAttrExtension &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtInterfaceDef;
-  typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtInterfaceDef
-      >
-    ExtInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtInterfaceDef
-      >
-    ExtInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXTINTERFACEDEF_CH_)
-#define _CORBA_EXTINTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export ExtInterfaceDef
-    : public virtual ::CORBA::InterfaceDef,
-      public virtual ::CORBA::InterfaceAttrExtension
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExtInterfaceDef>;
-    typedef ExtInterfaceDef_ptr _ptr_type;
-    typedef ExtInterfaceDef_var _var_type;
-    
-    // The static operations.
-    static ExtInterfaceDef_ptr _duplicate (ExtInterfaceDef_ptr obj);
-    
-    static void _tao_release (ExtInterfaceDef_ptr obj);
-    
-    static ExtInterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtInterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtInterfaceDef_ptr _nil (void)
-    {
-      return static_cast<ExtInterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExtInterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExtInterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExtInterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExtInterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExtInterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExtInterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExtInterfaceDef (const ExtInterfaceDef &);
-    
-    void operator= (const ExtInterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
-  class AbstractInterfaceDef;
-  typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AbstractInterfaceDef
-      >
-    AbstractInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AbstractInterfaceDef
-      >
-    AbstractInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDef
-    : public virtual ::CORBA::InterfaceDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<AbstractInterfaceDef>;
-    typedef AbstractInterfaceDef_ptr _ptr_type;
-    typedef AbstractInterfaceDef_var _var_type;
-    
-    // The static operations.
-    static AbstractInterfaceDef_ptr _duplicate (AbstractInterfaceDef_ptr obj);
-    
-    static void _tao_release (AbstractInterfaceDef_ptr obj);
-    
-    static AbstractInterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AbstractInterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AbstractInterfaceDef_ptr _nil (void)
-    {
-      return static_cast<AbstractInterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    AbstractInterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_AbstractInterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    AbstractInterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    AbstractInterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~AbstractInterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    AbstractInterfaceDef (const AbstractInterfaceDef &);
-    
-    void operator= (const AbstractInterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtAbstractInterfaceDef;
-  typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtAbstractInterfaceDef
-      >
-    ExtAbstractInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtAbstractInterfaceDef
-      >
-    ExtAbstractInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDef
-    : public virtual ::CORBA::AbstractInterfaceDef,
-      public virtual ::CORBA::InterfaceAttrExtension
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExtAbstractInterfaceDef>;
-    typedef ExtAbstractInterfaceDef_ptr _ptr_type;
-    typedef ExtAbstractInterfaceDef_var _var_type;
-    
-    // The static operations.
-    static ExtAbstractInterfaceDef_ptr _duplicate (ExtAbstractInterfaceDef_ptr obj);
-    
-    static void _tao_release (ExtAbstractInterfaceDef_ptr obj);
-    
-    static ExtAbstractInterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtAbstractInterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtAbstractInterfaceDef_ptr _nil (void)
-    {
-      return static_cast<ExtAbstractInterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExtAbstractInterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExtAbstractInterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExtAbstractInterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExtAbstractInterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExtAbstractInterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef &);
-    
-    void operator= (const ExtAbstractInterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-  
-  class LocalInterfaceDef;
-  typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        LocalInterfaceDef
-      >
-    LocalInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        LocalInterfaceDef
-      >
-    LocalInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
-#define _CORBA_LOCALINTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export LocalInterfaceDef
-    : public virtual ::CORBA::InterfaceDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<LocalInterfaceDef>;
-    typedef LocalInterfaceDef_ptr _ptr_type;
-    typedef LocalInterfaceDef_var _var_type;
-    
-    // The static operations.
-    static LocalInterfaceDef_ptr _duplicate (LocalInterfaceDef_ptr obj);
-    
-    static void _tao_release (LocalInterfaceDef_ptr obj);
-    
-    static LocalInterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static LocalInterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static LocalInterfaceDef_ptr _nil (void)
-    {
-      return static_cast<LocalInterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    LocalInterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_LocalInterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    LocalInterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    LocalInterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~LocalInterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    LocalInterfaceDef (const LocalInterfaceDef &);
-    
-    void operator= (const LocalInterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-  
-  class ExtLocalInterfaceDef;
-  typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtLocalInterfaceDef
-      >
-    ExtLocalInterfaceDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtLocalInterfaceDef
-      >
-    ExtLocalInterfaceDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF_CH_
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDef
-    : public virtual ::CORBA::LocalInterfaceDef,
-      public virtual ::CORBA::InterfaceAttrExtension
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExtLocalInterfaceDef>;
-    typedef ExtLocalInterfaceDef_ptr _ptr_type;
-    typedef ExtLocalInterfaceDef_var _var_type;
-    
-    // The static operations.
-    static ExtLocalInterfaceDef_ptr _duplicate (ExtLocalInterfaceDef_ptr obj);
-    
-    static void _tao_release (ExtLocalInterfaceDef_ptr obj);
-    
-    static ExtLocalInterfaceDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtLocalInterfaceDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtLocalInterfaceDef_ptr _nil (void)
-    {
-      return static_cast<ExtLocalInterfaceDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExtLocalInterfaceDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExtLocalInterfaceDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExtLocalInterfaceDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExtLocalInterfaceDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExtLocalInterfaceDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExtLocalInterfaceDef (const ExtLocalInterfaceDef &);
-    
-    void operator= (const ExtLocalInterfaceDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_REPOSITORY__TRAITS_CH_)
-#define _CORBA_REPOSITORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
-  {
-    static ::CORBA::Repository_ptr duplicate (
-        ::CORBA::Repository_ptr
-      );
-    static void release (
-        ::CORBA::Repository_ptr
-      );
-    static ::CORBA::Repository_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Repository_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF__TRAITS_CH_)
-#define _CORBA_MODULEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
-  {
-    static ::CORBA::ModuleDef_ptr duplicate (
-        ::CORBA::ModuleDef_ptr
-      );
-    static void release (
-        ::CORBA::ModuleDef_ptr
-      );
-    static ::CORBA::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ModuleDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_)
-#define _CORBA_CONSTANTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
-  {
-    static ::CORBA::ConstantDef_ptr duplicate (
-        ::CORBA::ConstantDef_ptr
-      );
-    static void release (
-        ::CORBA::ConstantDef_ptr
-      );
-    static ::CORBA::ConstantDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ConstantDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF__TRAITS_CH_)
-#define _CORBA_STRUCTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
-  {
-    static ::CORBA::StructDef_ptr duplicate (
-        ::CORBA::StructDef_ptr
-      );
-    static void release (
-        ::CORBA::StructDef_ptr
-      );
-    static ::CORBA::StructDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::StructDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF__TRAITS_CH_)
-#define _CORBA_UNIONDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
-  {
-    static ::CORBA::UnionDef_ptr duplicate (
-        ::CORBA::UnionDef_ptr
-      );
-    static void release (
-        ::CORBA::UnionDef_ptr
-      );
-    static ::CORBA::UnionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::UnionDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF__TRAITS_CH_)
-#define _CORBA_ENUMDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
-  {
-    static ::CORBA::EnumDef_ptr duplicate (
-        ::CORBA::EnumDef_ptr
-      );
-    static void release (
-        ::CORBA::EnumDef_ptr
-      );
-    static ::CORBA::EnumDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::EnumDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF__TRAITS_CH_)
-#define _CORBA_ALIASDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
-  {
-    static ::CORBA::AliasDef_ptr duplicate (
-        ::CORBA::AliasDef_ptr
-      );
-    static void release (
-        ::CORBA::AliasDef_ptr
-      );
-    static ::CORBA::AliasDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::AliasDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_)
-#define _CORBA_INTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
-  {
-    static ::CORBA::InterfaceDef_ptr duplicate (
-        ::CORBA::InterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::InterfaceDef_ptr
-      );
-    static ::CORBA::InterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::InterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_)
-#define _CORBA_EXCEPTIONDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
-  {
-    static ::CORBA::ExceptionDef_ptr duplicate (
-        ::CORBA::ExceptionDef_ptr
-      );
-    static void release (
-        ::CORBA::ExceptionDef_ptr
-      );
-    static ::CORBA::ExceptionDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExceptionDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF__TRAITS_CH_)
-#define _CORBA_NATIVEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
-  {
-    static ::CORBA::NativeDef_ptr duplicate (
-        ::CORBA::NativeDef_ptr
-      );
-    static void release (
-        ::CORBA::NativeDef_ptr
-      );
-    static ::CORBA::NativeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::NativeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
-  {
-    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
-        ::CORBA::AbstractInterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::AbstractInterfaceDef_ptr
-      );
-    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::AbstractInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
-  {
-    static ::CORBA::LocalInterfaceDef_ptr duplicate (
-        ::CORBA::LocalInterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::LocalInterfaceDef_ptr
-      );
-    static ::CORBA::LocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::LocalInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
-  {
-    static ::CORBA::ExtInterfaceDef_ptr duplicate (
-        ::CORBA::ExtInterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::ExtInterfaceDef_ptr
-      );
-    static ::CORBA::ExtInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExtInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
-  {
-    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
-      );
-    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExtAbstractInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
-  {
-    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
-        ::CORBA::ExtLocalInterfaceDef_ptr
-      );
-    static void release (
-        ::CORBA::ExtLocalInterfaceDef_ptr
-      );
-    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExtLocalInterfaceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF__TRAITS_CH_)
-#define _CORBA_PRIMITIVEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
-  {
-    static ::CORBA::PrimitiveDef_ptr duplicate (
-        ::CORBA::PrimitiveDef_ptr
-      );
-    static void release (
-        ::CORBA::PrimitiveDef_ptr
-      );
-    static ::CORBA::PrimitiveDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PrimitiveDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF__TRAITS_CH_)
-#define _CORBA_STRINGDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
-  {
-    static ::CORBA::StringDef_ptr duplicate (
-        ::CORBA::StringDef_ptr
-      );
-    static void release (
-        ::CORBA::StringDef_ptr
-      );
-    static ::CORBA::StringDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::StringDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF__TRAITS_CH_)
-#define _CORBA_SEQUENCEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
-  {
-    static ::CORBA::SequenceDef_ptr duplicate (
-        ::CORBA::SequenceDef_ptr
-      );
-    static void release (
-        ::CORBA::SequenceDef_ptr
-      );
-    static ::CORBA::SequenceDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::SequenceDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF__TRAITS_CH_)
-#define _CORBA_ARRAYDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
-  {
-    static ::CORBA::ArrayDef_ptr duplicate (
-        ::CORBA::ArrayDef_ptr
-      );
-    static void release (
-        ::CORBA::ArrayDef_ptr
-      );
-    static ::CORBA::ArrayDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ArrayDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF__TRAITS_CH_)
-#define _CORBA_WSTRINGDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
-  {
-    static ::CORBA::WstringDef_ptr duplicate (
-        ::CORBA::WstringDef_ptr
-      );
-    static void release (
-        ::CORBA::WstringDef_ptr
-      );
-    static ::CORBA::WstringDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::WstringDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_ATTRIBUTEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
-  {
-    static ::CORBA::AttributeDef_ptr duplicate (
-        ::CORBA::AttributeDef_ptr
-      );
-    static void release (
-        ::CORBA::AttributeDef_ptr
-      );
-    static ::CORBA::AttributeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::AttributeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_EXTATTRIBUTEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
-  {
-    static ::CORBA::ExtAttributeDef_ptr duplicate (
-        ::CORBA::ExtAttributeDef_ptr
-      );
-    static void release (
-        ::CORBA::ExtAttributeDef_ptr
-      );
-    static ::CORBA::ExtAttributeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExtAttributeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__TRAITS_CH_)
-#define _CORBA_OPERATIONDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
-  {
-    static ::CORBA::OperationDef_ptr duplicate (
-        ::CORBA::OperationDef_ptr
-      );
-    static void release (
-        ::CORBA::OperationDef_ptr
-      );
-    static ::CORBA::OperationDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::OperationDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_CH_)
-#define _CORBA_INTERFACEATTREXTENSION__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
-  {
-    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
-        ::CORBA::InterfaceAttrExtension_ptr
-      );
-    static void release (
-        ::CORBA::InterfaceAttrExtension_ptr
-      );
-    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::InterfaceAttrExtension_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ModuleDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ModuleDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ConstantDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ConstantDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WstringDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SequenceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ArrayDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDefSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttributeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttributeDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttributeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttributeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttributeDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttributeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParameterDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParameterDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContextIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContextIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContextIdSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContextIdSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OperationDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OperationDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::RepositoryIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::RepositoryIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::RepositoryIdSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::RepositoryIdSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OpDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OpDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OpDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OpDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttrDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttrDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttrDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttrDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttrDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttrDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttrDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttrDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceAttrExtension_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::PrimitiveKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::NativeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::NativeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StringDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WstringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WstringDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SequenceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SequenceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ArrayDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ArrayDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExceptionDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExceptionDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::AttributeMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAttributeDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAttributeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAttributeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::OperationMode);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ParDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ParDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ContextIdSeq_H_
-#define _TAO_CDR_OP_CORBA_ContextIdSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ContextIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ContextIdSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
-#define _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::RepositoryIdSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::RepositoryIdSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OpDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::OpDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AttrDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AttrDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ExtAttrDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ExtAttrDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef::FullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef::FullInterfaceDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceAttrExtension_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceAttrExtension_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AbstractInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtAbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtAbstractInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::LocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtLocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "IFR_BasicC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl
deleted file mode 100644
index 6edd2c8a1a9..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicC.inl
+++ /dev/null
@@ -1,891 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_REPOSITORY___CI_)
-#define _CORBA_REPOSITORY___CI_
-
-ACE_INLINE
-CORBA::Repository::Repository (
-    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_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_Repository_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Repository::Repository (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_MODULEDEF___CI_)
-#define _CORBA_MODULEDEF___CI_
-
-ACE_INLINE
-CORBA::ModuleDef::ModuleDef (
-    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_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ModuleDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ModuleDef::ModuleDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_CONSTANTDEF___CI_)
-#define _CORBA_CONSTANTDEF___CI_
-
-ACE_INLINE
-CORBA::ConstantDef::ConstantDef (
-    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_ConstantDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ConstantDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ConstantDef::ConstantDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConstantDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_STRUCTDEF___CI_)
-#define _CORBA_STRUCTDEF___CI_
-
-ACE_INLINE
-CORBA::StructDef::StructDef (
-    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_StructDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StructDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::StructDef::StructDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_StructDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_UNIONDEF___CI_)
-#define _CORBA_UNIONDEF___CI_
-
-ACE_INLINE
-CORBA::UnionDef::UnionDef (
-    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_UnionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_UnionDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::UnionDef::UnionDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_UnionDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ENUMDEF___CI_)
-#define _CORBA_ENUMDEF___CI_
-
-ACE_INLINE
-CORBA::EnumDef::EnumDef (
-    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_EnumDef_Proxy_Broker_ (0)
-{
-  this->CORBA_EnumDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::EnumDef::EnumDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EnumDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ALIASDEF___CI_)
-#define _CORBA_ALIASDEF___CI_
-
-ACE_INLINE
-CORBA::AliasDef::AliasDef (
-    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_AliasDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AliasDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AliasDef::AliasDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AliasDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_NATIVEDEF___CI_)
-#define _CORBA_NATIVEDEF___CI_
-
-ACE_INLINE
-CORBA::NativeDef::NativeDef (
-    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_NativeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_NativeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::NativeDef::NativeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_NativeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_PRIMITIVEDEF___CI_)
-#define _CORBA_PRIMITIVEDEF___CI_
-
-ACE_INLINE
-CORBA::PrimitiveDef::PrimitiveDef (
-    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_PrimitiveDef_Proxy_Broker_ (0)
-{
-  this->CORBA_PrimitiveDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::PrimitiveDef::PrimitiveDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_PrimitiveDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_STRINGDEF___CI_)
-#define _CORBA_STRINGDEF___CI_
-
-ACE_INLINE
-CORBA::StringDef::StringDef (
-    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_StringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_StringDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::StringDef::StringDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_StringDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_WSTRINGDEF___CI_)
-#define _CORBA_WSTRINGDEF___CI_
-
-ACE_INLINE
-CORBA::WstringDef::WstringDef (
-    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_WstringDef_Proxy_Broker_ (0)
-{
-  this->CORBA_WstringDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::WstringDef::WstringDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_WstringDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_SEQUENCEDEF___CI_)
-#define _CORBA_SEQUENCEDEF___CI_
-
-ACE_INLINE
-CORBA::SequenceDef::SequenceDef (
-    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_SequenceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_SequenceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::SequenceDef::SequenceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_SequenceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ARRAYDEF___CI_)
-#define _CORBA_ARRAYDEF___CI_
-
-ACE_INLINE
-CORBA::ArrayDef::ArrayDef (
-    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_ArrayDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ArrayDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ArrayDef::ArrayDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ArrayDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXCEPTIONDEF___CI_)
-#define _CORBA_EXCEPTIONDEF___CI_
-
-ACE_INLINE
-CORBA::ExceptionDef::ExceptionDef (
-    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_ExceptionDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExceptionDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExceptionDef::ExceptionDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExceptionDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ATTRIBUTEDEF___CI_)
-#define _CORBA_ATTRIBUTEDEF___CI_
-
-ACE_INLINE
-CORBA::AttributeDef::AttributeDef (
-    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_AttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AttributeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AttributeDef::AttributeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AttributeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF___CI_)
-#define _CORBA_EXTATTRIBUTEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtAttributeDef::ExtAttributeDef (
-    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_ExtAttributeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAttributeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDef::ExtAttributeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtAttributeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_OPERATIONDEF___CI_)
-#define _CORBA_OPERATIONDEF___CI_
-
-ACE_INLINE
-CORBA::OperationDef::OperationDef (
-    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_OperationDef_Proxy_Broker_ (0)
-{
-  this->CORBA_OperationDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::OperationDef::OperationDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_OperationDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_INTERFACEDEF___CI_)
-#define _CORBA_INTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::InterfaceDef::InterfaceDef (
-    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_InterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::InterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_InterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION___CI_)
-#define _CORBA_INTERFACEATTREXTENSION___CI_
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
-    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_InterfaceAttrExtension_Proxy_Broker_ (0)
-{
-  this->CORBA_InterfaceAttrExtension_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTINTERFACEDEF___CI_)
-#define _CORBA_EXTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtInterfaceDef::ExtInterfaceDef (
-    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_ExtInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDef::ExtInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___CI_)
-#define _CORBA_ABSTRACTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
-    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_AbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_AbstractInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___CI_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
-    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_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtAbstractInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
-#define _CORBA_LOCALINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::LocalInterfaceDef::LocalInterfaceDef (
-    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_LocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_LocalInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDef::LocalInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_LocalInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___CI_)
-#define _CORBA_EXTLOCALINTERFACEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
-    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_ExtLocalInterfaceDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtLocalInterfaceDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
deleted file mode 100644
index 9c80b614a85..00000000000
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// $Id$
-
-#include "IFR_Client_Adapter_Impl.h"
-#include "IFR_ExtendedC.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Stub.h"
-#include "tao/NVList.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-
-ACE_RCSID (IFR_Client,
-           IFR_Client_Adapter_Impl,
-           "$Id$")
-
-namespace TAO
-{
-  template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
-          >
-  {
-  };
-}
-
-TAO_IFR_Client_Adapter_Impl::~TAO_IFR_Client_Adapter_Impl (void)
-{
-}
-
-CORBA::Boolean
-TAO_IFR_Client_Adapter_Impl::interfacedef_cdr_insert (
-    TAO_OutputCDR &cdr,
-    CORBA::InterfaceDef_ptr object_type
-  )
-{
-  return cdr << object_type;
-}
-
-void
-TAO_IFR_Client_Adapter_Impl::interfacedef_any_insert (
-    CORBA::Any &any,
-    CORBA::InterfaceDef_ptr object_type
-  )
-{
-  any <<= object_type;
-}
-
-void
-TAO_IFR_Client_Adapter_Impl::dispose (
-    CORBA::InterfaceDef_ptr orphan
-  )
-{
-  CORBA::release (orphan);
-}
-
-CORBA::InterfaceDef_ptr
-TAO_IFR_Client_Adapter_Impl::get_interface (
-    CORBA::ORB_ptr orb,
-    const char *repo_id
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("InterfaceRepository"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
-
-  if (CORBA::is_nil (obj.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        CORBA::InterfaceDef::_nil ());
-    }
-
-  CORBA::Repository_var repo =
-    CORBA::Repository::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
-
-  if (CORBA::is_nil (repo.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        CORBA::InterfaceDef::_nil ());
-    }
-
-  CORBA::Contained_var result = repo->lookup_id (repo_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      return CORBA::InterfaceDef::_nil ();
-    }
-  else
-    {
-      return CORBA::InterfaceDef::_narrow (result.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-CORBA::InterfaceDef_ptr
-TAO_IFR_Client_Adapter_Impl::get_interface_remote (
-    CORBA::Object_ptr target
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval;
-
-  TAO::Argument *_tao_signature [] =
-    {
-      &_tao_retval
-    };
-
-  TAO::Invocation_Adapter _tao_call (
-      target,
-      _tao_signature,
-      1,
-      "_interface",
-      10,
-      0
-    );
-
-  ACE_TRY
-    {
-      _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK (_tao_retval.excp ());
-    }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-    {
-      return CORBA::InterfaceDef::_nil ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-
-  return _tao_retval.retn ();
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-void
-TAO_IFR_Client_Adapter_Impl::create_operation_list (
-    CORBA::ORB_ptr orb,
-    CORBA::OperationDef_ptr opDef,
-    CORBA::NVList_ptr &result
-    ACE_ENV_ARG_DECL
-  )
-{
-  // Create an empty NVList.
-  orb->create_list (0,
-                    result
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Get the parameters (if any) from the OperationDef, and for each
-  // parameter add a corresponding entry to the result.
-  CORBA::ParDescriptionSeq_var params =
-    opDef->params (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong paramCount = params->length ();
-
-  for (CORBA::ULong i = 0; i < paramCount; ++i)
-    {
-      CORBA::Any value;
-      TAO::Unknown_IDL_Type *unk = 0;
-      ACE_NEW (unk,
-               TAO::Unknown_IDL_Type (params[i].type.in ()));
-      value.replace (unk);
-
-      // Convert the parameter mode to an arg mode
-      CORBA::Flags flags = 0;
-      switch(params[i].mode)
-        {
-        case CORBA::PARAM_IN:
-          flags = CORBA::ARG_IN;
-          break;
-        case CORBA::PARAM_OUT:
-          flags = CORBA::ARG_OUT;
-          break;
-        case CORBA::PARAM_INOUT:
-          flags = CORBA::ARG_INOUT;
-          break;
-        default:
-          // Shouldn't happen
-          ACE_THROW (CORBA::INTERNAL());
-        }
-
-      // Add an argument to the NVList.
-      result->add_value (params[i].name.in (),
-                         value,
-                         flags);
-   }
-}
-
-#endif /*TAO_HAS_MINIMUM_CORBA*/
-// *********************************************************************
-
-// Initialization and registration of dynamic service object.
-
-int
-TAO_IFR_Client_Adapter_Impl::Initializer (void)
-{
-  TAO_ORB_Core::ifr_client_adapter_name ("Concrete_IFR_Client_Adapter");
-
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl);
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_IFR_Client_Adapter_Impl,
-    ACE_TEXT ("Concrete_IFR_Client_Adapter"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_IFR_Client_Adapter_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
deleted file mode 100644
index 052ea02860e..00000000000
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IFR_Client_Adapter_Impl.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IFR_CLIENT_ADAPTER_IMPL_H
-#define TAO_IFR_CLIENT_ADAPTER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ifr_client_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IFR_Client_Adapter.h"
-
-#include "ace/Service_Config.h"
-
-/**
- * @class TAO_IFR_Client_Adapter_Impl
- *
- * @brief TAO_IFR_Client_Adapter_Impl.
- *
- * Class that adapts various functions in the CORBA namespace
- * which use the Interface Repository. This is the derived class
- * that contains the actual implementations.
- */
-class TAO_IFR_Client_Export TAO_IFR_Client_Adapter_Impl
-  : public TAO_IFR_Client_Adapter
-{
-public:
-  virtual ~TAO_IFR_Client_Adapter_Impl (void);
-
-  virtual CORBA::Boolean interfacedef_cdr_insert (
-      TAO_OutputCDR &cdr,
-      CORBA::InterfaceDef_ptr object_type
-    );
-
-  virtual void interfacedef_any_insert (
-      CORBA::Any &any,
-      CORBA::InterfaceDef_ptr object_type
-    );
-
-  virtual void dispose (
-      CORBA::InterfaceDef_ptr orphan
-    );
-
-  virtual CORBA::InterfaceDef_ptr get_interface (
-      CORBA::ORB_ptr orb,
-      const char *repo_id
-      ACE_ENV_ARG_DECL
-    );
-
-  virtual CORBA::InterfaceDef_ptr get_interface_remote (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    );
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  virtual void create_operation_list (
-      CORBA::ORB_ptr orb,
-      CORBA::OperationDef_ptr,
-      CORBA::NVList_ptr&
-      ACE_ENV_ARG_DECL
-    );
-#endif /*TAO_HAS_MINIMUM_CORBA*/
-
-  // Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IFR_Client_Initializer =
-  &TAO_IFR_Client_Adapter_Impl::Initializer;
-
-#else
-
-static int
-TAO_Requires_IFR_Client_Initializer =
-  TAO_IFR_Client_Adapter_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IFR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
deleted file mode 100644
index 2431d9b5fe5..00000000000
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ /dev/null
@@ -1,292 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Components.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ComponentsC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -I../.. \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Components.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Components.pidl
-//
-//   The only modification necessary to the skeleton files is to
-//   change
-//
-//   #include "IFR_ComponentsC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_ComponentsC.h"
-//
-//   in IFR_ComponentsS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
-
-#ifndef _IFR_COMPONENTS_IDL_
-#define _IFR_COMPONENTS_IDL_
-
-#include "tao/IFR_Client/IFR_Extended.pidl"
-
-module CORBA
-{
-  typeprefix CORBA "omg.org";
-
-  module ComponentIR
-  {
-    interface ComponentDef;
-    interface HomeDef;
-
-    interface EventDef : ExtValueDef
-    {
-    };
-
-    interface Container : CORBA::Container
-    {
-      ComponentDef create_component (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ComponentDef base_component,
-	  in InterfaceDefSeq supports_interfaces
-	);
-
-      HomeDef create_home (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in HomeDef base_home,
-	  in ComponentDef managed_component,
-	  in InterfaceDefSeq supports_interfaces,
-	  in ValueDef primary_key
-	);
-
-      EventDef create_event (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in boolean is_custom,
-	  in boolean is_abstract,
-	  in ValueDef base_value,
-	  in boolean is_truncatable,
-	  in ValueDefSeq abstract_base_values,
-	  in InterfaceDefSeq supported_interfaces,
-	  in ExtInitializerSeq initializers
-	);
-    };
-
-    interface ModuleDef : CORBA::ModuleDef,
-			  Container
-    {
-    };
-
-    interface Repository : CORBA::Repository,
-			   Container
-    {
-    };
-
-    interface ProvidesDef : Contained
-    {
-      attribute InterfaceDef interface_type;
-    };
-
-    struct ProvidesDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      RepositoryId interface_type;
-    };
-
-    interface UsesDef : Contained
-    {
-      attribute InterfaceDef interface_type;
-      attribute boolean is_multiple;
-    };
-
-    struct UsesDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      RepositoryId interface_type;
-      boolean is_multiple;
-    };
-
-    interface EventPortDef : Contained
-    {
-      // read/write interface
-      attribute EventDef event;
-      // read interface
-      boolean is_a (in RepositoryId event_id);
-    };
-
-    struct EventPortDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      RepositoryId event;
-    };
-
-    interface EmitsDef : EventPortDef
-    {
-    };
-
-    interface PublishesDef : EventPortDef
-    {
-    };
-
-    interface ConsumesDef : EventPortDef
-    {
-    };
-
-    interface ComponentDef : ExtInterfaceDef
-    {
-      // read/write interface
-      attribute ComponentDef base_component;
-      attribute InterfaceDefSeq supported_interfaces;
-
-      // write interface
-      ProvidesDef create_provides (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in InterfaceDef interface_type
-	);
-
-      UsesDef create_uses (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in InterfaceDef interface_type,
-	  in boolean is_multiple
-	);
-
-      EmitsDef create_emits (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
-
-      PublishesDef create_publishes (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
-
-      ConsumesDef create_consumes (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
-    };
-
-    typedef sequence<ProvidesDescription> ProvidesDescriptionSeq;
-    typedef sequence<UsesDescription> UsesDescriptionSeq;
-    typedef sequence<EventPortDescription> EventPortDescriptionSeq;
-
-    struct ComponentDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      RepositoryId base_component;
-      RepositoryIdSeq supported_interfaces;
-      ProvidesDescriptionSeq provided_interfaces;
-      UsesDescriptionSeq used_interfaces;
-      EventPortDescriptionSeq emits_events;
-      EventPortDescriptionSeq publishes_events;
-      EventPortDescriptionSeq consumes_events;
-      ExtAttrDescriptionSeq attributes;
-      TypeCode type;
-    };
-
-    interface FactoryDef : OperationDef
-    {
-    };
-
-    interface FinderDef : OperationDef
-    {
-    };
-
-    interface HomeDef : ExtInterfaceDef
-    {
-      // read/write interface
-      attribute HomeDef base_home;
-      attribute InterfaceDefSeq supported_interfaces;
-      attribute ComponentDef managed_component;
-      attribute ValueDef primary_key;
-
-      // write interface
-      FactoryDef create_factory (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ParDescriptionSeq params,
-	  in ExceptionDefSeq exceptions
-	);
-
-      FinderDef create_finder (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ParDescriptionSeq params,
-	  in ExceptionDefSeq exceptions
-	);
-    };
-
-    struct HomeDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      RepositoryId base_home;
-      RepositoryId managed_component;
-      ValueDescription primary_key;
-      OpDescriptionSeq factories;
-      OpDescriptionSeq finders;
-      OpDescriptionSeq operations;
-      ExtAttrDescriptionSeq attributes;
-      TypeCode type;
-    };
-  };
-};
-
-#endif /* _IFR_COMPONENTS_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
deleted file mode 100644
index 158fdd88a07..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
+++ /dev/null
@@ -1,1954 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ComponentsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
-    "EventDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventDef =
-      &_tao_tc_CORBA_ComponentIR_EventDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Container =
-      &_tao_tc_CORBA_ComponentIR_Container;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-      &_tao_tc_CORBA_ComponentIR_ModuleDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Repository =
-      &_tao_tc_CORBA_ComponentIR_Repository;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
-    "ProvidesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDef =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
-    "ProvidesDescription",
-    _tao_fields_CORBA_ComponentIR_ProvidesDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescription =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
-    "UsesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDef =
-      &_tao_tc_CORBA_ComponentIR_UsesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId },
-    { "is_multiple", &CORBA::_tc_boolean }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
-    "UsesDescription",
-    _tao_fields_CORBA_ComponentIR_UsesDescription,
-    6);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescription =
-      &_tao_tc_CORBA_ComponentIR_UsesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
-    "EventPortDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDef =
-      &_tao_tc_CORBA_ComponentIR_EventPortDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "event", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
-    "EventPortDescription",
-    _tao_fields_CORBA_ComponentIR_EventPortDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescription =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EmitsDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
-    "EmitsDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EmitsDef =
-      &_tao_tc_CORBA_ComponentIR_EmitsDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_PublishesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
-    "PublishesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_PublishesDef =
-      &_tao_tc_CORBA_ComponentIR_PublishesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ConsumesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
-    "ConsumesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ConsumesDef =
-      &_tao_tc_CORBA_ComponentIR_ConsumesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
-    "ComponentDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDef =
-      &_tao_tc_CORBA_ComponentIR_ComponentDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_ProvidesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
-      &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
-    "ProvidesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_UsesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_UsesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
-      &CORBA_ComponentIR_UsesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
-    "UsesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_UsesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_EventPortDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_EventPortDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
-      &CORBA_ComponentIR_EventPortDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
-    "EventPortDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_component", &CORBA::_tc_RepositoryId },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "provided_interfaces", &CORBA::ComponentIR::_tc_ProvidesDescriptionSeq },
-    { "used_interfaces", &CORBA::ComponentIR::_tc_UsesDescriptionSeq },
-    { "emits_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "publishes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
-    "ComponentDescription",
-    _tao_fields_CORBA_ComponentIR_ComponentDescription,
-    13);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDescription =
-      &_tao_tc_CORBA_ComponentIR_ComponentDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FactoryDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
-    "FactoryDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FactoryDef =
-      &_tao_tc_CORBA_ComponentIR_FactoryDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FinderDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
-    "FinderDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FinderDef =
-      &_tao_tc_CORBA_ComponentIR_FinderDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
-    "HomeDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDef =
-      &_tao_tc_CORBA_ComponentIR_HomeDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_home", &CORBA::_tc_RepositoryId },
-    { "managed_component", &CORBA::_tc_RepositoryId },
-    { "primary_key", &CORBA::_tc_ValueDescription },
-    { "factories", &CORBA::_tc_OpDescriptionSeq },
-    { "finders", &CORBA::_tc_OpDescriptionSeq },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
-    "HomeDescription",
-    _tao_fields_CORBA_ComponentIR_HomeDescription,
-    12);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDescription =
-      &_tao_tc_CORBA_ComponentIR_HomeDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Container_ptr _tao_objptr =
-    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Container::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::Container>::extract (
-        _tao_any,
-        CORBA::ComponentIR::Container::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_Container,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ModuleDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Repository_ptr _tao_objptr =
-    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Repository::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::extract (
-        _tao_any,
-        CORBA::ComponentIR::Repository::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_Repository,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ProvidesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ProvidesDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_UsesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_UsesDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventPortDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventPortDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EmitsDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EmitsDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_PublishesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_PublishesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ConsumesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ConsumesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ComponentDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_FactoryDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FactoryDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::FinderDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_FinderDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FinderDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
-    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::HomeDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::HomeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
deleted file mode 100644
index f59eb0ee30b..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ /dev/null
@@ -1,5361 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IFR_ComponentsC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.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 "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::InterfaceDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::InterfaceDef_ptr,
-            CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDefSeq,
-            CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueDef_ptr,
-            CORBA::ValueDef_var,
-            CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ValueDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDefSeq,
-            CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExtInitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtInitializerSeq,
-            CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExceptionDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExceptionDefSeq,
-            CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ParDescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ParDescriptionSeq,
-            CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::ComponentDef_ptr,
-            CORBA::ComponentIR::ComponentDef_var,
-            CORBA::ComponentIR::ComponentDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::HomeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::HomeDef_ptr,
-            CORBA::ComponentIR::HomeDef_var,
-            CORBA::ComponentIR::HomeDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::EventDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::EventDef_ptr,
-            CORBA::ComponentIR::EventDef_var,
-            CORBA::ComponentIR::EventDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::ProvidesDef_ptr,
-            CORBA::ComponentIR::ProvidesDef_var,
-            CORBA::ComponentIR::ProvidesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::UsesDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::UsesDef_ptr,
-            CORBA::ComponentIR::UsesDef_var,
-            CORBA::ComponentIR::UsesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::EmitsDef_ptr,
-            CORBA::ComponentIR::EmitsDef_var,
-            CORBA::ComponentIR::EmitsDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::PublishesDef_ptr,
-            CORBA::ComponentIR::PublishesDef_var,
-            CORBA::ComponentIR::PublishesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::ConsumesDef_ptr,
-            CORBA::ComponentIR::ConsumesDef_var,
-            CORBA::ComponentIR::ConsumesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::FactoryDef_ptr,
-            CORBA::ComponentIR::FactoryDef_var,
-            CORBA::ComponentIR::FactoryDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ComponentIR::FinderDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ComponentIR::FinderDef_ptr,
-            CORBA::ComponentIR::FinderDef_var,
-            CORBA::ComponentIR::FinderDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::EventDef.
-
-CORBA::ComponentIR::EventDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate (
-    CORBA::ComponentIR::EventDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::EventDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release (
-    CORBA::ComponentIR::EventDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::EventDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::nil (void)
-{
-  return CORBA::ComponentIR::EventDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal (
-    CORBA::ComponentIR::EventDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::EventDef::EventDef (void)
- : the_TAO_EventDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::EventDef::CORBA_ComponentIR_EventDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_EventDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ExtValueDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::EventDef::~EventDef (void)
-{}
-
-void 
-CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EventDef *_tao_tmp_pointer =
-    static_cast<EventDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EventDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
-        CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EventDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
-        CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef::_duplicate (EventDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::EventDef::_tao_release (EventDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EventDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ValueDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtValueDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::EventDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::Container.
-
-CORBA::ComponentIR::Container_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate (
-    CORBA::ComponentIR::Container_ptr p
-  )
-{
-  return CORBA::ComponentIR::Container::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::release (
-    CORBA::ComponentIR::Container_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::Container_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::nil (void)
-{
-  return CORBA::ComponentIR::Container::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal (
-    CORBA::ComponentIR::Container_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::Container::create_component (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::ComponentIR::ComponentDef_ptr base_component,
-    const ::CORBA::InterfaceDefSeq & supports_interfaces
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_base_component,
-      &_tao_supports_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_component",
-      16,
-      this->the_TAO_Container_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
-
-::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::Container::create_home (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::ComponentIR::HomeDef_ptr base_home,
-    ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
-    const ::CORBA::InterfaceDefSeq & supports_interfaces,
-    ::CORBA::ValueDef_ptr primary_key
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_base_home,
-      &_tao_managed_component,
-      &_tao_supports_interfaces,
-      &_tao_primary_key
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      8,
-      "create_home",
-      11,
-      this->the_TAO_Container_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
-
-::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::Container::create_event (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::Boolean is_custom,
-    ::CORBA::Boolean is_abstract,
-    ::CORBA::ValueDef_ptr base_value,
-    ::CORBA::Boolean is_truncatable,
-    const ::CORBA::ValueDefSeq & abstract_base_values,
-    const ::CORBA::InterfaceDefSeq & supported_interfaces,
-    const ::CORBA::ExtInitializerSeq & initializers
-    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_Container_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_Container_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_is_custom,
-      &_tao_is_abstract,
-      &_tao_base_value,
-      &_tao_is_truncatable,
-      &_tao_abstract_base_values,
-      &_tao_supported_interfaces,
-      &_tao_initializers
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      11,
-      "create_event",
-      12,
-      this->the_TAO_Container_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ComponentIR::Container::Container (void)
- : the_TAO_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Container_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::Container::CORBA_ComponentIR_Container_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Container_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Container_setup_collocation ();
-}
-
-CORBA::ComponentIR::Container::~Container (void)
-{}
-
-void 
-CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Container *_tao_tmp_pointer =
-    static_cast<Container *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Container>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
-        CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Container>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
-        CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container::_duplicate (Container_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::Container::_tao_release (Container_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::Container::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/Container:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::ModuleDef.
-
-CORBA::ComponentIR::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate (
-    CORBA::ComponentIR::ModuleDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::ModuleDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release (
-    CORBA::ComponentIR::ModuleDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::ModuleDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::nil (void)
-{
-  return CORBA::ComponentIR::ModuleDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal (
-    CORBA::ComponentIR::ModuleDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::ModuleDef::ModuleDef (void)
- : the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ModuleDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ModuleDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ModuleDef_setup_collocation ();
-  this->CORBA_ComponentIR_Container_setup_collocation ();
-}
-
-CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
-{}
-
-void 
-CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ModuleDef *_tao_tmp_pointer =
-    static_cast<ModuleDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ModuleDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
-        CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ModuleDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
-        CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef::_duplicate (ModuleDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::ModuleDef::_tao_release (ModuleDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ModuleDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ModuleDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::Repository.
-
-CORBA::ComponentIR::Repository_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate (
-    CORBA::ComponentIR::Repository_ptr p
-  )
-{
-  return CORBA::ComponentIR::Repository::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release (
-    CORBA::ComponentIR::Repository_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::Repository_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::nil (void)
-{
-  return CORBA::ComponentIR::Repository::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal (
-    CORBA::ComponentIR::Repository_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::Repository::Repository (void)
- : the_TAO_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Repository_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Repository_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Repository_setup_collocation ();
-  this->CORBA_ComponentIR_Container_setup_collocation ();
-}
-
-CORBA::ComponentIR::Repository::~Repository (void)
-{}
-
-void 
-CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Repository *_tao_tmp_pointer =
-    static_cast<Repository *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Repository>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
-        CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Repository>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
-        CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository::_duplicate (Repository_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::Repository::_tao_release (Repository_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::Repository::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Repository:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/Repository:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::Repository::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/Repository:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::ProvidesDef.
-
-CORBA::ComponentIR::ProvidesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate (
-    CORBA::ComponentIR::ProvidesDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::ProvidesDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release (
-    CORBA::ComponentIR::ProvidesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::ProvidesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::nil (void)
-{
-  return CORBA::ComponentIR::ProvidesDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal (
-    CORBA::ComponentIR::ProvidesDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceDef_ptr CORBA::ComponentIR::ProvidesDef::interface_type (
-    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_ProvidesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ProvidesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_interface_type",
-      19,
-      this->the_TAO_ProvidesDef_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 CORBA::ComponentIR::ProvidesDef::interface_type (
-    ::CORBA::InterfaceDef_ptr interface_type
-    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_ProvidesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ProvidesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_interface_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_interface_type",
-      19,
-      this->the_TAO_ProvidesDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
- : the_TAO_ProvidesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ProvidesDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::ProvidesDef::CORBA_ComponentIR_ProvidesDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ProvidesDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
-{}
-
-void 
-CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ProvidesDef *_tao_tmp_pointer =
-    static_cast<ProvidesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ProvidesDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
-        CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ProvidesDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
-        CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::ProvidesDef::_tao_release (ProvidesDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ProvidesDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ProvidesDescription *_tao_tmp_pointer =
-    static_cast<ProvidesDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::UsesDef.
-
-CORBA::ComponentIR::UsesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate (
-    CORBA::ComponentIR::UsesDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::UsesDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release (
-    CORBA::ComponentIR::UsesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::UsesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::nil (void)
-{
-  return CORBA::ComponentIR::UsesDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal (
-    CORBA::ComponentIR::UsesDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceDef_ptr CORBA::ComponentIR::UsesDef::interface_type (
-    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_UsesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_UsesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_interface_type",
-      19,
-      this->the_TAO_UsesDef_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 CORBA::ComponentIR::UsesDef::interface_type (
-    ::CORBA::InterfaceDef_ptr interface_type
-    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_UsesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_UsesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_interface_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_interface_type",
-      19,
-      this->the_TAO_UsesDef_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
-
-CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
-    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_UsesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_UsesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_is_multiple",
-      16,
-      this->the_TAO_UsesDef_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 CORBA::ComponentIR::UsesDef::is_multiple (
-    ::CORBA::Boolean is_multiple
-    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_UsesDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_UsesDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_is_multiple
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_is_multiple",
-      16,
-      this->the_TAO_UsesDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ComponentIR::UsesDef::UsesDef (void)
- : the_TAO_UsesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_UsesDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::UsesDef::CORBA_ComponentIR_UsesDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_UsesDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ComponentIR::UsesDef::~UsesDef (void)
-{}
-
-void 
-CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UsesDef *_tao_tmp_pointer =
-    static_cast<UsesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<UsesDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
-        CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<UsesDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
-        CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef::_duplicate (UsesDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::UsesDef::_tao_release (UsesDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::UsesDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::UsesDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ComponentIR::UsesDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  UsesDescription *_tao_tmp_pointer =
-    static_cast<UsesDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::EventPortDef.
-
-CORBA::ComponentIR::EventPortDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate (
-    CORBA::ComponentIR::EventPortDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::EventPortDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release (
-    CORBA::ComponentIR::EventPortDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::EventPortDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::nil (void)
-{
-  return CORBA::ComponentIR::EventPortDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal (
-    CORBA::ComponentIR::EventPortDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::EventPortDef::event (
-    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_EventPortDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_EventPortDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_event",
-      10,
-      this->the_TAO_EventPortDef_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 CORBA::ComponentIR::EventPortDef::event (
-    ::CORBA::ComponentIR::EventDef_ptr event
-    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_EventPortDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_EventPortDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_event
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_event",
-      10,
-      this->the_TAO_EventPortDef_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
-
-CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
-    const char * event_id
-    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_EventPortDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_EventPortDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_event_id
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "is_a",
-      4,
-      this->the_TAO_EventPortDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ComponentIR::EventPortDef::EventPortDef (void)
- : the_TAO_EventPortDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::EventPortDef::CORBA_ComponentIR_EventPortDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_EventPortDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
-{}
-
-void 
-CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EventPortDef *_tao_tmp_pointer =
-    static_cast<EventPortDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EventPortDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
-        CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EventPortDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
-        CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef::_duplicate (EventPortDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::EventPortDef::_tao_release (EventPortDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EventPortDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::EventPortDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  EventPortDescription *_tao_tmp_pointer =
-    static_cast<EventPortDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::EmitsDef.
-
-CORBA::ComponentIR::EmitsDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate (
-    CORBA::ComponentIR::EmitsDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::EmitsDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release (
-    CORBA::ComponentIR::EmitsDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::EmitsDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::nil (void)
-{
-  return CORBA::ComponentIR::EmitsDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal (
-    CORBA::ComponentIR::EmitsDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::EmitsDef::EmitsDef (void)
- : the_TAO_EmitsDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EmitsDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::EmitsDef::CORBA_ComponentIR_EmitsDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_EmitsDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
-{}
-
-void 
-CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EmitsDef *_tao_tmp_pointer =
-    static_cast<EmitsDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EmitsDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
-        CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<EmitsDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
-        CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef::_duplicate (EmitsDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::EmitsDef::_tao_release (EmitsDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EmitsDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::PublishesDef.
-
-CORBA::ComponentIR::PublishesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate (
-    CORBA::ComponentIR::PublishesDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::PublishesDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release (
-    CORBA::ComponentIR::PublishesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::PublishesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::nil (void)
-{
-  return CORBA::ComponentIR::PublishesDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal (
-    CORBA::ComponentIR::PublishesDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::PublishesDef::PublishesDef (void)
- : the_TAO_PublishesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_PublishesDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::PublishesDef::CORBA_ComponentIR_PublishesDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_PublishesDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
-{}
-
-void 
-CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PublishesDef *_tao_tmp_pointer =
-    static_cast<PublishesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<PublishesDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
-        CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<PublishesDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
-        CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef::_duplicate (PublishesDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::PublishesDef::_tao_release (PublishesDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::PublishesDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::PublishesDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::ConsumesDef.
-
-CORBA::ComponentIR::ConsumesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate (
-    CORBA::ComponentIR::ConsumesDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::ConsumesDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release (
-    CORBA::ComponentIR::ConsumesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::ConsumesDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::nil (void)
-{
-  return CORBA::ComponentIR::ConsumesDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal (
-    CORBA::ComponentIR::ConsumesDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
- : the_TAO_ConsumesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ConsumesDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::ConsumesDef::CORBA_ComponentIR_ConsumesDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ConsumesDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
-{}
-
-void 
-CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ConsumesDef *_tao_tmp_pointer =
-    static_cast<ConsumesDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConsumesDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
-        CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ConsumesDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
-        CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::ConsumesDef::_tao_release (ConsumesDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ConsumesDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::ComponentDef.
-
-CORBA::ComponentIR::ComponentDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate (
-    CORBA::ComponentIR::ComponentDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::ComponentDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release (
-    CORBA::ComponentIR::ComponentDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::ComponentDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::nil (void)
-{
-  return CORBA::ComponentIR::ComponentDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal (
-    CORBA::ComponentIR::ComponentDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::ComponentDef::base_component (
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_base_component",
-      19,
-      this->the_TAO_ComponentDef_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 CORBA::ComponentIR::ComponentDef::base_component (
-    ::CORBA::ComponentIR::ComponentDef_ptr base_component
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_base_component
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_base_component",
-      19,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::InterfaceDefSeq * CORBA::ComponentIR::ComponentDef::supported_interfaces (
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_supported_interfaces",
-      25,
-      this->the_TAO_ComponentDef_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 CORBA::ComponentIR::ComponentDef::supported_interfaces (
-    const ::CORBA::InterfaceDefSeq & supported_interfaces
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_supported_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_supported_interfaces",
-      25,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::ComponentIR::ProvidesDef_ptr CORBA::ComponentIR::ComponentDef::create_provides (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::InterfaceDef_ptr interface_type
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_interface_type
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_provides",
-      15,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::ComponentIR::UsesDef_ptr CORBA::ComponentIR::ComponentDef::create_uses (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::InterfaceDef_ptr interface_type,
-    ::CORBA::Boolean is_multiple
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_interface_type,
-      &_tao_is_multiple
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_uses",
-      11,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::ComponentIR::EmitsDef_ptr CORBA::ComponentIR::ComponentDef::create_emits (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::ComponentIR::EventDef_ptr event
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_event
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_emits",
-      12,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::ComponentIR::PublishesDef_ptr CORBA::ComponentIR::ComponentDef::create_publishes (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::ComponentIR::EventDef_ptr event
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_event
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_publishes",
-      16,
-      this->the_TAO_ComponentDef_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
-
-::CORBA::ComponentIR::ConsumesDef_ptr CORBA::ComponentIR::ComponentDef::create_consumes (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::ComponentIR::EventDef_ptr event
-    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_ComponentDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_ComponentDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_event
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      5,
-      "create_consumes",
-      15,
-      this->the_TAO_ComponentDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ComponentIR::ComponentDef::ComponentDef (void)
- : the_TAO_ComponentDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ComponentDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::ComponentDef::CORBA_ComponentIR_ComponentDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ComponentDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ExtInterfaceDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
-{}
-
-void 
-CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ComponentDef *_tao_tmp_pointer =
-    static_cast<ComponentDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ComponentDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
-        CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ComponentDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
-        CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef::_duplicate (ComponentDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::ComponentDef::_tao_release (ComponentDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ComponentDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::ComponentDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_
-
-CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (void)
-{}
-
-CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
-      >
-    (max)
-{}
-
-CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::ProvidesDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
-    const ProvidesDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
-      >
-    (seq)
-{}
-
-CORBA::ComponentIR::ProvidesDescriptionSeq::~ProvidesDescriptionSeq (void)
-{}
-
-void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ProvidesDescriptionSeq * _tao_tmp_pointer =
-    static_cast<ProvidesDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_
-
-CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (void)
-{}
-
-CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
-      >
-    (max)
-{}
-
-CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::UsesDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
-    const UsesDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
-      >
-    (seq)
-{}
-
-CORBA::ComponentIR::UsesDescriptionSeq::~UsesDescriptionSeq (void)
-{}
-
-void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  UsesDescriptionSeq * _tao_tmp_pointer =
-    static_cast<UsesDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_
-
-CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (void)
-{}
-
-CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
-      >
-    (max)
-{}
-
-CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::EventPortDescription * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
-    const EventPortDescriptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
-      >
-    (seq)
-{}
-
-CORBA::ComponentIR::EventPortDescriptionSeq::~EventPortDescriptionSeq (void)
-{}
-
-void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  EventPortDescriptionSeq * _tao_tmp_pointer =
-    static_cast<EventPortDescriptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ComponentDescription *_tao_tmp_pointer =
-    static_cast<ComponentDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::FactoryDef.
-
-CORBA::ComponentIR::FactoryDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate (
-    CORBA::ComponentIR::FactoryDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::FactoryDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release (
-    CORBA::ComponentIR::FactoryDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::FactoryDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::nil (void)
-{
-  return CORBA::ComponentIR::FactoryDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal (
-    CORBA::ComponentIR::FactoryDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::FactoryDef::FactoryDef (void)
- : the_TAO_FactoryDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FactoryDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::FactoryDef::CORBA_ComponentIR_FactoryDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_FactoryDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_OperationDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
-{}
-
-void 
-CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  FactoryDef *_tao_tmp_pointer =
-    static_cast<FactoryDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FactoryDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
-        CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FactoryDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
-        CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef::_duplicate (FactoryDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::FactoryDef::_tao_release (FactoryDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::FactoryDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/OperationDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::FactoryDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::FinderDef.
-
-CORBA::ComponentIR::FinderDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate (
-    CORBA::ComponentIR::FinderDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::FinderDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release (
-    CORBA::ComponentIR::FinderDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::FinderDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::nil (void)
-{
-  return CORBA::ComponentIR::FinderDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal (
-    CORBA::ComponentIR::FinderDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-CORBA::ComponentIR::FinderDef::FinderDef (void)
- : the_TAO_FinderDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FinderDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::FinderDef::CORBA_ComponentIR_FinderDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_FinderDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_OperationDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::FinderDef::~FinderDef (void)
-{}
-
-void 
-CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  FinderDef *_tao_tmp_pointer =
-    static_cast<FinderDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FinderDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
-        CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FinderDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
-        CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef::_duplicate (FinderDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::FinderDef::_tao_release (FinderDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::FinderDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/OperationDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::FinderDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ComponentIR::HomeDef.
-
-CORBA::ComponentIR::HomeDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate (
-    CORBA::ComponentIR::HomeDef_ptr p
-  )
-{
-  return CORBA::ComponentIR::HomeDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release (
-    CORBA::ComponentIR::HomeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ComponentIR::HomeDef_ptr
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::nil (void)
-{
-  return CORBA::ComponentIR::HomeDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal (
-    CORBA::ComponentIR::HomeDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::HomeDef::base_home (
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_base_home",
-      14,
-      this->the_TAO_HomeDef_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 CORBA::ComponentIR::HomeDef::base_home (
-    ::CORBA::ComponentIR::HomeDef_ptr base_home
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_base_home
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_base_home",
-      14,
-      this->the_TAO_HomeDef_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
-
-::CORBA::InterfaceDefSeq * CORBA::ComponentIR::HomeDef::supported_interfaces (
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_supported_interfaces",
-      25,
-      this->the_TAO_HomeDef_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 CORBA::ComponentIR::HomeDef::supported_interfaces (
-    const ::CORBA::InterfaceDefSeq & supported_interfaces
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_supported_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_supported_interfaces",
-      25,
-      this->the_TAO_HomeDef_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
-
-::CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::HomeDef::managed_component (
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_managed_component",
-      22,
-      this->the_TAO_HomeDef_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 CORBA::ComponentIR::HomeDef::managed_component (
-    ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_managed_component
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_managed_component",
-      22,
-      this->the_TAO_HomeDef_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
-
-::CORBA::ValueDef_ptr CORBA::ComponentIR::HomeDef::primary_key (
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_primary_key",
-      16,
-      this->the_TAO_HomeDef_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 CORBA::ComponentIR::HomeDef::primary_key (
-    ::CORBA::ValueDef_ptr primary_key
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_primary_key
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_primary_key",
-      16,
-      this->the_TAO_HomeDef_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
-
-::CORBA::ComponentIR::FactoryDef_ptr CORBA::ComponentIR::HomeDef::create_factory (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::ParDescriptionSeq & params,
-    const ::CORBA::ExceptionDefSeq & exceptions
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_params,
-      &_tao_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_factory",
-      14,
-      this->the_TAO_HomeDef_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
-
-::CORBA::ComponentIR::FinderDef_ptr CORBA::ComponentIR::HomeDef::create_finder (
-    const char * id,
-    const char * name,
-    const char * version,
-    const ::CORBA::ParDescriptionSeq & params,
-    const ::CORBA::ExceptionDefSeq & exceptions
-    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_HomeDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ComponentIR_HomeDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_params,
-      &_tao_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_finder",
-      13,
-      this->the_TAO_HomeDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ComponentIR::HomeDef::HomeDef (void)
- : the_TAO_HomeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_HomeDef_setup_collocation ();
-}
-
-void
-CORBA::ComponentIR::HomeDef::CORBA_ComponentIR_HomeDef_setup_collocation ()
-{
-  if (::CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_HomeDef_Proxy_Broker_ =
-        ::CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ExtInterfaceDef_setup_collocation ();
-}
-
-CORBA::ComponentIR::HomeDef::~HomeDef (void)
-{}
-
-void 
-CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  HomeDef *_tao_tmp_pointer =
-    static_cast<HomeDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<HomeDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
-        CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<HomeDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
-        CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef::_duplicate (HomeDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ComponentIR::HomeDef::_tao_release (HomeDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::HomeDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ComponentIR::HomeDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ComponentIR::HomeDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  HomeDescription *_tao_tmp_pointer =
-    static_cast<HomeDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::EventDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::EventDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::EventDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::Container_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::Container_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::Container RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ModuleDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ModuleDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::ModuleDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::Repository_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::Repository_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::Repository RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ProvidesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ProvidesDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::ProvidesDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ProvidesDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.interface_type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ProvidesDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.interface_type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::UsesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::UsesDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::UsesDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::UsesDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.interface_type.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_multiple));
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::UsesDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.interface_type.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_multiple));
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::EventPortDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::EventPortDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::EventPortDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::EventPortDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.event.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::EventPortDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.event.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::EmitsDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::EmitsDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::EmitsDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::PublishesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::PublishesDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::PublishesDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ConsumesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ConsumesDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::ConsumesDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ComponentDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ComponentDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::ComponentDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::ComponentDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.base_component.in ()) &&
-    (strm << _tao_aggregate.supported_interfaces) &&
-    (strm << _tao_aggregate.provided_interfaces) &&
-    (strm << _tao_aggregate.used_interfaces) &&
-    (strm << _tao_aggregate.emits_events) &&
-    (strm << _tao_aggregate.publishes_events) &&
-    (strm << _tao_aggregate.consumes_events) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::ComponentDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.base_component.out ()) &&
-    (strm >> _tao_aggregate.supported_interfaces) &&
-    (strm >> _tao_aggregate.provided_interfaces) &&
-    (strm >> _tao_aggregate.used_interfaces) &&
-    (strm >> _tao_aggregate.emits_events) &&
-    (strm >> _tao_aggregate.publishes_events) &&
-    (strm >> _tao_aggregate.consumes_events) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::FactoryDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::FactoryDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::FactoryDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::FinderDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::FinderDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::FinderDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::HomeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::HomeDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ComponentIR::HomeDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ComponentIR::HomeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.base_home.in ()) &&
-    (strm << _tao_aggregate.managed_component.in ()) &&
-    (strm << _tao_aggregate.primary_key) &&
-    (strm << _tao_aggregate.factories) &&
-    (strm << _tao_aggregate.finders) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ComponentIR::HomeDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.base_home.out ()) &&
-    (strm >> _tao_aggregate.managed_component.out ()) &&
-    (strm >> _tao_aggregate.primary_key) &&
-    (strm >> _tao_aggregate.factories) &&
-    (strm >> _tao_aggregate.finders) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.type.out ());
-}
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
deleted file mode 100644
index 5d35ae15ad8..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ /dev/null
@@ -1,3121 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
-#define _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ifr_client_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IFR_Client/IFR_ExtendedC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_module/module_ch.cpp:48
-  
-  namespace ComponentIR
-  {
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_
-    
-    class ComponentDef;
-    typedef ComponentDef *ComponentDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          ComponentDef
-        >
-      ComponentDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          ComponentDef
-        >
-      ComponentDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_
-    
-    class HomeDef;
-    typedef HomeDef *HomeDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          HomeDef
-        >
-      HomeDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          HomeDef
-        >
-      HomeDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_
-    
-    class EventDef;
-    typedef EventDef *EventDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          EventDef
-        >
-      EventDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          EventDef
-        >
-      EventDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF_CH_
-    
-    class TAO_IFR_Client_Export EventDef
-      : public virtual ::CORBA::ExtValueDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<EventDef>;
-      typedef EventDef_ptr _ptr_type;
-      typedef EventDef_var _var_type;
-      
-      // The static operations.
-      static EventDef_ptr _duplicate (EventDef_ptr obj);
-      
-      static void _tao_release (EventDef_ptr obj);
-      
-      static EventDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EventDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EventDef_ptr _nil (void)
-      {
-        return static_cast<EventDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      EventDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_EventDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      EventDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      EventDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~EventDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      EventDef (const EventDef &);
-      
-      void operator= (const EventDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_
-    
-    class Container;
-    typedef Container *Container_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          Container
-        >
-      Container_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          Container
-        >
-      Container_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER_CH_
-    
-    class TAO_IFR_Client_Export Container
-      : public virtual ::CORBA::Container
-    {
-    public:
-      friend class TAO::Narrow_Utils<Container>;
-      typedef Container_ptr _ptr_type;
-      typedef Container_var _var_type;
-      
-      // The static operations.
-      static Container_ptr _duplicate (Container_ptr obj);
-      
-      static void _tao_release (Container_ptr obj);
-      
-      static Container_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static Container_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static Container_ptr _nil (void)
-      {
-        return static_cast<Container_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::ComponentIR::ComponentDef_ptr base_component,
-          const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::HomeDef_ptr create_home (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::ComponentIR::HomeDef_ptr base_home,
-          ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
-          const ::CORBA::InterfaceDefSeq & supports_interfaces,
-          ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::EventDef_ptr create_event (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::Boolean is_custom,
-          ::CORBA::Boolean is_abstract,
-          ::CORBA::ValueDef_ptr base_value,
-          ::CORBA::Boolean is_truncatable,
-          const ::CORBA::ValueDefSeq & abstract_base_values,
-          const ::CORBA::InterfaceDefSeq & supported_interfaces,
-          const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      Container (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_Container_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      Container (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      Container (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~Container (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      Container (const Container &);
-      
-      void operator= (const Container &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_
-    
-    class ModuleDef;
-    typedef ModuleDef *ModuleDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          ModuleDef
-        >
-      ModuleDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          ModuleDef
-        >
-      ModuleDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF_CH_
-    
-    class TAO_IFR_Client_Export ModuleDef
-      : public virtual ::CORBA::ModuleDef,
-        public virtual ::CORBA::ComponentIR::Container
-    {
-    public:
-      friend class TAO::Narrow_Utils<ModuleDef>;
-      typedef ModuleDef_ptr _ptr_type;
-      typedef ModuleDef_var _var_type;
-      
-      // The static operations.
-      static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-      
-      static void _tao_release (ModuleDef_ptr obj);
-      
-      static ModuleDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ModuleDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ModuleDef_ptr _nil (void)
-      {
-        return static_cast<ModuleDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      ModuleDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_ModuleDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      ModuleDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      ModuleDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~ModuleDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      ModuleDef (const ModuleDef &);
-      
-      void operator= (const ModuleDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_
-    
-    class Repository;
-    typedef Repository *Repository_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          Repository
-        >
-      Repository_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          Repository
-        >
-      Repository_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY_CH_
-    
-    class TAO_IFR_Client_Export Repository
-      : public virtual ::CORBA::Repository,
-        public virtual ::CORBA::ComponentIR::Container
-    {
-    public:
-      friend class TAO::Narrow_Utils<Repository>;
-      typedef Repository_ptr _ptr_type;
-      typedef Repository_var _var_type;
-      
-      // The static operations.
-      static Repository_ptr _duplicate (Repository_ptr obj);
-      
-      static void _tao_release (Repository_ptr obj);
-      
-      static Repository_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static Repository_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static Repository_ptr _nil (void)
-      {
-        return static_cast<Repository_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      Repository (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_Repository_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      Repository (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      Repository (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~Repository (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      Repository (const Repository &);
-      
-      void operator= (const Repository &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_
-    
-    class ProvidesDef;
-    typedef ProvidesDef *ProvidesDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          ProvidesDef
-        >
-      ProvidesDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          ProvidesDef
-        >
-      ProvidesDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF_CH_
-    
-    class TAO_IFR_Client_Export ProvidesDef
-      : public virtual ::CORBA::Contained
-    {
-    public:
-      friend class TAO::Narrow_Utils<ProvidesDef>;
-      typedef ProvidesDef_ptr _ptr_type;
-      typedef ProvidesDef_var _var_type;
-      
-      // The static operations.
-      static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
-      
-      static void _tao_release (ProvidesDef_ptr obj);
-      
-      static ProvidesDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ProvidesDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ProvidesDef_ptr _nil (void)
-      {
-        return static_cast<ProvidesDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::InterfaceDef_ptr interface_type (
-          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 interface_type (
-          ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      ProvidesDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_ProvidesDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      ProvidesDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      ProvidesDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~ProvidesDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      ProvidesDef (const ProvidesDef &);
-      
-      void operator= (const ProvidesDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct ProvidesDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          ProvidesDescription
-        >
-      ProvidesDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          ProvidesDescription,
-          ProvidesDescription_var
-        >
-      ProvidesDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export ProvidesDescription
-    {
-      typedef ProvidesDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager interface_type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_
-    
-    class UsesDef;
-    typedef UsesDef *UsesDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          UsesDef
-        >
-      UsesDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          UsesDef
-        >
-      UsesDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF_CH_)
-#define _CORBA_COMPONENTIR_USESDEF_CH_
-    
-    class TAO_IFR_Client_Export UsesDef
-      : public virtual ::CORBA::Contained
-    {
-    public:
-      friend class TAO::Narrow_Utils<UsesDef>;
-      typedef UsesDef_ptr _ptr_type;
-      typedef UsesDef_var _var_type;
-      
-      // The static operations.
-      static UsesDef_ptr _duplicate (UsesDef_ptr obj);
-      
-      static void _tao_release (UsesDef_ptr obj);
-      
-      static UsesDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static UsesDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static UsesDef_ptr _nil (void)
-      {
-        return static_cast<UsesDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::InterfaceDef_ptr interface_type (
-          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 interface_type (
-          ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual CORBA::Boolean is_multiple (
-          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 is_multiple (
-          ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      UsesDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_UsesDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      UsesDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      UsesDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~UsesDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      UsesDef (const UsesDef &);
-      
-      void operator= (const UsesDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct UsesDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          UsesDescription
-        >
-      UsesDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          UsesDescription,
-          UsesDescription_var
-        >
-      UsesDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export UsesDescription
-    {
-      typedef UsesDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager interface_type;
-      CORBA::Boolean is_multiple;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_
-    
-    class EventPortDef;
-    typedef EventPortDef *EventPortDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          EventPortDef
-        >
-      EventPortDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          EventPortDef
-        >
-      EventPortDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_
-    
-    class TAO_IFR_Client_Export EventPortDef
-      : public virtual ::CORBA::Contained
-    {
-    public:
-      friend class TAO::Narrow_Utils<EventPortDef>;
-      typedef EventPortDef_ptr _ptr_type;
-      typedef EventPortDef_var _var_type;
-      
-      // The static operations.
-      static EventPortDef_ptr _duplicate (EventPortDef_ptr obj);
-      
-      static void _tao_release (EventPortDef_ptr obj);
-      
-      static EventPortDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EventPortDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EventPortDef_ptr _nil (void)
-      {
-        return static_cast<EventPortDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::EventDef_ptr event (
-          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 event (
-          ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual CORBA::Boolean is_a (
-          const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_EventPortDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      EventPortDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_EventPortDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      EventPortDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      EventPortDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~EventPortDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      EventPortDef (const EventPortDef &);
-      
-      void operator= (const EventPortDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct EventPortDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          EventPortDescription
-        >
-      EventPortDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          EventPortDescription,
-          EventPortDescription_var
-        >
-      EventPortDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export EventPortDescription
-    {
-      typedef EventPortDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager event;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_
-    
-    class EmitsDef;
-    typedef EmitsDef *EmitsDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          EmitsDef
-        >
-      EmitsDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          EmitsDef
-        >
-      EmitsDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF_CH_
-    
-    class TAO_IFR_Client_Export EmitsDef
-      : public virtual ::CORBA::ComponentIR::EventPortDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<EmitsDef>;
-      typedef EmitsDef_ptr _ptr_type;
-      typedef EmitsDef_var _var_type;
-      
-      // The static operations.
-      static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
-      
-      static void _tao_release (EmitsDef_ptr obj);
-      
-      static EmitsDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EmitsDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static EmitsDef_ptr _nil (void)
-      {
-        return static_cast<EmitsDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      EmitsDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_EmitsDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      EmitsDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      EmitsDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~EmitsDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      EmitsDef (const EmitsDef &);
-      
-      void operator= (const EmitsDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EmitsDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_
-    
-    class PublishesDef;
-    typedef PublishesDef *PublishesDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          PublishesDef
-        >
-      PublishesDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          PublishesDef
-        >
-      PublishesDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_
-    
-    class TAO_IFR_Client_Export PublishesDef
-      : public virtual ::CORBA::ComponentIR::EventPortDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<PublishesDef>;
-      typedef PublishesDef_ptr _ptr_type;
-      typedef PublishesDef_var _var_type;
-      
-      // The static operations.
-      static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
-      
-      static void _tao_release (PublishesDef_ptr obj);
-      
-      static PublishesDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static PublishesDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static PublishesDef_ptr _nil (void)
-      {
-        return static_cast<PublishesDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      PublishesDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_PublishesDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      PublishesDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      PublishesDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~PublishesDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      PublishesDef (const PublishesDef &);
-      
-      void operator= (const PublishesDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PublishesDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_
-    
-    class ConsumesDef;
-    typedef ConsumesDef *ConsumesDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          ConsumesDef
-        >
-      ConsumesDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          ConsumesDef
-        >
-      ConsumesDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF_CH_
-    
-    class TAO_IFR_Client_Export ConsumesDef
-      : public virtual ::CORBA::ComponentIR::EventPortDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<ConsumesDef>;
-      typedef ConsumesDef_ptr _ptr_type;
-      typedef ConsumesDef_var _var_type;
-      
-      // The static operations.
-      static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
-      
-      static void _tao_release (ConsumesDef_ptr obj);
-      
-      static ConsumesDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ConsumesDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ConsumesDef_ptr _nil (void)
-      {
-        return static_cast<ConsumesDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      ConsumesDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_ConsumesDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      ConsumesDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      ConsumesDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~ConsumesDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      ConsumesDef (const ConsumesDef &);
-      
-      void operator= (const ConsumesDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConsumesDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF_CH_
-    
-    class TAO_IFR_Client_Export ComponentDef
-      : public virtual ::CORBA::ExtInterfaceDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<ComponentDef>;
-      typedef ComponentDef_ptr _ptr_type;
-      typedef ComponentDef_var _var_type;
-      
-      // The static operations.
-      static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
-      
-      static void _tao_release (ComponentDef_ptr obj);
-      
-      static ComponentDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ComponentDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static ComponentDef_ptr _nil (void)
-      {
-        return static_cast<ComponentDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-          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 base_component (
-          ::CORBA::ComponentIR::ComponentDef_ptr base_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          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 supported_interfaces (
-          const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::InterfaceDef_ptr interface_type,
-          ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes (
-          const char * id,
-          const char * name,
-          const char * version,
-          ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      ComponentDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_ComponentDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      ComponentDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      ComponentDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~ComponentDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      ComponentDef (const ComponentDef &);
-      
-      void operator= (const ComponentDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
-    
-    class ProvidesDescriptionSeq;
-    
-    typedef
-      TAO_VarSeq_Var_T<
-          ProvidesDescriptionSeq,
-          ProvidesDescription
-        >
-      ProvidesDescriptionSeq_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          ProvidesDescriptionSeq,
-          ProvidesDescriptionSeq_var,
-          ProvidesDescription
-        >
-      ProvidesDescriptionSeq_out;
-    
-    class TAO_IFR_Client_Export ProvidesDescriptionSeq
-      : public
-          TAO_Unbounded_Sequence<
-              ProvidesDescription
-            >
-    {
-    public:
-      ProvidesDescriptionSeq (void);
-      ProvidesDescriptionSeq (CORBA::ULong max);
-      ProvidesDescriptionSeq (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ProvidesDescription* buffer, 
-          CORBA::Boolean release = 0
-        );
-      ProvidesDescriptionSeq (const ProvidesDescriptionSeq &);
-      ~ProvidesDescriptionSeq (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef ProvidesDescriptionSeq_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
-    
-    class UsesDescriptionSeq;
-    
-    typedef
-      TAO_VarSeq_Var_T<
-          UsesDescriptionSeq,
-          UsesDescription
-        >
-      UsesDescriptionSeq_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          UsesDescriptionSeq,
-          UsesDescriptionSeq_var,
-          UsesDescription
-        >
-      UsesDescriptionSeq_out;
-    
-    class TAO_IFR_Client_Export UsesDescriptionSeq
-      : public
-          TAO_Unbounded_Sequence<
-              UsesDescription
-            >
-    {
-    public:
-      UsesDescriptionSeq (void);
-      UsesDescriptionSeq (CORBA::ULong max);
-      UsesDescriptionSeq (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          UsesDescription* buffer, 
-          CORBA::Boolean release = 0
-        );
-      UsesDescriptionSeq (const UsesDescriptionSeq &);
-      ~UsesDescriptionSeq (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef UsesDescriptionSeq_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
-    
-    class EventPortDescriptionSeq;
-    
-    typedef
-      TAO_VarSeq_Var_T<
-          EventPortDescriptionSeq,
-          EventPortDescription
-        >
-      EventPortDescriptionSeq_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          EventPortDescriptionSeq,
-          EventPortDescriptionSeq_var,
-          EventPortDescription
-        >
-      EventPortDescriptionSeq_out;
-    
-    class TAO_IFR_Client_Export EventPortDescriptionSeq
-      : public
-          TAO_Unbounded_Sequence<
-              EventPortDescription
-            >
-    {
-    public:
-      EventPortDescriptionSeq (void);
-      EventPortDescriptionSeq (CORBA::ULong max);
-      EventPortDescriptionSeq (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          EventPortDescription* buffer, 
-          CORBA::Boolean release = 0
-        );
-      EventPortDescriptionSeq (const EventPortDescriptionSeq &);
-      ~EventPortDescriptionSeq (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef EventPortDescriptionSeq_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq;
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct ComponentDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          ComponentDescription
-        >
-      ComponentDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          ComponentDescription,
-          ComponentDescription_var
-        >
-      ComponentDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export ComponentDescription
-    {
-      typedef ComponentDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager base_component;
-      CORBA::RepositoryIdSeq supported_interfaces;
-      CORBA::ComponentIR::ProvidesDescriptionSeq provided_interfaces;
-      CORBA::ComponentIR::UsesDescriptionSeq used_interfaces;
-      CORBA::ComponentIR::EventPortDescriptionSeq emits_events;
-      CORBA::ComponentIR::EventPortDescriptionSeq publishes_events;
-      CORBA::ComponentIR::EventPortDescriptionSeq consumes_events;
-      CORBA::ExtAttrDescriptionSeq attributes;
-      CORBA::TypeCode_var type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_
-    
-    class FactoryDef;
-    typedef FactoryDef *FactoryDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          FactoryDef
-        >
-      FactoryDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          FactoryDef
-        >
-      FactoryDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF_CH_
-    
-    class TAO_IFR_Client_Export FactoryDef
-      : public virtual ::CORBA::OperationDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<FactoryDef>;
-      typedef FactoryDef_ptr _ptr_type;
-      typedef FactoryDef_var _var_type;
-      
-      // The static operations.
-      static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
-      
-      static void _tao_release (FactoryDef_ptr obj);
-      
-      static FactoryDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static FactoryDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static FactoryDef_ptr _nil (void)
-      {
-        return static_cast<FactoryDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      FactoryDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_FactoryDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      FactoryDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      FactoryDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~FactoryDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      FactoryDef (const FactoryDef &);
-      
-      void operator= (const FactoryDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FactoryDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_interface.cpp:598
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_
-    
-    class FinderDef;
-    typedef FinderDef *FinderDef_ptr;
-    
-    typedef
-      TAO_Objref_Var_T<
-          FinderDef
-        >
-      FinderDef_var;
-    
-    typedef
-      TAO_Objref_Out_T<
-          FinderDef
-        >
-      FinderDef_out;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF_CH_
-    
-    class TAO_IFR_Client_Export FinderDef
-      : public virtual ::CORBA::OperationDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<FinderDef>;
-      typedef FinderDef_ptr _ptr_type;
-      typedef FinderDef_var _var_type;
-      
-      // The static operations.
-      static FinderDef_ptr _duplicate (FinderDef_ptr obj);
-      
-      static void _tao_release (FinderDef_ptr obj);
-      
-      static FinderDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static FinderDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static FinderDef_ptr _nil (void)
-      {
-        return static_cast<FinderDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      FinderDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_FinderDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      FinderDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      FinderDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~FinderDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      FinderDef (const FinderDef &);
-      
-      void operator= (const FinderDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FinderDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF_CH_
-    
-    class TAO_IFR_Client_Export HomeDef
-      : public virtual ::CORBA::ExtInterfaceDef
-    {
-    public:
-      friend class TAO::Narrow_Utils<HomeDef>;
-      typedef HomeDef_ptr _ptr_type;
-      typedef HomeDef_var _var_type;
-      
-      // The static operations.
-      static HomeDef_ptr _duplicate (HomeDef_ptr obj);
-      
-      static void _tao_release (HomeDef_ptr obj);
-      
-      static HomeDef_ptr _narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static HomeDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      static HomeDef_ptr _nil (void)
-      {
-        return static_cast<HomeDef_ptr> (0);
-      }
-      
-      static void _tao_any_destructor (void *);
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
-          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 base_home (
-          ::CORBA::ComponentIR::HomeDef_ptr base_home
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          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 supported_interfaces (
-          const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-          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 managed_component (
-          ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ValueDef_ptr primary_key (
-          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 primary_key (
-          ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory (
-          const char * id,
-          const char * name,
-          const char * version,
-          const ::CORBA::ParDescriptionSeq & params,
-          const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_operation/operation_ch.cpp:46
-      
-      virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder (
-          const char * id,
-          const char * name,
-          const char * version,
-          const ::CORBA::ParDescriptionSeq & params,
-          const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-        ));
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_interface/interface_ch.cpp:210
-      
-      virtual CORBA::Boolean _is_a (
-          const char *type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      
-      virtual const char* _interface_repository_id (void) const;
-      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-    private:
-      TAO::Collocation_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-    
-    protected:
-      // Concrete interface only.
-      HomeDef (void);
-      
-      // These methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode.
-      virtual void CORBA_ComponentIR_HomeDef_setup_collocation (void);
-      
-      // Concrete non-local interface only.
-      HomeDef (
-          IOP::IOR *ior,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      // Non-local interface only.
-      HomeDef (
-          TAO_Stub *objref,
-          CORBA::Boolean _tao_collocated = 0,
-          TAO_Abstract_ServantBase *servant = 0,
-          TAO_ORB_Core *orb_core = 0
-        );
-      
-      virtual ~HomeDef (void);
-    
-    private:
-      // Private and unimplemented for concrete interfaces.
-      HomeDef (const HomeDef &);
-      
-      void operator= (const HomeDef &);
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDef;
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct HomeDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          HomeDescription
-        >
-      HomeDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          HomeDescription,
-          HomeDescription_var
-        >
-      HomeDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export HomeDescription
-    {
-      typedef HomeDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      TAO_String_Manager base_home;
-      TAO_String_Manager managed_component;
-      CORBA::ValueDescription primary_key;
-      CORBA::OpDescriptionSeq factories;
-      CORBA::OpDescriptionSeq finders;
-      CORBA::OpDescriptionSeq operations;
-      CORBA::ExtAttrDescriptionSeq attributes;
-      CORBA::TypeCode_var type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_module/module_ch.cpp:66
-  
-  } // module CORBA::ComponentIR
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
-  {
-    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ComponentDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
-  {
-    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::HomeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef>
-  {
-    static ::CORBA::ComponentIR::EventDef_ptr duplicate (
-        ::CORBA::ComponentIR::EventDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::EventDef_ptr
-      );
-    static ::CORBA::ComponentIR::EventDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::EventDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container>
-  {
-    static ::CORBA::ComponentIR::Container_ptr duplicate (
-        ::CORBA::ComponentIR::Container_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::Container_ptr
-      );
-    static ::CORBA::ComponentIR::Container_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::Container_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef>
-  {
-    static ::CORBA::ComponentIR::ModuleDef_ptr duplicate (
-        ::CORBA::ComponentIR::ModuleDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ModuleDef_ptr
-      );
-    static ::CORBA::ComponentIR::ModuleDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ModuleDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository>
-  {
-    static ::CORBA::ComponentIR::Repository_ptr duplicate (
-        ::CORBA::ComponentIR::Repository_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::Repository_ptr
-      );
-    static ::CORBA::ComponentIR::Repository_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::Repository_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef>
-  {
-    static ::CORBA::ComponentIR::ProvidesDef_ptr duplicate (
-        ::CORBA::ComponentIR::ProvidesDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ProvidesDef_ptr
-      );
-    static ::CORBA::ComponentIR::ProvidesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ProvidesDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_USESDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef>
-  {
-    static ::CORBA::ComponentIR::UsesDef_ptr duplicate (
-        ::CORBA::ComponentIR::UsesDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::UsesDef_ptr
-      );
-    static ::CORBA::ComponentIR::UsesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::UsesDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef>
-  {
-    static ::CORBA::ComponentIR::EventPortDef_ptr duplicate (
-        ::CORBA::ComponentIR::EventPortDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::EventPortDef_ptr
-      );
-    static ::CORBA::ComponentIR::EventPortDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::EventPortDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef>
-  {
-    static ::CORBA::ComponentIR::EmitsDef_ptr duplicate (
-        ::CORBA::ComponentIR::EmitsDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::EmitsDef_ptr
-      );
-    static ::CORBA::ComponentIR::EmitsDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::EmitsDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef>
-  {
-    static ::CORBA::ComponentIR::PublishesDef_ptr duplicate (
-        ::CORBA::ComponentIR::PublishesDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::PublishesDef_ptr
-      );
-    static ::CORBA::ComponentIR::PublishesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::PublishesDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef>
-  {
-    static ::CORBA::ComponentIR::ConsumesDef_ptr duplicate (
-        ::CORBA::ComponentIR::ConsumesDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ConsumesDef_ptr
-      );
-    static ::CORBA::ComponentIR::ConsumesDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ConsumesDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef>
-  {
-    static ::CORBA::ComponentIR::FactoryDef_ptr duplicate (
-        ::CORBA::ComponentIR::FactoryDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::FactoryDef_ptr
-      );
-    static ::CORBA::ComponentIR::FactoryDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::FactoryDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef>
-  {
-    static ::CORBA::ComponentIR::FinderDef_ptr duplicate (
-        ::CORBA::ComponentIR::FinderDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::FinderDef_ptr
-      );
-    static ::CORBA::ComponentIR::FinderDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::FinderDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Container_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Repository_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ComponentDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ComponentDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ComponentDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::HomeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::HomeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::HomeDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::Container_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::Container_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ModuleDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::Repository_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ProvidesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ProvidesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ProvidesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ProvidesDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::UsesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::UsesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::UsesDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::UsesDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventPortDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventPortDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EventPortDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EventPortDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::EmitsDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::EmitsDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::PublishesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::PublishesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ConsumesDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ConsumesDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ComponentDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ComponentDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ComponentIR::ProvidesDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ComponentIR::UsesDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ComponentIR::UsesDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ComponentIR::EventPortDescriptionSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ComponentIR::EventPortDescriptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::ComponentDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::ComponentDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::FactoryDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::FactoryDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::FinderDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::FinderDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::HomeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ComponentIR::HomeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDescription &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "IFR_ComponentsC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
deleted file mode 100644
index 63e656401e4..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl
+++ /dev/null
@@ -1,531 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF___CI_)
-#define _CORBA_COMPONENTIR_EVENTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EventDef::EventDef (
-    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_EventDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventDef::EventDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EventDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER___CI_)
-#define _CORBA_COMPONENTIR_CONTAINER___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::Container::Container (
-    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_Container_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Container_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::Container::Container (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Container_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF___CI_)
-#define _CORBA_COMPONENTIR_MODULEDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ModuleDef::ModuleDef (
-    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_ModuleDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ModuleDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ModuleDef::ModuleDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ModuleDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY___CI_)
-#define _CORBA_COMPONENTIR_REPOSITORY___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::Repository::Repository (
-    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_Repository_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_Repository_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::Repository::Repository (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Repository_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___CI_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDef::ProvidesDef (
-    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_ProvidesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ProvidesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDef::ProvidesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ProvidesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF___CI_)
-#define _CORBA_COMPONENTIR_USESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDef::UsesDef (
-    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_UsesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_UsesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDef::UsesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_UsesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___CI_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDef::EventPortDef (
-    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_EventPortDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EventPortDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDef::EventPortDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EventPortDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF___CI_)
-#define _CORBA_COMPONENTIR_EMITSDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EmitsDef::EmitsDef (
-    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_EmitsDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_EmitsDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EmitsDef::EmitsDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_EmitsDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___CI_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::PublishesDef::PublishesDef (
-    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_PublishesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_PublishesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::PublishesDef::PublishesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_PublishesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___CI_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ConsumesDef::ConsumesDef (
-    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_ConsumesDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ConsumesDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ConsumesDef::ConsumesDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ConsumesDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___CI_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDef::ComponentDef (
-    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_ComponentDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_ComponentDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDef::ComponentDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ComponentDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___CI_)
-#define _CORBA_COMPONENTIR_FACTORYDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::FactoryDef::FactoryDef (
-    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_FactoryDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FactoryDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::FactoryDef::FactoryDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FactoryDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF___CI_)
-#define _CORBA_COMPONENTIR_FINDERDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::FinderDef::FinderDef (
-    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_FinderDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_FinderDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::FinderDef::FinderDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FinderDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___CI_)
-#define _CORBA_COMPONENTIR_HOMEDEF___CI_
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDef::HomeDef (
-    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_HomeDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ComponentIR_HomeDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDef::HomeDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_HomeDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
deleted file mode 100644
index 7a6a0ee51c8..00000000000
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Extended.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to fixed types and valuetypes.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -I../.. -GA \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
-//
-//   The only modification necessary to the skelton files is to
-//   change
-//
-//   #include "IFR_ExtendedC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_ExtendedC.h"
-//
-//   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
-
-#ifndef _IFR_EXTENDED_IDL_
-#define _IFR_EXTENDED_IDL_
-
-#include "tao/IFR_Client/IFR_Basic.pidl"
-#include <Visibility.pidl>
-#include <ValueModifier.pidl>
-
-module CORBA
-{
-  typeprefix CORBA "omg.org";
-
-// Already defined in other files, included above
-/*
-  typedef short ValueModifier;
-  const ValueModifier VM_NONE = 0;
-  const ValueModifier VM_CUSTOM = 1;
-  const ValueModifier VM_ABSTRACT = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-
-  typedef short Visibility;
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER = 1;
-*/
-  interface FixedDef : IDLType
-  {
-    attribute unsigned short digits;
-    attribute short scale;
-  };
-
-  struct ValueMember
-  {
-    Identifier name;
-    RepositoryId id;
-    RepositoryId defined_in;
-    VersionSpec version;
-    TypeCode type;
-    IDLType type_def;
-    Visibility access;
-  };
-
-  typedef sequence <ValueMember> ValueMemberSeq;
-
-  interface ValueMemberDef : Contained
-  {
-    readonly attribute TypeCode type;
-    attribute IDLType type_def;
-    attribute Visibility access;
-  };
-
-  interface ValueDef : Container,
-		       Contained,
-		       IDLType
-  {
-    // read/write interface
-    attribute InterfaceDefSeq supported_interfaces;
-    attribute InitializerSeq initializers;
-    attribute ValueDef base_value;
-    attribute ValueDefSeq abstract_base_values;
-    // read interface
-    attribute boolean is_abstract;
-    attribute boolean is_custom;
-    attribute boolean is_truncatable;
-    boolean is_a (
-        in RepositoryId id
-      );
-
-    struct FullValueDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      boolean is_abstract;
-      boolean is_custom;
-      RepositoryId defined_in;
-      VersionSpec version;
-      OpDescriptionSeq operations;
-      AttrDescriptionSeq attributes;
-      ValueMemberSeq members;
-      InitializerSeq initializers;
-      RepositoryIdSeq supported_interfaces;
-      RepositoryIdSeq abstract_base_values;
-      boolean is_truncatable;
-      RepositoryId base_value;
-      TypeCode type;
-    };
-
-    FullValueDescription describe_value ();
-
-    ValueMemberDef create_value_member  (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType type,
-        in Visibility access
-      );
-    AttributeDef create_attribute (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType type,
-        in AttributeMode mode
-      );
-    OperationDef create_operation (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType result,
-        in OperationMode mode,
-        in ParDescriptionSeq params,
-        in ExceptionDefSeq exceptions,
-        in ContextIdSeq contexts
-      );
-  };
-
-  struct ValueDescription
-  {
-    Identifier name;
-    RepositoryId id;
-    boolean is_abstract;
-    boolean is_custom;
-    RepositoryId defined_in;
-    VersionSpec version;
-    RepositoryIdSeq supported_interfaces;
-    RepositoryIdSeq abstract_base_values;
-    boolean is_truncatable;
-    RepositoryId base_value;
-  };
-
-  interface ExtValueDef : ValueDef
-  {
-    // read/write interface
-    attribute ExtInitializerSeq ext_initializers;
-
-    // read interface
-    struct ExtFullValueDescription
-    {
-      Identifier name;
-      RepositoryId id;
-      boolean is_abstract;
-      boolean is_custom;
-      RepositoryId defined_in;
-      VersionSpec version;
-      OpDescriptionSeq operations;
-      ExtAttrDescriptionSeq attributes;
-      ValueMemberSeq members;
-      ExtInitializerSeq initializers;
-      RepositoryIdSeq supported_interfaces;
-      RepositoryIdSeq abstract_base_values;
-      boolean is_truncatable;
-      RepositoryId base_value;
-      TypeCode type;
-    };
-
-    ExtFullValueDescription describe_ext_value ();
-
-    // write interface
-    ExtAttributeDef create_ext_attribute (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in IDLType type,
-	in AttributeMode mode,
-	in ExceptionDefSeq get_exceptions,
-	in ExceptionDefSeq set_exceptions
-      );
-  };
-
-  interface ValueBoxDef : TypedefDef
-  {
-    attribute IDLType original_type_def;
-  };
-};
-
-#endif /* _IFR_EXTENDED_IDL_ */
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
deleted file mode 100644
index 8fe4284ea71..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ExtendedC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FixedDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/FixedDef:1.0",
-    "FixedDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FixedDef =
-    &_tao_tc_CORBA_FixedDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "access", &CORBA::_tc_Visibility }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueMember:1.0",
-    "ValueMember",
-    _tao_fields_CORBA_ValueMember,
-    7);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMember =
-    &_tao_tc_CORBA_ValueMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
-      &CORBA_ValueMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
-    "ValueMemberSeq",
-    &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
-    &_tao_tc_CORBA_ValueMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueMemberDef:1.0",
-    "ValueMemberDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
-    &_tao_tc_CORBA_ValueMemberDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_InitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef_FullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
-    "FullValueDescription",
-    _tao_fields_CORBA_ValueDef_FullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
-  &_tao_tc_CORBA_ValueDef_FullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueDef:1.0",
-    "ValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDef =
-    &_tao_tc_CORBA_ValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDescription:1.0",
-    "ValueDescription",
-    _tao_fields_CORBA_ValueDescription,
-    10);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDescription =
-    &_tao_tc_CORBA_ValueDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_ExtInitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
-    "ExtFullValueDescription",
-    _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
-  &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtValueDef:1.0",
-    "ExtValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
-    &_tao_tc_CORBA_ExtValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueBoxDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueBoxDef:1.0",
-    "ValueBoxDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
-    &_tao_tc_CORBA_ValueBoxDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::FixedDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr _tao_elem
-  )
-{
-  CORBA::FixedDef_ptr _tao_objptr =
-    CORBA::FixedDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
-      _tao_any,
-      CORBA::FixedDef::_tao_any_destructor,
-      CORBA::_tc_FixedDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
-        _tao_any,
-        CORBA::FixedDef::_tao_any_destructor,
-        CORBA::_tc_FixedDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
-      _tao_any,
-      CORBA::ValueMember::_tao_any_destructor,
-      CORBA::_tc_ValueMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert (
-      _tao_any,
-      CORBA::ValueMember::_tao_any_destructor,
-      CORBA::_tc_ValueMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueMember>::extract (
-        _tao_any,
-        CORBA::ValueMember::_tao_any_destructor,
-        CORBA::_tc_ValueMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
-        _tao_any,
-        CORBA::ValueMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueMemberDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueMemberDef_ptr _tao_objptr =
-    CORBA::ValueMemberDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
-      _tao_any,
-      CORBA::ValueMemberDef::_tao_any_destructor,
-      CORBA::_tc_ValueMemberDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
-        _tao_any,
-        CORBA::ValueMemberDef::_tao_any_destructor,
-        CORBA::_tc_ValueMemberDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueDef_ptr _tao_objptr =
-    CORBA::ValueDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
-      _tao_any,
-      CORBA::ValueDef::_tao_any_destructor,
-      CORBA::_tc_ValueDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
-        _tao_any,
-        CORBA::ValueDef::_tao_any_destructor,
-        CORBA::_tc_ValueDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-      CORBA::ValueDef::_tc_FullValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert (
-      _tao_any,
-      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-      CORBA::ValueDef::_tc_FullValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDef::FullValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::extract (
-        _tao_any,
-        CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-        CORBA::ValueDef::_tc_FullValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ValueDescription::_tao_any_destructor,
-      CORBA::_tc_ValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert (
-      _tao_any,
-      CORBA::ValueDescription::_tao_any_destructor,
-      CORBA::_tc_ValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
-        _tao_any,
-        CORBA::ValueDescription::_tao_any_destructor,
-        CORBA::_tc_ValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtValueDef_ptr _tao_objptr =
-    CORBA::ExtValueDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtValueDef>::insert (
-      _tao_any,
-      CORBA::ExtValueDef::_tao_any_destructor,
-      CORBA::_tc_ExtValueDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtValueDef>::extract (
-        _tao_any,
-        CORBA::ExtValueDef::_tao_any_destructor,
-        CORBA::_tc_ExtValueDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef::ExtFullValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert (
-      _tao_any,
-      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtValueDef::ExtFullValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::extract (
-        _tao_any,
-        CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-        CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueBoxDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueBoxDef_ptr _tao_objptr =
-    CORBA::ValueBoxDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
-      _tao_any,
-      CORBA::ValueBoxDef::_tao_any_destructor,
-      CORBA::_tc_ValueBoxDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
-        _tao_any,
-        CORBA::ValueBoxDef::_tao_any_destructor,
-        CORBA::_tc_ValueBoxDef,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
deleted file mode 100644
index b4b2c709440..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ /dev/null
@@ -1,3270 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IFR_ExtendedC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.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 "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::IDLType>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::IDLType_ptr,
-            CORBA::IDLType_var,
-            CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDefSeq,
-            CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueDef_ptr,
-            CORBA::ValueDef_var,
-            CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ValueDef::FullValueDescription>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDef::FullValueDescription,
-            CORBA::ValueDef::FullValueDescription_var,
-            CORBA::ValueDef::FullValueDescription_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::InitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InitializerSeq,
-            CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ValueDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDefSeq,
-            CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
-
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtValueDef::ExtFullValueDescription,
-            CORBA::ExtValueDef::ExtFullValueDescription_var,
-            CORBA::ExtValueDef::ExtFullValueDescription_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExtInitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtInitializerSeq,
-            CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ExceptionDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExceptionDefSeq,
-            CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::AttributeMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::AttributeMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::AttributeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::AttributeDef_ptr,
-            CORBA::AttributeDef_var,
-            CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ExtAttributeDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ExtAttributeDef_ptr,
-            CORBA::ExtAttributeDef_var,
-            CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::OperationMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::OperationMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ParDescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ParDescriptionSeq,
-            CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::ContextIdSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ContextIdSeq,
-            CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::OperationDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::OperationDef_ptr,
-            CORBA::OperationDef_var,
-            CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::ValueMemberDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueMemberDef_ptr,
-            CORBA::ValueMemberDef_var,
-            CORBA::ValueMemberDef_out,
-            TAO::Objref_Traits<CORBA::ValueMemberDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::FixedDef.
-
-CORBA::FixedDef_ptr
-TAO::Objref_Traits<CORBA::FixedDef>::duplicate (
-    CORBA::FixedDef_ptr p
-  )
-{
-  return CORBA::FixedDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::FixedDef>::release (
-    CORBA::FixedDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::FixedDef_ptr
-TAO::Objref_Traits<CORBA::FixedDef>::nil (void)
-{
-  return CORBA::FixedDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::FixedDef>::marshal (
-    CORBA::FixedDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::UShort CORBA::FixedDef::digits (
-    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_FixedDef_Proxy_Broker_ == 0)
-    {
-      CORBA_FixedDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::UShort>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_digits",
-      11,
-      this->the_TAO_FixedDef_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 CORBA::FixedDef::digits (
-    ::CORBA::UShort digits
-    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_FixedDef_Proxy_Broker_ == 0)
-    {
-      CORBA_FixedDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_digits
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_digits",
-      11,
-      this->the_TAO_FixedDef_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
-
-CORBA::Short CORBA::FixedDef::scale (
-    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_FixedDef_Proxy_Broker_ == 0)
-    {
-      CORBA_FixedDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::Short>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_scale",
-      10,
-      this->the_TAO_FixedDef_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 CORBA::FixedDef::scale (
-    ::CORBA::Short scale
-    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_FixedDef_Proxy_Broker_ == 0)
-    {
-      CORBA_FixedDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_scale
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_scale",
-      10,
-      this->the_TAO_FixedDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::FixedDef::FixedDef (void)
- : the_TAO_FixedDef_Proxy_Broker_ (0)
-{
-  this->CORBA_FixedDef_setup_collocation ();
-}
-
-void
-CORBA::FixedDef::CORBA_FixedDef_setup_collocation ()
-{
-  if (::CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_FixedDef_Proxy_Broker_ =
-        ::CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::FixedDef::~FixedDef (void)
-{}
-
-void 
-CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  FixedDef *_tao_tmp_pointer =
-    static_cast<FixedDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::FixedDef_ptr
-CORBA::FixedDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FixedDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/FixedDef:1.0",
-        CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::FixedDef_ptr
-CORBA::FixedDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<FixedDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/FixedDef:1.0",
-        CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::FixedDef_ptr
-CORBA::FixedDef::_duplicate (FixedDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::FixedDef::_tao_release (FixedDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::FixedDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/FixedDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::FixedDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/FixedDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ValueMember::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ValueMember *_tao_tmp_pointer =
-    static_cast<ValueMember *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
-#define _CORBA_VALUEMEMBERSEQ_CS_
-
-CORBA::ValueMemberSeq::ValueMemberSeq (void)
-{}
-
-CORBA::ValueMemberSeq::ValueMemberSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
-      >
-    (max)
-{}
-
-CORBA::ValueMemberSeq::ValueMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ValueMember * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ValueMemberSeq::ValueMemberSeq (
-    const ValueMemberSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
-      >
-    (seq)
-{}
-
-CORBA::ValueMemberSeq::~ValueMemberSeq (void)
-{}
-
-void CORBA::ValueMemberSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ValueMemberSeq * _tao_tmp_pointer =
-    static_cast<ValueMemberSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ValueMemberDef.
-
-CORBA::ValueMemberDef_ptr
-TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate (
-    CORBA::ValueMemberDef_ptr p
-  )
-{
-  return CORBA::ValueMemberDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ValueMemberDef>::release (
-    CORBA::ValueMemberDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ValueMemberDef_ptr
-TAO::Objref_Traits<CORBA::ValueMemberDef>::nil (void)
-{
-  return CORBA::ValueMemberDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal (
-    CORBA::ValueMemberDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
-    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_ValueMemberDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueMemberDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type",
-      9,
-      this->the_TAO_ValueMemberDef_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
-
-::CORBA::IDLType_ptr CORBA::ValueMemberDef::type_def (
-    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_ValueMemberDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueMemberDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_type_def",
-      13,
-      this->the_TAO_ValueMemberDef_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 CORBA::ValueMemberDef::type_def (
-    ::CORBA::IDLType_ptr type_def
-    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_ValueMemberDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueMemberDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_type_def",
-      13,
-      this->the_TAO_ValueMemberDef_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
-
-CORBA::Visibility CORBA::ValueMemberDef::access (
-    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_ValueMemberDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueMemberDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::Visibility>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_access",
-      11,
-      this->the_TAO_ValueMemberDef_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 CORBA::ValueMemberDef::access (
-    ::CORBA::Visibility access
-    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_ValueMemberDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueMemberDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_access
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_access",
-      11,
-      this->the_TAO_ValueMemberDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ValueMemberDef::ValueMemberDef (void)
- : the_TAO_ValueMemberDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueMemberDef_setup_collocation ();
-}
-
-void
-CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ValueMemberDef_Proxy_Broker_ =
-        ::CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Contained_setup_collocation ();
-}
-
-CORBA::ValueMemberDef::~ValueMemberDef (void)
-{}
-
-void 
-CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ValueMemberDef *_tao_tmp_pointer =
-    static_cast<ValueMemberDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueMemberDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueMemberDef:1.0",
-        CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueMemberDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueMemberDef:1.0",
-        CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ValueMemberDef::_tao_release (ValueMemberDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ValueMemberDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ValueMemberDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ValueDef.
-
-CORBA::ValueDef_ptr
-TAO::Objref_Traits<CORBA::ValueDef>::duplicate (
-    CORBA::ValueDef_ptr p
-  )
-{
-  return CORBA::ValueDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ValueDef>::release (
-    CORBA::ValueDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ValueDef_ptr
-TAO::Objref_Traits<CORBA::ValueDef>::nil (void)
-{
-  return CORBA::ValueDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueDef>::marshal (
-    CORBA::ValueDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::InterfaceDefSeq * CORBA::ValueDef::supported_interfaces (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_supported_interfaces",
-      25,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::supported_interfaces (
-    const ::CORBA::InterfaceDefSeq & supported_interfaces
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_supported_interfaces
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_supported_interfaces",
-      25,
-      this->the_TAO_ValueDef_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
-
-::CORBA::InitializerSeq * CORBA::ValueDef::initializers (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::InitializerSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_initializers",
-      17,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::initializers (
-    const ::CORBA::InitializerSeq & initializers
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_initializers
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_initializers",
-      17,
-      this->the_TAO_ValueDef_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
-
-::CORBA::ValueDef_ptr CORBA::ValueDef::base_value (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_base_value",
-      15,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::base_value (
-    ::CORBA::ValueDef_ptr base_value
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_base_value
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_base_value",
-      15,
-      this->the_TAO_ValueDef_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
-
-::CORBA::ValueDefSeq * CORBA::ValueDef::abstract_base_values (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_abstract_base_values",
-      25,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::abstract_base_values (
-    const ::CORBA::ValueDefSeq & abstract_base_values
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_abstract_base_values
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_abstract_base_values",
-      25,
-      this->the_TAO_ValueDef_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
-
-CORBA::Boolean CORBA::ValueDef::is_abstract (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_is_abstract",
-      16,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::is_abstract (
-    ::CORBA::Boolean is_abstract
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_is_abstract
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_is_abstract",
-      16,
-      this->the_TAO_ValueDef_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
-
-CORBA::Boolean CORBA::ValueDef::is_custom (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_is_custom",
-      14,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::is_custom (
-    ::CORBA::Boolean is_custom
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_is_custom
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_is_custom",
-      14,
-      this->the_TAO_ValueDef_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
-
-CORBA::Boolean CORBA::ValueDef::is_truncatable (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_is_truncatable",
-      19,
-      this->the_TAO_ValueDef_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 CORBA::ValueDef::is_truncatable (
-    ::CORBA::Boolean is_truncatable
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_is_truncatable
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_is_truncatable",
-      19,
-      this->the_TAO_ValueDef_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
-
-CORBA::Boolean CORBA::ValueDef::is_a (
-    const char * id
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "is_a",
-      4,
-      this->the_TAO_ValueDef_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_structure/structure_cs.cpp:66
-
-void 
-CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  FullValueDescription *_tao_tmp_pointer =
-    static_cast<FullValueDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe_value",
-      14,
-      this->the_TAO_ValueDef_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
-
-::CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    ::CORBA::Visibility access
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ValueMemberDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_access
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_value_member",
-      19,
-      this->the_TAO_ValueDef_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
-
-::CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    ::CORBA::AttributeMode mode
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_mode
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      6,
-      "create_attribute",
-      16,
-      this->the_TAO_ValueDef_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
-
-::CORBA::OperationDef_ptr CORBA::ValueDef::create_operation (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr result,
-    ::CORBA::OperationMode mode,
-    const ::CORBA::ParDescriptionSeq & params,
-    const ::CORBA::ExceptionDefSeq & exceptions,
-    const ::CORBA::ContextIdSeq & contexts
-    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_ValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_result,
-      &_tao_mode,
-      &_tao_params,
-      &_tao_exceptions,
-      &_tao_contexts
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      9,
-      "create_operation",
-      16,
-      this->the_TAO_ValueDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ValueDef::ValueDef (void)
- : the_TAO_ValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueDef_setup_collocation ();
-}
-
-void
-CORBA::ValueDef::CORBA_ValueDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ValueDef_Proxy_Broker_ =
-        ::CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_Container_setup_collocation ();
-  this->CORBA_Contained_setup_collocation ();
-  this->CORBA_IDLType_setup_collocation ();
-}
-
-CORBA::ValueDef::~ValueDef (void)
-{}
-
-void 
-CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ValueDef *_tao_tmp_pointer =
-    static_cast<ValueDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ValueDef_ptr
-CORBA::ValueDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueDef:1.0",
-        CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueDef_ptr
-CORBA::ValueDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueDef:1.0",
-        CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueDef_ptr
-CORBA::ValueDef::_duplicate (ValueDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ValueDef::_tao_release (ValueDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ValueDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ValueDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ValueDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ValueDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ValueDescription *_tao_tmp_pointer =
-    static_cast<ValueDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ExtValueDef.
-
-CORBA::ExtValueDef_ptr
-TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate (
-    CORBA::ExtValueDef_ptr p
-  )
-{
-  return CORBA::ExtValueDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ExtValueDef>::release (
-    CORBA::ExtValueDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ExtValueDef_ptr
-TAO::Objref_Traits<CORBA::ExtValueDef>::nil (void)
-{
-  return CORBA::ExtValueDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ExtValueDef>::marshal (
-    CORBA::ExtValueDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ExtInitializerSeq * CORBA::ExtValueDef::ext_initializers (
-    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_ExtValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_ext_initializers",
-      21,
-      this->the_TAO_ExtValueDef_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 CORBA::ExtValueDef::ext_initializers (
-    const ::CORBA::ExtInitializerSeq & ext_initializers
-    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_ExtValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_ext_initializers
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_ext_initializers",
-      21,
-      this->the_TAO_ExtValueDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ExtFullValueDescription *_tao_tmp_pointer =
-    static_cast<ExtFullValueDescription *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::ExtValueDef::ExtFullValueDescription * CORBA::ExtValueDef::describe_ext_value (
-    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_ExtValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "describe_ext_value",
-      18,
-      this->the_TAO_ExtValueDef_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
-
-::CORBA::ExtAttributeDef_ptr CORBA::ExtValueDef::create_ext_attribute (
-    const char * id,
-    const char * name,
-    const char * version,
-    ::CORBA::IDLType_ptr type,
-    ::CORBA::AttributeMode mode,
-    const ::CORBA::ExceptionDefSeq & get_exceptions,
-    const ::CORBA::ExceptionDefSeq & set_exceptions
-    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_ExtValueDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ExtValueDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_id,
-      &_tao_name,
-      &_tao_version,
-      &_tao_type,
-      &_tao_mode,
-      &_tao_get_exceptions,
-      &_tao_set_exceptions
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      8,
-      "create_ext_attribute",
-      20,
-      this->the_TAO_ExtValueDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
-CORBA::ExtValueDef::ExtValueDef (void)
- : the_TAO_ExtValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtValueDef_setup_collocation ();
-}
-
-void
-CORBA::ExtValueDef::CORBA_ExtValueDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ExtValueDef_Proxy_Broker_ =
-        ::CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_ValueDef_setup_collocation ();
-}
-
-CORBA::ExtValueDef::~ExtValueDef (void)
-{}
-
-void 
-CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtValueDef *_tao_tmp_pointer =
-    static_cast<ExtValueDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtValueDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtValueDef:1.0",
-        CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ExtValueDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ExtValueDef:1.0",
-        CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef::_duplicate (ExtValueDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ExtValueDef::_tao_release (ExtValueDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ExtValueDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Container:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ValueDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ExtValueDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ExtValueDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ExtValueDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::ValueBoxDef.
-
-CORBA::ValueBoxDef_ptr
-TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate (
-    CORBA::ValueBoxDef_ptr p
-  )
-{
-  return CORBA::ValueBoxDef::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::ValueBoxDef>::release (
-    CORBA::ValueBoxDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::ValueBoxDef_ptr
-TAO::Objref_Traits<CORBA::ValueBoxDef>::nil (void)
-{
-  return CORBA::ValueBoxDef::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal (
-    CORBA::ValueBoxDef_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::IDLType_ptr CORBA::ValueBoxDef::original_type_def (
-    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_ValueBoxDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueBoxDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_original_type_def",
-      22,
-      this->the_TAO_ValueBoxDef_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 CORBA::ValueBoxDef::original_type_def (
-    ::CORBA::IDLType_ptr original_type_def
-    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_ValueBoxDef_Proxy_Broker_ == 0)
-    {
-      CORBA_ValueBoxDef_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_original_type_def
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "_set_original_type_def",
-      22,
-      this->the_TAO_ValueBoxDef_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::ValueBoxDef::ValueBoxDef (void)
- : the_TAO_ValueBoxDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueBoxDef_setup_collocation ();
-}
-
-void
-CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation ()
-{
-  if (::CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ValueBoxDef_Proxy_Broker_ =
-        ::CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
-    }
-  
-  this->CORBA_TypedefDef_setup_collocation ();
-}
-
-CORBA::ValueBoxDef::~ValueBoxDef (void)
-{}
-
-void 
-CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ValueBoxDef *_tao_tmp_pointer =
-    static_cast<ValueBoxDef *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueBoxDef>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueBoxDef:1.0",
-        CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ValueBoxDef>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/ValueBoxDef:1.0",
-        CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::ValueBoxDef::_tao_release (ValueBoxDef_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::ValueBoxDef::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IRObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Contained:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/IDLType:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypedefDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
-}
-
-CORBA::Boolean
-CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::FixedDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::FixedDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::FixedDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMember &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.type.in ()) &&
-    CORBA::Object::marshal (
-        _tao_aggregate.type_def.in (),
-        strm
-      ) &&
-    (strm << _tao_aggregate.access);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMember &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.type.out ()) &&
-    (strm >> _tao_aggregate.type_def.out ()) &&
-    (strm >> _tao_aggregate.access);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMemberSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMemberSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMemberDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMemberDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ValueMemberDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDef::FullValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.members) &&
-    (strm << _tao_aggregate.initializers) &&
-    (strm << _tao_aggregate.supported_interfaces) &&
-    (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm << _tao_aggregate.base_value.in ()) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDef::FullValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.members) &&
-    (strm >> _tao_aggregate.initializers) &&
-    (strm >> _tao_aggregate.supported_interfaces) &&
-    (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm >> _tao_aggregate.base_value.out ()) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ValueDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.supported_interfaces) &&
-    (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm << _tao_aggregate.base_value.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.supported_interfaces) &&
-    (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm >> _tao_aggregate.base_value.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
-    (strm << _tao_aggregate.defined_in.in ()) &&
-    (strm << _tao_aggregate.version.in ()) &&
-    (strm << _tao_aggregate.operations) &&
-    (strm << _tao_aggregate.attributes) &&
-    (strm << _tao_aggregate.members) &&
-    (strm << _tao_aggregate.initializers) &&
-    (strm << _tao_aggregate.supported_interfaces) &&
-    (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm << _tao_aggregate.base_value.in ()) &&
-    (strm << _tao_aggregate.type.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtValueDef::ExtFullValueDescription &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
-    (strm >> _tao_aggregate.defined_in.out ()) &&
-    (strm >> _tao_aggregate.version.out ()) &&
-    (strm >> _tao_aggregate.operations) &&
-    (strm >> _tao_aggregate.attributes) &&
-    (strm >> _tao_aggregate.members) &&
-    (strm >> _tao_aggregate.initializers) &&
-    (strm >> _tao_aggregate.supported_interfaces) &&
-    (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
-    (strm >> _tao_aggregate.base_value.out ()) &&
-    (strm >> _tao_aggregate.type.out ());
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExtValueDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExtValueDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ExtValueDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueBoxDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueBoxDef_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::ValueBoxDef RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
deleted file mode 100644
index b62da63b595..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ /dev/null
@@ -1,1570 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
-#define _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ifr_client_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/VisibilityC.h"
-#include "tao/ValueModifierC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_)
-#define _CORBA_FIXEDDEF__VAR_OUT_CH_
-  
-  class FixedDef;
-  typedef FixedDef *FixedDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        FixedDef
-      >
-    FixedDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        FixedDef
-      >
-    FixedDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_FIXEDDEF_CH_)
-#define _CORBA_FIXEDDEF_CH_
-  
-  class TAO_IFR_Client_Export FixedDef
-    : public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<FixedDef>;
-    typedef FixedDef_ptr _ptr_type;
-    typedef FixedDef_var _var_type;
-    
-    // The static operations.
-    static FixedDef_ptr _duplicate (FixedDef_ptr obj);
-    
-    static void _tao_release (FixedDef_ptr obj);
-    
-    static FixedDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static FixedDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static FixedDef_ptr _nil (void)
-    {
-      return static_cast<FixedDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::UShort digits (
-        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 digits (
-        ::CORBA::UShort digits
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Short scale (
-        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 scale (
-        ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    FixedDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_FixedDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    FixedDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    FixedDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~FixedDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    FixedDef (const FixedDef &);
-    
-    void operator= (const FixedDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FixedDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ValueMember;
-  
-  typedef
-    TAO_Var_Var_T<
-        ValueMember
-      >
-    ValueMember_var;
-  
-  typedef
-    TAO_Out_T<
-        ValueMember,
-        ValueMember_var
-      >
-    ValueMember_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ValueMember
-  {
-    typedef ValueMember_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::TypeCode_var type;
-    CORBA::IDLType_var type_def;
-    CORBA::Visibility access;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMember;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
-#define _CORBA_VALUEMEMBERSEQ_CH_
-  
-  class ValueMemberSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ValueMemberSeq,
-        ValueMember
-      >
-    ValueMemberSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ValueMemberSeq,
-        ValueMemberSeq_var,
-        ValueMember
-      >
-    ValueMemberSeq_out;
-  
-  class TAO_IFR_Client_Export ValueMemberSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ValueMember
-          >
-  {
-  public:
-    ValueMemberSeq (void);
-    ValueMemberSeq (CORBA::ULong max);
-    ValueMemberSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ValueMember* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ValueMemberSeq (const ValueMemberSeq &);
-    ~ValueMemberSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ValueMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_VALUEMEMBERDEF__VAR_OUT_CH_)
-#define _CORBA_VALUEMEMBERDEF__VAR_OUT_CH_
-  
-  class ValueMemberDef;
-  typedef ValueMemberDef *ValueMemberDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ValueMemberDef
-      >
-    ValueMemberDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ValueMemberDef
-      >
-    ValueMemberDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_VALUEMEMBERDEF_CH_)
-#define _CORBA_VALUEMEMBERDEF_CH_
-  
-  class TAO_IFR_Client_Export ValueMemberDef
-    : public virtual ::CORBA::Contained
-  {
-  public:
-    friend class TAO::Narrow_Utils<ValueMemberDef>;
-    typedef ValueMemberDef_ptr _ptr_type;
-    typedef ValueMemberDef_var _var_type;
-    
-    // The static operations.
-    static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj);
-    
-    static void _tao_release (ValueMemberDef_ptr obj);
-    
-    static ValueMemberDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueMemberDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueMemberDef_ptr _nil (void)
-    {
-      return static_cast<ValueMemberDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr type (
-        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 ::CORBA::IDLType_ptr type_def (
-        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 type_def (
-        ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Visibility access (
-        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 access (
-        ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ValueMemberDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ValueMemberDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ValueMemberDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ValueMemberDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ValueMemberDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ValueMemberDef (const ValueMemberDef &);
-    
-    void operator= (const ValueMemberDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
-#define _CORBA_VALUEDEF__VAR_OUT_CH_
-  
-  class ValueDef;
-  typedef ValueDef *ValueDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ValueDef
-      >
-    ValueDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ValueDef
-      >
-    ValueDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_VALUEDEF_CH_)
-#define _CORBA_VALUEDEF_CH_
-  
-  class TAO_IFR_Client_Export ValueDef
-    : public virtual ::CORBA::Container,
-      public virtual ::CORBA::Contained,
-      public virtual ::CORBA::IDLType
-  {
-  public:
-    friend class TAO::Narrow_Utils<ValueDef>;
-    typedef ValueDef_ptr _ptr_type;
-    typedef ValueDef_var _var_type;
-    
-    // The static operations.
-    static ValueDef_ptr _duplicate (ValueDef_ptr obj);
-    
-    static void _tao_release (ValueDef_ptr obj);
-    
-    static ValueDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueDef_ptr _nil (void)
-    {
-      return static_cast<ValueDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        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 supported_interfaces (
-        const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::InitializerSeq * initializers (
-        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 initializers (
-        const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ValueDef_ptr base_value (
-        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 base_value (
-        ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ValueDefSeq * abstract_base_values (
-        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 abstract_base_values (
-        const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_abstract (
-        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 is_abstract (
-        ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_custom (
-        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 is_custom (
-        ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_truncatable (
-        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 is_truncatable (
-        ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_a (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct FullValueDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          FullValueDescription
-        >
-      FullValueDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          FullValueDescription,
-          FullValueDescription_var
-        >
-      FullValueDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export FullValueDescription
-    {
-      typedef FullValueDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      CORBA::Boolean is_abstract;
-      CORBA::Boolean is_custom;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members;
-      ACE_NESTED_CLASS (CORBA, InitializerSeq) initializers;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values;
-      CORBA::Boolean is_truncatable;
-      TAO_String_Manager base_value;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_FullValueDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
-        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 ::CORBA::ValueMemberDef_ptr create_value_member (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::AttributeDef_ptr create_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OperationDef_ptr create_operation (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr result,
-        ::CORBA::OperationMode mode,
-        const ::CORBA::ParDescriptionSeq & params,
-        const ::CORBA::ExceptionDefSeq & exceptions,
-        const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ValueDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ValueDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ValueDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ValueDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ValueDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ValueDef (const ValueDef &);
-    
-    void operator= (const ValueDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ValueDescription;
-  
-  typedef
-    TAO_Var_Var_T<
-        ValueDescription
-      >
-    ValueDescription_var;
-  
-  typedef
-    TAO_Out_T<
-        ValueDescription,
-        ValueDescription_var
-      >
-    ValueDescription_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_IFR_Client_Export ValueDescription
-  {
-    typedef ValueDescription_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager id;
-    CORBA::Boolean is_abstract;
-    CORBA::Boolean is_custom;
-    TAO_String_Manager defined_in;
-    TAO_String_Manager version;
-    CORBA::RepositoryIdSeq supported_interfaces;
-    CORBA::RepositoryIdSeq abstract_base_values;
-    CORBA::Boolean is_truncatable;
-    TAO_String_Manager base_value;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDescription;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
-#define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-  
-  class ExtValueDef;
-  typedef ExtValueDef *ExtValueDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ExtValueDef
-      >
-    ExtValueDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ExtValueDef
-      >
-    ExtValueDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_EXTVALUEDEF_CH_)
-#define _CORBA_EXTVALUEDEF_CH_
-  
-  class TAO_IFR_Client_Export ExtValueDef
-    : public virtual ::CORBA::ValueDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<ExtValueDef>;
-    typedef ExtValueDef_ptr _ptr_type;
-    typedef ExtValueDef_var _var_type;
-    
-    // The static operations.
-    static ExtValueDef_ptr _duplicate (ExtValueDef_ptr obj);
-    
-    static void _tao_release (ExtValueDef_ptr obj);
-    
-    static ExtValueDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtValueDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ExtValueDef_ptr _nil (void)
-    {
-      return static_cast<ExtValueDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExtInitializerSeq * ext_initializers (
-        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 ext_initializers (
-        const ::CORBA::ExtInitializerSeq & ext_initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_type.cpp:258
-    
-    struct ExtFullValueDescription;
-    
-    typedef
-      TAO_Var_Var_T<
-          ExtFullValueDescription
-        >
-      ExtFullValueDescription_var;
-    
-    typedef
-      TAO_Out_T<
-          ExtFullValueDescription,
-          ExtFullValueDescription_var
-        >
-      ExtFullValueDescription_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
-    struct TAO_IFR_Client_Export ExtFullValueDescription
-    {
-      typedef ExtFullValueDescription_var _var_type;
-      
-      static void _tao_any_destructor (void *);
-      TAO_String_Manager name;
-      TAO_String_Manager id;
-      CORBA::Boolean is_abstract;
-      CORBA::Boolean is_custom;
-      TAO_String_Manager defined_in;
-      TAO_String_Manager version;
-      ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations;
-      ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes;
-      ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members;
-      ACE_NESTED_CLASS (CORBA, ExtInitializerSeq) initializers;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces;
-      ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values;
-      CORBA::Boolean is_truncatable;
-      TAO_String_Manager base_value;
-      ACE_NESTED_CLASS (CORBA, TypeCode_var) type;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ExtFullValueDescription;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        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 ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
-        const char * id,
-        const char * name,
-        const char * version,
-        ::CORBA::IDLType_ptr type,
-        ::CORBA::AttributeMode mode,
-        const ::CORBA::ExceptionDefSeq & get_exceptions,
-        const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ExtValueDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ExtValueDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ExtValueDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ExtValueDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ExtValueDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ExtValueDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ExtValueDef (const ExtValueDef &);
-    
-    void operator= (const ExtValueDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
-#define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-  
-  class ValueBoxDef;
-  typedef ValueBoxDef *ValueBoxDef_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ValueBoxDef
-      >
-    ValueBoxDef_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ValueBoxDef
-      >
-    ValueBoxDef_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_VALUEBOXDEF_CH_)
-#define _CORBA_VALUEBOXDEF_CH_
-  
-  class TAO_IFR_Client_Export ValueBoxDef
-    : public virtual ::CORBA::TypedefDef
-  {
-  public:
-    friend class TAO::Narrow_Utils<ValueBoxDef>;
-    typedef ValueBoxDef_ptr _ptr_type;
-    typedef ValueBoxDef_var _var_type;
-    
-    // The static operations.
-    static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj);
-    
-    static void _tao_release (ValueBoxDef_ptr obj);
-    
-    static ValueBoxDef_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueBoxDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ValueBoxDef_ptr _nil (void)
-    {
-      return static_cast<ValueBoxDef_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::IDLType_ptr original_type_def (
-        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 original_type_def (
-        ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ValueBoxDef (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_ValueBoxDef_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ValueBoxDef (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ValueBoxDef (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ValueBoxDef (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ValueBoxDef (const ValueBoxDef &);
-    
-    void operator= (const ValueBoxDef &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueBoxDef;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_VALUEDEF__TRAITS_CH_)
-#define _CORBA_VALUEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
-  {
-    static ::CORBA::ValueDef_ptr duplicate (
-        ::CORBA::ValueDef_ptr
-      );
-    static void release (
-        ::CORBA::ValueDef_ptr
-      );
-    static ::CORBA::ValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ValueDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_)
-#define _CORBA_VALUEBOXDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
-  {
-    static ::CORBA::ValueBoxDef_ptr duplicate (
-        ::CORBA::ValueBoxDef_ptr
-      );
-    static void release (
-        ::CORBA::ValueBoxDef_ptr
-      );
-    static ::CORBA::ValueBoxDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ValueBoxDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_)
-#define _CORBA_EXTVALUEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
-  {
-    static ::CORBA::ExtValueDef_ptr duplicate (
-        ::CORBA::ExtValueDef_ptr
-      );
-    static void release (
-        ::CORBA::ExtValueDef_ptr
-      );
-    static ::CORBA::ExtValueDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ExtValueDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF__TRAITS_CH_)
-#define _CORBA_FIXEDDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
-  {
-    static ::CORBA::FixedDef_ptr duplicate (
-        ::CORBA::FixedDef_ptr
-      );
-    static void release (
-        ::CORBA::FixedDef_ptr
-      );
-    static ::CORBA::FixedDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::FixedDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_CH_)
-#define _CORBA_VALUEMEMBERDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
-  {
-    static ::CORBA::ValueMemberDef_ptr duplicate (
-        ::CORBA::ValueMemberDef_ptr
-      );
-    static void release (
-        ::CORBA::ValueMemberDef_ptr
-      );
-    static ::CORBA::ValueMemberDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ValueMemberDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMember *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMemberSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDef::FullValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef::FullValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef::FullValueDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDef::FullValueDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef::ExtFullValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef::ExtFullValueDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMember &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
-#define _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueMemberSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueMemberSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMemberDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMemberDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef::FullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef::FullValueDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExtValueDef::ExtFullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtValueDef::ExtFullValueDescription &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "IFR_ExtendedC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
deleted file mode 100644
index 21c51c95edd..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_FIXEDDEF___CI_)
-#define _CORBA_FIXEDDEF___CI_
-
-ACE_INLINE
-CORBA::FixedDef::FixedDef (
-    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_FixedDef_Proxy_Broker_ (0)
-{
-  this->CORBA_FixedDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::FixedDef::FixedDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_FixedDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEMEMBERDEF___CI_)
-#define _CORBA_VALUEMEMBERDEF___CI_
-
-ACE_INLINE
-CORBA::ValueMemberDef::ValueMemberDef (
-    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_ValueMemberDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueMemberDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueMemberDef::ValueMemberDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueMemberDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEDEF___CI_)
-#define _CORBA_VALUEDEF___CI_
-
-ACE_INLINE
-CORBA::ValueDef::ValueDef (
-    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_ValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueDef::ValueDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_EXTVALUEDEF___CI_)
-#define _CORBA_EXTVALUEDEF___CI_
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtValueDef (
-    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_ExtValueDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ExtValueDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtValueDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ExtValueDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_VALUEBOXDEF___CI_)
-#define _CORBA_VALUEBOXDEF___CI_
-
-ACE_INLINE
-CORBA::ValueBoxDef::ValueBoxDef (
-    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_ValueBoxDef_Proxy_Broker_ (0)
-{
-  this->CORBA_ValueBoxDef_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::ValueBoxDef::ValueBoxDef (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ValueBoxDef_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.pc.in b/TAO/tao/IFR_Client/TAO_IFR_Client.pc.in
deleted file mode 100644
index e0db24b973b..00000000000
--- a/TAO/tao/IFR_Client/TAO_IFR_Client.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_IFR_Client
-Description: TAO Interface Repository Client Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_IFR_Client
-Cflags: -I${includedir}
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.rc b/TAO/tao/IFR_Client/TAO_IFR_Client.rc
deleted file mode 100644
index c981fee5b26..00000000000
--- a/TAO/tao/IFR_Client/TAO_IFR_Client.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "IFR_Client\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_IFR_ClientDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_IFR_Client.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/IFR_Client/ifr_client_export.h b/TAO/tao/IFR_Client/ifr_client_export.h
deleted file mode 100644
index 9285f2823ea..00000000000
--- a/TAO/tao/IFR_Client/ifr_client_export.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_IFR_CLIENT_EXPORT_H
-#define TAO_IFR_CLIENT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_IFR_CLIENT_HAS_DLL)
-#    define TAO_IFR_CLIENT_HAS_DLL 0
-#  endif /* ! TAO_IFR_CLIENT_HAS_DLL */
-#else
-#  if !defined (TAO_IFR_CLIENT_HAS_DLL)
-#    define TAO_IFR_CLIENT_HAS_DLL 1
-#  endif /* ! TAO_IFR_CLIENT_HAS_DLL */
-#endif
-
-#if defined (TAO_IFR_CLIENT_HAS_DLL) && (TAO_IFR_CLIENT_HAS_DLL == 1)
-#  if defined (TAO_IFR_CLIENT_BUILD_DLL)
-#    define TAO_IFR_Client_Export ACE_Proper_Export_Flag
-#    define TAO_IFR_CLIENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IFR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_IFR_CLIENT_BUILD_DLL */
-#    define TAO_IFR_Client_Export ACE_Proper_Import_Flag
-#    define TAO_IFR_CLIENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IFR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IFR_CLIENT_BUILD_DLL */
-#else /* TAO_IFR_CLIENT_HAS_DLL == 1 */
-#  define TAO_IFR_Client_Export
-#  define TAO_IFR_CLIENT_SINGLETON_DECLARATION(T)
-#  define TAO_IFR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IFR_CLIENT_HAS_DLL == 1 */
-
-#endif /* TAO_IFR_CLIENT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
deleted file mode 100644
index 5465433b0e0..00000000000
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// @(#) $Id$
-
-#include "tao/IFR_Client_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           IFR_Client_Adapter,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_IFR_Client_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_IFR_Client_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
deleted file mode 100644
index 9e8afc3e10f..00000000000
--- a/TAO/tao/IFR_Client_Adapter.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IFR_Client_Adapter.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IFR_CLIENT_ADAPTER_H
-#define TAO_IFR_CLIENT_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-class TAO_OutputCDR;
-
-namespace CORBA
-{
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-
-  class Any;
-
-  class ORB;
-  typedef ORB *ORB_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class OperationDef;
-  typedef OperationDef *OperationDef_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
-  class Environment;
-}
-
-/**
- * @class TAO_IFR_Client_Adapter
- *
- * @brief TAO_IFR_Client_Adapter.
- *
- * Class that adapts various functions in the CORBA namespace
- * which use the Interface Repository. This is a base class for
- * the actual implementation in the TAO_IFR_Client library.
- */
-class TAO_Export TAO_IFR_Client_Adapter : public ACE_Service_Object
-{
-public:
-  virtual CORBA::Boolean interfacedef_cdr_insert (
-      TAO_OutputCDR &cdr,
-      CORBA::InterfaceDef_ptr object_type
-    ) = 0;
-
-  virtual void interfacedef_any_insert (
-      CORBA::Any &any,
-      CORBA::InterfaceDef_ptr object_type
-    ) = 0;
-
-  virtual void dispose (
-      CORBA::InterfaceDef_ptr orphan
-    ) = 0;
-
-  virtual CORBA::InterfaceDef_ptr get_interface (
-      CORBA::ORB_ptr orb,
-      const char *repo_id
-      ACE_ENV_ARG_DECL
-    ) = 0;
-
-  virtual CORBA::InterfaceDef_ptr get_interface_remote (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    ) = 0;
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  virtual void create_operation_list (
-               CORBA::ORB_ptr orb,
-               CORBA::OperationDef_ptr,
-               CORBA::NVList_ptr&
-               ACE_ENV_ARG_DECL
-             ) = 0;
-#endif /*TAO_HAS_MINIMUM_CORBA*/
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IFR_CLIENT_ADAPTER_H */
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
deleted file mode 100644
index 4fa9e7da509..00000000000
--- a/TAO/tao/IIOP.pidl
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-//
-//   This file was used to generate the code in
-//   IIOP*.* The command used to generate code
-//   is:
-//
-//     tao_idl \
-//        -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IIOP.pidl
-//
-//   Remember to patch the generated files using diff/IIOP.diff
-//   This is from the GIOP 1.2 spec for Bi Dir IIOP.
-
-#ifndef TAO_IIOP_PIDL
-#define TAO_IIOP_PIDL
-
-// This is a OMG specified IDL. When IIOP modules start getting
-// complicated we may want to have them here.
-#pragma prefix "omg.org"
-
-
-module IIOP
-{
-  struct ListenPoint
-  {
-    string host;
-    unsigned short port;
-  };
-
-  typedef sequence<ListenPoint> ListenPointList;
-
-  struct BiDirIIOPServiceContext
-  {
-    ListenPointList listen_points;
-  };
-};
-
-#endif  /* TAO_IIOP_PIDL */
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
deleted file mode 100644
index 3a0d62b0802..00000000000
--- a/TAO/tao/IIOPA.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_ListenPoint[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_ushort }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPoint (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/ListenPoint:1.0",
-    "ListenPoint",
-    _tao_fields_IIOP_ListenPoint,
-    2);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPoint =
-    &_tao_tc_IIOP_ListenPoint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-#define _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IIOP_ListenPointList_0 (
-        CORBA::tk_sequence,
-        &IIOP::_tc_ListenPoint,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IIOP_ListenPointList_0 =
-      &IIOP_ListenPointList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IIOP_ListenPointList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPointList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IIOP/ListenPointList:1.0",
-    "ListenPointList",
-    &TAO::TypeCode::tc_IIOP_ListenPointList_0);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPointList =
-    &_tao_tc_IIOP_ListenPointList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] =
-  {
-    { "listen_points", &IIOP::_tc_ListenPointList }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_BiDirIIOPServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0",
-    "BiDirIIOPServiceContext",
-    _tao_fields_IIOP_BiDirIIOPServiceContext,
-    1);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext =
-    &_tao_tc_IIOP_BiDirIIOPServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPoint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPoint *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPoint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract (
-        _tao_any,
-        IIOP::ListenPoint::_tao_any_destructor,
-        IIOP::_tc_ListenPoint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPointList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPointList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPointList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
-        _tao_any,
-        IIOP::ListenPointList::_tao_any_destructor,
-        TAO::TypeCode::tc_IIOP_ListenPointList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::BiDirIIOPServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract (
-        _tao_any,
-        IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-        IIOP::_tc_BiDirIIOPServiceContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
deleted file mode 100644
index 5db2f8c6682..00000000000
--- a/TAO/tao/IIOPC.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IIOPC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IIOP::ListenPoint::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ListenPoint *_tao_tmp_pointer =
-    static_cast<ListenPoint *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IIOP_LISTENPOINTLIST_CS_)
-#define _IIOP_LISTENPOINTLIST_CS_
-
-IIOP::ListenPointList::ListenPointList (void)
-{}
-
-IIOP::ListenPointList::ListenPointList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
-      >
-    (max)
-{}
-
-IIOP::ListenPointList::ListenPointList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IIOP::ListenPoint * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
-      >
-    (max, length, buffer, release)
-{}
-
-IIOP::ListenPointList::ListenPointList (
-    const ListenPointList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
-      >
-    (seq)
-{}
-
-IIOP::ListenPointList::~ListenPointList (void)
-{}
-
-void IIOP::ListenPointList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ListenPointList * _tao_tmp_pointer =
-    static_cast<ListenPointList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IIOP::BiDirIIOPServiceContext::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  BiDirIIOPServiceContext *_tao_tmp_pointer =
-    static_cast<BiDirIIOPServiceContext *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IIOP::ListenPoint &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IIOP::ListenPoint &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IIOP_ListenPointList_CPP_
-#define _TAO_CDR_OP_IIOP_ListenPointList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IIOP::ListenPointList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IIOP::ListenPointList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IIOP_ListenPointList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IIOP::BiDirIIOPServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.listen_points);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IIOP::BiDirIIOPServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.listen_points);
-}
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
deleted file mode 100644
index 332e5cd56dd..00000000000
--- a/TAO/tao/IIOPC.h
+++ /dev/null
@@ -1,274 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IIOPC_H_
-#define _TAO_IDL_ORIG_IIOPC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace IIOP
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ListenPoint;
-  
-  typedef
-    TAO_Var_Var_T<
-        ListenPoint
-      >
-    ListenPoint_var;
-  
-  typedef
-    TAO_Out_T<
-        ListenPoint,
-        ListenPoint_var
-      >
-    ListenPoint_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export ListenPoint
-  {
-    typedef ListenPoint_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager host;
-    CORBA::UShort port;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPoint;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IIOP_LISTENPOINTLIST_CH_)
-#define _IIOP_LISTENPOINTLIST_CH_
-  
-  class ListenPointList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ListenPointList,
-        ListenPoint
-      >
-    ListenPointList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ListenPointList,
-        ListenPointList_var,
-        ListenPoint
-      >
-    ListenPointList_out;
-  
-  class TAO_Export ListenPointList
-    : public
-        TAO_Unbounded_Sequence<
-            ListenPoint
-          >
-  {
-  public:
-    ListenPointList (void);
-    ListenPointList (CORBA::ULong max);
-    ListenPointList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ListenPoint* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ListenPointList (const ListenPointList &);
-    ~ListenPointList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ListenPointList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPointList;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct BiDirIIOPServiceContext;
-  
-  typedef
-    TAO_Var_Var_T<
-        BiDirIIOPServiceContext
-      >
-    BiDirIIOPServiceContext_var;
-  
-  typedef
-    TAO_Out_T<
-        BiDirIIOPServiceContext,
-        BiDirIIOPServiceContext_var
-      >
-    BiDirIIOPServiceContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export BiDirIIOPServiceContext
-  {
-    typedef BiDirIIOPServiceContext_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IIOP::ListenPointList listen_points;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module IIOP
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_
-#define _TAO_CDR_OP_IIOP_ListenPointList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IIOP::ListenPointList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IIOP::ListenPointList &
-  );
-
-#endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServiceContext &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
deleted file mode 100644
index c7c3608ff5c..00000000000
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ /dev/null
@@ -1,967 +0,0 @@
-#include "tao/IIOP_Acceptor.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/Transport.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/IIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_netdb.h"
-
-
-ACE_RCSID (tao,
-           IIOP_Acceptor,
-           "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
-template class ACE_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_IIOP_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_IIOP_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_IIOP_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_IIOP_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
-#pragma instantiate ACE_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (IOP::TAG_INTERNET_IOP),
-    addrs_ (0),
-    port_span_ (1),
-    hosts_ (0),
-    hostname_in_ior_ (0),
-    endpoint_count_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    lite_flag_ (flag),
-    base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0)
-{
-}
-
-TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-
-  delete [] this->addrs_;
-
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    CORBA::string_free (this->hosts_[i]);
-
-  delete [] this->hosts_;
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-int
-TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
-                                   TAO_MProfile &mprofile,
-                                   CORBA::Short priority)
-{
-  // Sanity check.
-  if (this->endpoint_count_ == 0)
-    return -1;
-
-  // Check if multiple endpoints should be put in one profile or
-  // if they should be spread across multiple profiles.
-  if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
-  else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
-}
-
-int
-TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Short priority)
-{
-  // Adding this->endpoint_count_ to the TAO_MProfile.
-  const int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < this->endpoint_count_
-      && mprofile.grow (count + this->endpoint_count_) == -1)
-    return -1;
-
-  // Create a profile for each acceptor endpoint.
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    {
-      // Skip if the host name
-      if (i > 0
-          && (this->addrs_[i].get_port_number() == this->addrs_[0].get_port_number())
-          && ACE_OS::strcmp(this->hosts_[i], this->hosts_[0]) == 0)
-        continue;
-
-      TAO_IIOP_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_IIOP_Profile (this->hosts_[i],
-                                        this->addrs_[i].get_port_number (),
-                                        object_key,
-                                        this->addrs_[i],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      pfile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (pfile) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-          return -1;
-        }
-
-      // Do not add any tagged components to the profile if configured
-      // by the user not to do so, or if an IIOP 1.0 endpoint is being
-      // created (IIOP 1.0 did not support tagged components).
-      if (this->orb_core_->orb_params ()->std_profile_components () == 0
-          || (this->version_.major == 1 && this->version_.minor == 0))
-        continue;
-
-      pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-      this->orb_core_->codeset_manager()->
-        set_codeset(pfile->tagged_components());
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                          TAO_MProfile &mprofile,
-                                          CORBA::Short priority)
-{
-  CORBA::ULong index = 0;
-  TAO_Profile *pfile = 0;
-  TAO_IIOP_Profile *iiop_profile = 0;
-
-  // First see if <mprofile> already contains a IIOP profile.
-  for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
-    {
-      pfile = mprofile.get_profile (i);
-      if (pfile->tag () == IOP::TAG_INTERNET_IOP)
-        {
-          iiop_profile = dynamic_cast<TAO_IIOP_Profile *> (pfile);
-          break;
-        }
-    }
-
-  // If <mprofile> doesn't contain a IIOP_Profile, we need to create
-  // one.
-  if (iiop_profile == 0)
-    {
-      ACE_NEW_RETURN (iiop_profile,
-                      TAO_IIOP_Profile (this->hosts_[0],
-                                        this->addrs_[0].get_port_number (),
-                                        object_key,
-                                        this->addrs_[0],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-
-      iiop_profile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (iiop_profile) == -1)
-        {
-          iiop_profile->_decr_refcnt ();
-          iiop_profile = 0;
-          return -1;
-        }
-
-      // Do not add any tagged components to the profile if configured
-      // by the user not to do so, or if an IIOP 1.0 endpoint is being
-      // created (IIOP 1.0 did not support tagged components).
-      if (this->orb_core_->orb_params ()->std_profile_components () != 0
-          && (this->version_.major >= 1 && this->version_.minor >= 1))
-        {
-          iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-          this->orb_core_->codeset_manager()->
-            set_codeset(iiop_profile->tagged_components());
-        }
-
-      index = 1;
-    }
-
-  // Add any remaining acceptor endpoints to the IIOP_Profile.
-  for (;
-       index < this->endpoint_count_;
-       ++index)
-    {
-      if (index > 0 &&
-          this->addrs_[index].get_port_number() == this->addrs_[0].get_port_number() &&
-          ACE_OS::strcmp(this->hosts_[index], this->hosts_[0]) == 0)
-        continue;
-
-      TAO_IIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_IIOP_Endpoint (this->hosts_[index],
-                                         this->addrs_[index].get_port_number (),
-                                         this->addrs_[index]),
-                      -1);
-      endpoint->priority (priority);
-      iiop_profile->add_endpoint (endpoint);
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_IIOP_Endpoint *endp =
-    dynamic_cast<const TAO_IIOP_Endpoint *> (endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    {
-      // compare the port and host name.  Please do *NOT* optimize
-      // this code by comparing the IP address instead.  That would
-      // trigger the following bug:
-      //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
-      //
-      if (endp->port() == this->addrs_[i].get_port_number()
-          && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0)
-        return 1;
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         ACE_Reactor *reactor,
-                         int major,
-                         int minor,
-                         const char *address,
-                         const char *options)
-{
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("IIOP_Acceptor::open, address==%s, options=%s\n"),
-                  address, options));
-    }
-      
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - ")
-                         ACE_TEXT ("IIOP_Acceptor::open, ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (address == 0)
-    return -1;
-
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  ACE_INET_Addr addr;
-
-  const char *port_separator_loc = ACE_OS::strchr (address, ':');
-  const char *specified_hostname = 0;
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (port_separator_loc == address)
-    {
-      // The address is a port number or port name.  No hostname was
-      // specified.  The hostname for each network interface and the
-      // fully qualified domain name must be obtained.
-
-      // Check for multiple network interfaces.
-      if (this->probe_interfaces (orb_core) == -1)
-        return -1;
-
-      // First convert the port into a usable form.
-      if (addr.set (address + sizeof (':')) != 0)
-        return -1;
-
-      // Now reset the port and set the host.
-      if (addr.set (addr.get_port_number (),
-                    static_cast<ACE_UINT32> (INADDR_ANY),
-                    1) != 0)
-        return -1;
-      else
-        return this->open_i (addr,
-                             reactor);
-    }
-  else if (port_separator_loc == 0)
-    {
-      // The address is a hostname.  No port was specified, so assume
-      // port zero (port will be chosen for us).
-      if (addr.set ((unsigned short) 0, address) != 0)
-        return -1;
-
-      specified_hostname = address;
-    }
-  else
-    {
-      // Host and port were specified.
-      if (addr.set (address) != 0)
-        return -1;
-
-      // Extract out just the host part of the address.
-      const size_t len = port_separator_loc - address;
-      ACE_OS::memcpy (tmp_host, address, len);
-      tmp_host[len] = '\0';
-
-      specified_hostname = tmp_host;
-    }
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("IIOP_Acceptor: specified host=%s:%d\n"),
-                  (specified_hostname==0 ? "<null>" : specified_hostname),
-                  addr.get_port_number ()));
-    }
-      
-  this->endpoint_count_ = 1;  // Only one hostname to store
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  this->hosts_[0] = 0;
-
-  if (this->hostname_in_ior_ != 0)
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Overriding address in IOR with %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_)));
-        }
-      specified_hostname = this->hostname_in_ior_;
-    }
-
-  if (this->hostname (orb_core,
-                      addr,
-                      this->hosts_[0],
-                      specified_hostname) != 0)
-    return -1;
-
-  // Copy the addr.  The port is (re)set in
-  // TAO_IIOP_Acceptor::open_i().
-  if (this->addrs_[0].set (addr) != 0)
-    return -1;
-
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                 ACE_Reactor *reactor,
-                                 int major,
-                                 int minor,
-                                 const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - ")
-                         ACE_TEXT ("IIOP_Acceptor::open_default, ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (major >= 0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  // Check for multiple network interfaces.
-  if (this->probe_interfaces (orb_core) == -1)
-    return -1;
-
-  // Now that each network interface's hostname has been cached, open
-  // an endpoint on each network interface using the INADDR_ANY
-  // address.
-  ACE_INET_Addr addr;
-
-  if (addr.set (static_cast<unsigned short> (0),
-                static_cast<ACE_UINT32> (INADDR_ANY),
-                1) != 0)
-    return -1;
-
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
-                           ACE_Reactor *reactor)
-{
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  CREATION_STRATEGY (this->orb_core_,
-                                     this->lite_flag_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  unsigned short requested_port = addr.get_port_number ();
-  if (requested_port == 0)
-    {
-      // don't care, i.e., let the OS choose an ephemeral port
-      if (this->base_acceptor_.open (addr,
-                                     reactor,
-                                     this->creation_strategy_,
-                                     this->accept_strategy_,
-                                     this->concurrency_strategy_) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                        ACE_TEXT ("%p, "),
-                        ACE_TEXT ("cannot open acceptor\n")));
-          return -1;
-        }
-    }
-  else
-    {
-      ACE_INET_Addr a(addr);
-
-      bool found_a_port = false;
-      ACE_UINT32 last_port = requested_port + this->port_span_ - 1;
-      if (last_port > ACE_MAX_DEFAULT_PORT)
-        {
-          last_port = ACE_MAX_DEFAULT_PORT;
-        }
-
-      for (ACE_UINT32 p = requested_port; p <= last_port; p++)
-        {
-          if (TAO_debug_level > 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                        ACE_TEXT ("trying to listen on port %d\n"), p));
-
-          // Now try to actually open on that port
-          a.set_port_number ((u_short)p);
-          if (this->base_acceptor_.open (a,
-                                         reactor,
-                                         this->creation_strategy_,
-                                         this->accept_strategy_,
-                                         this->concurrency_strategy_) != -1)
-            {
-              found_a_port = true;
-              break;
-            }
-        }
-
-      // Now, if we couldn't locate a port, we punt
-      if (! found_a_port)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                        ACE_TEXT ("cannot open acceptor in port range (%d,%d)")
-                        ACE_TEXT ("- %p\n"),
-                        requested_port, last_port, ACE_TEXT("")));
-          return -1;
-        }
-    }
-
-  ACE_INET_Addr address;
-
-  // We do this make sure the port number the endpoint is listening on
-  // gets set in the addr.
-  if (this->base_acceptor_.acceptor ().get_local_addr (address) != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                    ACE_TEXT ("%p"),
-                    ACE_TEXT ("cannot get local addr\n")));
-      return -1;
-    }
-
-  // Set the port for each addr.  If there is more than one network
-  // interface then the endpoint created on each interface will be on
-  // the same port.  This is how a wildcard socket bind() is supposed
-  // to work.
-  unsigned short port = address.get_port_number ();
-  for (CORBA::ULong j = 0; j < this->endpoint_count_; ++j)
-    this->addrs_[j].set_port_number (port, 1);
-
-  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
-  // This avoids having child processes acquire the listen socket thereby
-  // denying the server the opportunity to restart on a well-known endpoint.
-  // This does not affect the aberrent behavior on Win32 platforms.
-
-  if (TAO_debug_level > 5)
-    {
-      for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
-                      this->addrs_[i].get_port_number ()));
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
-                             ACE_INET_Addr &addr,
-                             char *&host,
-                             const char *specified_hostname)
-{
-  if (this->hostname_in_ior_ != 0)
-    {
-      if (TAO_debug_level >= 5)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor - Overriding the hostname with <%s>\n"),
-                      this->hostname_in_ior_));
-      
-      host = CORBA::string_dup (this->hostname_in_ior_);
-    }
-  else if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // If dotted decimal addresses are enabled,
-      // just return ours.
-      return this->dotted_decimal_address (addr, host);
-    }
-  else if (specified_hostname != 0)
-    {
-      // If the user specified a hostname, pass it back
-      // blindly as it overrides our choice of hostname.
-      host = CORBA::string_dup (specified_hostname);
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN + 1];
-
-      // Get the hostname associated with our address
-      if (addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-        {
-          // On failure, just return the decimal address.
-          return this->dotted_decimal_address (addr, host);
-        }
-      else
-        {
-          host = CORBA::string_dup (tmp_host);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
-                                           char *&host)
-{
-  int result = 0;
-  const char *tmp = 0;
-
-  // If the IP address in the INET_Addr is the INADDR_ANY address,
-  // then force the actual IP address to be used by initializing a new
-  // INET_Addr with the hostname from the original one.  If that fails
-  // then something is seriously wrong with the systems networking
-  // setup.
-  if (addr.get_ip_address () == INADDR_ANY)
-    {
-      ACE_INET_Addr new_addr;
-      result = new_addr.set (addr.get_port_number (),
-                             addr.get_host_name ());
-      tmp = new_addr.get_host_addr ();
-    }
-  else
-    tmp = addr.get_host_addr ();
-
-  if (tmp == 0 || result != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - ")
-                    ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address, ")
-                    ACE_TEXT ("- %p, "),
-                    ACE_TEXT ("cannot determine hostname\n")));
-      return -1;
-    }
-
-  host = CORBA::string_dup (tmp);
-  return 0;
-}
-
-int
-TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
-{
-  // Extract the hostname for each network interface, and then cache
-  // it.  The hostnames will then be used when creating a
-  // TAO_IIOP_Profile for each endpoint setup on the probed
-  // network interfaces.
-  ACE_INET_Addr *if_addrs = 0;
-  size_t if_cnt = 0;
-
-  if (ACE::get_ip_interfaces (if_cnt, if_addrs) != 0
-      && errno != ENOTSUP)
-    {
-      // In the case where errno == ENOTSUP, if_cnt and if_addrs will
-      // not be modified, and will each remain equal to zero.  This
-      // causes the default interface to be used.
-      return -1;
-    }
-
-  if (if_cnt == 0 || if_addrs == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) - Unable to probe network ")
-                      ACE_TEXT ("interfaces. Using default.\n")));
-        }
-
-      if_cnt = 1; // Force the network interface count to be one.
-      delete [] if_addrs;
-      ACE_NEW_RETURN (if_addrs,
-                      ACE_INET_Addr[if_cnt],
-                      -1);
-    }
-
-  // Scan for the loopback interface since it shouldn't be included in
-  // the list of cached hostnames unless it is the only interface.
-  size_t lo_cnt = 0;  // Loopback interface count
-  for (size_t j = 0; j < if_cnt; ++j)
-    if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
-      ++lo_cnt;
-
-  // The instantiation for this template is in
-  // tao/IIOP_Connector.cpp.
-  ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_if_addrs (if_addrs);
-
-  // If the loopback interface is the only interface then include it
-  // in the list of interfaces to query for a hostname, otherwise
-  // exclude it from the list.
-  if (if_cnt == lo_cnt)
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt);
-  else
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt - lo_cnt);
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  ACE_OS::memset (this->hosts_, 0, sizeof (char*) * this->endpoint_count_);
-
-  // The number of hosts/interfaces we want to cache may not be the
-  // same as the number of detected interfaces so keep a separate
-  // count.
-  size_t host_cnt = 0;
-
-  for (size_t i = 0; i < if_cnt; ++i)
-    {
-      // Ignore any loopback interface if there are other
-      // non-loopback interfaces.
-      if (if_cnt != lo_cnt &&
-          if_addrs[i].get_ip_address () == INADDR_LOOPBACK)
-        continue;
-
-      if (this->hostname (orb_core,
-                          if_addrs[i],
-                          this->hosts_[host_cnt]) != 0)
-        return -1;
-
-
-      // Copy the addr.  The port is (re)set in
-      // TAO_IIOP_Acceptor::open_i().
-      if (this->addrs_[host_cnt].set (if_addrs[i]) != 0)
-        return -1;
-
-      ++host_cnt;
-    }
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_IIOP_Acceptor::endpoint_count (void)
-{
-  return this->endpoint_count_;
-}
-
-int
-TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO::ObjectKey &object_key)
-{
-  // Create the decoding stream from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't*do any*
-  // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - IIOP_Profile::decode, v%d.%d\n"),
-                      major,
-                      minor));
-        }
-      return -1;
-    }
-
-  CORBA::String_var host;
-  CORBA::UShort port = 0;
-
-  // Get host and port. No processing here too..
-  if (cdr.read_string (host.out ()) == 0
-      || cdr.read_ushort (port) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - TAO_IIOP_Acceptor::object_key, ")
-                      ACE_TEXT ("error while decoding host/port\n")));
-        }
-      return -1;
-    }
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  // We are NOT bothered about the rest.
-
-  return 1;
-}
-
-int
-TAO_IIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  const ACE_CString options (str);
-
-  const size_t len = options.length ();
-
-  static const char option_delimiter = '&';
-
-  // Count the number of options.
-  int argc = 1;
-
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      argc++;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  ACE_CString *argv_base = 0;
-  ACE_NEW_RETURN (argv_base, ACE_CString[argc],-1);
-  ACE_CString **argv = 0;
-  ACE_NEW_RETURN (argv, ACE_CString*[argc],-1);
-
-  int begin = 0;
-  int end = -1;
-  int result = 0;
-  for (int j = 0; j < argc; ++j)
-    {
-      begin = end + 1;
-
-      if (j < argc - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = static_cast<CORBA::ULong> (len);
-
-      if (end == begin)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) Zero length IIOP option.\n")));
-          result = -1;
-          break;
-        }
-      else if (end != ACE_CString::npos)
-        {
-          argv_base[j] = options.substring (begin, end);
-          argv[j] = &argv_base[j];
-        }
-    }
-
-  if (result == 0)
-    result = this->parse_options_i (argc,argv);
-
-  if (argc > 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) IIOP")
-                  ACE_TEXT (" endpoint has %d unknown options:\n"),
-                  argc));
-      for (int i = 0; i < argc; i++)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("\t%s\n"),
-                    argv[i]->c_str()));
-      result = -1;
-    }
-  delete [] argv;
-  delete [] argv_base;
-  return result;
-}
-
-int
-TAO_IIOP_Acceptor::parse_options_i (int &argc,
-                                    ACE_CString **argv)
-{
-  int i = 0;
-  while (i < argc)
-    {
-      size_t len = argv[i]->length();
-      int slot = argv[i]->find ("=");
-
-      if (slot == static_cast <int> (len - 1)
-          || slot == ACE_CString::npos)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) IIOP option <%s> is ")
-                           ACE_TEXT ("missing a value.\n"),
-                           ACE_TEXT_CHAR_TO_TCHAR(argv[i]->c_str ())),
-                          -1);
-
-      ACE_CString name = argv[i]->substring (0, slot);
-      ACE_CString value = argv[i]->substring (slot + 1);
-
-      if (name.length () == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) Zero length IIOP ")
-                           ACE_TEXT ("option name.\n")),
-                          -1);
-      if (name == "priority")
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
-                             ACE_TEXT ("endpoint priorities no longer supported. \n"),
-                             value.c_str ()),
-                            -1);
-        }
-      else if (name == "portspan")
-        {
-          int range = static_cast <int> (ACE_OS::atoi (value.c_str ()));
-          // @@ What's the lower bound on the range?  zero, or one?
-          if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint ")
-                               ACE_TEXT ("portspan: <%s>\n")
-                               ACE_TEXT ("Valid range 1 -- %d\n"),
-                               value.c_str (), ACE_MAX_DEFAULT_PORT),
-                              -1);
-
-          this->port_span_ = static_cast <u_short> (range);
-        }
-      else if (name == "hostname_in_ior")
-        {
-          this->hostname_in_ior_ = value.rep ();
-        }
-      else
-        {
-          // the name is not known, skip to the next option
-          i++;
-          continue;
-        }
-      // at the end, we've consumed this argument. Shift the list and
-      // put this one on the end. This technique has the effect of
-      // putting them in reverse order, but that doesn't matter, since
-      // these arguments are only whole strings.
-      argc--;
-      ACE_CString *temp = argv[i];
-      for (int j = i; j <= argc-1; j++)
-        argv[j] = argv[j+1];
-      argv[argc] = temp;
-    }
-  return 0;
-}
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
deleted file mode 100644
index 1e56680f1b7..00000000000
--- a/TAO/tao/IIOP_Acceptor.h
+++ /dev/null
@@ -1,234 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IIOP_Acceptor.h
- *
- *  $Id$
- *
- *  IIOP specific acceptor processing
- *
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IIOP_ACCEPTOR_H
-#define TAO_IIOP_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Acceptor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Acceptor.h"
-
-#include "tao/Transport_Acceptor.h"
-#include "tao/IIOP_Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-#include "tao/GIOP_Message_Version.h"
-
-/**
- * @class TAO_IIOP_Acceptor
- *
- * @brief TAO_IIOP_Acceptor
- *
- * The IIOP-specific bridge class for the concrete acceptor.
- */
-class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  /// Constructor.
-  TAO_IIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_IIOP_Acceptor (void);
-
-  /// @@ Helper method for the implementation repository, should go
-  ///    away
-  const ACE_INET_Addr& address (void) const;
-
-  /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
-
-  typedef ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_IIOP_Connection_Handler> CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
-
-  /**
-   * The TAO_Acceptor methods, check the documentation in
-   * Transport_Acceptor.h for details.
-   */
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority);
-  virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key);
-
-  /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
-   * is useful if the given address corresponds to more than one
-   * hostname and the desired one cannot be determined in any
-   * other way. 
-   * This method is used both when constructing IOR endpoints and LPL
-   * (listen point lists).
-   *
-   * The algorithm used is:
-   * - If hostname_in_ior_ has been set, it is used "as is";
-   * - else if use_dotted_decimal_addresses_ is set, the text representaion
-   *   of the IP is used;
-   * - else if specified_hostname is given, it used "as is";
-   * - else a reverse (address to name) lookup is used to obtain the
-   *   hostname or the IP if no reverse mapping exists.
-   */
-  virtual int hostname (TAO_ORB_Core *orb_core,
-                ACE_INET_Addr &addr,
-                char *&host,
-                const char *specified_hostname = 0);
-
-protected:
-
-  /**
-   * Set the host name for the given address using the dotted decimal
-   * format.
-   */
-  int dotted_decimal_address (ACE_INET_Addr &addr,
-                              char *&host);
-
-  /**
-   * Implement the common part of the open*() methods.  This method is
-   * virtual to allow a derived class implementation to be invoked
-   * instead.
-   */
-  virtual int open_i (const ACE_INET_Addr &addr,
-                      ACE_Reactor *reactor);
-
-  /**
-   * Probe the system for available network interfaces, and initialize
-   * the <addrs_> array with an ACE_INET_Addr for each network
-   * interface.  The port for each initialized ACE_INET_Addr will be
-   * set in the open_i() method.  This method only gets invoked when
-   * no explicit hostname is provided in the specified endpoint.
-   */
-  int probe_interfaces (TAO_ORB_Core *orb_core);
-
-  /**
-   * Parse protocol specific options.
-   *
-   * Currently supported:
-   *    portspan -- specifies the range of ports over which the acceptor
-   *                should scan looking for a free port (this is convenient
-   *                for situations where you might normally use an ephemeral
-   *                port but can't because you're behind a firewall and don't
-   *                want to permit passage on all ephemeral ports)
-   */
-  int parse_options (const char *options);
-
-  /**
-   * Parse options splits the options list in to an argv array. This
-   * allows manipulation of the list in a manner similar to
-   * orb_init. By moving the consumed args to the tail of the list and
-   * reducing the argc count, the base parse_options_i can be called
-   * by derived parse_options_i. Method returns -1 if an ill-formed or
-   * otherwise bogus arg is encountered. The only strictly bogus arg
-   * was priority, which was a holdover from the early RT IIOP
-   * implementations. an ill-formed option is one which is missing an
-   * equal sign or something to the left of it.
-   */
-  virtual int parse_options_i (int &argc, ACE_CString ** argv);
-
-  /// Helper method to add a new profile to the mprofile for
-  /// each endpoint.
-  int create_new_profile (const TAO::ObjectKey &object_key,
-                          TAO_MProfile &mprofile,
-                          CORBA::Short priority);
-
-  /// Helper method to create a profile that contains all of
-  /// our endpoints.
-  int create_shared_profile (const TAO::ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             CORBA::Short priority);
-
-protected:
-
-  /// Array of ACE_INET_Addr instances, each one corresponding to a
-  /// given network interface.
-  ACE_INET_Addr *addrs_;
-
-  /**
-   * The number of ports over which the acceptor should search (starting
-   * at the port specified in each element of addrs_) for an available
-   * port.  This is specified via the "portspan=" option to the endpoint.
-   */
-  unsigned short port_span_;
-
-  /**
-   * Cache the information about the endpoints serviced by this
-   * acceptor.
-   * There may in fact be multiple hostnames for this endpoint. For
-   * example, if the IP address is INADDR_ANY (0.0.0.0) then there
-   * will be possibly a different hostname for each interface.
-   */
-  char **hosts_;
-
-  /**
-   * Override the hostname used in the ORBEndPoint.
-   */
-  char *hostname_in_ior_;
-
-  /// The number of host names cached in the hosts_ array (equivalent
-  /// to the number of endpoints opened by this Acceptor).
-  CORBA::ULong endpoint_count_;
-
-  /**
-   * The GIOP version for this endpoint
-   * @@ Theoretically they shouldn't be here!! We need to look at a
-   * way to move this out
-   */
-  TAO_GIOP_Message_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// Should we use GIOP lite??
-  const bool lite_flag_;
-
-private:
-
-  /// the concrete acceptor, as a pointer to it's base class.
-  BASE_ACCEPTOR base_acceptor_;
-
-  /// Acceptor strategies.
-  CREATION_STRATEGY *creation_strategy_;
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/IIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_IIOP_ACCEPTOR_H */
diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i
deleted file mode 100644
index 3b55c132b62..00000000000
--- a/TAO/tao/IIOP_Acceptor.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_IIOP_Acceptor::address (void) const
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  // @@ This is busted.
-  //    The Implementation Repository will have to start supporting
-  //    IORs with multiple profiles.  For now, we just return the
-  //    first addr.
-  //                    -Ossama
-  return this->addrs_[0];
-}
-
-ACE_INLINE const ACE_INET_Addr *
-TAO_IIOP_Acceptor::endpoints (void)
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  return this->addrs_;
-}
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
deleted file mode 100644
index 383f69f55d5..00000000000
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-#include "IIOP_Connection_Handler.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "IIOP_Transport.h"
-#include "IIOP_Endpoint.h"
-#include "IIOPC.h"
-#include "Thread_Lane_Resources.h"
-#include "Base_Transport_Property.h"
-#include "Protocols_Hooks.h"
-#include "Wait_Strategy.h"
-
-#include "ace/os_include/netinet/os_tcp.h"
-#include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (tao,
-           IIOP_Connection_Handler,
-           "$Id$")
-
-TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_IIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (0);
-}
-
-
-TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (
-  TAO_ORB_Core *orb_core,
-  CORBA::Boolean flag)
-  : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  TAO_IIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-           TAO_IIOP_Transport (this, orb_core, flag));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-}
-
-TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core)
-  : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-}
-
-TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-}
-
-int
-TAO_IIOP_Connection_Handler::open_handler (void *v)
-{
-  return this->open (v);
-}
-
-int
-TAO_IIOP_Connection_Handler::open (void*)
-{
-  TAO_IIOP_Protocol_Properties protocol_properties;
-
-  // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  protocol_properties.no_delay_ =
-    this->orb_core ()->orb_params ()->nodelay ();
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
-
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (client)
-        {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  if (this->set_socket_option (this->peer (),
-                               protocol_properties.send_buffer_size_,
-                               protocol_properties.recv_buffer_size_) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_TCP_NODELAY)
-  if (this->peer ().set_option (ACE_IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &protocol_properties.no_delay_,
-                                sizeof (protocol_properties.no_delay_)) == -1)
-    return -1;
-#endif /* ! ACE_LACKS_TCP_NODELAY */
-
-  if (this->transport ()->wait_strategy ()->non_blocking ())
-    {
-      if (this->peer ().enable (ACE_NONBLOCK) == -1)
-        return -1;
-    }
-
-  // Called by the <Strategy_Acceptor> when the handler is
-  // completely connected.
-
-  ACE_INET_Addr remote_addr;
-  if (this->peer ().get_remote_addr (remote_addr) == -1)
-    return -1;
-
-  ACE_INET_Addr local_addr;
-  if (this->peer ().get_local_addr (local_addr) == -1)
-    return -1;
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ")
-                ACE_TEXT("The local addr is <%s> \n"),
-                local_addr. get_host_addr ()));
-
-  if (local_addr.get_ip_address () == remote_addr.get_ip_address ()
-      && local_addr.get_port_number () == remote_addr.get_port_number ())
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16];
-          ACE_TCHAR local_as_string[MAXHOSTNAMELEN + 16];
-
-          (void) remote_addr.addr_to_string (remote_as_string,
-                                             sizeof(remote_as_string));
-          (void) local_addr.addr_to_string (local_as_string,
-                                            sizeof(local_as_string));
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO(%P|%t) - IIOP_Connection_Handler::open, ")
-                      ACE_TEXT("Holy Cow! The remote addr and ")
-                      ACE_TEXT("local addr are identical (%s == %s)\n"),
-                      remote_as_string, local_as_string));
-        }
-      return -1;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_TCHAR client[MAXHOSTNAMELEN + 16];
-
-      // Verify that we can resolve the peer hostname.
-      if (remote_addr.addr_to_string (client, sizeof (client)) == -1)
-        return -1;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::open, IIOP ")
-                  ACE_TEXT ("connection to peer <%s> on %d\n"),
-                  client, this->peer ().get_handle ()));
-    }
-
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
-
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 0;
-}
-
-int
-TAO_IIOP_Connection_Handler::resume_handler (void)
-{
-  return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
-}
-
-int
-TAO_IIOP_Connection_Handler::close_connection (void)
-{
-  // To maintain maximum compatibility, we only set this socket option
-  // if the user has provided a linger timeout.
-  int linger = this->orb_core()->orb_params()->linger ();
-  if (linger != -1)
-    {
-      struct linger lval;
-      lval.l_onoff = 1;
-      lval.l_linger = linger;
-
-      if (this->peer ().set_option(SOL_SOCKET,
-                                   SO_LINGER,
-                                   (void*) &lval,
-                                   sizeof (lval)) == -1)
-        {
-          if (TAO_debug_level)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_LIB_TEXT ("TAO (%P|%t) Unable to set ")
-                          ACE_LIB_TEXT ("SO_LINGER on %d\n"),
-                          this->peer ().get_handle ()));
-            }
-        }
-    }
-
-  return this->close_connection_eh (this);
-}
-
-int
-TAO_IIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_eh (h, this);
-}
-
-int
-TAO_IIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
-{
-  const int result =
-    this->handle_output_eh (handle, this);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_IIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                             const void *)
-{
-  // We don't use this upcall for I/O.  This is only used by the
-  // Connector to indicate that the connection timedout.  Therefore,
-  // we should call close().
-  return this->close ();
-}
-
-int
-TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                           ACE_Reactor_Mask)
-{
-  ACE_ASSERT (0);
-  return 0;
-}
-
-int
-TAO_IIOP_Connection_Handler::close (u_long)
-{
-  return this->close_handler ();
-}
-
-int
-TAO_IIOP_Connection_Handler::release_os_resources (void)
-{
-  return this->peer ().close ();
-}
-
-int
-TAO_IIOP_Connection_Handler::add_transport_to_cache (void)
-{
-  ACE_INET_Addr addr;
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Construct an  IIOP_Endpoint object
-  TAO_IIOP_Endpoint endpoint (
-      addr,
-      this->orb_core()->orb_params()->use_dotted_decimal_addresses ());
-
-  // Construct a property object
-  TAO_Base_Transport_Property prop (&endpoint);
-
-  TAO::Transport_Cache_Manager &cache =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Idle the transport..
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
-}
-
-int
-TAO_IIOP_Connection_Handler::process_listen_point_list (
-    IIOP::ListenPointList &listen_list)
-{
-  // Get the size of the list
-  const CORBA::ULong len = listen_list.length ();
-
-  if (TAO_debug_level > 0 && len == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::")
-                  ACE_TEXT("process_listen_point_list, ")
-                  ACE_TEXT("Received list of size 0, check client config.\n")));
-    }
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      IIOP::ListenPoint listen_point = listen_list[i];
-      ACE_INET_Addr addr (listen_point.port,
-                          listen_point.host.in ());
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::")
-                      ACE_TEXT("process_listen_point_list, ")
-                      ACE_TEXT("Listening port [%d] on [%s]\n"),
-                      listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ())));
-        }
-
-      // Construct an  IIOP_Endpoint object using the host as provided
-      // in the listen point list.  We must use host in that form because
-      // that's also how the ORB on the other side will advertise the host
-      // in an IOR.
-      TAO_IIOP_Endpoint endpoint (listen_point.host.in (),
-                                  listen_point.port, addr);
-
-      // Construct a property object
-      TAO_Base_Transport_Property prop (&endpoint);
-
-      // Mark the connection as bidirectional
-      prop.set_bidir_flag (1);
-
-      // The property for this handler has changed. Recache the
-      // handler with this property
-      int retval =
-        this->transport ()->recache_transport (&prop);
-
-      if (retval == -1)
-        return retval;
-
-      // Make the handler idle and ready for use
-      this->transport ()->make_idle ();
-    }
-
-  return 0;
-}
-
-int
-TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
-{
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = (int)(codepoint) << 2;
-    }
-
-  if (tos != this->dscp_codepoint_)
-    {
-      int result = this->peer ().set_option (IPPROTO_IP,
-                                             IP_TOS,
-                                             (int *) &tos ,
-                                             (int) sizeof (tos));
-
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - IIOP_Connection_Handler::"
-                      "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
-                      tos,
-                      result,
-                      result == -1 ? "try running as superuser" : ""));
-        }
-
-      // On successful setting of TOS field.
-      if (result == 0)
-        this->dscp_codepoint_ = tos;
-
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
deleted file mode 100644
index 5654472ea3e..00000000000
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   IIOP_Connection_Handler.h
- *
- *  $Id$
- *
- *  @author Originally by Chris Cleeland as IIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_IIOP_CONNECTION_HANDLER_H
-#define TAO_IIOP_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Svc_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Stream.h"
-
-#include "tao/Connection_Handler.h"
-#include "tao/Basic_Types.h"
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_IIOP_SVC_HANDLER;
-
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-namespace IIOP
-{
-  class ListenPointList;
-}
-
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
-// ****************************************************************
-
-/**
- * @class TAO_IIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-
-
-class TAO_Export TAO_IIOP_Connection_Handler : public TAO_IIOP_SVC_HANDLER,
-                                               public TAO_Connection_Handler
-{
-
-public:
-
-  TAO_IIOP_Connection_Handler (ACE_Thread_Manager * = 0);
-
-  /// Constructor.
-  TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag);
-
-  /// Destructor.
-  ~TAO_IIOP_Connection_Handler (void);
-
-  /// Called by the @c Strategy_Acceptor when the handler is completely
-  /// connected.  Argument is unused.
-  virtual int open (void *);
-
-  /// Close called by the Acceptor or Connector when connection
-  /// establishment fails.
-  int close (u_long = 0);
-
-  //@{
-  /** @name Event Handler overloads
-   */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-  /// Process the @a listen_list
-  int process_listen_point_list (IIOP::ListenPointList &listen_list);
-
-  /// Check if network priority needs to be enabled
-  int enable_network_priority (void);
-
-  /// Set Diff-Serv codepoint on outgoing packets.
-  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
-  virtual int open_handler (void *);
-
-protected:
-
-  /// Constructor that could be used by the derived classes.
-  /**
-   * Sometimes new pluggable protocols which have similarities with
-   * IIOP may be tempted to this class for their use. Classical
-   * example being that of IIOP_SSL_Connection_Handler. This
-   * constructor just initializes its base class and sets all of its
-   * contents to the default value, if any
-   */
-  TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core);
-
-  //@{
-  /**
-   * @name TAO_Connection Handler overloads
-   */
-  virtual int release_os_resources (void);
-  //@}
-
-private:
-
-  /// Stores the type of service value.
-  int dscp_codepoint_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
deleted file mode 100644
index e412edaf0bb..00000000000
--- a/TAO/tao/IIOP_Connector.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-#include "IIOP_Connector.h"
-#include "IIOP_Profile.h"
-#include "debug.h"
-#include "ORB_Core.h"
-#include "Environment.h"
-#include "Protocols_Hooks.h"
-#include "Connect_Strategy.h"
-#include "Thread_Lane_Resources.h"
-#include "Profile_Transport_Resolver.h"
-#include "Transport.h"
-#include "Wait_Strategy.h"
-#include "SystemException.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           IIOP_Connector,
-           "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector_Base<TAO_IIOP_Connection_Handler>;
-template class ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<TAO_IIOP_Connection_Handler>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector_Base<TAO_IIOP_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_IIOP_Connection_Handler>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (IOP::TAG_INTERNET_IOP)
-  , lite_flag_ (flag)
-  , connect_strategy_ ()
-  , base_connector_ ()
-{
-}
-
-TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
-{
-}
-
-int
-TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  // @@todo: The functionality of the following two statements could
-  // be done in the constructor, but that involves changing the
-  // interface of the pluggable transport factory.
-
-  // Set the ORB Core
-  this->orb_core (orb_core);
-
-  // Create our connect strategy
-  if (this->create_connect_strategy () == -1)
-    return -1;
-
-  /// Our connect creation strategy
-  TAO_IIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
-
-  ACE_NEW_RETURN (connect_creation_strategy,
-                  TAO_IIOP_CONNECT_CREATION_STRATEGY
-                      (orb_core->thr_mgr (),
-                       orb_core,
-                       this->lite_flag_),
-                  -1);
-
-  /// Our activation strategy
-  TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
-
-  ACE_NEW_RETURN (concurrency_strategy,
-                  TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-                  -1);
-
-  return this->base_connector_.open (this->orb_core ()->reactor (),
-                                     connect_creation_strategy,
-                                     &this->connect_strategy_,
-                                     concurrency_strategy);
-}
-
-int
-TAO_IIOP_Connector::close (void)
-{
-  delete this->base_connector_.concurrency_strategy ();
-  delete this->base_connector_.creation_strategy ();
-  return this->base_connector_.close ();
-}
-
-int
-TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
-{
-  TAO_IIOP_Endpoint *iiop_endpoint =
-    this->remote_endpoint (endpoint);
-
-  if (iiop_endpoint == 0)
-    return -1;
-
-   const ACE_INET_Addr &remote_address =
-     iiop_endpoint->object_addr ();
-
-   // Verify that the remote ACE_INET_Addr was initialized properly.
-   // Failure can occur if hostname lookup failed when initializing the
-   // remote ACE_INET_Addr.
-   if (remote_address.get_type () != AF_INET)
-     {
-       if (TAO_debug_level > 0)
-         {
-           ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("TAO (%P|%t) IIOP connection failed.\n")
-                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                       ACE_TEXT ("due to a hostname lookup ")
-                       ACE_TEXT ("failure.\n")));
-         }
-
-       return -1;
-     }
-
-   return 0;
-}
-
-TAO_Transport *
-TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
-                                     TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value *timeout)
-{
-  TAO_IIOP_Endpoint *iiop_endpoint =
-    this->remote_endpoint (desc.endpoint ());
-
-  if (iiop_endpoint == 0)
-    return 0;
-
-  const ACE_INET_Addr &remote_address =
-    iiop_endpoint->object_addr ();
-
-  u_short port = 0;
-  const ACE_UINT32 ia_any = INADDR_ANY;
-  ACE_INET_Addr local_addr(port, ia_any);
-
-  if (iiop_endpoint->is_preferred_network ())
-    local_addr.set (port, iiop_endpoint->preferred_network ());
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                "to <%s:%d> which should %s\n",
-                ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
-                iiop_endpoint->port(),
-                r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
-
-  // Get the right synch options
-  ACE_Synch_Options synch_options;
-
-  this->active_connect_strategy_->synch_options (timeout,
-                                                 synch_options);
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked_connect ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      timeout = &tmp_zero;
-    }
-
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
-
-  int result =
-    this->base_connector_.connect (svc_handler,
-                                   remote_address,
-                                   synch_options,
-                                   local_addr);
-
-  // The connect() method creates the service handler and bumps the
-  // #REFCOUNT# up one extra.  There are four possibilities from
-  // calling connect(): (a) connection succeeds immediately - in this
-  // case, the #REFCOUNT# on the handler is two; (b) connection
-  // completion is pending - in this case, the #REFCOUNT# on the
-  // handler is also two; (c) connection fails immediately - in this
-  // case, the #REFCOUNT# on the handler is one since close() gets
-  // called on the handler; (d) the connect immediately returns when we
-  // have specified that it shouldn't block.
-  //
-  // The extra reference count in
-  // TAO_Connect_Creation_Strategy::make_svc_handler() is needed in
-  // the case when connection completion is pending and we are going
-  // to wait on a variable in the handler to changes, signifying
-  // success or failure.  Note, that this increment cannot be done
-  // once the connect() returns since this might be too late if
-  // another thread pick up the completion and potentially deletes the
-  // handler before we get a chance to increment the reference count.
-
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
-
-  TAO_Transport *transport = svc_handler->transport ();
-
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
-        {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     timeout))
-            {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::"
-                                      "make_connection, "
-                                      "wait for completion failed\n"));
-            }
-        }
-      else
-        {
-          // Transport is not usable
-          transport = 0;
-        }
-    }
-
-  // In case of errors transport is zero
-  if (transport == 0)
-    {
-      // Give users a clue to the problem.
-      if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                      "connection to <%s:%d> failed (%p)\n",
-                      iiop_endpoint->host (), iiop_endpoint->port (),
-                      ACE_TEXT("errno")));
-
-      return 0;
-    }
-
-  // At this point, the connection has be successfully created
-  // connected or not connected, but we have a connection.
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
-                iiop_endpoint->host (),
-                iiop_endpoint->port (),
-                svc_handler->peer ().get_handle ()));
-
-  // Add the handler to Cache
-  int retval =
-    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (
-      &desc,
-      transport);
-
-  // Failure in adding to cache.
-  if (retval != 0)
-    {
-      // Close the handler.
-      svc_handler->close ();
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
-                      "could not add the new connection to cache\n"));
-        }
-
-      return 0;
-    }
-
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
-
-      // Close the handler.
-      (void) transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - IIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
-
-      return 0;
-    }
-
-  return transport;
-}
-
-TAO_Profile *
-TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile = 0;
-  ACE_NEW_RETURN (pfile,
-                  TAO_IIOP_Profile (this->orb_core ()),
-                  0);
-
-  const int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-TAO_Profile *
-TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The endpoint should be of the form:
-  //    N.n@host:port/object_key
-  // or:
-  //    host:port/object_key
-
-  TAO_Profile *profile = 0;
-  ACE_NEW_THROW_EX (profile,
-                    TAO_IIOP_Profile (this->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return profile;
-}
-
-int
-TAO_IIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  static const char *protocol[] = { "iiop", "iioploc" };
-
-  const size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-  if (slot == 0) // an empty string is valid for corbaloc.
-    return 0;
-
-  const size_t len0 = ACE_OS::strlen (protocol[0]);
-  const size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an IIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_IIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_IIOP_Profile::object_key_delimiter_;
-}
-
-TAO_IIOP_Endpoint *
-TAO_IIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != IOP::TAG_INTERNET_IOP)
-    return 0;
-
-  TAO_IIOP_Endpoint *iiop_endpoint =
-    dynamic_cast<TAO_IIOP_Endpoint *> (endpoint );
-
-  if (iiop_endpoint == 0)
-    return 0;
-
-  return iiop_endpoint;
-}
-
-int
-TAO_IIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_IIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_IIOP_Connection_Handler*>(svc_handler);
-
-  // Cancel from the connector
-  if (handler)
-    return this->base_connector_.cancel (handler);
-
-  return -1;
-}
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
deleted file mode 100644
index 2f7d91f769c..00000000000
--- a/TAO/tao/IIOP_Connector.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IIOP_Connector.h
- *
- *  $Id$
- *
- *  IIOP specific connector processing
- *
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_IIOP_CONNECTOR_H
-#define TAO_IIOP_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/SOCK_Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Connector.h"
-
-#include "tao/Transport_Connector.h"
-#include "tao/Connector_Impl.h"
-#include "tao/IIOP_Connection_Handler.h"
-
-class TAO_IIOP_Endpoint;
-
-
-// ****************************************************************
-
-/**
- * @class TAO_IIOP_Connector
- *
- * @brief IIOP-specific Connector bridge for pluggable protocols.
- *
- * Concrete instance of the TAO_Connector class.  Responsible
- * for establishing a connection with a server and is called from the
- * Connector_Registory.
- */
-class TAO_Export TAO_IIOP_Connector : public TAO_Connector
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_IIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_IIOP_Connector (void);
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Transport_Connector.h
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-
-public:
-
-  typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
-          TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY;
-
-  typedef TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>
-          TAO_IIOP_CONNECT_CREATION_STRATEGY;
-
-  typedef ACE_Connect_Strategy<TAO_IIOP_Connection_Handler,
-                               ACE_SOCK_CONNECTOR>
-          TAO_IIOP_CONNECT_STRATEGY ;
-
-  typedef ACE_Strategy_Connector<TAO_IIOP_Connection_Handler,
-                                 ACE_SOCK_CONNECTOR>
-          TAO_IIOP_BASE_CONNECTOR;
-
-protected:
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Transport_Connector.h
-  int set_validate_endpoint (TAO_Endpoint *ep);
-
-  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
-                                  TAO_Transport_Descriptor_Interface &desc,
-                                  ACE_Time_Value *timeout = 0);
-
-  /// More TAO_Connector methods, please check the documentation on
-  /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
-protected:
-
-  /// Do we need to use a GIOP_Lite for sending messages?
-  const bool lite_flag_;
-
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
-private:
-
-  /// Our connect strategy
-  TAO_IIOP_CONNECT_STRATEGY connect_strategy_;
-
-  /// The connector initiating connection requests for IIOP.
-  TAO_IIOP_BASE_CONNECTOR base_connector_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
deleted file mode 100644
index 1f7f4d7b7b6..00000000000
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-#include "IIOP_Endpoint.h"
-#include "IOP_IORC.h"
-#include "debug.h"
-#include "ORB_Core.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/Guard_T.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (tao,
-           IIOP_Endpoint,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/os_include/os_netdb.h"
-
-#include "ace/Vector_T.h"
-#include "ace/ACE.h"
-#include "ace/INET_Addr.h"
-#include "ace/Sock_Connect.h"
-
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
-  : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
-  , host_ ()
-  , port_ (683) // default port (IANA assigned)
-  , is_encodable_ (true)
-  , object_addr_set_ (false)
-  , object_addr_ (addr)
-  , preferred_path_ ()
-  , next_ (0)
-{
-  this->set (addr, use_dotted_decimal_addresses);
-}
-
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      const ACE_INET_Addr &addr,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (IOP::TAG_INTERNET_IOP,
-                  priority)
-  , host_ (host)
-  , port_ (port)
-  , is_encodable_ (true)
-  , object_addr_set_ (false)
-  , object_addr_ (addr)
-  , preferred_path_ ()
-  , next_ (0)
-{
-}
-
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (void)
-  : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
-  , host_ ()
-  , port_ (683)  // default port (IANA assigned)
-  , is_encodable_ (true)
-  , object_addr_set_ (false)
-  , object_addr_ ()
-  , preferred_path_ ()
-  , next_ (0)
-{
-}
-
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (IOP::TAG_INTERNET_IOP, priority)
-  , host_ (host)
-  , port_ (port)
-  , is_encodable_ (true)
-  , object_addr_set_ (false)
-  , object_addr_ ()
-  , preferred_path_ ()
-  , next_ (0)
-{
-}
-
-TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
-{
-}
-
-TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
-  : TAO_Endpoint (rhs.tag_, rhs.priority_)
-  , host_ (rhs.host_)
-  , port_ (rhs.port_)
-  , is_encodable_ (rhs.is_encodable_)
-  , object_addr_set_ (rhs.object_addr_set_)
-  , object_addr_ (rhs.object_addr_)
-  , preferred_path_  (rhs.preferred_path_)
-  , next_ (0)
-{
-}
-
-int
-TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr,
-                        int use_dotted_decimal_addresses)
-{
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (use_dotted_decimal_addresses
-      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-    {
-      if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ")
-                      ACE_TEXT ("- %p cannot determine hostname\n")));
-        }
-
-      const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ")
-                          ACE_TEXT ("- %p "),
-                          ACE_TEXT ("cannot determine hostname and hostaddr\n")));
-            }
-          return -1;
-        }
-      else
-        this->host_ = tmp;
-    }
-  else
-    this->host_ = CORBA::string_dup (tmp_host);
-
-  this->port_ = addr.get_port_number();
-
-  return 0;
-}
-
-int
-TAO_IIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_IIOP_Endpoint::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-TAO_Endpoint *
-TAO_IIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_IIOP_Endpoint::duplicate (void)
-{
-  TAO_IIOP_Endpoint *endpoint = 0;
-
-  // @@ NOTE: Not exception safe..
-  ACE_NEW_RETURN (endpoint, TAO_IIOP_Endpoint (*this), 0);
-
-  return endpoint;
-}
-
-const ACE_INET_Addr &
-TAO_IIOP_Endpoint::object_addr (void) const
-{
-  // The object_addr_ is initialized here, rather than at IOR decode
-  // time for several reasons:
-  //   1. A request on the object may never be invoked.
-  //   2. The DNS setup may have changed dynamically.
-  //   ...etc..
-
-  // Double checked locking optimization.
-  if (!this->object_addr_set_)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        guard,
-                        this->addr_lookup_lock_,
-                        this->object_addr_);
-
-      if (!this->object_addr_set_)
-        {
-          (void) this->object_addr_i ();
-        }
-    }
-
-  return this->object_addr_;
-}
-
-void
-TAO_IIOP_Endpoint::object_addr_i (void) const
-{
-  // We should have already held the lock
-
-  if (this->object_addr_.set (this->port_,
-                              this->host_.in ()) == -1)
-    {
-      // If this call fails, it most likely due a hostname
-      // lookup failure caused by a DNS misconfiguration.  If
-      // a request is made to the object at the given host and
-      // port, then a CORBA::TRANSIENT() exception should be
-      // thrown.
-
-      // Invalidate the ACE_INET_Addr.  This is used as a flag
-      // to denote that ACE_INET_Addr initialization failed.
-      this->object_addr_.set_type (-1);
-    }
-  else
-    {
-      this->object_addr_set_ = true;
-    }
-}
-
-static ACE_CString find_local(const ACE_Vector<ACE_CString>& local_ips,
-                              const ACE_CString& pattern)
-{
-  for (size_t i = 0; i < local_ips.size(); ++i)
-  {
-    ACE_CString ret = local_ips[i];
-    if (ACE::wild_match(ret.c_str(), pattern.c_str()))
-      return ret;
-  }
-  return "";
-}
-
-TAO_IIOP_Endpoint*
-TAO_IIOP_Endpoint::add_local_endpoint(TAO_IIOP_Endpoint* ep, const char* local)
-{
-  TAO_Endpoint* tmp = ep->duplicate();
-  ep->next_ = static_cast<TAO_IIOP_Endpoint*>(tmp);
-  ep->next_->is_encodable_ = true;
-  ep->next_->preferred_path_.host = CORBA::string_dup(local);
-  return ep->next_;
-}
-
-static void
-get_ip_interfaces(ACE_Vector<ACE_CString>& local_ips)
-{
-  ACE_INET_Addr* tmp = 0;
-  size_t cnt = 0;
-  int err = ACE::get_ip_interfaces (cnt, tmp);
-  if (err != 0)
-    return;
-  // @@ Do we need to worry about IPv6 here?
-  ACE_TCHAR buf[32];
-  for (size_t i = 0; i < cnt; ++i)
-  {
-    int err = tmp[i].addr_to_string(buf, 32);
-    ACE_ASSERT(err == 0);
-    ACE_UNUSED_ARG(err);
-    ACE_CString tmp(ACE_TEXT_ALWAYS_CHAR(buf));
-    ssize_t pos = tmp.find(':');
-    if (pos != ACE_CString::npos)
-      tmp = tmp.substr(0, pos);
-    local_ips.push_back(tmp);
-  }
-  delete[] tmp;
-}
-
-// Given a comma separated list of preferred interface directives, which
-// are of the form <wild_remote>=<wild_local>, this function will retrieve
-// the list of preferred local ip addresses by matching wild_local against
-// the list of all local ip interfaces, for any directive where wild_remote
-// matches the host from our endpoint.
-static void find_preferred_interfaces (const ACE_CString& host,
-                                       const ACE_CString& csvPreferred,
-                                       ACE_Vector<ACE_CString>& preferred)
-{
-  ACE_Vector<ACE_CString> local_ips;
-  get_ip_interfaces(local_ips);
-  if (local_ips.size() == 0)
-    return;
-
-  // The outer loop steps through each preferred interface directive
-  // and chains a new endpoint if the remote interface matches the
-  // current endpoint.
-  size_t index = 0;
-  while (index < csvPreferred.length())
-  {
-    ssize_t comma = csvPreferred.find(',', index);
-    ssize_t assign = csvPreferred.find('=', index);
-
-    if (assign == ACE_CString::npos)
-    {
-      assign = csvPreferred.find(':', index);
-      if (assign == ACE_CString::npos)
-      {
-        ACE_ASSERT(assign != ACE_CString::npos);
-        return;
-      }
-    }
-
-    ACE_CString wild_local;
-    if (comma == ACE_CString::npos)
-      wild_local = csvPreferred.substr(assign + 1);
-    else
-      wild_local = csvPreferred.substr(assign + 1, comma - assign - 1);
-    ACE_CString wild_remote = csvPreferred.substr(index, assign - index);
-
-    index = static_cast<size_t>(comma) + 1;
-
-    // For now, we just try to match against the host literally. In
-    // the future it might be worthwhile to resolve some aliases for
-    // this->host_ using DNS (and possibly reverse DNS) lookups. Then we
-    // could try matching against those too.
-    if (ACE::wild_match(host.c_str(), wild_remote.c_str(), false))
-    {
-      // If it's a match, then it means we need to use a
-      // local interface that matches wild_local.
-      ACE_CString local = find_local(local_ips, wild_local);
-      if (local.length() > 0)
-      {
-        preferred.push_back(local);
-      }
-      else
-      {
-        // There is no matching local interface, so we can skip
-        // to the next preferred interface directive.
-      }
-    }
-    else
-    {
-      // The preferred interface directive is for a different
-      // remote endpoint.
-    }
-    if (comma == ACE_CString::npos)
-      break;
-  }
-}
-
-CORBA::ULong
-TAO_IIOP_Endpoint::preferred_interfaces (const char* csv, bool enforce)
-{
-  ACE_Vector<ACE_CString> preferred;
-  find_preferred_interfaces(this->host_.in(), csv, preferred);
-  CORBA::ULong count = preferred.size();
-  if (count > 0)
-  {
-    this->is_encodable_ = true;
-    this->preferred_path_.host = CORBA::string_dup(preferred[0].c_str());
-    TAO_IIOP_Endpoint* ep = this;
-    for (size_t i = 1; i < count; ++i)
-    {
-      ep = add_local_endpoint(ep, preferred[i].c_str());
-    }
-
-    // If we're not enforcing the preferred interfaces, then we can just add
-    // a new non-preferred endpoint to the end with a default local addr.
-    if (! enforce)
-    {
-      ep = add_local_endpoint(ep, "");
-    }
-    else
-    {
-      --count;
-    }
-  }
-  return count;
-}
-
-CORBA::Boolean
-TAO_IIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  const TAO_IIOP_Endpoint *endpoint =
-    dynamic_cast<const TAO_IIOP_Endpoint *> (other_endpoint);
-
-  if (endpoint == 0)
-    return 0;
-
-  return (this->port_ == endpoint->port_
-          && (ACE_OS::strcmp (this->host (), endpoint->host ()) == 0));
-}
-
-CORBA::ULong
-TAO_IIOP_Endpoint::hash (void)
-{
-  if (this->hash_val_ != 0)
-    return this->hash_val_;
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->addr_lookup_lock_,
-                      this->hash_val_);
-    // .. DCL
-    if (this->hash_val_ != 0)
-      return this->hash_val_;
-
-    // A few comments about this optimization. The call below will
-    // deadlock if the object_addr_set is false. If you don't belive
-
-    if (!this->object_addr_set_)
-      {
-        // Set the object_addr first
-        (void) this->object_addr_i ();
-      }
-
-    this->hash_val_ =
-      this->object_addr_.get_ip_address () + this->port ();
-  }
-
-  return this->hash_val_;
-}
-
-bool
-TAO_IIOP_Endpoint::is_preferred_network (void) const
-{
-  return (this->preferred_path_.host.in () != 0 &&
-          this->preferred_path_.host.in ()[0] != 0);
-}
-
-const char *
-TAO_IIOP_Endpoint::preferred_network (void) const
-{
-  return this->preferred_path_.host.in ();
-}
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
deleted file mode 100644
index 3240859488f..00000000000
--- a/TAO/tao/IIOP_Endpoint.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     IIOP_Endpoint.h
- *
- *  $Id$
- *
-    IIOP implementation of PP Framework Endpoint interface.
- *
- *  @author  Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_IIOP_ENDPOINT_H
-#define TAO_IIOP_ENDPOINT_H
-
-#include /**/ "ace/pre.h"
-#include "ace/INET_Addr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Endpoint.h"
-#include "tao/CORBA_String.h"
-#include "tao/IIOP_EndpointsC.h"
-
-class TAO_IIOP_Connection_Handler;
-
-/**
- * @class TAO_IIOP_Endpoint
- *
- * @brief TAO_IIOP_Endpoint
- *
- * IIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_Export TAO_IIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  // @todo Lose these friends!
-  friend class TAO_IIOP_Profile;
-  friend class TAO_SSLIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_IIOP_Endpoint (void);
-
-  /// Constructor.  This is the most efficient constructor since it
-  /// does not require any address resolution processing.
-  TAO_IIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     const ACE_INET_Addr &addr,
-                     CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Constructor.
-  TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
-                     int use_dotted_decimal_addresses);
-
-  /// Constructor.  This constructor is used when decoding endpoints.
-  TAO_IIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     CORBA::Short priority);
-
-
-
-  /// Destructor.
-  ~TAO_IIOP_Endpoint (void);
-
-  // = Implementation of abstract TAO_Endpoint methods.  See
-  // Endpoint.h for their documentation.
-
-  virtual TAO_Endpoint *next (void);
-
-  virtual int addr_to_string (char *buffer, size_t length);
-
-  /// Makes a copy of @c this
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
-  /// endpoints are equivalent if their port and host are the same.
-  virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
-
-  // = IIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_INET_Addr &object_addr (void) const;
-
-  /// Return a pointer to the host string.  This object maintains
-  /// ownership of this string.
-  const char *host (void) const;
-
-  /// Copy the string <h> into <host_> and return the resulting pointer.
-  /// This object maintains ownership of this string.
-  const char *host (const char *h);
-
-  /// Return the port number.
-  CORBA::UShort port (void) const;
-
-  /// Set the port number.
-  CORBA::UShort port (CORBA::UShort p);
-
-  /// Do we have a preferred local network for the target?
-  bool is_preferred_network (void) const;
-
-  /// Return the preferred network if any.
-  const char *preferred_network (void) const;
-
-private:
-
-  /// Helper method for setting INET_Addr.
-  int set (const ACE_INET_Addr &addr,
-           int use_dotted_decimal_addresses);
-
-  /// Helper method for object_addr () call.
-  void object_addr_i (void) const;
-
-  /// Generate preferred interfaces from the options passed in by the
-  /// user.
-  CORBA::ULong preferred_interfaces (const char* csvPreferred, bool enforce);
-
-  /// Chain a new duplicate of ourself with the specified
-  /// local preferred interface.
-  TAO_IIOP_Endpoint* add_local_endpoint(TAO_IIOP_Endpoint* ep, const char* local);
-
-  /// Canonical copy constructor
-  /**
-   * In private section to prevent clients from invoking this
-   * accidentally. Clients should only use duplicate () to make a depp
-   * copy
-   */
-  TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &);
-
-private:
-
-  /// String representing the host name.
-  CORBA::String_var host_;
-
-  /// TCP port number.
-  CORBA::UShort port_;
-
-  /// Is this endpoint created encodable as part of the IOR?
-  bool is_encodable_;
-
-  /// Flag to indicate if the address has been resolved and set.
-  mutable bool object_addr_set_;
-
-  /// Cached instance of ACE_INET_Addr for use in making
-  /// invocations, etc.
-  mutable ACE_INET_Addr object_addr_;
-
-  /// Preferred path for this endpoint.
-  TAO::IIOP_Endpoint_Info preferred_path_;
-
-  /// IIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_IIOP_Endpoint *next_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i
deleted file mode 100644
index d439be3e94c..00000000000
--- a/TAO/tao/IIOP_Endpoint.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-
-ACE_INLINE const char *
-TAO_IIOP_Endpoint::host (void) const
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Endpoint::port (void) const
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Endpoint::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl
deleted file mode 100644
index a0795123572..00000000000
--- a/TAO/tao/IIOP_Endpoints.pidl
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IIOP_Endpoints.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for data structures used to
-//   encapsulate data in TAO_TAG_ENDPOINTS tagged component.  This
-//   TAO-specific component is used for transmission of multiple
-//   endpoints per single profile.  Data structures defined here are
-//   used for transmission of IIOP endpoints.  See IIOP_Profile.*
-//   for more details.
-//
-//
-//   This file was used to generate the code in
-//   IIOP_EndpointsC.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//         -o orig -Ge 1 -GA -Sc -Sci \
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IIOP_Endpoints.pidl
-//
-// ================================================================
-
-#ifndef _TAO_IIOP_ENDPOINTS_IDL_
-#define _TAO_IIOP_ENDPOINTS_IDL_
-
-module TAO
-{
-  /// Stores information for a single IIOP endpoint.
-  struct IIOP_Endpoint_Info
-  {
-    string host;
-    short port;
-    short priority;
-  };
-
-  /// Stores information for a collection of IIOP endpoints.
-  typedef sequence <IIOP_Endpoint_Info> IIOPEndpointSequence;
-};
-
-#endif /* _TAO_IIOP_ENDPOINTS_IDL_ */
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
deleted file mode 100644
index 580430d7ee0..00000000000
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOP_EndpointsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_short },
-    { "priority", &CORBA::_tc_short }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    "IDL:TAO/IIOP_Endpoint_Info:1.0",
-    "IIOP_Endpoint_Info",
-    _tao_fields_TAO_IIOP_Endpoint_Info,
-    3);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info =
-    &_tao_tc_TAO_IIOP_Endpoint_Info;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-#define _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_IIOPEndpointSequence_0 (
-        CORBA::tk_sequence,
-        &TAO::_tc_IIOP_Endpoint_Info,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_IIOPEndpointSequence_0 =
-      &TAO_IIOPEndpointSequence_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOPEndpointSequence (
-    CORBA::tk_alias,
-    "IDL:TAO/IIOPEndpointSequence:1.0",
-    "IIOPEndpointSequence",
-    &TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence =
-    &_tao_tc_TAO_IIOPEndpointSequence;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert_copy (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOP_Endpoint_Info *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::extract (
-        _tao_any,
-        TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-        TAO::_tc_IIOP_Endpoint_Info,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert_copy (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOPEndpointSequence *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::extract (
-        _tao_any,
-        TAO::IIOPEndpointSequence::_tao_any_destructor,
-        TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
deleted file mode 100644
index e50a1032d00..00000000000
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IIOP_EndpointsC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-TAO::IIOP_Endpoint_Info::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  IIOP_Endpoint_Info *_tao_tmp_pointer =
-    static_cast<IIOP_Endpoint_Info *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_)
-#define _TAO_IIOPENDPOINTSEQUENCE_CS_
-
-TAO::IIOPEndpointSequence::IIOPEndpointSequence (void)
-{}
-
-TAO::IIOPEndpointSequence::IIOPEndpointSequence (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        TAO::IIOP_Endpoint_Info
-      >
-    (max)
-{}
-
-TAO::IIOPEndpointSequence::IIOPEndpointSequence (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    TAO::IIOP_Endpoint_Info * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        TAO::IIOP_Endpoint_Info
-      >
-    (max, length, buffer, release)
-{}
-
-TAO::IIOPEndpointSequence::IIOPEndpointSequence (
-    const IIOPEndpointSequence &seq
-  )
-  : TAO_Unbounded_Sequence<
-        TAO::IIOP_Endpoint_Info
-      >
-    (seq)
-{}
-
-TAO::IIOPEndpointSequence::~IIOPEndpointSequence (void)
-{}
-
-void TAO::IIOPEndpointSequence::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  IIOPEndpointSequence * _tao_tmp_pointer =
-    static_cast<IIOPEndpointSequence *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port) &&
-    (strm << _tao_aggregate.priority);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port) &&
-    (strm >> _tao_aggregate.priority);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_
-#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::IIOPEndpointSequence &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::IIOPEndpointSequence &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
deleted file mode 100644
index 95077b7450c..00000000000
--- a/TAO/tao/IIOP_EndpointsC.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
-#define _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct IIOP_Endpoint_Info;
-  
-  typedef
-    TAO_Var_Var_T<
-        IIOP_Endpoint_Info
-      >
-    IIOP_Endpoint_Info_var;
-  
-  typedef
-    TAO_Out_T<
-        IIOP_Endpoint_Info,
-        IIOP_Endpoint_Info_var
-      >
-    IIOP_Endpoint_Info_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export IIOP_Endpoint_Info
-  {
-    typedef IIOP_Endpoint_Info_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager host;
-    CORBA::Short port;
-    CORBA::Short priority;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_)
-#define _TAO_IIOPENDPOINTSEQUENCE_CH_
-  
-  class IIOPEndpointSequence;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        IIOPEndpointSequence,
-        IIOP_Endpoint_Info
-      >
-    IIOPEndpointSequence_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        IIOPEndpointSequence,
-        IIOPEndpointSequence_var,
-        IIOP_Endpoint_Info
-      >
-    IIOPEndpointSequence_out;
-  
-  class TAO_Export IIOPEndpointSequence
-    : public
-        TAO_Unbounded_Sequence<
-            IIOP_Endpoint_Info
-          >
-  {
-  public:
-    IIOPEndpointSequence (void);
-    IIOPEndpointSequence (CORBA::ULong max);
-    IIOPEndpointSequence (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        IIOP_Endpoint_Info* buffer, 
-        CORBA::Boolean release = 0
-      );
-    IIOPEndpointSequence (const IIOPEndpointSequence &);
-    ~IIOPEndpointSequence (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef IIOPEndpointSequence_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOP_Endpoint_Info &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOP_Endpoint_Info*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOP_Endpoint_Info *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOP_Endpoint_Info *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOPEndpointSequence &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOPEndpointSequence*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOPEndpointSequence *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOPEndpointSequence *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::IIOP_Endpoint_Info &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::IIOP_Endpoint_Info &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_
-#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const TAO::IIOPEndpointSequence &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO::IIOPEndpointSequence &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
deleted file mode 100644
index 852fde2c935..00000000000
--- a/TAO/tao/IIOP_Factory.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "IIOP_Factory.h"
-#include "IIOP_Acceptor.h"
-#include "IIOP_Connector.h"
-#include "IOP_IORC.h"
-
-#include "ace/OS_NS_strings.h"
-
-
-ACE_RCSID (tao,
-           IIOP_Factory,
-           "$Id$")
-
-
-static const char prefix_[] = "iiop";
-
-TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_IIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_IIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_IIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_IIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_IIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_IIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_IIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory,
-                       ACE_TEXT ("IIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_IIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory)
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
deleted file mode 100644
index 66bd50adfab..00000000000
--- a/TAO/tao/IIOP_Factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   IIOP_Factory.h
- *
- *  $Id$
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IIOP_FACTORY_H
-#define TAO_IIOP_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Protocol_Factory.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Export TAO_IIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  TAO_IIOP_Protocol_Factory (void);
-  virtual ~TAO_IIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IIOP_FACTORY_H */
diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp
deleted file mode 100644
index 0790993aeeb..00000000000
--- a/TAO/tao/IIOP_Lite_Factory.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "IIOP_Lite_Factory.h"
-#include "IIOP_Acceptor.h"
-#include "IIOP_Connector.h"
-#include "IOP_IORC.h"
-
-#include "ace/OS_NS_strings.h"
-
-
-ACE_RCSID (tao,
-           IIOP_Factory,
-           "$Id$")
-
-
-static const char prefix_[] = "iiop";
-
-TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_IIOP_Lite_Protocol_Factory::~TAO_IIOP_Lite_Protocol_Factory (void)
-{
-
-}
-
-int
-TAO_IIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_IIOP_Lite_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_IIOP_Lite_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_IIOP_Lite_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
-  ACE_NEW_RETURN (acceptor,
-                  TAO_IIOP_Acceptor (lite_flag),
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_IIOP_Lite_Protocol_Factory::init (int /*argc*/,
-                                      ACE_TCHAR* /*argv*/ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_IIOP_Lite_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_IIOP_Connector (lite_flag),
-                  0);
-  return connector;
-}
-
-int
-TAO_IIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory,
-                       ACE_TEXT ("IIOP_Lite_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_IIOP_Lite_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                       ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Lite_Protocol_Factory)
diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h
deleted file mode 100644
index fe4e1026abe..00000000000
--- a/TAO/tao/IIOP_Lite_Factory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   IIOP_Lite_Factory.h
- *
- *  $Id$
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IIOP_LITE_FACTORY_H
-#define TAO_IIOP_LITE_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Protocol_Factory.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Export TAO_IIOP_Lite_Protocol_Factory :
-  public TAO_Protocol_Factory
-{
-public:
-  TAO_IIOP_Lite_Protocol_Factory (void);
-
-  virtual ~TAO_IIOP_Lite_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IIOP_Lite_factory_H */
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
deleted file mode 100644
index 0ce59854060..00000000000
--- a/TAO/tao/IIOP_Profile.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-#include "tao/IIOP_Profile.h"
-#include "tao/Environment.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/IIOP_EndpointsC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID (tao,
-           IIOP_Profile,
-           "$Id$")
-
-#include "ace/os_include/os_netdb.h"
-
-static const char prefix_[] = "iiop";
-
-const char TAO_IIOP_Profile::object_key_delimiter_ = '/';
-
-char
-TAO_IIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_IIOP_Profile::object_key_delimiter_;
-}
-
-
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO::ObjectKey &object_key,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (IOP::TAG_INTERNET_IOP,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ()),
-    count_ (1)
-{
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
-                                    CORBA::UShort port,
-                                    const TAO::ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (IOP::TAG_INTERNET_IOP,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (host, port, addr),
-    count_ (1)
-{
-}
-
-TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (IOP::TAG_INTERNET_IOP,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
-                                           TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1)
-{
-}
-
-TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-int
-TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
-{
-  // Decode host and port into the <endpoint_>.
-  if (cdr.read_string (this->endpoint_.host_.out ()) == 0
-      || cdr.read_ushort (this->endpoint_.port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - ")
-                    ACE_TEXT ("error while decoding host/port\n")));
-      return -1;
-    }
-
-  if (cdr.good_bit ())
-    {
-      // Invalidate the object_addr_ until first access.
-      this->endpoint_.object_addr_.set_type (-1);
-
-      const char* csv = this->orb_core()->orb_params()->preferred_interfaces();
-      bool enforce = this->orb_core()->orb_params()->enforce_pref_interfaces();
-      this->count_ += this->endpoint_.preferred_interfaces(csv, enforce);
-
-      return 1;
-    }
-
-  return -1;
-}
-
-void
-TAO_IIOP_Profile::parse_string_i (const char *ior
-                                  ACE_ENV_ARG_DECL)
-{
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-
-  const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_);
-
-  if (okd == 0 || okd == ior)
-    {
-      // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Length of host string.
-  CORBA::ULong length_host = 0;
-
-  const char *cp_pos = ACE_OS::strchr (ior, ':');  // Look for a port
-
-  if (cp_pos == ior)
-    {
-      // No hostname, however one is required by the spec when specifying a port.
-      // See formal-04-03-01, section 13.6.10.3
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                   ACE_LIB_TEXT ("\nTAO (%P|%t) IIOP_Profile: ")
-                   ACE_LIB_TEXT ("Host address may be omited only when no port has been specified.\n")));
-        }
-
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-  else if (cp_pos != 0)
-    {
-      // A port number or port name was specified.
-      CORBA::ULong length_port = okd - cp_pos - 1;
-
-      CORBA::String_var tmp = CORBA::string_alloc (length_port);
-
-      ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port);
-      tmp[length_port] = '\0';
-
-      if (ACE_OS::strspn (tmp.in (), "1234567890") == length_port)
-        {
-          this->endpoint_.port_ =
-            static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
-        }
-      else
-        {
-          ACE_INET_Addr ia;
-          if (ia.string_to_addr (tmp.in ()) == -1)
-            {
-              ACE_THROW (CORBA::INV_OBJREF (
-                             CORBA::SystemException::_tao_minor_code (
-                               0,
-                               EINVAL),
-                             CORBA::COMPLETED_NO));
-            }
-          else
-            {
-              this->endpoint_.port_ = ia.get_port_number ();
-            }
-        }
-      length_host = cp_pos - ior;
-    }
-  else
-    length_host = okd - ior;
-
-  CORBA::String_var tmp = CORBA::string_alloc (length_host);
-
-  // Skip the trailing '/'
-  ACE_OS::strncpy (tmp.inout (), ior, length_host);
-  tmp[length_host] = '\0';
-
-  this->endpoint_.host_ = tmp._retn ();
-
-  if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0)
-    {
-      ACE_INET_Addr host_addr;
-
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host, i.e. the
-      // local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-        {
-          // Can't get the IP address since the INET_Addr wasn't
-          // initialized.  Just throw an exception.
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("IIOP_Profile::parse_string ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-
-          // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
-                       CORBA::SystemException::_tao_minor_code (
-                         0,
-                         EINVAL),
-                       CORBA::COMPLETED_NO));
-        }
-      else
-        this->endpoint_.host_ = CORBA::string_dup (tmp_host);
-    }
-
-  TAO::ObjectKey ok;
-
-  TAO::ObjectKey::decode_string_to_sequence (ok,
-                                             okd + 1);
-
-  (void) this->orb_core ()->object_key_table ().bind (ok,
-                                                      this->ref_object_key_);
-}
-
-CORBA::Boolean
-TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
-{
-  const TAO_IIOP_Profile *op =
-    dynamic_cast<const TAO_IIOP_Profile *> (other_profile);
-
-  // Make sure we have a TAO_IIOP_Profile.
-  if (op == 0)
-    return 0;
-
-  // Check endpoints equivalence.
-  const TAO_IIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_IIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Get the hash value for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  const TAO::ObjectKey &ok =
-    this->ref_object_key_->object_key ();
-
-  if (ok.length () >= 4)
-    {
-      hashval += ok[1];
-      hashval += ok[3];
-    }
-
-  hashval += TAO_Profile::hash_service_i (max);
-
-  return hashval % max;
-}
-
-TAO_Endpoint*
-TAO_IIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-CORBA::ULong
-TAO_IIOP_Profile::endpoint_count (void) const
-{
-  return this->count_;
-}
-
-void
-TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  ++this->count_;
-}
-
-char *
-TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::String_var key;
-  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
-                                             this->ref_object_key_->object_key ());
-
-  size_t buflen = (8 /* "corbaloc" */ +
-                   1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
-                   1 /* colon separator */ +
-                   1 /* major version */ +
-                   1 /* decimal point */ +
-                   1 /* minor version */ +
-                   1 /* `@' character */ +
-                   ACE_OS::strlen (this->endpoint_.host ()) +
-                   1 /* colon separator */ +
-                   5 /* port number */ +
-                   1 /* object key separator */ +
-                   ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
-
-  return buf;
-}
-
-const char *
-TAO_IIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-void
-TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  encap.write_string (this->endpoint_.host ());
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->endpoint_.port ());
-
-  // OCTET SEQUENCE for object key
-  if (this->ref_object_key_)
-    encap << this->ref_object_key_->object_key ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - IIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
-    }
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components ().encode (encap);
-}
-
-int
-TAO_IIOP_Profile::encode_endpoints (void)
-{
-  CORBA::ULong actual_count = 0;
-
-  const TAO_IIOP_Endpoint *endpoint = &this->endpoint_;
-
-  // Count the number of endpoints that needs to be encoded
-  for (CORBA::ULong c = 0;
-       c != this->count_;
-       ++c)
-    {
-      if (endpoint->is_encodable_)
-        ++actual_count;
-
-      endpoint = endpoint->next_;
-    }
-
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-
-  TAO::IIOPEndpointSequence endpoints;
-  endpoints.length (actual_count);
-
-  endpoint = &this->endpoint_;
-
-  for (CORBA::ULong i = 0;
-       i < actual_count;
-       ++i)
-    {
-      if (endpoint->is_encodable_)
-        {
-          endpoints[i].host = endpoint->host ();
-          endpoints[i].port = endpoint->port ();
-          endpoints[i].priority = endpoint->priority ();
-        }
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-
-  this->set_tagged_components (out_cdr);
-
-  return  0;
-}
-
-
-int
-TAO_IIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (reinterpret_cast<const char *> (buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      // Extract endpoints sequence.
-      TAO::IIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_IIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_IIOP_Endpoint (endpoints[i].host,
-                                             endpoints[i].port,
-                                             endpoints[i].priority),
-                          -1);
-
-          this->add_endpoint (endpoint);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
deleted file mode 100644
index ee145ad9b53..00000000000
--- a/TAO/tao/IIOP_Profile.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file     IIOP_Profile.h
- *
- *  $Id$
- *
- *   IIOP profile specific processing
- *
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IIOP_PROFILE_H
-#define TAO_IIOP_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Profile.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IIOP_Endpoint.h"
-
-// TAO IIOP_Profile concrete Profile definitions
-/**
- * @class TAO_IIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating ORBs over a TCP/IP network.
- *
- * This class defines the IIOP profile as specified in the CORBA
- * specification.
- */
-class TAO_Export TAO_IIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that IIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO::ObjectKey &object_key,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, this is the most efficient since it
-  /// doesn't require any address resolution processing.
-  TAO_IIOP_Profile (const char *host,
-                    CORBA::UShort port,
-                    const TAO::ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, default.
-  TAO_IIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_IIOP_Profile (void);
-
-  /// Template methods. Please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-  /**
-   * Add @a endp to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * @a endp.
-   */
-  void add_endpoint (TAO_IIOP_Endpoint *endp);
-
-protected:
-
-  /// Template methods. Please see Profile.h for the documentation.
-  virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-
-protected:
-
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only for two cases
-   * (1) when RTCORBA is enabled and
-   * (2) the ORB is initialized with -ORBPreferredInterfaces option.
-   * However, in the near future, this will be used in for mode as
-   * well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS  feature.
-   *
-   * This is probably as good a place to discuss how the list of
-   * endpoints is used for #2. If the ORB is configured to use
-   * preferred interfaces for invocation, TAO creates an endpoint per
-   * preferred interface. To be clear, every tuple
-   * <destination:target> will have an endpoint. What TAO essentially
-   * does is that creates it multiple endpoints so that the invocation
-   * code path can use existing iterating techniques to try one
-   * preferred interface after another (if the first did not work). If
-   * the ORB is configured with -ORBEnforcePreferredInterface set to
-   * false in addition to the ORBPreferredInterfaces option , TAO
-   * creates another endpoint with the preferred bit set to null, so
-   * that the invocation code can fall back to a TCP stack returned
-   * local address.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard IIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_IIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  CORBA::ULong count_;
-};
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
deleted file mode 100644
index 75ff779b373..00000000000
--- a/TAO/tao/IIOP_Transport.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-#include "IIOP_Transport.h"
-#include "IIOP_Acceptor.h"
-#include "IIOPC.h"
-#include "Acceptor_Registry.h"
-#include "operation_details.h"
-#include "Wait_Strategy.h"
-#include "debug.h"
-#include "GIOP_Message_Base.h"
-#include "Protocols_Hooks.h"
-#include "ORB_Core.h"
-#include "Thread_Lane_Resources.h"
-#include "Transport_Mux_Strategy.h"
-
-ACE_RCSID (tao,
-           IIOP_Transport,
-           "$Id$")
-
-TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Boolean )
-  : TAO_Transport (IOP::TAG_INTERNET_IOP,
-                   orb_core)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
-{
-  // Use the normal GIOP object
-  ACE_NEW (this->messaging_object_,
-           TAO_GIOP_Message_Base (orb_core));
-}
-
-TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-ACE_Event_Handler *
-TAO_IIOP_Transport::event_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Connection_Handler *
-TAO_IIOP_Transport::connection_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Pluggable_Messaging *
-TAO_IIOP_Transport::messaging_object (void)
-{
-  return this->messaging_object_;
-}
-
-ssize_t
-TAO_IIOP_Transport::send (iovec *iov, int iovcnt,
-                          size_t &bytes_transferred,
-                          const ACE_Time_Value *max_wait_time)
-{
-  ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt,
-                                                             max_wait_time);
-  if (retval > 0)
-    bytes_transferred = retval;
-  else
-    {
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::send, ")
-                      ACE_TEXT ("send failure - %m (%d)\n"),
-                      this->id (), errno));
-        }
-    }
-
-  return retval;
-}
-
-ssize_t
-TAO_IIOP_Transport::recv (char *buf,
-                          size_t len,
-                          const ACE_Time_Value *max_wait_time)
-{
-  ssize_t n = this->connection_handler_->peer ().recv (buf,
-                                                       len,
-                                                       max_wait_time);
-
-  // Do not print the error message if it is a timeout, which could
-  // occur in thread-per-connection.
-  if (n == -1 &&
-      TAO_debug_level > 4 &&
-      errno != ETIME)
-    {
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, ")
-                  ACE_TEXT ("read failure - %m\n"),
-                  this->id ()));
-    }
-
-  // Error handling
-  if (n == -1)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-
-      return -1;
-    }
-
-  // Most of the errors handling is common for
-  // Now the message has been read
-
-  // @@ What are the other error handling here??
-  else if (n == 0)
-    {
-      return -1;
-    }
-
-  return n;
-}
-
-int
-TAO_IIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
-
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-    return -1;
-
-  this->first_request_sent();
-
-  return 0;
-}
-
-int
-TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // This guarantees to send all data (bytes) or return an error.
-  const ssize_t n = this->send_message_shared (stub,
-                                               message_semantics,
-                                               stream.begin (),
-                                               max_wait_time);
-
-  if (n == -1)
-    {
-      // Dont try to be smart and request for %p in the debug
-      // statement.  If the event handler is destroyed the transport
-      // would return -1 with errno set to ENOENT. %p then would dump
-      // a core. %m would then be softer on this.
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::send_message, ")
-                    ACE_TEXT ("write failure - %m\n"),
-                    this->id ()));
-      return -1;
-    }
-
-  return 1;
-}
-
-int
-TAO_IIOP_Transport::send_message_shared (
-  TAO_Stub *stub,
-  int message_semantics,
-  const ACE_Message_Block *message_block,
-  ACE_Time_Value *max_wait_time)
-{
-  int r;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-    r = this->send_message_shared_i (stub, message_semantics,
-                                     message_block, max_wait_time);
-  }
-
-  if (r == -1)
-    {
-      this->close_connection ();
-    }
-
-  return r;
-}
-
-int
-TAO_IIOP_Transport::generate_request_header (TAO_Operation_Details &opdetails,
-                                             TAO_Target_Specification &spec,
-                                             TAO_OutputCDR &msg)
-{
-  // Check whether we have a Bi Dir IIOP policy set, whether the
-  // messaging objects are ready to handle bidirectional connections
-  // and also make sure that we have not recd. or sent any information
-  // regarding this before...
-  if (this->orb_core ()->bidir_giop_policy () &&
-      this->messaging_object_->is_ready_for_bidirectional (msg) &&
-      this->bidirectional_flag () < 0)
-    {
-      this->set_bidir_context_info (opdetails);
-
-      // Set the flag to 1 (i.e., originating side)
-      this->bidirectional_flag (1);
-
-      // At the moment we enable BiDIR giop we have to get a new
-      // request id to make sure that we follow the even/odd rule
-      // for request id's. We only need to do this when enabled
-      // it, after that the Transport Mux Strategy will make sure
-      // that the rule is followed
-      opdetails.request_id (this->tms ()->request_id ());
-    }
-
-  return TAO_Transport::generate_request_header (opdetails,
-                                                 spec,
-                                                 msg);
-}
-
-int
-TAO_IIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major, minor);
-
-  return 1;
-}
-
-int
-TAO_IIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
-{
-  CORBA::Boolean byte_order;
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    return -1;
-
-  cdr.reset_byte_order (static_cast<int> (byte_order));
-
-  IIOP::ListenPointList listen_list;
-  if ((cdr >> listen_list) == 0)
-    return -1;
-
-  // As we have received a bidirectional information, set the flag to
-  // 0 (i.e., non-originating side)
-  this->bidirectional_flag (0);
-
-  return this->connection_handler_->process_listen_point_list (listen_list);
-}
-
-void
-TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
-{
-  // Get a handle to the acceptor registry
-  TAO_Acceptor_Registry &ar =
-    this->orb_core ()->lane_resources ().acceptor_registry ();
-
-  IIOP::ListenPointList listen_point_list;
-
-  const TAO_AcceptorSetIterator end = ar.end ();
-
-  for (TAO_AcceptorSetIterator acceptor = ar.begin ();
-       acceptor != end;
-       ++acceptor)
-    {
-      // Check whether it is a IIOP acceptor
-      if ((*acceptor)->tag () == IOP::TAG_INTERNET_IOP)
-        {
-          if (this->get_listen_point (listen_point_list, *acceptor) == -1)
-            {
-              if (TAO_debug_level > 0)
-                ACE_ERROR ((LM_ERROR,
-                            "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
-                            "error getting listen_point\n"));
-
-              return;
-            }
-        }
-    }
-
-  if (listen_point_list.length () == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
-                    "listen_point list is empty, client should send a list "
-                    "with at least one point\n"));
-
-      return;
-    }
-
-  // We have the ListenPointList at this point. Create a output CDR
-  // stream at this point
-  TAO_OutputCDR cdr;
-
-  // Marshal the information into the stream
-  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
-      || (cdr << listen_point_list) == 0)
-    return;
-
-  // Add this info in to the svc_list
-  opdetails.request_service_context ().set_context (IOP::BI_DIR_IIOP,
-                                                    cdr);
-
-  return;
-}
-
-int
-TAO_IIOP_Transport::get_listen_point (
-    IIOP::ListenPointList &listen_point_list,
-    TAO_Acceptor *acceptor)
-{
-  TAO_IIOP_Acceptor *iiop_acceptor =
-    dynamic_cast<TAO_IIOP_Acceptor *> (acceptor);
-
-  if (iiop_acceptor == 0)
-    return -1;
-
-  // Get the array of endpoints serviced by TAO_IIOP_Acceptor
-  const ACE_INET_Addr *endpoint_addr =
-    iiop_acceptor->endpoints ();
-
-  // Get the endpoint count
-  const size_t count =
-    iiop_acceptor->endpoint_count ();
-
-  // Get the local address of the connection
-  ACE_INET_Addr local_addr;
-
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
-                         ACE_TEXT ("could not resolve local host address\n")),
-                        -1);
-    }
-
-  // Note: Looks like there is no point in sending the list of
-  // endpoints on interfaces on which this connection has not
-  // been established. If this is wrong, please correct me.
-  CORBA::String_var local_interface;
-
-  // Get the hostname for the local address
-  if (iiop_acceptor->hostname (this->orb_core_,
-                                      local_addr,
-                                      local_interface.out ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
-                         ACE_TEXT ("could not resolve local host name\n")),
-                        -1);
-    }
-
-  for (size_t index = 0;
-       index < count;
-       ++index)
-    {
-      if (local_addr.get_ip_address ()
-          == endpoint_addr[index].get_ip_address ())
-        {
-          // Get the count of the number of elements
-          const CORBA::ULong len = listen_point_list.length ();
-
-          // Increase the length by 1
-          listen_point_list.length (len + 1);
-
-          // We have the connection and the acceptor endpoint on the
-          // same interface
-          IIOP::ListenPoint & point = listen_point_list[len];
-          point.host = CORBA::string_dup (local_interface.in ());
-          point.port = endpoint_addr[index].get_port_number ();
-
-          if (TAO_debug_level >= 5)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P:%t) Listen_Point_List[%d] = <%s:%d>"), 
-                        len,
-                        point.host.in (),
-                        point.port));
-          }
-          
-        }
-    }
-
-  return 1;
-}
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
deleted file mode 100644
index 5bbebdd5ae9..00000000000
--- a/TAO/tao/IIOP_Transport.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   IIOP_Transport.h
- *
- *  $Id$
- *
- *  @author Originally by Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_IIOP_TRANSPORT_H
-#define TAO_IIOP_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Transport.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace IIOP
-{
-  class ListenPointList;
-}
-
-// Forward decls.
-class TAO_IIOP_Connection_Handler;
-class TAO_ORB_Core;
-class TAO_Operation_Details;
-class TAO_Pluggable_Messaging;
-class TAO_Acceptor;
-class TAO_Adapter;
-
-/**
- * @class TAO_IIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  IIOP protocol.
- *
- * Specialization of the base TAO_Transport class to handle the IIOP
- * protocol.
- */
-class TAO_Export TAO_IIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
-                      TAO_ORB_Core *orb_core,
-                      CORBA::Boolean flag);
-
-protected:
-
-  /// Destructor
-  /**
-   * Protected destructor to enforce proper memory management through
-   * the reference counting mechanism.
-   */
-  virtual ~TAO_IIOP_Transport (void);
-
-  /** @name Overridden Template Methods
-   *
-   * Please check the documentation in "tao/Transport.h" for more
-   * details.
-   */
-  //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-
-  /// Access the underlying messaging object
-  virtual TAO_Pluggable_Messaging *messaging_object (void);
-
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *timeout = 0);
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-  virtual int send_message_shared (TAO_Stub *stub,
-                                   int message_semantics,
-                                   const ACE_Message_Block *message_block,
-                                   ACE_Time_Value *max_wait_time);
-
-
-public:
-
-  /// Bridge method to call a similar method on the connection handler
-  void update_protocol_properties (int send_buffer_size,
-                                   int recv_buffer_size,
-                                   int no_delay,
-                                   int enable_network_priority);
-
-  /// @todo These methods IMHO should have more meaningful
-  /// names. The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int message_semantics,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  /*virtual int send_reply (TAO_OutputCDR &stream,
-                          TAO_Adapter *poa = 0);*/
-
-  virtual int generate_request_header (TAO_Operation_Details &opdetails,
-                                       TAO_Target_Specification &spec,
-                                       TAO_OutputCDR &msg);
-
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-  virtual int tear_listen_point_list (TAO_InputCDR &cdr);
-
-  virtual TAO_Connection_Handler * connection_handler_i (void);
-
-  //@}
-
-private:
-
-  /// Set the Bidirectional context info in the service context list
-  void set_bidir_context_info (TAO_Operation_Details &opdetails);
-
-  /// Add the listen points in @a acceptor to the @a listen_point_list
-  /// if this connection is in the same interface as that of the
-  /// endpoints in the @a acceptor
-  int get_listen_point (IIOP::ListenPointList &listen_point_list,
-                        TAO_Acceptor *acceptor);
-private:
-
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_IIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
deleted file mode 100644
index 7e70877a9ca..00000000000
--- a/TAO/tao/IOP.pidl
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- IDL -*-
-/**
- * @file IOP.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the IOP module.
- *
- * This file is used to generate IOPC.{h,cpp}, using the following
- * command:
- *
- *   tao_idl.exe
- *        -o orig -St -Sp -Ge 1 -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include="tao/TAO_Export.h"
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        IOP.pidl
- *
- * and then:
- *
- * patch < diffs/IOP.diff
- *
- * The code left in IOPC.{h,inl,cpp} is ready for use.
- *
- */
-
-#ifndef TAO_IOP_PIDL
-#define TAO_IOP_PIDL
-
-#include "IOP_IOR.pidl"
-#include "IOP_Codec.pidl"
-
-#endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
deleted file mode 100644
index b16ffbbd190..00000000000
--- a/TAO/tao/IOPC.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IOPC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
deleted file mode 100644
index ef62ef4934b..00000000000
--- a/TAO/tao/IOPC.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IOPC_H_
-#define _TAO_IDL_ORIG_IOPC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#include "tao/IOP_IORC.h"
-#include "tao/IOP_CodecC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/IOPS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
deleted file mode 100644
index 6bad875aab1..00000000000
--- a/TAO/tao/IOPS_T.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:566
-
-#ifndef _TAO_IDL_ORIG_IOPS_T_H_
-#define _TAO_IDL_ORIG_IOPS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1111
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl
deleted file mode 100644
index 8ccee00dc53..00000000000
--- a/TAO/tao/IOP_Codec.pidl
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file IOP_Codec.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the IOP module.
- *
- * This file is used to generate IOPC.{h,cpp}, using the following
- * command:
- *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        IOP_Codec.pidl
- *
- */
-
-#ifndef TAO_IOP_CODEC_PIDL
-#define TAO_IOP_CODEC_PIDL
-
-#include <Typecode_types.pidl>
-#include <OctetSeq.pidl>
-
-#pragma prefix "omg.org"
-
-module IOP
-{
-    local interface Codec {
-    exception InvalidTypeForEncoding {};
-    exception FormatMismatch {};
-    exception TypeMismatch {};
-
-    CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
-    any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
-    CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
-    any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
-      raises (FormatMismatch, TypeMismatch);
-  };
-
-  typedef short EncodingFormat;
-  const EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
-  struct Encoding {
-    EncodingFormat format;
-    octet major_version;
-    octet minor_version;
-  };
-
-  local interface CodecFactory {
-    exception UnknownEncoding {};
-
-    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-  };
-};
-
-#pragma prefix ""
-
-#endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
deleted file mode 100644
index cddbabf3d68..00000000000
--- a/TAO/tao/IOP_CodecA.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IOP_CodecC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_InvalidTypeForEncoding (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
-    "InvalidTypeForEncoding",
-    _tao_fields_IOP_Codec_InvalidTypeForEncoding,
-    0);
-  
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
-  &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_FormatMismatch (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
-    "FormatMismatch",
-    _tao_fields_IOP_Codec_FormatMismatch,
-    0);
-  
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
-  &_tao_tc_IOP_Codec_FormatMismatch;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec_TypeMismatch (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
-    "TypeMismatch",
-    _tao_fields_IOP_Codec_TypeMismatch,
-    0);
-  
-::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
-  &_tao_tc_IOP_Codec_TypeMismatch;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Codec (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/IOP/Codec:1.0",
-    "Codec");
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Codec =
-    &_tao_tc_IOP_Codec;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_EncodingFormat (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/EncodingFormat:1.0",
-    "EncodingFormat",
-    &CORBA::_tc_short);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
-    &_tao_tc_IOP_EncodingFormat;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] =
-  {
-    { "format", &IOP::_tc_EncodingFormat },
-    { "major_version", &CORBA::_tc_octet },
-    { "minor_version", &CORBA::_tc_octet }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_Encoding (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/Encoding:1.0",
-    "Encoding",
-    _tao_fields_IOP_Encoding,
-    3);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Encoding =
-    &_tao_tc_IOP_Encoding;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_CodecFactory_UnknownEncoding (
-    CORBA::tk_except,
-    "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
-    "UnknownEncoding",
-    _tao_fields_IOP_CodecFactory_UnknownEncoding,
-    0);
-  
-::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
-  &_tao_tc_IOP_CodecFactory_UnknownEncoding;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_CodecFactory (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/IOP/CodecFactory:1.0",
-    "CodecFactory");
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_CodecFactory =
-    &_tao_tc_IOP_CodecFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec_ptr _tao_elem
-  )
-{
-  IOP::Codec_ptr _tao_objptr =
-    IOP::Codec::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<IOP::Codec>::insert (
-      _tao_any,
-      IOP::Codec::_tao_any_destructor,
-      IOP::_tc_Codec,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<IOP::Codec>::extract (
-        _tao_any,
-        IOP::Codec::_tao_any_destructor,
-        IOP::_tc_Codec,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert_copy (
-      _tao_any,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::InvalidTypeForEncoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert (
-      _tao_any,
-      IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-      IOP::Codec::_tc_InvalidTypeForEncoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::InvalidTypeForEncoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::InvalidTypeForEncoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::InvalidTypeForEncoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::extract (
-        _tao_any,
-        IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor,
-        IOP::Codec::_tc_InvalidTypeForEncoding,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert_copy (
-      _tao_any,
-      IOP::Codec::FormatMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_FormatMismatch,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::FormatMismatch *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert (
-      _tao_any,
-      IOP::Codec::FormatMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_FormatMismatch,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::FormatMismatch *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::FormatMismatch *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::extract (
-        _tao_any,
-        IOP::Codec::FormatMismatch::_tao_any_destructor,
-        IOP::Codec::_tc_FormatMismatch,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert_copy (
-      _tao_any,
-      IOP::Codec::TypeMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_TypeMismatch,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Codec::TypeMismatch *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert (
-      _tao_any,
-      IOP::Codec::TypeMismatch::_tao_any_destructor,
-      IOP::Codec::_tc_TypeMismatch,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Codec::TypeMismatch *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Codec::TypeMismatch *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Codec::TypeMismatch *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::extract (
-        _tao_any,
-        IOP::Codec::TypeMismatch::_tao_any_destructor,
-        IOP::Codec::_tc_TypeMismatch,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::Encoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy (
-      _tao_any,
-      IOP::Encoding::_tao_any_destructor,
-      IOP::_tc_Encoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::Encoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::Encoding>::insert (
-      _tao_any,
-      IOP::Encoding::_tao_any_destructor,
-      IOP::_tc_Encoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::Encoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::Encoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::Encoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::Encoding>::extract (
-        _tao_any,
-        IOP::Encoding::_tao_any_destructor,
-        IOP::_tc_Encoding,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr _tao_elem
-  )
-{
-  IOP::CodecFactory_ptr _tao_objptr =
-    IOP::CodecFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<IOP::CodecFactory>::insert (
-      _tao_any,
-      IOP::CodecFactory::_tao_any_destructor,
-      IOP::_tc_CodecFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::CodecFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<IOP::CodecFactory>::extract (
-        _tao_any,
-        IOP::CodecFactory::_tao_any_destructor,
-        IOP::_tc_CodecFactory,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert_copy (
-      _tao_any,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::CodecFactory::UnknownEncoding *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert (
-      _tao_any,
-      IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-      IOP::CodecFactory::_tc_UnknownEncoding,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::CodecFactory::UnknownEncoding *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::CodecFactory::UnknownEncoding *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::extract (
-        _tao_any,
-        IOP::CodecFactory::UnknownEncoding::_tao_any_destructor,
-        IOP::CodecFactory::_tc_UnknownEncoding,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
deleted file mode 100644
index c20eb02a233..00000000000
--- a/TAO/tao/IOP_CodecC.cpp
+++ /dev/null
@@ -1,748 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IOP_CodecC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for IOP::Codec.
-
-IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::duplicate (
-    IOP::Codec_ptr p
-  )
-{
-  return IOP::Codec::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<IOP::Codec>::release (
-    IOP::Codec_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::nil (void)
-{
-  return IOP::Codec::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<IOP::Codec>::marshal (
-    IOP::Codec_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
-  : CORBA::UserException (
-        "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
-        "InvalidTypeForEncoding"
-      )
-{
-}
-
-IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
-{
-}
-
-IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IOP::Codec::InvalidTypeForEncoding&
-IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidTypeForEncoding *_tao_tmp_pointer =
-    static_cast<InvalidTypeForEncoding *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidTypeForEncoding *> (_tao_excp);
-}
-
-const IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidTypeForEncoding *> (_tao_excp);
-}
-
-CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IOP::Codec::InvalidTypeForEncoding (*this),
-      0
-    );
-  return result;
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const
-{
-  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IOP::Codec::FormatMismatch::FormatMismatch (void)
-  : CORBA::UserException (
-        "IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
-        "FormatMismatch"
-      )
-{
-}
-
-IOP::Codec::FormatMismatch::~FormatMismatch (void)
-{
-}
-
-IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IOP::Codec::FormatMismatch&
-IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
-{
-  FormatMismatch *_tao_tmp_pointer =
-    static_cast<FormatMismatch *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<FormatMismatch *> (_tao_excp);
-}
-
-const IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const FormatMismatch *> (_tao_excp);
-}
-
-CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IOP::Codec::FormatMismatch::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IOP::Codec::FormatMismatch (*this),
-      0
-    );
-  return result;
-}
-
-void IOP::Codec::FormatMismatch::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::FormatMismatch::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::FormatMismatch::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const
-{
-  return ::IOP::Codec::_tc_FormatMismatch;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IOP::Codec::TypeMismatch::TypeMismatch (void)
-  : CORBA::UserException (
-        "IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
-        "TypeMismatch"
-      )
-{
-}
-
-IOP::Codec::TypeMismatch::~TypeMismatch (void)
-{
-}
-
-IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IOP::Codec::TypeMismatch&
-IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TypeMismatch *_tao_tmp_pointer =
-    static_cast<TypeMismatch *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<TypeMismatch *> (_tao_excp);
-}
-
-const IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const TypeMismatch *> (_tao_excp);
-}
-
-CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IOP::Codec::TypeMismatch::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IOP::Codec::TypeMismatch (*this),
-      0
-    );
-  return result;
-}
-
-void IOP::Codec::TypeMismatch::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::TypeMismatch::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const
-{
-  return ::IOP::Codec::_tc_TypeMismatch;
-}
-
-IOP::Codec::Codec (void)
-{}
-
-IOP::Codec::~Codec (void)
-{}
-
-void 
-IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Codec *_tao_tmp_pointer =
-    static_cast<Codec *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-IOP::Codec_ptr
-IOP::Codec::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Codec::_nil ();
-    }
-  
-  Codec_ptr proxy =
-    dynamic_cast<Codec_ptr> (_tao_objref);
-  
-  return Codec::_duplicate (proxy);
-}
-
-IOP::Codec_ptr
-IOP::Codec::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Codec::_nil ();
-    }
-  
-  Codec_ptr proxy =
-    dynamic_cast<Codec_ptr> (_tao_objref);
-  
-  return Codec::_duplicate (proxy);
-}
-
-IOP::Codec_ptr
-IOP::Codec::_duplicate (Codec_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-IOP::Codec::_tao_release (Codec_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-IOP::Codec::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/IOP/Codec:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* IOP::Codec::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/IOP/Codec:1.0";
-}
-
-CORBA::Boolean
-IOP::Codec::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IOP::Encoding::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Encoding *_tao_tmp_pointer =
-    static_cast<Encoding *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for IOP::CodecFactory.
-
-IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
-    IOP::CodecFactory_ptr p
-  )
-{
-  return IOP::CodecFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<IOP::CodecFactory>::release (
-    IOP::CodecFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::nil (void)
-{
-  return IOP::CodecFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<IOP::CodecFactory>::marshal (
-    IOP::CodecFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
-  : CORBA::UserException (
-        "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
-        "UnknownEncoding"
-      )
-{
-}
-
-IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
-{
-}
-
-IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IOP::CodecFactory::UnknownEncoding&
-IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UnknownEncoding *_tao_tmp_pointer =
-    static_cast<UnknownEncoding *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<UnknownEncoding *> (_tao_excp);
-}
-
-const IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const UnknownEncoding *> (_tao_excp);
-}
-
-CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IOP::CodecFactory::UnknownEncoding (*this),
-      0
-    );
-  return result;
-}
-
-void IOP::CodecFactory::UnknownEncoding::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::CodecFactory::UnknownEncoding::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::CodecFactory::UnknownEncoding::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const
-{
-  return ::IOP::CodecFactory::_tc_UnknownEncoding;
-}
-
-IOP::CodecFactory::CodecFactory (void)
-{}
-
-IOP::CodecFactory::~CodecFactory (void)
-{}
-
-void 
-IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  CodecFactory *_tao_tmp_pointer =
-    static_cast<CodecFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-IOP::CodecFactory_ptr
-IOP::CodecFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return CodecFactory::_nil ();
-    }
-  
-  CodecFactory_ptr proxy =
-    dynamic_cast<CodecFactory_ptr> (_tao_objref);
-  
-  return CodecFactory::_duplicate (proxy);
-}
-
-IOP::CodecFactory_ptr
-IOP::CodecFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return CodecFactory::_nil ();
-    }
-  
-  CodecFactory_ptr proxy =
-    dynamic_cast<CodecFactory_ptr> (_tao_objref);
-  
-  return CodecFactory::_duplicate (proxy);
-}
-
-IOP::CodecFactory_ptr
-IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-IOP::CodecFactory::_tao_release (CodecFactory_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-IOP::CodecFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/IOP/CodecFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* IOP::CodecFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/IOP/CodecFactory:1.0";
-}
-
-CORBA::Boolean
-IOP::CodecFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::Encoding &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.format) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version));
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::Encoding &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.format) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version));
-}
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
deleted file mode 100644
index dd1300a2a5f..00000000000
--- a/TAO/tao/IOP_CodecC.h
+++ /dev/null
@@ -1,696 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
-#define _TAO_IDL_ORIG_IOP_CODECC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/Typecode_typesC.h"
-#include "tao/OctetSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace IOP
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_IOP_CODEC__VAR_OUT_CH_)
-#define _IOP_CODEC__VAR_OUT_CH_
-  
-  class Codec;
-  typedef Codec *Codec_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Codec
-      >
-    Codec_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Codec
-      >
-    Codec_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IOP_CODEC_CH_)
-#define _IOP_CODEC_CH_
-  
-  class TAO_Export Codec
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Codec_ptr _ptr_type;
-    typedef Codec_var _var_type;
-    
-    // The static operations.
-    static Codec_ptr _duplicate (Codec_ptr obj);
-    
-    static void _tao_release (Codec_ptr obj);
-    
-    static Codec_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Codec_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Codec_ptr _nil (void)
-    {
-      return static_cast<Codec_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
-#define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-    
-    class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
-    {
-    public:
-      
-      InvalidTypeForEncoding (void);
-      InvalidTypeForEncoding (const InvalidTypeForEncoding &);
-      ~InvalidTypeForEncoding (void);
-
-      InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
-      static const InvalidTypeForEncoding *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_InvalidTypeForEncoding;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
-#define _IOP_CODEC_FORMATMISMATCH_CH_
-    
-    class TAO_Export FormatMismatch : public CORBA::UserException
-    {
-    public:
-      
-      FormatMismatch (void);
-      FormatMismatch (const FormatMismatch &);
-      ~FormatMismatch (void);
-
-      FormatMismatch &operator= (const FormatMismatch &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static FormatMismatch *_downcast (CORBA::Exception *);
-      static const FormatMismatch *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_FormatMismatch;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
-#define _IOP_CODEC_TYPEMISMATCH_CH_
-    
-    class TAO_Export TypeMismatch : public CORBA::UserException
-    {
-    public:
-      
-      TypeMismatch (void);
-      TypeMismatch (const TypeMismatch &);
-      ~TypeMismatch (void);
-
-      TypeMismatch &operator= (const TypeMismatch &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static TypeMismatch *_downcast (CORBA::Exception *);
-      static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_TypeMismatch;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OctetSeq * encode (
-        const ::CORBA::Any & data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IOP::Codec::InvalidTypeForEncoding
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * decode (
-        const ::CORBA::OctetSeq & data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IOP::Codec::FormatMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OctetSeq * encode_value (
-        const ::CORBA::Any & data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IOP::Codec::InvalidTypeForEncoding
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * decode_value (
-        const ::CORBA::OctetSeq & data,
-        ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IOP::Codec::FormatMismatch,
-        ::IOP::Codec::TypeMismatch
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Codec (void);
-    
-    virtual ~Codec (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Codec (const Codec &);
-    
-    void operator= (const Codec &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Codec;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short EncodingFormat;
-  typedef CORBA::Short_out EncodingFormat_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct Encoding;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        Encoding
-      >
-    Encoding_var;
-  
-  typedef
-    Encoding &
-    Encoding_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export Encoding
-  {
-    typedef Encoding_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IOP::EncodingFormat format;
-    CORBA::Octet major_version;
-    CORBA::Octet minor_version;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Encoding;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
-#define _IOP_CODECFACTORY__VAR_OUT_CH_
-  
-  class CodecFactory;
-  typedef CodecFactory *CodecFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        CodecFactory
-      >
-    CodecFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        CodecFactory
-      >
-    CodecFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IOP_CODECFACTORY_CH_)
-#define _IOP_CODECFACTORY_CH_
-  
-  class TAO_Export CodecFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef CodecFactory_ptr _ptr_type;
-    typedef CodecFactory_var _var_type;
-    
-    // The static operations.
-    static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-    
-    static void _tao_release (CodecFactory_ptr obj);
-    
-    static CodecFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static CodecFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static CodecFactory_ptr _nil (void)
-    {
-      return static_cast<CodecFactory_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
-#define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-    
-    class TAO_Export UnknownEncoding : public CORBA::UserException
-    {
-    public:
-      
-      UnknownEncoding (void);
-      UnknownEncoding (const UnknownEncoding &);
-      ~UnknownEncoding (void);
-
-      UnknownEncoding &operator= (const UnknownEncoding &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static UnknownEncoding *_downcast (CORBA::Exception *);
-      static const UnknownEncoding *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::Codec_ptr create_codec (
-        const ::IOP::Encoding & enc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IOP::CodecFactory::UnknownEncoding
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    CodecFactory (void);
-    
-    virtual ~CodecFactory (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    CodecFactory (const CodecFactory &);
-    
-    void operator= (const CodecFactory &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module IOP
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_IOP_CODEC__TRAITS_CH_)
-#define _IOP_CODEC__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::IOP::Codec>
-  {
-    static ::IOP::Codec_ptr duplicate (
-        ::IOP::Codec_ptr
-      );
-    static void release (
-        ::IOP::Codec_ptr
-      );
-    static ::IOP::Codec_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::IOP::Codec_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
-#define _IOP_CODECFACTORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::IOP::CodecFactory>
-  {
-    static ::IOP::CodecFactory_ptr duplicate (
-        ::IOP::CodecFactory_ptr
-      );
-    static void release (
-        ::IOP::CodecFactory_ptr
-      );
-    static ::IOP::CodecFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::IOP::CodecFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IOP_CodecS.h b/TAO/tao/IOP_CodecS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/IOP_CodecS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
deleted file mode 100644
index 1ce9a4f3821..00000000000
--- a/TAO/tao/IOP_IOR.pidl
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- IDL -*-
-/**
- * @file IOP_IOR.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the IOP module.
- *
- * This file is used to generate IOPC.{h,cpp}, using the following
- * command:
- *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        IOP_IOR.pidl
- *
- * and then:
- *
- * cp orig/IOP_IORC.{h,inl,cpp} .
- * cp orig/IOP_IORA.cpp .
- */
-
-#ifndef TAO_IOP_IOR_PIDL
-#define TAO_IOP_IOR_PIDL
-
-#include <OctetSeq.pidl>
-
-#pragma prefix "omg.org"
-
-module IOP
-{
-  typedef unsigned long ProfileId;
-  const ProfileId TAG_INTERNET_IOP = 0;
-  const ProfileId TAG_MULTIPLE_COMPONENTS = 1;
-
-  struct TaggedProfile {
-    ProfileId       tag;
-    CORBA::OctetSeq profile_data;
-  };
-
-  typedef sequence<TaggedProfile> TaggedProfileSeq;
-
-  struct IOR {
-    string           type_id;
-    TaggedProfileSeq profiles;
-  };
-
-  typedef unsigned long ComponentId;
-  struct TaggedComponent {
-    ComponentId     tag;
-    CORBA::OctetSeq component_data;
-  };
-  typedef sequence<TaggedComponent> MultipleComponentProfile;
-  typedef sequence<TaggedComponent> TaggedComponentList;
-  typedef sequence<TaggedComponent> TaggedComponentSeq;
-
-  // @@ All security related tags are located in the Security Service
-  // @@ related IDL files, in accordance with the Security Service 1.8
-  // @@ specification.
-
-  const ComponentId TAG_ORB_TYPE = 0;
-  const ComponentId TAG_CODE_SETS = 1;
-  const ComponentId TAG_POLICIES = 2;
-  const ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3;
-
-  const ComponentId TAG_COMPLETE_OBJECT_KEY = 5;
-  const ComponentId TAG_ENDPOINT_ID_POSITION = 6;
-  const ComponentId TAG_LOCATION_POLICY = 12;
-  const ComponentId TAG_DCE_STRING_BINDING = 100;
-  const ComponentId TAG_DCE_BINDING_NAME = 101;
-  const ComponentId TAG_DCE_NO_PIPES = 102;
-
-  typedef unsigned long ServiceId;
-  struct ServiceContext {
-    ServiceId          context_id;
-    CORBA::OctetSeq    context_data;
-  };
-  typedef sequence <ServiceContext> ServiceContextList;
-
-  const ServiceId TransactionService = 0;
-  const ServiceId CodeSets = 1;
-  const ServiceId ChainBypassCheck = 2;
-  const ServiceId ChainBypassInfo = 3;
-  const ServiceId LogicalThreadId = 4;
-  const ServiceId BI_DIR_IIOP = 5;
-  const ServiceId SendingContextRunTime = 6;
-  const ServiceId INVOCATION_POLICIES = 7;
-  // const ServiceId FORWARDED_IDENTITY = 8;
-  const ServiceId UnknownExceptionInfo = 9;
-
-  // The following are defined in CORBA v2.4.2 Chapter 24 (February, 2001):
-  const ServiceId RTCorbaPriority = 10;
-  const ServiceId RTCorbaPriorityRange = 11;
-
-  // The following are defined in the ptc/2000-04-04:
-  // Fault Tolerant CORBA Specification, V1.0
-  const ComponentId TAG_FT_GROUP = 27;
-  const ComponentId TAG_FT_PRIMARY = 28;
-  const ComponentId TAG_FT_HEARTBEAT_ENABLED = 29;
-  const ServiceId FT_GROUP_VERSION = 12;
-  const ServiceId FT_REQUEST = 13;
-
-  // The following are not defined yet in the Unreliable Multicast
-  // InterORB Protocol (orbos/2001-11-08)
-  const ProfileId TAG_UIPMC = 0x54414f0c;  // @@ Get real number
-  const ComponentId TAG_GROUP = 0x54414f03;  // @@ Get real number
-  const ComponentId TAG_GROUP_IIOP = 0x54414f04; // @@ Get real number
-};
-
-#pragma prefix ""
-
-#endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
deleted file mode 100644
index c7580feaf97..00000000000
--- a/TAO/tao/IOP_IORA.cpp
+++ /dev/null
@@ -1,976 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IOP_IORC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ProfileId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ProfileId:1.0",
-    "ProfileId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ProfileId =
-    &_tao_tc_IOP_ProfileId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedProfile[] =
-  {
-    { "tag", &IOP::_tc_ProfileId },
-    { "profile_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfile (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedProfile:1.0",
-    "TaggedProfile",
-    _tao_fields_IOP_TaggedProfile,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfile =
-    &_tao_tc_IOP_TaggedProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedProfileSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedProfile,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedProfileSeq_0 =
-      &IOP_TaggedProfileSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfileSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedProfileSeq:1.0",
-    "TaggedProfileSeq",
-    &TAO::TypeCode::tc_IOP_TaggedProfileSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq =
-    &_tao_tc_IOP_TaggedProfileSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_IOR[] =
-  {
-    { "type_id", &CORBA::_tc_string },
-    { "profiles", &IOP::_tc_TaggedProfileSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_IOR (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/IOR:1.0",
-    "IOR",
-    _tao_fields_IOP_IOR,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IOR =
-    &_tao_tc_IOP_IOR;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ComponentId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ComponentId:1.0",
-    "ComponentId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ComponentId =
-    &_tao_tc_IOP_ComponentId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedComponent[] =
-  {
-    { "tag", &IOP::_tc_ComponentId },
-    { "component_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedComponent:1.0",
-    "TaggedComponent",
-    _tao_fields_IOP_TaggedComponent,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponent =
-    &_tao_tc_IOP_TaggedComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-#define _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_MultipleComponentProfile_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_MultipleComponentProfile_0 =
-      &IOP_MultipleComponentProfile_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_MultipleComponentProfile (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/MultipleComponentProfile:1.0",
-    "MultipleComponentProfile",
-    &TAO::TypeCode::tc_IOP_MultipleComponentProfile_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile =
-    &_tao_tc_IOP_MultipleComponentProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentList_0 =
-      &IOP_TaggedComponentList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentList:1.0",
-    "TaggedComponentList",
-    &TAO::TypeCode::tc_IOP_TaggedComponentList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentList =
-    &_tao_tc_IOP_TaggedComponentList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentSeq_0 =
-      &IOP_TaggedComponentSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentSeq:1.0",
-    "TaggedComponentSeq",
-    &TAO::TypeCode::tc_IOP_TaggedComponentSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq =
-    &_tao_tc_IOP_TaggedComponentSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceId:1.0",
-    "ServiceId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceId =
-    &_tao_tc_IOP_ServiceId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_ServiceContext[] =
-  {
-    { "context_id", &IOP::_tc_ServiceId },
-    { "context_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/ServiceContext:1.0",
-    "ServiceContext",
-    _tao_fields_IOP_ServiceContext,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContext =
-    &_tao_tc_IOP_ServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-#define _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_ServiceContextList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_ServiceContext,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_ServiceContextList_0 =
-      &IOP_ServiceContextList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_ServiceContextList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceContextList:1.0",
-    "ServiceContextList",
-    &TAO::TypeCode::tc_IOP_ServiceContextList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContextList =
-    &_tao_tc_IOP_ServiceContextList;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfile::_tao_any_destructor,
-      IOP::_tc_TaggedProfile,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfile *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert (
-      _tao_any,
-      IOP::TaggedProfile::_tao_any_destructor,
-      IOP::_tc_TaggedProfile,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::extract (
-        _tao_any,
-        IOP::TaggedProfile::_tao_any_destructor,
-        IOP::_tc_TaggedProfile,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfileSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::extract (
-        _tao_any,
-        IOP::TaggedProfileSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::IOR &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::IOR>::insert_copy (
-      _tao_any,
-      IOP::IOR::_tao_any_destructor,
-      IOP::_tc_IOR,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::IOR *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::IOR>::insert (
-      _tao_any,
-      IOP::IOR::_tao_any_destructor,
-      IOP::_tc_IOR,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::IOR *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::IOR *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::IOR *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::IOR>::extract (
-        _tao_any,
-        IOP::IOR::_tao_any_destructor,
-        IOP::_tc_IOR,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponent::_tao_any_destructor,
-      IOP::_tc_TaggedComponent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert (
-      _tao_any,
-      IOP::TaggedComponent::_tao_any_destructor,
-      IOP::_tc_TaggedComponent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::extract (
-        _tao_any,
-        IOP::TaggedComponent::_tao_any_destructor,
-        IOP::_tc_TaggedComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert_copy (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::MultipleComponentProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::extract (
-        _tao_any,
-        IOP::MultipleComponentProfile::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::extract (
-        _tao_any,
-        IOP::TaggedComponentList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::extract (
-        _tao_any,
-        IOP::TaggedComponentSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert_copy (
-      _tao_any,
-      IOP::ServiceContext::_tao_any_destructor,
-      IOP::_tc_ServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert (
-      _tao_any,
-      IOP::ServiceContext::_tao_any_destructor,
-      IOP::_tc_ServiceContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContext>::extract (
-        _tao_any,
-        IOP::ServiceContext::_tao_any_destructor,
-        IOP::_tc_ServiceContext,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContextList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert_copy (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContextList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContextList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::extract (
-        _tao_any,
-        IOP::ServiceContextList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_ServiceContextList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
deleted file mode 100644
index 0bd9d24f103..00000000000
--- a/TAO/tao/IOP_IORC.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IOP_IORC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IOP::TaggedProfile::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  TaggedProfile *_tao_tmp_pointer =
-    static_cast<TaggedProfile *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_TAGGEDPROFILESEQ_CS_)
-#define _IOP_TAGGEDPROFILESEQ_CS_
-
-IOP::TaggedProfileSeq::TaggedProfileSeq (void)
-{}
-
-IOP::TaggedProfileSeq::TaggedProfileSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
-      >
-    (max)
-{}
-
-IOP::TaggedProfileSeq::TaggedProfileSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IOP::TaggedProfile * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
-      >
-    (max, length, buffer, release)
-{}
-
-IOP::TaggedProfileSeq::TaggedProfileSeq (
-    const TaggedProfileSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
-      >
-    (seq)
-{}
-
-IOP::TaggedProfileSeq::~TaggedProfileSeq (void)
-{}
-
-void IOP::TaggedProfileSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  TaggedProfileSeq * _tao_tmp_pointer =
-    static_cast<TaggedProfileSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IOP::IOR::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  IOR *_tao_tmp_pointer =
-    static_cast<IOR *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IOP::TaggedComponent::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  TaggedComponent *_tao_tmp_pointer =
-    static_cast<TaggedComponent *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
-#define _IOP_MULTIPLECOMPONENTPROFILE_CS_
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (void)
-{}
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max)
-{}
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IOP::TaggedComponent * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max, length, buffer, release)
-{}
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (
-    const MultipleComponentProfile &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (seq)
-{}
-
-IOP::MultipleComponentProfile::~MultipleComponentProfile (void)
-{}
-
-void IOP::MultipleComponentProfile::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  MultipleComponentProfile * _tao_tmp_pointer =
-    static_cast<MultipleComponentProfile *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
-#define _IOP_TAGGEDCOMPONENTLIST_CS_
-
-IOP::TaggedComponentList::TaggedComponentList (void)
-{}
-
-IOP::TaggedComponentList::TaggedComponentList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max)
-{}
-
-IOP::TaggedComponentList::TaggedComponentList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IOP::TaggedComponent * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max, length, buffer, release)
-{}
-
-IOP::TaggedComponentList::TaggedComponentList (
-    const TaggedComponentList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (seq)
-{}
-
-IOP::TaggedComponentList::~TaggedComponentList (void)
-{}
-
-void IOP::TaggedComponentList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  TaggedComponentList * _tao_tmp_pointer =
-    static_cast<TaggedComponentList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CS_
-
-IOP::TaggedComponentSeq::TaggedComponentSeq (void)
-{}
-
-IOP::TaggedComponentSeq::TaggedComponentSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max)
-{}
-
-IOP::TaggedComponentSeq::TaggedComponentSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IOP::TaggedComponent * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (max, length, buffer, release)
-{}
-
-IOP::TaggedComponentSeq::TaggedComponentSeq (
-    const TaggedComponentSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >
-    (seq)
-{}
-
-IOP::TaggedComponentSeq::~TaggedComponentSeq (void)
-{}
-
-void IOP::TaggedComponentSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  TaggedComponentSeq * _tao_tmp_pointer =
-    static_cast<TaggedComponentSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-IOP::ServiceContext::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ServiceContext *_tao_tmp_pointer =
-    static_cast<ServiceContext *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_SERVICECONTEXTLIST_CS_)
-#define _IOP_SERVICECONTEXTLIST_CS_
-
-IOP::ServiceContextList::ServiceContextList (void)
-{}
-
-IOP::ServiceContextList::ServiceContextList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
-      >
-    (max)
-{}
-
-IOP::ServiceContextList::ServiceContextList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IOP::ServiceContext * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
-      >
-    (max, length, buffer, release)
-{}
-
-IOP::ServiceContextList::ServiceContextList (
-    const ServiceContextList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
-      >
-    (seq)
-{}
-
-IOP::ServiceContextList::~ServiceContextList (void)
-{}
-
-void IOP::ServiceContextList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ServiceContextList * _tao_tmp_pointer =
-    static_cast<ServiceContextList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedProfile &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.profile_data);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedProfile &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.profile_data);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_
-#define _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedProfileSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedProfileSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::IOR &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.type_id.in ()) &&
-    (strm << _tao_aggregate.profiles);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::IOR &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.type_id.out ()) &&
-    (strm >> _tao_aggregate.profiles);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponent &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.component_data);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponent &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.component_data);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_
-#define _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::MultipleComponentProfile &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::MultipleComponentProfile &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentList_CPP_
-#define _TAO_CDR_OP_IOP_TaggedComponentList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponentList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponentList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_
-#define _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponentSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponentSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.context_id) &&
-    (strm << _tao_aggregate.context_data);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.context_id) &&
-    (strm >> _tao_aggregate.context_data);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_IOP_ServiceContextList_CPP_
-#define _TAO_CDR_OP_IOP_ServiceContextList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContextList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContextList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
deleted file mode 100644
index f3269d1c314..00000000000
--- a/TAO/tao/IOP_IORC.h
+++ /dev/null
@@ -1,875 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IOP_IORC_H_
-#define _TAO_IDL_ORIG_IOP_IORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/OctetSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace IOP
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ProfileId;
-  typedef CORBA::ULong_out ProfileId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ProfileId;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ProfileId TAG_INTERNET_IOP = 0U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ProfileId TAG_MULTIPLE_COMPONENTS = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct TaggedProfile;
-  
-  typedef
-    TAO_Var_Var_T<
-        TaggedProfile
-      >
-    TaggedProfile_var;
-  
-  typedef
-    TAO_Out_T<
-        TaggedProfile,
-        TaggedProfile_var
-      >
-    TaggedProfile_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export TaggedProfile
-  {
-    typedef TaggedProfile_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IOP::ProfileId tag;
-    CORBA::OctetSeq profile_data;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfile;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_TAGGEDPROFILESEQ_CH_)
-#define _IOP_TAGGEDPROFILESEQ_CH_
-  
-  class TaggedProfileSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        TaggedProfileSeq,
-        TaggedProfile
-      >
-    TaggedProfileSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        TaggedProfileSeq,
-        TaggedProfileSeq_var,
-        TaggedProfile
-      >
-    TaggedProfileSeq_out;
-  
-  class TAO_Export TaggedProfileSeq
-    : public
-        TAO_Unbounded_Sequence<
-            TaggedProfile
-          >
-  {
-  public:
-    TaggedProfileSeq (void);
-    TaggedProfileSeq (CORBA::ULong max);
-    TaggedProfileSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedProfile* buffer, 
-        CORBA::Boolean release = 0
-      );
-    TaggedProfileSeq (const TaggedProfileSeq &);
-    ~TaggedProfileSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef TaggedProfileSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct IOR;
-  
-  typedef
-    TAO_Var_Var_T<
-        IOR
-      >
-    IOR_var;
-  
-  typedef
-    TAO_Out_T<
-        IOR,
-        IOR_var
-      >
-    IOR_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export IOR
-  {
-    typedef IOR_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager type_id;
-    IOP::TaggedProfileSeq profiles;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IOR;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ComponentId;
-  typedef CORBA::ULong_out ComponentId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ComponentId;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct TaggedComponent;
-  
-  typedef
-    TAO_Var_Var_T<
-        TaggedComponent
-      >
-    TaggedComponent_var;
-  
-  typedef
-    TAO_Out_T<
-        TaggedComponent,
-        TaggedComponent_var
-      >
-    TaggedComponent_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export TaggedComponent
-  {
-    typedef TaggedComponent_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IOP::ComponentId tag;
-    CORBA::OctetSeq component_data;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponent;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
-#define _IOP_MULTIPLECOMPONENTPROFILE_CH_
-  
-  class MultipleComponentProfile;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        MultipleComponentProfile,
-        TaggedComponent
-      >
-    MultipleComponentProfile_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        MultipleComponentProfile,
-        MultipleComponentProfile_var,
-        TaggedComponent
-      >
-    MultipleComponentProfile_out;
-  
-  class TAO_Export MultipleComponentProfile
-    : public
-        TAO_Unbounded_Sequence<
-            TaggedComponent
-          >
-  {
-  public:
-    MultipleComponentProfile (void);
-    MultipleComponentProfile (CORBA::ULong max);
-    MultipleComponentProfile (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
-      );
-    MultipleComponentProfile (const MultipleComponentProfile &);
-    ~MultipleComponentProfile (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef MultipleComponentProfile_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
-#define _IOP_TAGGEDCOMPONENTLIST_CH_
-  
-  class TaggedComponentList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        TaggedComponentList,
-        TaggedComponent
-      >
-    TaggedComponentList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        TaggedComponentList,
-        TaggedComponentList_var,
-        TaggedComponent
-      >
-    TaggedComponentList_out;
-  
-  class TAO_Export TaggedComponentList
-    : public
-        TAO_Unbounded_Sequence<
-            TaggedComponent
-          >
-  {
-  public:
-    TaggedComponentList (void);
-    TaggedComponentList (CORBA::ULong max);
-    TaggedComponentList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
-      );
-    TaggedComponentList (const TaggedComponentList &);
-    ~TaggedComponentList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef TaggedComponentList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CH_
-  
-  class TaggedComponentSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        TaggedComponentSeq,
-        TaggedComponent
-      >
-    TaggedComponentSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        TaggedComponentSeq,
-        TaggedComponentSeq_var,
-        TaggedComponent
-      >
-    TaggedComponentSeq_out;
-  
-  class TAO_Export TaggedComponentSeq
-    : public
-        TAO_Unbounded_Sequence<
-            TaggedComponent
-          >
-  {
-  public:
-    TaggedComponentSeq (void);
-    TaggedComponentSeq (CORBA::ULong max);
-    TaggedComponentSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent* buffer, 
-        CORBA::Boolean release = 0
-      );
-    TaggedComponentSeq (const TaggedComponentSeq &);
-    ~TaggedComponentSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef TaggedComponentSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_ORB_TYPE = 0U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_CODE_SETS = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_POLICIES = 2U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_COMPLETE_OBJECT_KEY = 5U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_ENDPOINT_ID_POSITION = 6U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_LOCATION_POLICY = 12U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_DCE_STRING_BINDING = 100U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_DCE_BINDING_NAME = 101U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_DCE_NO_PIPES = 102U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ServiceId;
-  typedef CORBA::ULong_out ServiceId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceId;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ServiceContext;
-  
-  typedef
-    TAO_Var_Var_T<
-        ServiceContext
-      >
-    ServiceContext_var;
-  
-  typedef
-    TAO_Out_T<
-        ServiceContext,
-        ServiceContext_var
-      >
-    ServiceContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export ServiceContext
-  {
-    typedef ServiceContext_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IOP::ServiceId context_id;
-    CORBA::OctetSeq context_data;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContext;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_SERVICECONTEXTLIST_CH_)
-#define _IOP_SERVICECONTEXTLIST_CH_
-  
-  class ServiceContextList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ServiceContextList,
-        ServiceContext
-      >
-    ServiceContextList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ServiceContextList,
-        ServiceContextList_var,
-        ServiceContext
-      >
-    ServiceContextList_out;
-  
-  class TAO_Export ServiceContextList
-    : public
-        TAO_Unbounded_Sequence<
-            ServiceContext
-          >
-  {
-  public:
-    ServiceContextList (void);
-    ServiceContextList (CORBA::ULong max);
-    ServiceContextList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServiceContext* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ServiceContextList (const ServiceContextList &);
-    ~ServiceContextList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ServiceContextList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContextList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId TransactionService = 0U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId CodeSets = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId ChainBypassCheck = 2U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId ChainBypassInfo = 3U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId LogicalThreadId = 4U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId BI_DIR_IIOP = 5U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId SendingContextRunTime = 6U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId INVOCATION_POLICIES = 7U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId UnknownExceptionInfo = 9U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId RTCorbaPriority = 10U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId RTCorbaPriorityRange = 11U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_FT_GROUP = 27U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_FT_PRIMARY = 28U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_FT_HEARTBEAT_ENABLED = 29U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId FT_GROUP_VERSION = 12U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId FT_REQUEST = 13U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ProfileId TAG_UIPMC = 1413566220U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_GROUP = 1413566211U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_GROUP_IIOP = 1413566212U;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module IOP
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfileSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfileSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfileSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfileSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IOP_TaggedProfileSeq_H_
-#define _TAO_CDR_OP_IOP_TaggedProfileSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedProfileSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedProfileSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
-#define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentList_H_
-#define _TAO_CDR_OP_IOP_TaggedComponentList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentList &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
-#define _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_IOP_ServiceContextList_H_
-#define _TAO_CDR_OP_IOP_ServiceContextList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IOP_IORS.h b/TAO/tao/IOP_IORS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/IOP_IORS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
deleted file mode 100644
index 4d59fed3776..00000000000
--- a/TAO/tao/IORInterceptor.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, portableserver, objreftemplate, core {
-  sharedname    = TAO_IORInterceptor
-  dynamicflags  = TAO_IORINTERCEPTOR_BUILD_DLL
-
-  Source_Files {
-    IORInterceptor
-  }
-
-  Header_Files {
-    IORInterceptor
-  }
-
-  Inline_Files {
-    IORInterceptor
-  }
-
-  Template_Files {
-    IORInterceptor
-  }
-
-  Resource_Files {
-    IORInterceptor
-  }
-
-  PIDL_Files {
-    IORInterceptor
-  }
-
-  Pkgconfig_Files {
-    IORInterceptor/TAO_IORInterceptor.pc.in
-  }
-}
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
deleted file mode 100644
index ca0a10a1038..00000000000
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "IORInfo.h"
-#include "tao/PortableServer/Root_POA.h"
-
-#include "tao/PolicyC.h"
-#include "tao/IOPC.h"
-#include "tao/ORB_Constants.h"
-
-
-ACE_RCSID (IORInterceptor,
-           IORInfo,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "IORInfo.inl"
-#endif /* __ACE_INLINE__ */
-
-
-TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
-  : poa_ (poa),
-    components_established_ (0)
-{
-}
-
-TAO_IORInfo::~TAO_IORInfo (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  CORBA::Policy_var policy =
-    this->poa_->get_policy (type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  if (!CORBA::is_nil (policy.in ()))
-    {
-      return policy._retn ();
-    }
-
-  // TODO: Now check the global ORB policies.
-  // ........
-
-  // No policy matching the given PolicyType was found.
-  ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
-                                       CORBA::COMPLETED_NO),
-                    CORBA::Policy::_nil ());
-}
-
-void
-TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->components_established_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
-
-  // Add the given tagged component to all profiles.
-  this->poa_->save_ior_component (component
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_IORInfo::add_ior_component_to_profile (
-    const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->components_established_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
-
-  this->poa_->save_ior_component_and_profile_id (component,
-                                                 profile_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-PortableInterceptor::AdapterManagerId
-TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableInterceptor::AdapterState
-TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT);
-
-  return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Return the Object Reference Template whenever an IOR Interceptor
-  // is invoked.  Its value is the template created for the adapter
-  // policies and the IOR Interceptor calls to add_ior_component and
-  // add_ior_component_to_profile.  It's a const value and its value
-  // never changes.
-  PortableInterceptor::ObjectReferenceTemplate *adapter_template =
-    this->poa_->get_adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (adapter_template == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return adapter_template;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Return the current_factory that is used to create the object
-  // references by the adapter.  Though initially, its value is the
-  // same as the adapter_template, unlike adapter_template, its value
-  // can be changed.  The value of the current_factory can be changed
-  // only during the call to components_established method.
-  PortableInterceptor::ObjectReferenceFactory *adapter_factory =
-    this->poa_->get_obj_ref_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (adapter_factory == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return adapter_factory;
-}
-
-void
-TAO_IORInfo::current_factory (
-    PortableInterceptor::ObjectReferenceFactory * current_factory
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->poa_->set_obj_ref_factory (current_factory
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->poa_ == 0)
-    {
-      // Although not defined by the spec, duplicate the behavior used
-      // by the ORBInitInfo object once CORBA::ORB_init() has been
-      // called.  Specifically, the IORInfo object is no longer valid
-      // once the POA has invoked all IORInterceptor interception
-      // points.  This also prevents memory access violations from
-      // occuring if the POA is destroyed before this IORInfo object.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
-                                          CORBA::COMPLETED_NO));
-    }
-}
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
deleted file mode 100644
index c377ff1c994..00000000000
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   IORInfo.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_IOR_INFO_H
-#define TAO_IOR_INFO_H
-
-#include /**/ "ace/pre.h"
-
-#include "IORInfoC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/// Forward declarations.
-class TAO_Root_POA;
-
-
-/**
- * @class TAO_IORInfo
- *
- * @brief This class exposes an interface that allows IORInterceptors add
- * tagged components to IORs.
- */
-class TAO_IORInfo
-  : public virtual PortableInterceptor::IORInfo,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  TAO_IORInfo (TAO_Root_POA *poa);
-
-  /**
-   * @name PortableInterceptor::IORInfo Methods
-   *
-   * Methods exposed by the PortableInterceptor::IORInfo interface.
-   */
-  //@{
-
-  /// Return the policy matching the given policy type that is in
-  /// effect for the object whose IOR is being created.
-  virtual CORBA::Policy_ptr get_effective_policy (
-      CORBA::PolicyType type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the given tagged component to all profiles.
-  virtual void add_ior_component (
-      const IOP::TaggedComponent & component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the given tagged component to all profiles matching the given
-  /// ProfileId.
-  virtual void add_ior_component_to_profile (
-      const IOP::TaggedComponent & component,
-      IOP::ProfileId profile_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual PortableInterceptor::AdapterManagerId manager_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual PortableInterceptor::AdapterState state (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void current_factory (
-      PortableInterceptor::ObjectReferenceFactory * current_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  //@}
-
-  /// Invalidate this IORInfo instance.
-  /**
-   * Once the IOR interception points have been invoked, this IORInfo
-   * instance is no longer valid.
-   */
-  void invalidate (void);
-
-  /// Inform the this IORInfo object that the
-  /// IORInterceptor::components_established() interception point has
-  /// been called.
-  /**
-   * This method is used so to inform the IORInfo when the
-   * add_ior_component() and add_ior_component_to_profile() methods
-   * are invalid.  They are only valid in the
-   * IORInterceptor::establish_components() interception point.
-   */
-  void components_established (void);
-
-protected:
-
-  /// Protected destructor to enforce proper memory managment through
-  /// the reference counting mechanism.
-  ~TAO_IORInfo (void);
-
-  /// Check if this IORInfo instance is valid.
-  /**
-   * Once all IORInterceptor interception points have been called,
-   * this IORInfo object is no longer valid.  Throw an exception in
-   * that case.
-   */
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_IORInfo (const TAO_IORInfo &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &))
-
-private:
-
-  /// Pointer to POA
-  TAO_Root_POA *poa_;
-
-  /// True if the IORInterceptor::components_established()
-  /// interception point was called.  False otherwise.
-  /**
-   * This flag is used to prevent the add_ior_component() and
-   * add_ior_component_to_profile() methods from being incorrectly
-   * called after the IORInterceptor::establish_components()
-   * interception point has been called.
-   */
-  CORBA::Boolean components_established_;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "IORInfo.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IOR_INFO_H */
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
deleted file mode 100644
index 3a94b482656..00000000000
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE void
-TAO_IORInfo::invalidate (void)
-{
-  this->poa_ = 0;
-}
-
-ACE_INLINE void
-TAO_IORInfo::components_established (void)
-{
-  this->components_established_ = 1;
-}
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
deleted file mode 100644
index 33bd2b8f705..00000000000
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file IORInfo.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the IORInfo
- * components in the ORB.
- *
- * The following is from orbos/99-12-02 Portable Interceptors spec,
- * the full IDL is downloadable from orbos/99-12-02. This file contains
- * interfaces from PortableInterceptor.idl that depend on
- * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit
- * directly or indirectly from CORBA::ValueBase. This separate file
- * has been created to remove the dependency from the rest of module
- * PortableInterceptor.
- *
- * This file was used to generate the code in IORInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -Sci
- *          -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_IORInterceptor_Export
- *          -Wb,export_include="iorinterceptor_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          IORInfo.pidl
- */
-
-// File: IORInfo.idl
-#ifndef _IORINFO_IDL_
-#define _IORINFO_IDL_
-
-#include "tao/PortableInterceptor.pidl"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
-
-module PortableInterceptor
-{
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface IORInfo
-  {
-    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
-
-    void add_ior_component (in IOP::TaggedComponent a_component);
-
-    void add_ior_component_to_profile (
-        in IOP::TaggedComponent a_component,
-        in IOP::ProfileId profile_id
-      );
-
-    readonly attribute AdapterManagerId manager_id;
-
-    readonly attribute AdapterState state;
-
-    readonly attribute ObjectReferenceTemplate adapter_template;
-
-    attribute ObjectReferenceFactory current_factory;
-  };
-};
-
-#endif  /* _IORINFO_IDL_ */
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
deleted file mode 100644
index 59b0bd08115..00000000000
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IORInfoC.h"
-#include "tao/CDR.h"
-#include "tao/Object_Argument_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
-    : public
-        Object_Arg_Traits_T<
-            PortableInterceptor::ObjectReferenceFactory *,
-            PortableInterceptor::ObjectReferenceFactory_var,
-            PortableInterceptor::ObjectReferenceFactory_out,
-            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::IORInfo.
-
-PortableInterceptor::IORInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::duplicate (
-    PortableInterceptor::IORInfo_ptr p
-  )
-{
-  return PortableInterceptor::IORInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::release (
-    PortableInterceptor::IORInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::IORInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::nil (void)
-{
-  return PortableInterceptor::IORInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal (
-    PortableInterceptor::IORInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::IORInfo::IORInfo (void)
-{}
-
-PortableInterceptor::IORInfo::~IORInfo (void)
-{}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IORInfo::_nil ();
-    }
-  
-  IORInfo_ptr proxy =
-    dynamic_cast<IORInfo_ptr> (_tao_objref);
-  
-  return IORInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IORInfo::_nil ();
-    }
-  
-  IORInfo_ptr proxy =
-    dynamic_cast<IORInfo_ptr> (_tao_objref);
-  
-  return IORInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::IORInfo::_tao_release (IORInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/IORInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
deleted file mode 100644
index 64b2ba035cc..00000000000
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ /dev/null
@@ -1,291 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IORINFOC_H_
-#define _TAO_IDL_ORIG_IORINFOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "iorinterceptor_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
-  
-  class IORInfo;
-  typedef IORInfo *IORInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IORInfo
-      >
-    IORInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IORInfo
-      >
-    IORInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO_CH_
-  
-  class TAO_IORInterceptor_Export IORInfo
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef IORInfo_ptr _ptr_type;
-    typedef IORInfo_var _var_type;
-    
-    // The static operations.
-    static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-    
-    static void _tao_release (IORInfo_ptr obj);
-    
-    static IORInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInfo_ptr _nil (void)
-    {
-      return static_cast<IORInfo_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr get_effective_policy (
-        ::CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_component (
-        const ::IOP::TaggedComponent & a_component
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_component_to_profile (
-        const ::IOP::TaggedComponent & a_component,
-        ::IOP::ProfileId profile_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::AdapterManagerId manager_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::AdapterState state (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void current_factory (
-        ::PortableInterceptor::ObjectReferenceFactory * current_factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    IORInfo (void);
-    
-    virtual ~IORInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IORInfo (const IORInfo &);
-    
-    void operator= (const IORInfo &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo>
-  {
-    static ::PortableInterceptor::IORInfo_ptr duplicate (
-        ::PortableInterceptor::IORInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::IORInfo_ptr
-      );
-    static ::PortableInterceptor::IORInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::IORInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.h b/TAO/tao/IORInterceptor/IORInterceptor.h
deleted file mode 100644
index 802055759e9..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    IORInterceptor.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_IORINTERCEPTOR_IORINTERCEPTOR_H
-#define TAO_IORINTERCEPTOR_IORINTERCEPTOR_H
-#include /**/ "ace/pre.h"
-
-#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_IORINTERCEPTOR_IORINTERCEPTOR_H*/
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
deleted file mode 100644
index cd1a0454ea9..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file IORInterceptor.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the IOR Interceptor
- * components in the ORB.
- *
- * The following is from orbos/99-12-02 Portable Interceptors spec,
- * the full IDL is downloadable from orbos/99-12-02. This file contains
- * interfaces from PortableInterceptor.idl that depend on
- * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit
- * directly or indirectly from CORBA::ValueBase. This separate file
- * has been created to remove the dependency from the rest of module
- * PortableInterceptor.
- *
- * This file was used to generate the code in IORInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci
- *          -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_IORInterceptor_Export
- *          -Wb,export_include="iorinterceptor_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          IORInterceptor.pidl
- *
- * Please apply the patch in IORInterceptor.diff to the generated stubs and
- * skeletons.
- */
-
-// File: IORInterceptor.idl
-#ifndef _IOR_INTERCEPTOR_IDL_
-#define _IOR_INTERCEPTOR_IDL_
-
-#include "tao/PortableInterceptor.pidl"
-#include "tao/IORInterceptor/IORInfo.pidl"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
-
-module PortableInterceptor
-{
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface IORInterceptor : Interceptor
-  {
-    void establish_components (in IORInfo info);
-
-    void components_established (in IORInfo info);
-
-    void adapter_manager_state_changed (
-        in AdapterManagerId id,
-        in AdapterState state
-      );
-    void adapter_state_changed (
-        in ObjectReferenceTemplateSeq templates,
-        in AdapterState state
-      );
-  };
-};
-
-#endif  /* _IOR_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
deleted file mode 100644
index e66ab20c72a..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IORInterceptor.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::IORInterceptor.
-
-PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate (
-    PortableInterceptor::IORInterceptor_ptr p
-  )
-{
-  return PortableInterceptor::IORInterceptor::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release (
-    PortableInterceptor::IORInterceptor_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void)
-{
-  return PortableInterceptor::IORInterceptor::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal (
-    PortableInterceptor::IORInterceptor_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::IORInterceptor::IORInterceptor (void)
-{}
-
-PortableInterceptor::IORInterceptor::~IORInterceptor (void)
-{}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IORInterceptor::_nil ();
-    }
-  
-  IORInterceptor_ptr proxy =
-    dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-  
-  return IORInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IORInterceptor::_nil ();
-    }
-  
-  IORInterceptor_ptr proxy =
-    dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-  
-  return IORInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::IORInterceptor::_tao_release (IORInterceptor_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInterceptor::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
deleted file mode 100644
index d8c358510ec..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE
-#error "You should not include IORInterceptorC.h directly, use IORInterceptor.h"
-#endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "iorinterceptor_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/IORInterceptor/IORInfoC.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-  
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IORInterceptor
-      >
-    IORInterceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IORInterceptor
-      >
-    IORInterceptor_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-  
-  class TAO_IORInterceptor_Export IORInterceptor
-    : public virtual ::PortableInterceptor::Interceptor
-  {
-  public:
-    typedef IORInterceptor_ptr _ptr_type;
-    typedef IORInterceptor_var _var_type;
-    
-    // The static operations.
-    static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-    
-    static void _tao_release (IORInterceptor_ptr obj);
-    
-    static IORInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInterceptor_ptr _nil (void)
-    {
-      return static_cast<IORInterceptor_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void establish_components (
-        ::PortableInterceptor::IORInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void components_established (
-        ::PortableInterceptor::IORInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void adapter_manager_state_changed (
-        ::PortableInterceptor::AdapterManagerId id,
-        ::PortableInterceptor::AdapterState state
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void adapter_state_changed (
-        const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-        ::PortableInterceptor::AdapterState state
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    IORInterceptor (void);
-    
-    virtual ~IORInterceptor (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IORInterceptor (const IORInterceptor &);
-    
-    void operator= (const IORInterceptor &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
-  {
-    static ::PortableInterceptor::IORInterceptor_ptr duplicate (
-        ::PortableInterceptor::IORInterceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::IORInterceptor_ptr
-      );
-    static ::PortableInterceptor::IORInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::IORInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
deleted file mode 100644
index 986cc031d01..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include "IORInterceptor_Adapter_Factory_Impl.h"
-#include "IORInterceptor_Adapter_Impl.h"
-
-#include "tao/ORB_Core.h"
-
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Adapter_Factory_Impl,
-           "$Id$")
-
-TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
-{
-}
-
-TAO_IORInterceptor_Adapter *
-TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_IORInterceptor_Adapter_Impl *nia = 0;
-  ACE_NEW_THROW_EX (nia,
-                    TAO_IORInterceptor_Adapter_Impl (),
-                    CORBA::NO_MEMORY ());
-
-  return nia;
-}
-
-
-// *********************************************************************
-
-// Initialization and registration of dynamic service object.
-
-int
-TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
-{
-  TAO_ORB_Core::iorinterceptor_adapter_factory_name (
-      "Concrete_IORInterceptor_Adapter_Factory"
-    );
-
-  return
-    ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_IORInterceptor_Adapter_Factory_Impl
-      );
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_IORInterceptor_Adapter_Factory_Impl,
-    ACE_TEXT ("Concrete_IORInterceptor_Adapter_Factory"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_IORInterceptor_Adapter_Factory_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
deleted file mode 100644
index 4b11bc97d9c..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IORInterceptor_Adapter_Factory_Impl.h
- *
- *  $Id$
- *
- *  @author  George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IORINTERCEPTOR_ADAPTER_FACTORY_IMPL_H
-#define TAO_IORINTERCEPTOR_ADAPTER_FACTORY_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "iorinterceptor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Service_Config.h"
-#include "tao/IORInterceptor_Adapter_Factory.h"
-
-
-class TAO_IORInterceptor_Adapter;
-
-/**
- * @class TAO_IORInterceptor_Adapter_Factory_Impl
- *
- * @brief TAO_IORInterceptor_Adapter_Factory_Impl.
- *
- * Class that creates instances of TAO_IORInterceptor_Adapter (one per ORB).
- * This is the derived class that contains the actual implementations.
- */
-class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl
-  : public TAO_IORInterceptor_Adapter_Factory
-{
-public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void);
-
-  virtual TAO_IORInterceptor_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
-ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
-
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORInterceptor_Initializer =
-  &TAO_IORInterceptor_Adapter_Factory_Impl::Initializer;
-
-#else
-
-static int
-TAO_Requires_IORInterceptor_Initializer =
-  TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_IORINTERCEPTOR_SAFE_INCLUDE
-#include "tao/IORInterceptor/IORInterceptorC.h"
-#undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
deleted file mode 100644
index 4a0ebe96dbb..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// $Id$
-
-#include "IORInterceptor_Adapter_Impl.h"
-#include "IORInfo.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/Non_Servant_Upcall.h"
-
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Adapter_Impl,
-           "$Id$")
-
-
-TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
-{
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr i
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->ior_interceptor_list_.add_interceptor (i
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  TAO::IORInterceptor_List::TYPE & i =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t len = i.size ();
-  size_t ilen = len;
-
-  ACE_TRY
-    {
-      for (size_t k = 0; k < len; ++k)
-        {
-          // Destroy the interceptors in reverse order in case the
-          // array list is only partially destroyed and another
-          // invocation occurs afterwards.
-          --ilen;
-
-          i[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Since Interceptor::destroy() can throw an exception,
-          // decrease the size of the interceptor array incrementally
-          // since some interceptors may not have been destroyed yet.
-          // Note that this size reduction is fast since no memory is
-          // actually deallocated.
-          i.size (ilen);
-        }
-    }
-  ACE_CATCHALL
-    {
-      // Exceptions should not be propagated beyond this call.
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Exception in ")
-                      ACE_TEXT ("IORInterceptor_Adapter_Impl")
-                      ACE_TEXT ("::destroy_interceptors () \n")));
-        }
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  delete this;
-}
-
-TAO::IORInterceptor_List *
-TAO_IORInterceptor_Adapter_Impl::interceptor_list (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return &this->ior_interceptor_list_;
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::establish_components (
-  TAO_Root_POA* poa
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  TAO_IORInfo *tao_info = 0;
-  ACE_NEW_THROW_EX (tao_info,
-                    TAO_IORInfo (poa),
-                    CORBA::NO_MEMORY (
-                       CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          ENOMEM),
-                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::IORInfo_var info = tao_info;
-
-  // Release the POA during IORInterceptor calls to avoid potential
-  // deadlocks.
-  TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      ACE_TRY
-        {
-          interceptors[i]->establish_components (info.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // According to the Portable Interceptors specification,
-          // IORInterceptor::establish_components() must not throw an
-          // exception.  If it does, then the ORB is supposed to
-          // ignore it and continue processing the remaining
-          // IORInterceptors.
-          if (TAO_debug_level > 1)
-            {
-              CORBA::String_var name = interceptors[i]->name (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              // @@ What do we do if we get an exception here?
-
-              if (name.in () != 0)
-                {
-                  ACE_DEBUG ((LM_WARNING,
-                              "(%P|%t) Exception thrown while processing "
-                              "IORInterceptor \"%s\">\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
-                }
-
-              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "Ignoring exception in "
-                                       "IORInterceptor::establish_components");
-            }
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-
-  tao_info->components_established ();
-
-  this->components_established (info.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // The IORInfo instance is no longer valid.  Invalidate it to
-  // prevent the user from peforming "illegal" operations.
-  tao_info->invalidate ();
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::components_established (
-  PortableInterceptor::IORInfo_ptr info
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  TAO::IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  // All the establish_components() interception points have been
-  // invoked. Now call the components_established() interception point
-  // on all the IORInterceptors.
-  for (size_t j = 0; j < interceptor_count; ++j)
-    {
-      ACE_TRY
-        {
-          interceptors[j]->components_established (
-            info
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
-                                         CORBA::COMPLETED_NO));
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
-      const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::IORInterceptor_List::TYPE interceptors =
-    this->ior_interceptor_list_.interceptors();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template;
-
-  seq_obj_ref_template.length (array_obj_ref_template.size());
-
-  for (size_t counter = 0; counter < array_obj_ref_template.size(); ++counter)
-    {
-      PortableInterceptor::ObjectReferenceTemplate *member =
-        array_obj_ref_template[counter];
-
-      CORBA::add_ref (member);
-
-      seq_obj_ref_template[counter] = member;
-    }
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      interceptors[i]->adapter_state_changed (seq_obj_ref_template,
-                                              state
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  /// Whenever the POAManager state is changed, the
-  /// adapter_manager_state_changed method is to be invoked on all the IOR
-  ///  Interceptors.
-  TAO::IORInterceptor_List::TYPE & interceptors =
-    this->ior_interceptor_list_.interceptors ();
-
-  const size_t interceptor_count = interceptors.size ();
-
-  if (interceptor_count == 0)
-    return;
-
-  for (size_t i = 0; i < interceptor_count; ++i)
-    {
-      interceptors[i]->adapter_manager_state_changed (
-        id,
-        state
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
deleted file mode 100644
index 5d01a63e2eb..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IORInterceptor_Adapter_Impl.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IORINTERCEPTOR_ADAPTER_IMPL_H
-#define TAO_IORINTERCEPTOR_ADAPTER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "iorinterceptor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/IORInterceptor_Adapter.h"
-#include "tao/IORInterceptor/IORInterceptor.h"
-
-class TAO_Root_POA;
-
-/**
- * @class TAO_IORInterceptor_Adapter_Impl
- *
- * @brief TAO_IORInterceptor_Adapter_Impl.
- *
- * Class that adapts various functions involving the PortableInterceptor
- * interfaces IORInfo and IORInterceptor. This is the derived class
- * that contains the actual implementations.
- */
-class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
-  : public TAO_IORInterceptor_Adapter
-{
-public:
-  virtual ~TAO_IORInterceptor_Adapter_Impl (void);
-
-  virtual void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  virtual TAO::IORInterceptor_List *interceptor_list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Call the IORInterceptor::components_established() method on all
-  /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_state_changed (
-      const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// List of IOR interceptors maintained
-  TAO::IORInterceptor_List ior_interceptor_list_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.pc.in b/TAO/tao/IORInterceptor/TAO_IORInterceptor.pc.in
deleted file mode 100644
index 1466b10bbcb..00000000000
--- a/TAO/tao/IORInterceptor/TAO_IORInterceptor.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_IORInterceptor 
-Description: TAO IOR Interceptor Library
-Requires: TAO_PortableServer, TAO_ObjRefTemplate, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_IORInterceptor
-Cflags: -I${includedir}
diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc b/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
deleted file mode 100644
index 6ce65995cb2..00000000000
--- a/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "IORInterceptor\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_IORInterceptorDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_IORInterceptor.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff
deleted file mode 100644
index 093fb2b40e9..00000000000
--- a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- orig/IORInterceptorC.h	2005-02-18 12:20:12.583740800 +0100
-+++ IORInterceptorC.h	2005-02-18 12:20:13.304777600 +0100
-@@ -34,6 +34,9 @@
- #include /**/ "ace/pre.h"
- 
- 
-+#ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE
-+#error "You should not include IORInterceptorC.h directly, use IORInterceptor.h"
-+#endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */
- #include "ace/config-all.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
---- orig/IORInterceptorC.cpp	2005-02-18 12:20:12.583740800 +0100
-+++ IORInterceptorC.cpp	2005-02-18 12:20:13.304777600 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "IORInterceptorC.h"
-+#include "IORInterceptor.h"
- #include "tao/CDR.h"
- #include "ace/OS_NS_string.h"
- 
diff --git a/TAO/tao/IORInterceptor/iorinterceptor_export.h b/TAO/tao/IORInterceptor/iorinterceptor_export.h
deleted file mode 100644
index 4c6180c412a..00000000000
--- a/TAO/tao/IORInterceptor/iorinterceptor_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_IORINTERCEPTOR_EXPORT_H
-#define TAO_IORINTERCEPTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_IORINTERCEPTOR_HAS_DLL)
-#    define TAO_IORINTERCEPTOR_HAS_DLL 0
-#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
-#else
-#  if !defined (TAO_IORINTERCEPTOR_HAS_DLL)
-#    define TAO_IORINTERCEPTOR_HAS_DLL 1
-#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
-#endif
-
-#if defined (TAO_IORINTERCEPTOR_HAS_DLL) && (TAO_IORINTERCEPTOR_HAS_DLL == 1)
-#  if defined (TAO_IORINTERCEPTOR_BUILD_DLL)
-#    define TAO_IORInterceptor_Export ACE_Proper_Export_Flag
-#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_IORINTERCEPTOR_BUILD_DLL */
-#    define TAO_IORInterceptor_Export ACE_Proper_Import_Flag
-#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IORINTERCEPTOR_BUILD_DLL */
-#else /* TAO_IORINTERCEPTOR_HAS_DLL == 1 */
-#  define TAO_IORInterceptor_Export
-#  define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T)
-#  define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IORINTERCEPTOR_HAS_DLL == 1 */
-
-#endif /* TAO_IORINTERCEPTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
deleted file mode 100644
index ac2d3f7a4a7..00000000000
--- a/TAO/tao/IORInterceptor_Adapter.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// @(#) $Id$
-
-#include "tao/IORInterceptor_Adapter.h"
-
-ACE_RCSID (tao, 
-           IORInterceptor_Adapter, 
-           "$Id$")
-
-TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void)
-{
-}
-
-
-
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
deleted file mode 100644
index 3516bc34c9b..00000000000
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IORInterceptor_Adapter.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IORINTERCEPTOR_ADAPTER_H
-#define TAO_IORINTERCEPTOR_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-#include "ace/Array_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-#include "tao/PI_ForwardC.h"
-#include "tao/Interceptor_List.h"
-
-namespace PortableInterceptor
-{
-  class Interceptor;
-  typedef Interceptor *Interceptor_ptr;
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-  class IORInfo;
-  typedef IORInfo *IORInfo_ptr;
-  class ObjectReferenceTemplate;
-}
-
-namespace TAO
-{
-  typedef Interceptor_List< ::PortableInterceptor::IORInterceptor>
-    IORInterceptor_List;
-
-  typedef ACE_Array_Base< ::PortableInterceptor::ObjectReferenceTemplate*>
-    ObjectReferenceTemplate_Array;
-}
-
-class TAO_Root_POA;
-
-/**
- * @class TAO_IORInterceptor_Adapter
- *
- * @brief TAO_IORInterceptor_Adapter.
- *
- * Class that adapts various functions involving the PortableInterceptor
- * interfaces IORInfo and IORInterceptor. This is a base class for
- * the actual implementation in the TAO_IORInterceptor library.
- */
-class TAO_Export TAO_IORInterceptor_Adapter : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_IORInterceptor_Adapter (void);
-
-  virtual void add_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void destroy_interceptors (
-      ACE_ENV_SINGLE_ARG_DECL
-      )
-  ACE_THROW_SPEC (()) = 0;
-
-  virtual TAO::IORInterceptor_List *interceptor_list (void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  /// Call the IORInterceptor::establish_components() method on all
-  /// registered IORInterceptors.
-  /**
-   * This method calls IORInterceptor::establish_components() method
-   * on all registered IORInterceptors, and
-   * IORInterceptor::components_established() once the former is
-   * completed.
-   */
-  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  /// Call the IORInterceptor::components_established() method on all
-  /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void adapter_state_changed (
-      const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual void adapter_manager_state_changed (
-      PortableInterceptor::AdapterManagerId id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IORINTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
deleted file mode 100644
index dc0687bb517..00000000000
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-#include "tao/IORInterceptor_Adapter_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           IORInterceptor_Adapter_Factory, 
-           "$Id$")
-
-TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_IORInterceptor_Adapter_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_IORInterceptor_Adapter_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
deleted file mode 100644
index e56e7994296..00000000000
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IORInterceptor_Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author  George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H
-#define TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-class TAO_IORInterceptor_Adapter;
-
-/**
- * @class TAO_IORInterceptor_Adapter_Factory
- *
- * @brief TAO_IORInterceptor_Adapter_Factory.
- *
- * Class that creates one instance of TAO_IOR_Interceptor_Adapter per
- * ORB on the ORB's first usage of its ior_interceptor_adapter_. This is a base
- * class for the actual implementation in the TAO_IORInterceptor library.
- */
-class TAO_Export TAO_IORInterceptor_Adapter_Factory
-  : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_IORInterceptor_Adapter_Factory (void);
-
-  virtual TAO_IORInterceptor_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
deleted file mode 100644
index af964e2a3aa..00000000000
--- a/TAO/tao/IORManipulation.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_IORManip
-  dynamicflags = TAO_IORMANIP_BUILD_DLL
-
-  Source_Files {
-    IORManipulation
-  }
-
-  Header_Files {
-    IORManipulation
-  }
-
-  Inline_Files {
-    IORManipulation
-  }
-
-  Template_Files {
-    IORManipulation
-  }
-
-  Resource_Files {
-    IORManipulation
-  }
-
-  PIDL_Files {
-    IORManipulation
-  }
-
-  Pkgconfig_Files {
-    IORManipulation/TAO_IORManip.pc.in
-  }
-}
diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl
deleted file mode 100644
index b523f138ba9..00000000000
--- a/TAO/tao/IORManipulation/IOR.pidl
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * @file IOR.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the TAO_IOP namespace.
- *
- * This file was used to generate the code in IORC.{h,cpp}.
- *
- * To regenerate the code use:
- *
- * tao_idl \
- *        -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci \
- *          -Wb,export_macro=TAO_IORManip_Export \
- *          -Wb,export_include="ior_manip_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *   IOR.pidl
- *
- */
-
-#ifndef TAO_IOR_PIDL
-#define TAO_IOR_PIDL
-
-module TAO_IOP
-{
-  /**
-   * @exception EmptyProfileList
-   *
-   * @brief @@ Bala, please describe this exception
-   */
-  exception EmptyProfileList {};
-
-  /**
-   * @exception NotFound
-   *
-   * @brief @@ Bala, please describe this exception
-   */
-  exception NotFound {};
-
-  /**
-   * @exception Duplicate
-   *
-   * @brief @@ Bala, please describe this exception
-   */
-  exception Duplicate {};
-
-  /**
-   * @exception Invalid_IOR
-   *
-   * @brief @@ Bala, please describe this exception
-   */
-  exception Invalid_IOR {};
-
-  /**
-   * @exception MultiProfileList
-   *
-   * @brief @@ Bala, please describe this exception
-   */
-  exception MultiProfileList {};
-
-  /**
-   * @interface TAO_IOR_Property
-   *
-   * Allows setting properties  by the different services in the
-   * IOR. The implementations of this interface would reside in the
-   * services. This interface essentially performs a role of a
-   * callback object.
-   *
-   * @todo This interface seems redundant in the face of the
-   * PortableInterceptor::IORInterceptor and the
-   * ObjectReferenceTemplate.  If that is the case we should deprecate
-   * it and remove it.
-   */
-  local interface TAO_IOR_Property
-  {
-    /// Operation that would set the required properties in the <ior>
-    /// as needed by the service.
-    boolean set_property (inout Object ior)
-      raises (Invalid_IOR);
-
-    /// Sets the profile ior1, in the profile ior2 to be a
-    /// primary.
-    boolean set_primary (inout Object ior1,
-                         in Object ior2)
-      raises (Duplicate, NotFound);
-
-    /// Returns the ior  of the primary from <ior> if it has been
-    /// set. Else returns a NotFound exception
-    Object get_primary (in Object ior)
-      raises (NotFound);
-
-    /// Returns a true or false depending on whether a primary member
-    /// has been set in <ior>
-    boolean is_primary_set (in Object ior);
-
-    /// If any of the IOR's within the IOGR has a primary tag, just
-    /// remove it. Returns zero if no primary was found.
-    boolean remove_primary_tag (inout Object iogr)
-      raises (NotFound);
-  };
-
-  /**
-   * @interface TAO_IOR_Manipulation
-   *
-   * @brief Allows applications to manipulate object references.
-   *
-   * Manipulating Object References.  While this interface does not
-   * assume the use of CORBA complient IOPs, the IOP termonology is
-   * used throughout.
-   * Object references (Object) are used since they encapsulate the
-   * notion of object references and IORs.
-   * Note, an IOR contains one or more profiles and a profile can be
-   * considered to represent the location or route to a specific instance
-   * of an object.
-   * A profile may also contain supplimentary information useful for
-   * differrent services such as security.
-   * All Object references may have multiple profiles
-   */
-  local interface TAO_IOR_Manipulation
-  {
-      typedef sequence <Object> IORList;
-
-      Object merge_iors (in IORList iors)
-        raises (EmptyProfileList,Duplicate,Invalid_IOR);
-      // Create a new object reference by merging the profiles lists in the
-      // supplied list of one or more object references.
-
-      Object add_profiles (in Object ior1,
-                           in Object ior2)
-        raises (EmptyProfileList, Duplicate, Invalid_IOR);
-      // copy the profile list from "ior2" to "ior1".
-      // Note on ordering, while the current implementation will place
-      // the profiles from ior2 (which are not already in ior1) on the
-      // end of the profile list in ior1, there is no guarantee this ordering
-      // will be maintained.  For example, string_to_object or object_to_string
-      // may reorder the profile lists.  So, if it is important to use one
-      // profile before another then policies should be used along with tagged
-      // components/tagged profiles.
-
-      Object remove_profiles (in Object ior1,
-                              in Object ior2)
-        raises (Invalid_IOR, EmptyProfileList, NotFound);
-      // Any profile in ior1 which matches at least one profile in ior2
-      // will be removed.  Returns a new object reference
-
-
-      boolean set_property (in TAO_IOR_Property prop,
-                            in Object ior)
-        raises (Invalid_IOR, Duplicate);
-      // Allows setting of properties as defined by the <prop> object
-      // in the <ior> list
-
-      // @@ Primary is specific to FT.. But let us have these
-      // @@ operations around. Further, as we pass the property object
-      // @@ around the implementation will not be tied with the FT
-      // @@ service. Any service can use their own ways of defining a
-      // @@ primary. For example FT service uses IOP::TAG_FT_PRIMARY
-      // @@ to identify a primary and some other service could use
-      // @@ something else. But the actual implementation of the
-      // @@ property object would take care of that.
-      boolean set_primary (in TAO_IOR_Property prop,
-                           in Object ior1,
-                           in Object ior2)
-        raises (Invalid_IOR, Duplicate, MultiProfileList, NotFound);
-      // Sets the profile ior1, in the profile ior2 to be a
-      // primary. If ior1 is a multi-profile IOR then the operation
-      // raises the MultiProfileList exception. If ior1 is not found
-      // in ior2, it raises an Invalid_IOR exception. If ior2 has a
-      // primary already defined then it raises a Duplicate
-      // exception.
-
-      /// If any of the IOR's within the IOGR has a primary tag, just remove
-      /// it. Return zero if no primary found.
-      boolean remove_primary_tag (in TAO_IOR_Property prop,
-                                  in Object ior);
-
-
-      Object get_primary (in TAO_IOR_Property prop,
-                          in Object ior)
-        raises (NotFound);
-      // Returns the ior  of the primary from <ior> if it has been
-      // set. Else returns a NotFound exception
-
-      boolean is_primary_set (in TAO_IOR_Property prop,
-                              in Object ior);
-      // Returns a true or false depending on whether a primary member
-      // has been set in <ior>
-
-      unsigned long is_in_ior(in Object ior1, in Object ior2)
-        raises (NotFound);
-      // returns number of profiles which are in both ior1 and ior2.
-
-      unsigned long get_profile_count (in Object ior)
-        raises (EmptyProfileList);
-      // This will return the number of profiles contained in the
-      // corresponding object reference for this object.
-  };
-};
-
-#endif /* TAO_IOR_PIDL */
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
deleted file mode 100644
index c433be40bdb..00000000000
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ /dev/null
@@ -1,902 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IORManip_Loader.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_EmptyProfileList = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_EmptyProfileList (
-    CORBA::tk_except,
-    "IDL:TAO_IOP/EmptyProfileList:1.0",
-    "EmptyProfileList",
-    _tao_fields_TAO_IOP_EmptyProfileList,
-    0);
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_EmptyProfileList =
-    &_tao_tc_TAO_IOP_EmptyProfileList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_NotFound = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_NotFound (
-    CORBA::tk_except,
-    "IDL:TAO_IOP/NotFound:1.0",
-    "NotFound",
-    _tao_fields_TAO_IOP_NotFound,
-    0);
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_NotFound =
-    &_tao_tc_TAO_IOP_NotFound;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_Duplicate = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_Duplicate (
-    CORBA::tk_except,
-    "IDL:TAO_IOP/Duplicate:1.0",
-    "Duplicate",
-    _tao_fields_TAO_IOP_Duplicate,
-    0);
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Duplicate =
-    &_tao_tc_TAO_IOP_Duplicate;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_Invalid_IOR = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_Invalid_IOR (
-    CORBA::tk_except,
-    "IDL:TAO_IOP/Invalid_IOR:1.0",
-    "Invalid_IOR",
-    _tao_fields_TAO_IOP_Invalid_IOR,
-    0);
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Invalid_IOR =
-    &_tao_tc_TAO_IOP_Invalid_IOR;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_MultiProfileList = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_MultiProfileList (
-    CORBA::tk_except,
-    "IDL:TAO_IOP/MultiProfileList:1.0",
-    "MultiProfileList",
-    _tao_fields_TAO_IOP_MultiProfileList,
-    0);
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_MultiProfileList =
-    &_tao_tc_TAO_IOP_MultiProfileList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_TAO_IOR_Property (
-    CORBA::tk_local_interface,
-    "IDL:TAO_IOP/TAO_IOR_Property:1.0",
-    "TAO_IOR_Property");
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property =
-    &_tao_tc_TAO_IOP_TAO_IOR_Property;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD
-#define _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_IOP_TAO_IOR_Manipulation_IORList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Object,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0 =
-      &TAO_IOP_TAO_IOR_Manipulation_IORList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
-    CORBA::tk_alias,
-    "IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0",
-    "IORList",
-    &TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0);
-  
-::CORBA::TypeCode_ptr const TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
-  &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IOP_TAO_IOR_Manipulation (
-    CORBA::tk_local_interface,
-    "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",
-    "TAO_IOR_Manipulation");
-  
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation =
-    &_tao_tc_TAO_IOP_TAO_IOR_Manipulation;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::EmptyProfileList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert_copy (
-      _tao_any,
-      TAO_IOP::EmptyProfileList::_tao_any_destructor,
-      TAO_IOP::_tc_EmptyProfileList,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::EmptyProfileList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::insert (
-      _tao_any,
-      TAO_IOP::EmptyProfileList::_tao_any_destructor,
-      TAO_IOP::_tc_EmptyProfileList,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::EmptyProfileList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::EmptyProfileList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::EmptyProfileList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::extract (
-        _tao_any,
-        TAO_IOP::EmptyProfileList::_tao_any_destructor,
-        TAO_IOP::_tc_EmptyProfileList,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::NotFound &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert_copy (
-      _tao_any,
-      TAO_IOP::NotFound::_tao_any_destructor,
-      TAO_IOP::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::NotFound *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::insert (
-      _tao_any,
-      TAO_IOP::NotFound::_tao_any_destructor,
-      TAO_IOP::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::NotFound *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::NotFound *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::NotFound *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::extract (
-        _tao_any,
-        TAO_IOP::NotFound::_tao_any_destructor,
-        TAO_IOP::_tc_NotFound,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::Duplicate &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert_copy (
-      _tao_any,
-      TAO_IOP::Duplicate::_tao_any_destructor,
-      TAO_IOP::_tc_Duplicate,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::Duplicate *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::insert (
-      _tao_any,
-      TAO_IOP::Duplicate::_tao_any_destructor,
-      TAO_IOP::_tc_Duplicate,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::Duplicate *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::Duplicate *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::Duplicate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::extract (
-        _tao_any,
-        TAO_IOP::Duplicate::_tao_any_destructor,
-        TAO_IOP::_tc_Duplicate,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::Invalid_IOR &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert_copy (
-      _tao_any,
-      TAO_IOP::Invalid_IOR::_tao_any_destructor,
-      TAO_IOP::_tc_Invalid_IOR,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::Invalid_IOR *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::insert (
-      _tao_any,
-      TAO_IOP::Invalid_IOR::_tao_any_destructor,
-      TAO_IOP::_tc_Invalid_IOR,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::Invalid_IOR *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::Invalid_IOR *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::Invalid_IOR *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::extract (
-        _tao_any,
-        TAO_IOP::Invalid_IOR::_tao_any_destructor,
-        TAO_IOP::_tc_Invalid_IOR,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::MultiProfileList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert_copy (
-      _tao_any,
-      TAO_IOP::MultiProfileList::_tao_any_destructor,
-      TAO_IOP::_tc_MultiProfileList,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::MultiProfileList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::insert (
-      _tao_any,
-      TAO_IOP::MultiProfileList::_tao_any_destructor,
-      TAO_IOP::_tc_MultiProfileList,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::MultiProfileList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::MultiProfileList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::MultiProfileList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::extract (
-        _tao_any,
-        TAO_IOP::MultiProfileList::_tao_any_destructor,
-        TAO_IOP::_tc_MultiProfileList,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Property_ptr _tao_elem
-  )
-{
-  TAO_IOP::TAO_IOR_Property_ptr _tao_objptr =
-    TAO_IOP::TAO_IOR_Property::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Property_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::insert (
-      _tao_any,
-      TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
-      TAO_IOP::_tc_TAO_IOR_Property,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Property_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::extract (
-        _tao_any,
-        TAO_IOP::TAO_IOR_Property::_tao_any_destructor,
-        TAO_IOP::_tc_TAO_IOR_Property,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Manipulation_ptr _tao_elem
-  )
-{
-  TAO_IOP::TAO_IOR_Manipulation_ptr _tao_objptr =
-    TAO_IOP::TAO_IOR_Manipulation::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Manipulation_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::insert (
-      _tao_any,
-      TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
-      TAO_IOP::_tc_TAO_IOR_Manipulation,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Manipulation_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::extract (
-        _tao_any,
-        TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor,
-        TAO_IOP::_tc_TAO_IOR_Manipulation,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::insert_copy (
-      _tao_any,
-      TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Manipulation::IORList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::insert (
-      _tao_any,
-      TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO_IOP::TAO_IOR_Manipulation::IORList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::extract (
-        _tao_any,
-        TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor,
-        TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
deleted file mode 100644
index 80b5d8c433b..00000000000
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ /dev/null
@@ -1,1007 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IORManip_Loader.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-TAO_IOP::EmptyProfileList::EmptyProfileList (void)
-  : CORBA::UserException (
-        "IDL:TAO_IOP/EmptyProfileList:1.0",
-        "EmptyProfileList"
-      )
-{
-}
-
-TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
-{
-}
-
-TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-TAO_IOP::EmptyProfileList&
-TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EmptyProfileList *_tao_tmp_pointer =
-    static_cast<EmptyProfileList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-TAO_IOP::EmptyProfileList *
-TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<EmptyProfileList *> (_tao_excp);
-}
-
-const TAO_IOP::EmptyProfileList *
-TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const EmptyProfileList *> (_tao_excp);
-}
-
-CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::TAO_IOP::EmptyProfileList, 0);
-  return retval;
-}
-
-CORBA::Exception *
-TAO_IOP::EmptyProfileList::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::TAO_IOP::EmptyProfileList (*this),
-      0
-    );
-  return result;
-}
-
-void TAO_IOP::EmptyProfileList::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void TAO_IOP::EmptyProfileList::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void TAO_IOP::EmptyProfileList::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_tao_type (void) const
-{
-  return ::TAO_IOP::_tc_EmptyProfileList;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-TAO_IOP::NotFound::NotFound (void)
-  : CORBA::UserException (
-        "IDL:TAO_IOP/NotFound:1.0",
-        "NotFound"
-      )
-{
-}
-
-TAO_IOP::NotFound::~NotFound (void)
-{
-}
-
-TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-TAO_IOP::NotFound&
-TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NotFound *_tao_tmp_pointer =
-    static_cast<NotFound *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-TAO_IOP::NotFound *
-TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<NotFound *> (_tao_excp);
-}
-
-const TAO_IOP::NotFound *
-TAO_IOP::NotFound::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const NotFound *> (_tao_excp);
-}
-
-CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::TAO_IOP::NotFound, 0);
-  return retval;
-}
-
-CORBA::Exception *
-TAO_IOP::NotFound::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::TAO_IOP::NotFound (*this),
-      0
-    );
-  return result;
-}
-
-void TAO_IOP::NotFound::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void TAO_IOP::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void TAO_IOP::NotFound::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::NotFound::_tao_type (void) const
-{
-  return ::TAO_IOP::_tc_NotFound;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-TAO_IOP::Duplicate::Duplicate (void)
-  : CORBA::UserException (
-        "IDL:TAO_IOP/Duplicate:1.0",
-        "Duplicate"
-      )
-{
-}
-
-TAO_IOP::Duplicate::~Duplicate (void)
-{
-}
-
-TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-TAO_IOP::Duplicate&
-TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Duplicate *_tao_tmp_pointer =
-    static_cast<Duplicate *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-TAO_IOP::Duplicate *
-TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<Duplicate *> (_tao_excp);
-}
-
-const TAO_IOP::Duplicate *
-TAO_IOP::Duplicate::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const Duplicate *> (_tao_excp);
-}
-
-CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::TAO_IOP::Duplicate, 0);
-  return retval;
-}
-
-CORBA::Exception *
-TAO_IOP::Duplicate::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::TAO_IOP::Duplicate (*this),
-      0
-    );
-  return result;
-}
-
-void TAO_IOP::Duplicate::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void TAO_IOP::Duplicate::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void TAO_IOP::Duplicate::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Duplicate::_tao_type (void) const
-{
-  return ::TAO_IOP::_tc_Duplicate;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-TAO_IOP::Invalid_IOR::Invalid_IOR (void)
-  : CORBA::UserException (
-        "IDL:TAO_IOP/Invalid_IOR:1.0",
-        "Invalid_IOR"
-      )
-{
-}
-
-TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
-{
-}
-
-TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-TAO_IOP::Invalid_IOR&
-TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Invalid_IOR *_tao_tmp_pointer =
-    static_cast<Invalid_IOR *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-TAO_IOP::Invalid_IOR *
-TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<Invalid_IOR *> (_tao_excp);
-}
-
-const TAO_IOP::Invalid_IOR *
-TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const Invalid_IOR *> (_tao_excp);
-}
-
-CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::TAO_IOP::Invalid_IOR, 0);
-  return retval;
-}
-
-CORBA::Exception *
-TAO_IOP::Invalid_IOR::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::TAO_IOP::Invalid_IOR (*this),
-      0
-    );
-  return result;
-}
-
-void TAO_IOP::Invalid_IOR::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void TAO_IOP::Invalid_IOR::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void TAO_IOP::Invalid_IOR::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_tao_type (void) const
-{
-  return ::TAO_IOP::_tc_Invalid_IOR;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-TAO_IOP::MultiProfileList::MultiProfileList (void)
-  : CORBA::UserException (
-        "IDL:TAO_IOP/MultiProfileList:1.0",
-        "MultiProfileList"
-      )
-{
-}
-
-TAO_IOP::MultiProfileList::~MultiProfileList (void)
-{
-}
-
-TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-TAO_IOP::MultiProfileList&
-TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
-{
-  MultiProfileList *_tao_tmp_pointer =
-    static_cast<MultiProfileList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-TAO_IOP::MultiProfileList *
-TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<MultiProfileList *> (_tao_excp);
-}
-
-const TAO_IOP::MultiProfileList *
-TAO_IOP::MultiProfileList::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const MultiProfileList *> (_tao_excp);
-}
-
-CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::TAO_IOP::MultiProfileList, 0);
-  return retval;
-}
-
-CORBA::Exception *
-TAO_IOP::MultiProfileList::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::TAO_IOP::MultiProfileList (*this),
-      0
-    );
-  return result;
-}
-
-void TAO_IOP::MultiProfileList::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void TAO_IOP::MultiProfileList::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void TAO_IOP::MultiProfileList::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_tao_type (void) const
-{
-  return ::TAO_IOP::_tc_MultiProfileList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for TAO_IOP::TAO_IOR_Property.
-
-TAO_IOP::TAO_IOR_Property_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::duplicate (
-    TAO_IOP::TAO_IOR_Property_ptr p
-  )
-{
-  return TAO_IOP::TAO_IOR_Property::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release (
-    TAO_IOP::TAO_IOR_Property_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-TAO_IOP::TAO_IOR_Property_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::nil (void)
-{
-  return TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::marshal (
-    TAO_IOP::TAO_IOR_Property_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
-{}
-
-TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
-{}
-
-void 
-TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TAO_IOR_Property *_tao_tmp_pointer =
-    static_cast<TAO_IOR_Property *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TAO_IOR_Property::_nil ();
-    }
-  
-  TAO_IOR_Property_ptr proxy =
-    dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-  
-  return TAO_IOR_Property::_duplicate (proxy);
-}
-
-TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TAO_IOR_Property::_nil ();
-    }
-  
-  TAO_IOR_Property_ptr proxy =
-    dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-  
-  return TAO_IOR_Property::_duplicate (proxy);
-}
-
-TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-TAO_IOP::TAO_IOR_Property::_tao_release (TAO_IOR_Property_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Property::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:TAO_IOP/TAO_IOR_Property:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
-}
-
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for TAO_IOP::TAO_IOR_Manipulation.
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::duplicate (
-    TAO_IOP::TAO_IOR_Manipulation_ptr p
-  )
-{
-  return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release (
-    TAO_IOP::TAO_IOR_Manipulation_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::nil (void)
-{
-  return TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
-    TAO_IOP::TAO_IOR_Manipulation_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
-{}
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
-      >
-    (max)
-{}
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Object_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
-      >
-    (max, length, buffer, release)
-{}
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
-    const IORList &seq
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::Object
-      >
-    (seq)
-{}
-
-TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void)
-{}
-
-void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  IORList * _tao_tmp_pointer =
-    static_cast<IORList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-{}
-
-TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-{}
-
-void 
-TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TAO_IOR_Manipulation *_tao_tmp_pointer =
-    static_cast<TAO_IOR_Manipulation *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TAO_IOR_Manipulation::_nil ();
-    }
-  
-  TAO_IOR_Manipulation_ptr proxy =
-    dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-  
-  return TAO_IOR_Manipulation::_duplicate (proxy);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TAO_IOR_Manipulation::_nil ();
-    }
-  
-  TAO_IOR_Manipulation_ptr proxy =
-    dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-  
-  return TAO_IOR_Manipulation::_duplicate (proxy);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation::_tao_release (TAO_IOR_Manipulation_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Manipulation::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::EmptyProfileList &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::EmptyProfileList&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::NotFound &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::NotFound&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::Duplicate &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::Duplicate&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::Invalid_IOR &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::Invalid_IOR&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_IOP::MultiProfileList &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_IOP::MultiProfileList&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
deleted file mode 100644
index 3c3fb06fc6c..00000000000
--- a/TAO/tao/IORManipulation/IORC.h
+++ /dev/null
@@ -1,922 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IORC_H_
-#define _TAO_IDL_ORIG_IORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
- #ifndef TAO_IORMANIP_SAFE_INCLUDE
- #error "You should not include IORC.h directly, use IORManip_Loader.h"
- #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
-
-#include "ior_manip_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IORManip_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO_IOP
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
-#define _TAO_IOP_EMPTYPROFILELIST_CH_
-  
-  class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
-  {
-  public:
-    
-    EmptyProfileList (void);
-    EmptyProfileList (const EmptyProfileList &);
-    ~EmptyProfileList (void);
-
-    EmptyProfileList &operator= (const EmptyProfileList &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static EmptyProfileList *_downcast (CORBA::Exception *);
-    static const EmptyProfileList *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_EmptyProfileList;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_TAO_IOP_NOTFOUND_CH_)
-#define _TAO_IOP_NOTFOUND_CH_
-  
-  class TAO_IORManip_Export NotFound : public CORBA::UserException
-  {
-  public:
-    
-    NotFound (void);
-    NotFound (const NotFound &);
-    ~NotFound (void);
-
-    NotFound &operator= (const NotFound &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static NotFound *_downcast (CORBA::Exception *);
-    static const NotFound *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_TAO_IOP_DUPLICATE_CH_)
-#define _TAO_IOP_DUPLICATE_CH_
-  
-  class TAO_IORManip_Export Duplicate : public CORBA::UserException
-  {
-  public:
-    
-    Duplicate (void);
-    Duplicate (const Duplicate &);
-    ~Duplicate (void);
-
-    Duplicate &operator= (const Duplicate &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static Duplicate *_downcast (CORBA::Exception *);
-    static const Duplicate *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Duplicate;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_TAO_IOP_INVALID_IOR_CH_)
-#define _TAO_IOP_INVALID_IOR_CH_
-  
-  class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
-  {
-  public:
-    
-    Invalid_IOR (void);
-    Invalid_IOR (const Invalid_IOR &);
-    ~Invalid_IOR (void);
-
-    Invalid_IOR &operator= (const Invalid_IOR &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static Invalid_IOR *_downcast (CORBA::Exception *);
-    static const Invalid_IOR *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Invalid_IOR;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
-#define _TAO_IOP_MULTIPROFILELIST_CH_
-  
-  class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
-  {
-  public:
-    
-    MultiProfileList (void);
-    MultiProfileList (const MultiProfileList &);
-    ~MultiProfileList (void);
-
-    MultiProfileList &operator= (const MultiProfileList &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static MultiProfileList *_downcast (CORBA::Exception *);
-    static const MultiProfileList *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_MultiProfileList;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
-  
-  class TAO_IOR_Property;
-  typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        TAO_IOR_Property
-      >
-    TAO_IOR_Property_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        TAO_IOR_Property
-      >
-    TAO_IOR_Property_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-  
-  class TAO_IORManip_Export TAO_IOR_Property
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef TAO_IOR_Property_ptr _ptr_type;
-    typedef TAO_IOR_Property_var _var_type;
-    
-    // The static operations.
-    static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-    
-    static void _tao_release (TAO_IOR_Property_ptr obj);
-    
-    static TAO_IOR_Property_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TAO_IOR_Property_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TAO_IOR_Property_ptr _nil (void)
-    {
-      return static_cast<TAO_IOR_Property_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean set_property (
-        ::CORBA::Object_ptr & ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::Invalid_IOR
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean set_primary (
-        ::CORBA::Object_ptr & ior1,
-        ::CORBA::Object_ptr ior2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::Duplicate,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr get_primary (
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_primary_set (
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean remove_primary_tag (
-        ::CORBA::Object_ptr & iogr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    TAO_IOR_Property (void);
-    
-    virtual ~TAO_IOR_Property (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    TAO_IOR_Property (const TAO_IOR_Property &);
-    
-    void operator= (const TAO_IOR_Property &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
-  
-  class TAO_IOR_Manipulation;
-  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        TAO_IOR_Manipulation
-      >
-    TAO_IOR_Manipulation_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        TAO_IOR_Manipulation
-      >
-    TAO_IOR_Manipulation_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-  
-  class TAO_IORManip_Export TAO_IOR_Manipulation
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef TAO_IOR_Manipulation_ptr _ptr_type;
-    typedef TAO_IOR_Manipulation_var _var_type;
-    
-    // The static operations.
-    static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-    
-    static void _tao_release (TAO_IOR_Manipulation_ptr obj);
-    
-    static TAO_IOR_Manipulation_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TAO_IOR_Manipulation_ptr _nil (void)
-    {
-      return static_cast<TAO_IOR_Manipulation_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-    
-    class IORList;
-    
-    typedef
-      TAO_MngSeq_Var_T<
-          IORList,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Object
-            >
-        >
-      IORList_var;
-    
-    typedef
-      TAO_MngSeq_Out_T<
-          IORList,
-          IORList_var,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Object
-            >
-        >
-      IORList_out;
-    
-    class TAO_IORManip_Export IORList
-      : public
-          TAO_Unbounded_Pseudo_Sequence<
-              CORBA::Object
-            >
-    {
-    public:
-      IORList (void);
-      IORList (CORBA::ULong max);
-      IORList (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Object_ptr* buffer, 
-          CORBA::Boolean release = 0
-        );
-      IORList (const IORList &);
-      ~IORList (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef IORList_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_IORList;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr merge_iors (
-        const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::EmptyProfileList,
-        ::TAO_IOP::Duplicate,
-        ::TAO_IOP::Invalid_IOR
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr add_profiles (
-        ::CORBA::Object_ptr ior1,
-        ::CORBA::Object_ptr ior2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::EmptyProfileList,
-        ::TAO_IOP::Duplicate,
-        ::TAO_IOP::Invalid_IOR
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr remove_profiles (
-        ::CORBA::Object_ptr ior1,
-        ::CORBA::Object_ptr ior2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::Invalid_IOR,
-        ::TAO_IOP::EmptyProfileList,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean set_property (
-        ::TAO_IOP::TAO_IOR_Property_ptr prop,
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::Invalid_IOR,
-        ::TAO_IOP::Duplicate
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean set_primary (
-        ::TAO_IOP::TAO_IOR_Property_ptr prop,
-        ::CORBA::Object_ptr ior1,
-        ::CORBA::Object_ptr ior2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::Invalid_IOR,
-        ::TAO_IOP::Duplicate,
-        ::TAO_IOP::MultiProfileList,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean remove_primary_tag (
-        ::TAO_IOP::TAO_IOR_Property_ptr prop,
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr get_primary (
-        ::TAO_IOP::TAO_IOR_Property_ptr prop,
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_primary_set (
-        ::TAO_IOP::TAO_IOR_Property_ptr prop,
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong is_in_ior (
-        ::CORBA::Object_ptr ior1,
-        ::CORBA::Object_ptr ior2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong get_profile_count (
-        ::CORBA::Object_ptr ior
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::TAO_IOP::EmptyProfileList
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    TAO_IOR_Manipulation (void);
-    
-    virtual ~TAO_IOR_Manipulation (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-    
-    void operator= (const TAO_IOR_Manipulation &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO_IOP
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Property>
-  {
-    static ::TAO_IOP::TAO_IOR_Property_ptr duplicate (
-        ::TAO_IOP::TAO_IOR_Property_ptr
-      );
-    static void release (
-        ::TAO_IOP::TAO_IOR_Property_ptr
-      );
-    static ::TAO_IOP::TAO_IOR_Property_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::TAO_IOP::TAO_IOR_Property_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Manipulation>
-  {
-    static ::TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
-        ::TAO_IOP::TAO_IOR_Manipulation_ptr
-      );
-    static void release (
-        ::TAO_IOP::TAO_IOR_Manipulation_ptr
-      );
-    static ::TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::TAO_IOP::TAO_IOR_Manipulation_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::EmptyProfileList &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::EmptyProfileList*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::EmptyProfileList *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::EmptyProfileList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::NotFound &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::NotFound*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::NotFound *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::NotFound *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Duplicate &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Duplicate*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Duplicate *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Duplicate *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Invalid_IOR &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Invalid_IOR*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Invalid_IOR *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Invalid_IOR *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::MultiProfileList &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::MultiProfileList*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::MultiProfileList *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::MultiProfileList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr); // copying
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr *); // non-copying
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Property_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr); // copying
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr *); // non-copying
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList &); // copying version
-TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList*); // noncopying version
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::TAO_IOR_Manipulation::IORList *&); // deprecated
-TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::EmptyProfileList &);
-TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::EmptyProfileList &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::NotFound &);
-TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::NotFound &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Duplicate &);
-TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Duplicate &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Invalid_IOR &);
-TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Invalid_IOR &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::MultiProfileList &);
-TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
deleted file mode 100644
index 5d06739f52c..00000000000
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "IORManip_Loader.h"
-#include "IORManipulation.h"
-
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (IORManipulation,
-           IORManip_Loader,
-           "$Id$")
-
-
-TAO_IORManip_Loader::TAO_IORManip_Loader (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
-                                    int,
-                                    ACE_TCHAR *[]
-                                    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Object_ptr obj;
-  ACE_NEW_RETURN (obj,
-                  TAO_IOR_Manipulation_impl,
-                  CORBA::Object::_nil ());
-  return obj;
-}
-
-int
-TAO_IORManip_Loader::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader);
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader,
-                       ACE_TEXT ("IORManip_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_IORManip_Loader),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_IORManip, TAO_IORManip_Loader)
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
deleted file mode 100644
index 5a1d9d9d1b5..00000000000
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynamicAny.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =========================================================================
-
-#ifndef TAO_IORMANIP_LOADER_H
-#define TAO_IORMANIP_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "ior_manip_export.h"
-#include "tao/Object_Loader.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader
-{
-public:
-  /// Constructor
-  TAO_IORManip_Loader (void);
-
-  /// Creates a IORManip factory and returns it.
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                           int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader)
-ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORManip_Initializer = &TAO_IORManip_Loader::Initializer;
-
-#else
-
-static int
-TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_IORMANIP_SAFE_INCLUDE
-#include "IORC.h"
-#undef TAO_IORMANIP_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IORManip_H */
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
deleted file mode 100644
index 7a9e1cf18f3..00000000000
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-#include "IORManipulation.h"
-
-#include "tao/MProfile.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (IORManipulation,
-           IORManipulation,
-           "$Id$")
-
-
-TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
-{
-}
-
-TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::Invalid_IOR))
-{
-  // we need to create a new CORBA::Object which has the union of the
-  // two profile lists.  However, if any profiles are duplicates (i.e. in
-  // bott lisis) then an exception is raised.
-
-  // Deterinine how many profiles we have
-  // Get an estimate of the size - pfile count could change since we
-  // neither lock nor get a copy in this loop.
-  CORBA::ULong i, count=0;
-  for (i = 0; i < iors.length (); i++)
-    {
-      count += iors[i]->_stubobj ()->base_profiles ().profile_count ();
-    }
-
-  // make sure we have some profiles
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Merged_Profiles (count);
-
-  // get the profile lists, start by initialize the composite reference
-  // by using the first Object.  Then for each subsequent Object verify
-  // they are the same type and they do not have duplicate profiles.
-  auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ());
-  if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-  CORBA::String_var id =
-    CORBA::string_dup (iors[0]->_stubobj ()->type_id.in ());
-
-  for (i = 1; i < iors.length () ; i++)
-    {
-      // this gets a copy of the MProfile, hense the auto_ptr;
-
-      ACE_AUTO_PTR_RESET (tmp_pfiles,
-                          iors[i]->_stubobj ()->make_profiles (),
-                          TAO_MProfile);
-
-      // check to see if any of the profile in tmp_pfiles are already
-      // in Merged_Profiles.  If so raise exception.
-      if (Merged_Profiles.is_equivalent (tmp_pfiles.get ()))
-        ACE_THROW_RETURN (TAO_IOP::Duplicate (),
-                          CORBA::Object::_nil ());
-
-      // If the object type_id's differ then raise an exception.
-      if (id.in () && iors[i]->_stubobj ()->type_id.in () &&
-          ACE_OS::strcmp (id.in (), iors[i]->_stubobj ()->type_id.in ()))
-        ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-      // append profiles
-      if (Merged_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-        ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                          CORBA::Object::_nil ());
-
-    }
-
-  // MS C++ knows nothing about reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-
-  TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
-                                          Merged_Profiles
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Make the stub memory allocation exception safe for the duration
-  // of this method.
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-
-  // Create the CORBA level proxy
-  CORBA::Object_ptr temp_obj = CORBA::Object::_nil ();
-  ACE_NEW_THROW_EX (temp_obj,
-                    CORBA::Object (safe_stub.get ()),
-                    CORBA::NO_MEMORY ());
-
-  CORBA::Object_var new_obj = temp_obj;
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj.in ()))
-    {
-      ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Release ownership of the pointers protected by the auto_ptrs since they
-  // no longer need to be protected by this point.
-  stub = safe_stub.release ();
-
-  return new_obj._retn ();
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::add_profiles (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::Invalid_IOR))
-{
-
-  // Get an estimate of the number of profiles
-  CORBA::Object_ptr buffer [2];
-  buffer [0] = ior1;
-  buffer [1] = ior2;
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::remove_profiles (
-    CORBA::Object_ptr group,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::Invalid_IOR,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::NotFound
-      ))
-{
-  // First verify they are the same type!
-  CORBA::String_var id =
-    CORBA::string_dup (group->_stubobj ()->type_id.in ());
-  if (id.in () && ior2->_stubobj ()->type_id.in () &&
-      ACE_OS::strcmp (id.in (), ior2->_stubobj ()->type_id.in ()))
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  // Since we are removing from group ...
-  CORBA::ULong count = group->_stubobj ()->base_profiles ().profile_count ();
-
-  // make sure we have some profiles
-  if (count == 0 ||
-      ior2->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      CORBA::Object::_nil ());
-
-  // initialize with estimated pfile count.
-  TAO_MProfile Diff_Profiles (count);
-
-  auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ());
-  if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      CORBA::Object::_nil ());
-
-  ACE_AUTO_PTR_RESET (tmp_pfiles,
-                      ior2->_stubobj ()->make_profiles (),
-                      TAO_MProfile);
-
-  if (Diff_Profiles.remove_profiles (tmp_pfiles.get ()) < 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      CORBA::Object::_nil ());
-
-  // MS C++ knows nothing about reset!
-  // tmp_pfiles.reset (0); // get rid of last MProfile
-
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-
-  TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
-                                          Diff_Profiles
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Make the stub memory allocation exception safe for the duration
-  // of this method.
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-
-  // Create the CORBA level proxy
-  CORBA::Object_ptr temp_obj = CORBA::Object::_nil ();
-  ACE_NEW_THROW_EX (temp_obj,
-                    CORBA::Object (safe_stub.get ()),
-                    CORBA::NO_MEMORY ());
-
-  CORBA::Object_var new_obj = temp_obj;
-
-  // Exception safety is no longer an issue by this point so release
-  // the TAO_Stub from the TAO_Stub_Auto_Ptr.
-  stub = safe_stub.release ();
-
-  // Clean up in case of errors.
-  if (CORBA::is_nil (new_obj.in ()))
-    {
-      ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                        CORBA::Object::_nil ());
-    }
-
-  return new_obj._retn ();
-}
-
-CORBA::Boolean
-TAO_IOR_Manipulation_impl::set_property (
-    TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::Invalid_IOR,
-                   TAO_IOP::Duplicate))
-{
-  // make sure we have some profiles
-  if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      0);
-
-  // Call the implementation object to
-  return prop->set_property (group
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-//@@ note awkward argument order
-CORBA::Boolean
-TAO_IOR_Manipulation_impl::set_primary (
-    TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr new_primary,
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::Invalid_IOR,
-                   TAO_IOP::Duplicate,
-                   TAO_IOP::MultiProfileList))
-{
-  // make sure we have some profiles in GROUP
-  if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                      0);
-
-  // Make sure we have only one profile in new_primary
-  // @@ Will fail if the object has been
-  /*if (new_primary->_stubobj ()->base_profiles ().profile_count () > 1)
-    ACE_THROW_RETURN (TAO_IOP::MultiProfileList (),
-    0);*/
-
-  // Call the callback object to do the rest of the processing.
-  return prop->set_primary (new_primary,
-                            group
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_IOR_Manipulation_impl::get_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    ))
-{
-  // make sure we have some profiles in IOR
-  if (group->_stubobj ()->base_profiles ().profile_count () == 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (), 0);
-  // @@ Bala: this was throwing TAO_IOP::Invalid_IOR, but it was not
-  // in the throw spec, that will result in a CORBA::UNKNOWN at
-  // run-time (if it does not crash).  Any idea about what is going on
-  // here?
-
-  return prop->get_primary (group
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_IOR_Manipulation_impl::is_primary_set (
-    TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return prop->is_primary_set (group ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_IOR_Manipulation_impl:: remove_primary_tag (
-    TAO_IOP::TAO_IOR_Property_ptr prop,
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return prop->remove_primary_tag (group ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::NotFound))
-{
-  CORBA::ULong count = 0;
-  TAO_Profile *pfile1, *pfile2;
-  auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ());
-  auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ());
-
-  tmp_pfiles1->rewind ();
-  while ((pfile1 = tmp_pfiles1->get_next ()) > 0)
-    {
-      tmp_pfiles2->rewind ();
-      while ((pfile2 = tmp_pfiles2->get_next ()) > 0)
-        {
-          if (pfile1->is_equivalent (pfile2))
-            count++;
-        }
-    }
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::NotFound (),
-                      0);
-
-  return count;
-}
-
-CORBA::ULong
-TAO_IOR_Manipulation_impl::get_profile_count (
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   TAO_IOP::EmptyProfileList))
-{
-  CORBA::ULong count;
-  count = group->_stubobj ()->base_profiles ().profile_count ();
-
-  if (count == 0)
-    ACE_THROW_RETURN (TAO_IOP::EmptyProfileList (),
-                      0);
-
-  return count;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_MProfile>;
-template class ACE_Auto_Basic_Ptr<TAO_MProfile>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_MProfile>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_MProfile>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
deleted file mode 100644
index 0666e0ef6b7..00000000000
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    IORManipulation.h
-//
-// = DESCRIPTION
-//    This class implements IOR interface to the ORB
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IOR_MANIPULATION_H
-#define TAO_IOR_MANIPULATION_H
-#include /**/ "ace/pre.h"
-
-#include "tao/LocalObject.h"
-#include "IORManip_Loader.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IORC.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_IORManip_Export TAO_IOR_Manipulation_impl
-  : public TAO_IOP::TAO_IOR_Manipulation,
-    public TAO_Local_RefCounted_Object
-{
-  // = TITLE
-  //     IOR Manipulation class
-  //
-  // = DESCRIPTION
-  //
-  //
-public:
-
-  TAO_IOR_Manipulation_impl (void);
-  // constructor
-
-  ~TAO_IOR_Manipulation_impl (void);
-  // destructor
-
-  virtual CORBA::Object_ptr merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::Duplicate,
-        TAO_IOP::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr add_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::Duplicate,
-        TAO_IOP::Invalid_IOR
-      ));
-
-  virtual CORBA::Object_ptr remove_profiles (
-    CORBA::Object_ptr group,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::Invalid_IOR,
-        TAO_IOP::EmptyProfileList,
-        TAO_IOP::NotFound
-      ));
-
-  virtual CORBA::Boolean set_property (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate
-    ));
-
-  // @@ note awkward argument order
-  virtual CORBA::Boolean set_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr new_primary,
-      CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate,
-      TAO_IOP::MultiProfileList
-    ));
-
-  virtual CORBA::Object_ptr get_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    ));
-
-  virtual CORBA::Boolean is_primary_set (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-   virtual CORBA::Boolean remove_primary_tag (
-       TAO_IOP::TAO_IOR_Property_ptr prop,
-       CORBA::Object_ptr iogr
-       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  virtual CORBA::ULong is_in_ior (
-    CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::NotFound
-      ));
-
-  virtual CORBA::ULong get_profile_count (
-    CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        TAO_IOP::EmptyProfileList
-      ));
-private:
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IOR_MANIPULATION_H */
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.pc.in b/TAO/tao/IORManipulation/TAO_IORManip.pc.in
deleted file mode 100644
index f0e66efd415..00000000000
--- a/TAO/tao/IORManipulation/TAO_IORManip.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_IORManip
-Description: TAO IOR Manipulation Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_IORManip
-Cflags: -I${includedir}
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.rc b/TAO/tao/IORManipulation/TAO_IORManip.rc
deleted file mode 100644
index 9874dd6f19e..00000000000
--- a/TAO/tao/IORManipulation/TAO_IORManip.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "IORManip\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_IORManipDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_IORManip.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/IORManipulation/diffs/IOR.diff b/TAO/tao/IORManipulation/diffs/IOR.diff
deleted file mode 100644
index 04d191129c9..00000000000
--- a/TAO/tao/IORManipulation/diffs/IOR.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- orig/IORC.h	2005-03-31 12:04:13.717832000 +0200
-+++ IORC.h	2005-03-31 12:04:13.878062400 +0200
-@@ -40,6 +40,10 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
-+ #ifndef TAO_IORMANIP_SAFE_INCLUDE
-+ #error "You should not include IORC.h directly, use IORManip_Loader.h"
-+ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
-+
- #include "ior_manip_export.h"
- #include "tao/ORB.h"
- #include "tao/SystemException.h"
---- orig/IORC.cpp	2005-03-31 12:04:13.717832000 +0200
-+++ IORC.cpp	2005-03-31 12:04:13.878062400 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:291
- 
- 
--#include "IORC.h"
-+#include "IORManip_Loader.h"
- #include "tao/CDR.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
---- orig/IORA.cpp	2005-03-31 12:04:13.717832000 +0200
-+++ IORA.cpp	2005-03-31 12:05:19.502425600 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "IORC.h"
-+#include "IORManip_Loader.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/IORManipulation/ior_manip_export.h b/TAO/tao/IORManipulation/ior_manip_export.h
deleted file mode 100644
index 0173c23bb58..00000000000
--- a/TAO/tao/IORManipulation/ior_manip_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_IORMANIP_EXPORT_H
-#define TAO_IORMANIP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_IORMANIP_HAS_DLL)
-#    define TAO_IORMANIP_HAS_DLL 0
-#  endif /* ! TAO_IORMANIP_HAS_DLL */
-#else
-#  if !defined (TAO_IORMANIP_HAS_DLL)
-#    define TAO_IORMANIP_HAS_DLL 1
-#  endif /* ! TAO_IORMANIP_HAS_DLL */
-#endif
-
-#if defined (TAO_IORMANIP_HAS_DLL) && (TAO_IORMANIP_HAS_DLL == 1)
-#  if defined (TAO_IORMANIP_BUILD_DLL)
-#    define TAO_IORManip_Export ACE_Proper_Export_Flag
-#    define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_IORMANIP_BUILD_DLL */
-#    define TAO_IORManip_Export ACE_Proper_Import_Flag
-#    define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IORMANIP_BUILD_DLL */
-#else /* TAO_IORMANIP_HAS_DLL == 1 */
-#  define TAO_IORManip_Export
-#  define TAO_IORMANIP_SINGLETON_DECLARATION(T)
-#  define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IORMANIP_HAS_DLL == 1 */
-
-#endif /* TAO_IORMANIP_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
deleted file mode 100644
index 92010d7a90f..00000000000
--- a/TAO/tao/IORTable.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_IORTable
-  dynamicflags = TAO_IORTABLE_BUILD_DLL
-
-  Source_Files {
-    IORTable 
-  }
-
-  Header_Files {
-    IORTable
-  }
-
-  Inline_Files {
-    IORTable
-  }
-
-  Template_Files {
-    IORTable
-  }
-
-  Resource_Files {
-    IORTable
-  }
-
-  PIDL_Files {
-    IORTable
-  }
-
-  Pkgconfig_Files {
-    IORTable/TAO_IORTable.pc.in
-  }
-}
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
deleted file mode 100644
index 6b5d631f90f..00000000000
--- a/TAO/tao/IORTable/IORTable.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- */
-
-// =================================================================
-/**
- * @file IORTable.cpp
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- *
- */
-// =================================================================
-
-#include "IORTable.h"
-#include "Table_Adapter.h"
-
-ACE_RCSID (IORTable, IORTable, "$Id$")
-
-int
-TAO_IORTable_Initializer::init (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory);
-}
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
deleted file mode 100644
index 26b097aa2dd..00000000000
--- a/TAO/tao/IORTable/IORTable.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-
-
-//=============================================================================
-/**
- *  @file    IORTable.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_IORTABLE_H
-#define TAO_IORTABLE_H
-
-#include /**/ "ace/pre.h"
-
-#include "iortable_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_IORTable_Export TAO_IORTable_Initializer
-{
-public:
-  /// Used to force the initialization of the ORB code.
-  static int init (void);
-};
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORTable_Initializer = &TAO_IORTable_Initializer::init;
-
-#else
-
-static int
-TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_IORTABLE_SAFE_INCLUDE
-#include "IORTableC.h"
-#undef TAO_IORTABLE_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IORTABLE_H */
diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl
deleted file mode 100644
index f68bd177e2a..00000000000
--- a/TAO/tao/IORTable/IORTable.pidl
+++ /dev/null
@@ -1,79 +0,0 @@
-// ================================================================
-/**
- * @file IORTable.pidl
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- *
- * @brief Pre-compiled IDL source for the IORTable module.
- *
- * This file was used to generate the code in
- * IORTable{C}.{h,cpp}
- *
- *   The command used to generate code from this file is:
- *
- *     tao_idl -o orig -Ge 1 -Sa -St -Sci \
- *          -Wb,export_macro=TAO_IORTable_Export \
- *          -Wb,export_include=iortable_export.h \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          IORTable.pidl
- *
- */
-// ================================================================
-
-/// Define a module to avoid namespace pollution
-module IORTable
-{
-  local interface Locator;
-
-  /// The object key is already in the IORTable
-  exception AlreadyBound {};
-
-  /// Cannot find the object key in the IORTable
-  exception NotFound {};
-
-  /// Define the IORTable interface
-  /**
-   *
-   *  Any TAO server can be configured as an corbaloc agent.
-   *  Such agents forward requests generated using a simple
-   *  ObjectKey in a corbaloc specifcation to the real location
-   *  of the object.
-   *  In TAO we implement this feature by dynamically (or
-   *  statically) adding a new Object Adapter to the ORB, that
-   *  handles any sort of request.
-   */
-  local interface Table
-  {
-    /// Bind <object_key> to the <IOR>
-    void bind (in string object_key,
-               in string IOR)
-      raises (AlreadyBound);
-
-    /// Bind <object_key> to the <IOR>
-    void rebind (in string object_key,
-                 in string IOR);
-
-    /// Remove the binding for <object_key>
-    void unbind (in string object_key)
-      raises (NotFound);
-
-    /// Set the locator, if no binding is set for an object_key we try
-    /// to use the locator to resolve it
-    void set_locator (in Locator the_locator);
-  };
-
-  /// Callback interface to locate  object keys dynamically
-  /**
-   * The application can provide a callback interface to locate object
-   * keys dynamically.
-   */
-  local interface Locator
-  {
-    /// Returns an IOR to use for <object_key>
-    string locate (in string object_key)
-      raises (NotFound);
-  };
-};
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
deleted file mode 100644
index afbeabe311b..00000000000
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IORTable.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IORTable::AlreadyBound::AlreadyBound (void)
-  : CORBA::UserException (
-        "IDL:IORTable/AlreadyBound:1.0",
-        "AlreadyBound"
-      )
-{
-}
-
-IORTable::AlreadyBound::~AlreadyBound (void)
-{
-}
-
-IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IORTable::AlreadyBound&
-IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-IORTable::AlreadyBound *
-IORTable::AlreadyBound::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<AlreadyBound *> (_tao_excp);
-}
-
-const IORTable::AlreadyBound *
-IORTable::AlreadyBound::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const AlreadyBound *> (_tao_excp);
-}
-
-CORBA::Exception *IORTable::AlreadyBound::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IORTable::AlreadyBound, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IORTable::AlreadyBound::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IORTable::AlreadyBound (*this),
-      0
-    );
-  return result;
-}
-
-void IORTable::AlreadyBound::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IORTable::AlreadyBound::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IORTable::AlreadyBound::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-IORTable::NotFound::NotFound (void)
-  : CORBA::UserException (
-        "IDL:IORTable/NotFound:1.0",
-        "NotFound"
-      )
-{
-}
-
-IORTable::NotFound::~NotFound (void)
-{
-}
-
-IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-IORTable::NotFound&
-IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-IORTable::NotFound *
-IORTable::NotFound::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<NotFound *> (_tao_excp);
-}
-
-const IORTable::NotFound *
-IORTable::NotFound::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const NotFound *> (_tao_excp);
-}
-
-CORBA::Exception *IORTable::NotFound::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IORTable::NotFound, 0);
-  return retval;
-}
-
-CORBA::Exception *
-IORTable::NotFound::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::IORTable::NotFound (*this),
-      0
-    );
-  return result;
-}
-
-void IORTable::NotFound::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void IORTable::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IORTable::NotFound::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for IORTable::Table.
-
-IORTable::Table_ptr
-TAO::Objref_Traits<IORTable::Table>::duplicate (
-    IORTable::Table_ptr p
-  )
-{
-  return IORTable::Table::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<IORTable::Table>::release (
-    IORTable::Table_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-IORTable::Table_ptr
-TAO::Objref_Traits<IORTable::Table>::nil (void)
-{
-  return IORTable::Table::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<IORTable::Table>::marshal (
-    IORTable::Table_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-IORTable::Table::Table (void)
-{}
-
-IORTable::Table::~Table (void)
-{}
-
-IORTable::Table_ptr
-IORTable::Table::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Table::_nil ();
-    }
-  
-  Table_ptr proxy =
-    dynamic_cast<Table_ptr> (_tao_objref);
-  
-  return Table::_duplicate (proxy);
-}
-
-IORTable::Table_ptr
-IORTable::Table::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Table::_nil ();
-    }
-  
-  Table_ptr proxy =
-    dynamic_cast<Table_ptr> (_tao_objref);
-  
-  return Table::_duplicate (proxy);
-}
-
-IORTable::Table_ptr
-IORTable::Table::_duplicate (Table_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-IORTable::Table::_tao_release (Table_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-IORTable::Table::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:IORTable/Table:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* IORTable::Table::_interface_repository_id (void) const
-{
-  return "IDL:IORTable/Table:1.0";
-}
-
-CORBA::Boolean
-IORTable::Table::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for IORTable::Locator.
-
-IORTable::Locator_ptr
-TAO::Objref_Traits<IORTable::Locator>::duplicate (
-    IORTable::Locator_ptr p
-  )
-{
-  return IORTable::Locator::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<IORTable::Locator>::release (
-    IORTable::Locator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-IORTable::Locator_ptr
-TAO::Objref_Traits<IORTable::Locator>::nil (void)
-{
-  return IORTable::Locator::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<IORTable::Locator>::marshal (
-    IORTable::Locator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-IORTable::Locator::Locator (void)
-{}
-
-IORTable::Locator::~Locator (void)
-{}
-
-IORTable::Locator_ptr
-IORTable::Locator::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Locator::_nil ();
-    }
-  
-  Locator_ptr proxy =
-    dynamic_cast<Locator_ptr> (_tao_objref);
-  
-  return Locator::_duplicate (proxy);
-}
-
-IORTable::Locator_ptr
-IORTable::Locator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Locator::_nil ();
-    }
-  
-  Locator_ptr proxy =
-    dynamic_cast<Locator_ptr> (_tao_objref);
-  
-  return Locator::_duplicate (proxy);
-}
-
-IORTable::Locator_ptr
-IORTable::Locator::_duplicate (Locator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-IORTable::Locator::_tao_release (Locator_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-IORTable::Locator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:IORTable/Locator:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* IORTable::Locator::_interface_repository_id (void) const
-{
-  return "IDL:IORTable/Locator:1.0";
-}
-
-CORBA::Boolean
-IORTable::Locator::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IORTable::AlreadyBound &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IORTable::AlreadyBound&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IORTable::NotFound &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IORTable::NotFound&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
deleted file mode 100644
index 4f2d10cf9f0..00000000000
--- a/TAO/tao/IORTable/IORTableC.h
+++ /dev/null
@@ -1,466 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IORTABLEC_H_
-#define _TAO_IDL_ORIG_IORTABLEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "iortable_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
- #ifndef TAO_IORTABLE_SAFE_INCLUDE
- #error "You should not include IORTableC.h directly, use IORTable.h"
- #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IORTable_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace IORTable
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_)
-#define _IORTABLE_LOCATOR__VAR_OUT_CH_
-  
-  class Locator;
-  typedef Locator *Locator_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Locator
-      >
-    Locator_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Locator
-      >
-    Locator_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IORTABLE_ALREADYBOUND_CH_)
-#define _IORTABLE_ALREADYBOUND_CH_
-  
-  class TAO_IORTable_Export AlreadyBound : public CORBA::UserException
-  {
-  public:
-    
-    AlreadyBound (void);
-    AlreadyBound (const AlreadyBound &);
-    ~AlreadyBound (void);
-
-    AlreadyBound &operator= (const AlreadyBound &);
-    
-    static AlreadyBound *_downcast (CORBA::Exception *);
-    static const AlreadyBound *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IORTABLE_NOTFOUND_CH_)
-#define _IORTABLE_NOTFOUND_CH_
-  
-  class TAO_IORTable_Export NotFound : public CORBA::UserException
-  {
-  public:
-    
-    NotFound (void);
-    NotFound (const NotFound &);
-    ~NotFound (void);
-
-    NotFound &operator= (const NotFound &);
-    
-    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;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_IORTABLE_TABLE__VAR_OUT_CH_)
-#define _IORTABLE_TABLE__VAR_OUT_CH_
-  
-  class Table;
-  typedef Table *Table_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Table
-      >
-    Table_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Table
-      >
-    Table_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IORTABLE_TABLE_CH_)
-#define _IORTABLE_TABLE_CH_
-  
-  class TAO_IORTable_Export Table
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Table_ptr _ptr_type;
-    typedef Table_var _var_type;
-    
-    // The static operations.
-    static Table_ptr _duplicate (Table_ptr obj);
-    
-    static void _tao_release (Table_ptr obj);
-    
-    static Table_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Table_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Table_ptr _nil (void)
-    {
-      return static_cast<Table_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void bind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IORTable::AlreadyBound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void rebind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void unbind (
-        const char * object_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IORTable::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_locator (
-        ::IORTable::Locator_ptr the_locator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Table (void);
-    
-    virtual ~Table (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Table (const Table &);
-    
-    void operator= (const Table &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IORTABLE_LOCATOR_CH_)
-#define _IORTABLE_LOCATOR_CH_
-  
-  class TAO_IORTable_Export Locator
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Locator_ptr _ptr_type;
-    typedef Locator_var _var_type;
-    
-    // The static operations.
-    static Locator_ptr _duplicate (Locator_ptr obj);
-    
-    static void _tao_release (Locator_ptr obj);
-    
-    static Locator_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Locator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Locator_ptr _nil (void)
-    {
-      return static_cast<Locator_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * locate (
-        const char * object_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::IORTable::NotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Locator (void);
-    
-    virtual ~Locator (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Locator (const Locator &);
-    
-    void operator= (const Locator &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module IORTable
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_IORTABLE_LOCATOR__TRAITS_CH_)
-#define _IORTABLE_LOCATOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORTable_Export Objref_Traits< ::IORTable::Locator>
-  {
-    static ::IORTable::Locator_ptr duplicate (
-        ::IORTable::Locator_ptr
-      );
-    static void release (
-        ::IORTable::Locator_ptr
-      );
-    static ::IORTable::Locator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::IORTable::Locator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_TABLE__TRAITS_CH_)
-#define _IORTABLE_TABLE__TRAITS_CH_
-  
-  template<>
-  struct TAO_IORTable_Export Objref_Traits< ::IORTable::Table>
-  {
-    static ::IORTable::Table_ptr duplicate (
-        ::IORTable::Table_ptr
-      );
-    static void release (
-        ::IORTable::Table_ptr
-      );
-    static ::IORTable::Table_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::IORTable::Table_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::AlreadyBound &);
-TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::AlreadyBound &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::NotFound &);
-TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
deleted file mode 100644
index 7b0d6bb538a..00000000000
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * @file IOR_Table_Impl.cpp
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- *
- */
-
-#include "IOR_Table_Impl.h"
-#include "ace/Guard_T.h"
-
-ACE_RCSID (IORTable,
-           IOR_Table_Impl,
-           "$Id$")
-
-
-TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
-{
-}
-
-char *
-TAO_IOR_Table_Impl::find (const char *object_key
-                          ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ))
-{
-  // We don't want the lock held during locate, so make it go out
-  // of scope before then.
-  {
-    ACE_CString key (object_key);
-    ACE_CString ior;
-
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-    if (this->map_.find (key, ior) == 0)
-      {
-        return CORBA::string_dup (ior.c_str ());
-      }
-    if (CORBA::is_nil (this->locator_.in ()))
-      ACE_THROW_RETURN (IORTable::NotFound (), 0);
-  }
-
-  return this->locator_->locate (object_key ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_IOR_Table_Impl::bind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::AlreadyBound
-      ))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  if (this->map_.bind (object_key, IOR) != 0)
-    ACE_THROW (IORTable::AlreadyBound ());
-}
-
-void
-TAO_IOR_Table_Impl::rebind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_NOT_USED
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  this->map_.rebind (object_key, IOR);
-}
-
-void
-TAO_IOR_Table_Impl::unbind (
-        const char * object_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  if (this->map_.unbind (object_key) != 0)
-    ACE_THROW (IORTable::NotFound ());
-}
-
-void
-TAO_IOR_Table_Impl::set_locator (
-        IORTable::Locator_ptr locator
-        ACE_ENV_ARG_DECL_NOT_USED
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-  this->locator_ = IORTable::Locator::_duplicate (locator);
-}
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
deleted file mode 100644
index acdcebdfa11..00000000000
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IOR_Table_Impl.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_IOR_TABLE_IMPL_H
-#define TAO_IOR_TABLE_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "IORTable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Null_Mutex.h"
-#include "tao/LocalObject.h"
-#include "ace/SString.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_IORTable_Export TAO_IOR_Table_Impl
-  : public virtual IORTable::Table,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor
-  TAO_IOR_Table_Impl (void);
-
-  /// Find the object, using the locator if it is not on the table.
-  char *find (
-      const char *object_key
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      IORTable::NotFound
-    ));
-
-    /**
-     * @name The IORTable::Table methods
-     *
-     * Please check the IORTable.pidl file for details.
-     */
-    //@{
-    virtual void bind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::AlreadyBound
-      ));
-
-    virtual void rebind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void unbind (
-        const char * object_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ));
-
-    virtual void set_locator (
-        IORTable::Locator_ptr the_locator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    //@}
-
-private:
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> Map;
-
-  /// The map
-  Map map_;
-
-  /// The locator
-  IORTable::Locator_var locator_;
-
-  /// Synchronization
-  TAO_SYNCH_MUTEX lock_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IOR_TABLE_IMPL */
diff --git a/TAO/tao/IORTable/TAO_IORTable.pc.in b/TAO/tao/IORTable/TAO_IORTable.pc.in
deleted file mode 100644
index 9c5ffcf6d73..00000000000
--- a/TAO/tao/IORTable/TAO_IORTable.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_IORTable
-Description: TAO IOR Table Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_IORTable
-Cflags: -I${includedir}
diff --git a/TAO/tao/IORTable/TAO_IORTable.rc b/TAO/tao/IORTable/TAO_IORTable.rc
deleted file mode 100644
index eb75c022a62..00000000000
--- a/TAO/tao/IORTable/TAO_IORTable.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "IORTable\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_IORTableDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_IORTable.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
deleted file mode 100644
index 4fedc0b3f29..00000000000
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * @file Table_Adapter.cpp
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- *
- */
-
-#include "Table_Adapter.h"
-#include "IOR_Table_Impl.h"
-#include "tao/ORB_Core.h"
-#include "tao/Object.h"
-#include "tao/ORB.h"
-
-ACE_RCSID (IORTable,
-           Table_Adapter,
-           "$Id$")
-
-TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core)
-  :  orb_core_ (orb_core)
-  ,  root_ (0)
-{
-}
-
-TAO_Table_Adapter::~TAO_Table_Adapter (void)
-{
-  CORBA::release (this->root_);
-}
-
-void
-TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_NEW_THROW_EX (this->root_,
-                    TAO_IOR_Table_Impl (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-}
-
-void
-TAO_Table_Adapter::close (int  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  CORBA::release (this->root_);
-  this->root_ = 0;
-}
-
-void
-TAO_Table_Adapter::check_close (int  ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-int
-TAO_Table_Adapter::priority (void) const
-{
-  return 16; // @@
-}
-
-int
-TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
-                             TAO_ServerRequest &,
-                             CORBA::Object_out forward_to
-                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var object_key;
-  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
-                                            key);
-  ACE_TRY
-    {
-      CORBA::String_var ior =
-        this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      forward_to =
-        this->orb_core_->orb ()->string_to_object (ior.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (IORTable::NotFound, nf_ex)
-    {
-      return TAO_Adapter::DS_MISMATCHED_KEY;
-    }
-  ACE_ENDTRY;
-  return TAO_Adapter::DS_FORWARD;
-}
-
-const char *
-TAO_Table_Adapter::name (void) const
-{
-  return "IORTable";
-}
-
-CORBA::Object_ptr
-TAO_Table_Adapter::root (void)
-{
-  return CORBA::Object::_duplicate (this->root_);
-}
-
-CORBA::Object_ptr
-TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
-                                             const TAO_MProfile &)
-{
-  return new CORBA::Object (stub);
-}
-
-CORBA::Long
-TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *,
-                                                 CORBA::Object_ptr )
-{
-  return 0;
-}
-// ****************************************************************
-
-TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
-{
-}
-
-TAO_Adapter*
-TAO_Table_Adapter_Factory::create (TAO_ORB_Core *oc)
-{
-  return new TAO_Table_Adapter (oc);
-}
-
-ACE_FACTORY_DEFINE (TAO_IORTable, TAO_Table_Adapter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_Table_Adapter_Factory,
-                       ACE_TEXT ("TAO_IORTable"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Table_Adapter_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
deleted file mode 100644
index 3e1a8b2fcd8..00000000000
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file Table_Adapter.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@uci.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_TABLE_ADAPTER_H
-#define TAO_TABLE_ADAPTER_H
-#include /**/ "ace/pre.h"
-
-#include "iortable_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Adapter.h"
-#include "tao/Adapter_Factory.h"
-#include "ace/Service_Config.h"
-
-class TAO_IOR_Table_Impl;
-
-class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter
-{
-public:
-  /// Constructor
-  TAO_Table_Adapter (TAO_ORB_Core *orb_core);
-
-  /// Destructor
-  virtual ~TAO_Table_Adapter (void);
-
-  // = The TAO_Adapter methods, please check tao/Adapter.h for the
-  // documentation
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL);
-  virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL);
-  virtual int priority (void) const;
-  virtual int dispatch (TAO::ObjectKey &key,
-                        TAO_ServerRequest &request,
-                        CORBA::Object_out foward_to
-                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual const char *name (void) const;
-  virtual CORBA::Object_ptr root (void);
-  virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
-                                                      const TAO_MProfile &);
-
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr);
-private:
-  /// The ORB Core we belong to
-  TAO_ORB_Core *orb_core_;
-
-  /// The table implementation
-  TAO_IOR_Table_Impl *root_;
-};
-
-// ****************************************************************
-
-class TAO_IORTable_Export TAO_Table_Adapter_Factory : public TAO_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_Table_Adapter_Factory (void);
-
-  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
-  // details.
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Table_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_IORTable, TAO_Table_Adapter_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_TABLE_ADAPTER_H */
diff --git a/TAO/tao/IORTable/diff/IORTable.diff b/TAO/tao/IORTable/diff/IORTable.diff
deleted file mode 100644
index 616072f0fbd..00000000000
--- a/TAO/tao/IORTable/diff/IORTable.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- orig/IORTableC.h	2005-02-18 12:17:41.246128000 +0100
-+++ IORTableC.h	2005-02-18 12:17:41.726819200 +0100
-@@ -47,6 +47,10 @@
- #include "tao/Object.h"
- #include "tao/Objref_VarOut_T.h"
- 
-+ #ifndef TAO_IORTABLE_SAFE_INCLUDE
-+ #error "You should not include IORTableC.h directly, use IORTable.h"
-+ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
---- orig/IORTableC.cpp	2005-02-18 12:17:41.246128000 +0100
-+++ IORTableC.cpp	2005-02-18 12:17:41.746848000 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "IORTableC.h"
-+#include "IORTable.h"
- #include "tao/CDR.h"
- #include "ace/OS_NS_string.h"
- 
diff --git a/TAO/tao/IORTable/iortable_export.h b/TAO/tao/IORTable/iortable_export.h
deleted file mode 100644
index ba6833bea98..00000000000
--- a/TAO/tao/IORTable/iortable_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_IORTABLE_EXPORT_H
-#define TAO_IORTABLE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_IORTABLE_HAS_DLL)
-#    define TAO_IORTABLE_HAS_DLL 0
-#  endif /* ! TAO_IORTABLE_HAS_DLL */
-#else
-#  if !defined (TAO_IORTABLE_HAS_DLL)
-#    define TAO_IORTABLE_HAS_DLL 1
-#  endif /* ! TAO_IORTABLE_HAS_DLL */
-#endif
-
-#if defined (TAO_IORTABLE_HAS_DLL) && (TAO_IORTABLE_HAS_DLL == 1)
-#  if defined (TAO_IORTABLE_BUILD_DLL)
-#    define TAO_IORTable_Export ACE_Proper_Export_Flag
-#    define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_IORTABLE_BUILD_DLL */
-#    define TAO_IORTable_Export ACE_Proper_Import_Flag
-#    define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IORTABLE_BUILD_DLL */
-#else /* TAO_IORTABLE_HAS_DLL == 1 */
-#  define TAO_IORTable_Export
-#  define TAO_IORTABLE_SINGLETON_DECLARATION(T)
-#  define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IORTABLE_HAS_DLL == 1 */
-
-#endif /* TAO_IORTABLE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
deleted file mode 100644
index 6c9a01c5336..00000000000
--- a/TAO/tao/IOR_Parser.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "tao/IOR_Parser.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, IOR_Parser, "$Id$")
-
-TAO_IOR_Parser::~TAO_IOR_Parser (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_IOR_Parser>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_IOR_Parser>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
deleted file mode 100644
index 1b4c2e0ab8e..00000000000
--- a/TAO/tao/IOR_Parser.h
+++ /dev/null
@@ -1,66 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   IOR_Parser.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_IOR_PARSER_H
-#define TAO_IOR_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ORB;
-  typedef ORB *ORB_ptr;
-}
-
-/**
- * @class TAO_IOR_Parser
- *
- * @brief Defines the interface for the pluggable IOR parser components
- *
- * The ORB is able to dynamically load the list of IOR formats it
- * understands.  That allow us to integrate formats such as
- * corbaname:, http: or ftp: only when required.
- * This class provides a uniform interface for all the IOR parsers
- */
-class TAO_Export TAO_IOR_Parser : public ACE_Service_Object
-{
-public:
-  /// The destructor
-  virtual ~TAO_IOR_Parser (void);
-
-  /// Return 1 if @a ior_string starts with a prefix known to this IOR
-  /// parser
-  virtual int match_prefix (const char *ior_string) const = 0;
-
-  /**
-   * Parse the @a ior argument and return an object reference.
-   * The call may raise the standard system exceptions (NO_MEMORY,
-   * INV_OBJREF, etc.)
-   */
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IOR_PARSER_H */
diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc
deleted file mode 100644
index b7906ed913d..00000000000
--- a/TAO/tao/ImR_Client.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core, portableserver {
-  sharedname   = TAO_ImR_Client
-  dynamicflags = TAO_IMR_CLIENT_BUILD_DLL
-
-  Source_Files {
-    ImR_Client
-  }
-
-  Header_Files {
-    ImR_Client
-  }
-
-  Inline_Files {
-    ImR_Client
-  }
-
-  Template_Files {
-    ImR_Client
-  }
-
-  Resource_Files {
-    ImR_Client
-  }
-
-  PIDL_Files {
-    ImR_Client
-  }
-
-  Pkgconfig_Files {
-    ImR_Client/TAO_ImR_Client.pc.in
-  }
-}
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
deleted file mode 100644
index 70da4aa13bf..00000000000
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// $Id$
-
-#include "ImR_Client.h"
-
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/Non_Servant_Upcall.h"
-#include "tao/ImR_Client/ServerObject_i.h"
-#include "tao/ImR_Client/ImplRepoC.h"
-
-ACE_RCSID (ImR_Client,
-           ImR_Client,
-           "$Id$")
-
-namespace TAO
-{
-  namespace ImR_Client
-  {
-    void
-    ImR_Client_Adapter_Impl::imr_notify_startup (
-      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
-    {
-      CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
-
-      if (CORBA::is_nil (imr.in ()))
-          return;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
-
-      ImplementationRepository::Administration_var imr_locator;
-
-      {
-        // ATTENTION: Trick locking here, see class header for details
-        TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
-        ACE_UNUSED_ARG (non_servant_upcall);
-
-        imr_locator =
-          ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-
-      if (CORBA::is_nil(imr_locator.in ()))
-          return;
-
-      TAO_Root_POA *root_poa = poa->object_adapter ().root_poa ();
-      ACE_NEW_THROW_EX (this->server_object_,
-                        ServerObject_i (poa->orb_core ().orb (),
-                                        root_poa),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      PortableServer::ServantBase_var safe_servant (this->server_object_);
-      ACE_UNUSED_ARG (safe_servant);
-
-      // Since this method is called from the POA constructor, there
-      // shouldn't be any waiting required.  Therefore,
-      // <wait_occurred_restart_call_ignored> can be ignored.
-      int wait_occurred_restart_call_ignored = 0;
-
-      // Activate the servant in the root poa.
-      PortableServer::ObjectId_var id =
-        root_poa->activate_object_i (this->server_object_,
-                                     poa->server_priority (),
-                                     wait_occurred_restart_call_ignored
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  (), false
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ImplementationRepository::ServerObject_var svr
-        = ImplementationRepository::ServerObject::_narrow (obj.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
-        {
-          ACE_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n"));
-          return;
-        }
-
-      CORBA::String_var ior =
-        svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Search for "corbaloc:" alone, without the protocol.  This code
-      // should be protocol neutral.
-      const char corbaloc[] = "corbaloc:";
-      char *pos = ACE_OS::strstr (ior.inout (), corbaloc);
-      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-
-      pos = ACE_OS::strchr (pos + 1,
-                            svr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-      ACE_CString partial_ior(ior.in (), (pos - ior.in()) + 1);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Informing IMR that we are running at: %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
-
-      ACE_TRY
-        {
-          // ATTENTION: Trick locking here, see class header for details
-          TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          imr_locator->server_is_running (poa->name().c_str (),
-                                          partial_ior.c_str(),
-                                          svr.in()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::SystemException, sysex)
-        {
-          // Avoid warnings on platforms with native C++ exceptions
-          ACE_UNUSED_ARG (sysex);
-          ACE_RE_THROW;
-        }
-      ACE_CATCHANY
-        {
-          ACE_TRY_THROW (CORBA::TRANSIENT (
-              CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-              CORBA::COMPLETED_NO));
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n"));
-    }
-
-    void
-    ImR_Client_Adapter_Impl::imr_notify_shutdown (
-      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
-    {
-      // Notify the Implementation Repository about shutting down.
-      CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
-
-      // Check to see if there was an imr returned.
-      // If none, return ourselves.
-      if (CORBA::is_nil (imr.in ()))
-        return;
-
-      ACE_TRY_NEW_ENV
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Notifying IMR of Shutdown server:%s\n",
-                        poa->the_name()));
-
-          // ATTENTION: Trick locking here, see class header for details
-          TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // Get the IMR's administrative object and call shutting_down on it
-          ImplementationRepository::Administration_var imr_locator =
-            ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          imr_locator->server_is_shutting_down (poa->name().c_str ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH(CORBA::COMM_FAILURE, ex)
-        {
-          // At the moment we call this during ORB shutdown and the ORB is
-          // configured to drop replies during shutdown (it does by default in
-          // the LF model) we get a COMM_FAILURE exception which we ignore
-          if (TAO_debug_level > 0)
-            ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n"));
-          ACE_UNUSED_ARG (ex);
-        }
-      ACE_CATCH(CORBA::TRANSIENT, ex)
-        {
-          // Similarly, there are cases where we could get a TRANSIENT.
-          if (TAO_debug_level > 0)
-            ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n"));
-          ACE_UNUSED_ARG (ex);
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ImR_Client_Adapter_Impl::imr_notify_shutdown()");
-          // Ignore exceptions
-        }
-      ACE_ENDTRY;
-
-      if (this->server_object_)
-        {
-          PortableServer::POA_var poa =
-            this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ());
-
-          if (!root_poa)
-            {
-              ACE_THROW (CORBA::OBJ_ADAPTER ());
-            }
-
-          PortableServer::ObjectId_var id =
-            root_poa->servant_to_id_i (this->server_object_
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          root_poa->deactivate_object_i (id.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          server_object_ = 0;
-        }
-    }
-
-    // *********************************************************************
-
-    // Initialization and registration of dynamic service object.
-
-    int
-    ImR_Client_Adapter_Impl::Initializer (void)
-    {
-      TAO_Root_POA::imr_client_adapter_name ("Concrete_ImR_Client_Adapter");
-
-      return ACE_Service_Config::process_directive (ace_svc_desc_ImR_Client_Adapter_Impl);
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ImR_Client_Adapter_Impl,
-        ACE_TEXT ("Concrete_ImR_Client_Adapter"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImR_Client_Adapter_Impl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
-  }
-}
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
deleted file mode 100644
index 533533a0691..00000000000
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ImR_Client.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-
-#ifndef TAO_IMR_CLIENT_ADAPTER_IMPL_H
-#define TAO_IMR_CLIENT_ADAPTER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "imr_client_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/ImR_Client_Adapter.h"
-
-#include "ace/Service_Config.h"
-
-class ServerObject_i;
-
-namespace TAO
-{
-  namespace ImR_Client
-  {
-    /**
-     * @class IFR_Client_Adapter_Impl
-     *
-     * @brief IFR_Client_Adapter_Impl.
-     *
-     * Class that adapts various functions in the PortableServer library
-     * which use the Implementation Repository. This is the derived class
-     * that contains the actual implementations.
-     */
-    class TAO_IMR_Client_Export ImR_Client_Adapter_Impl
-      : public ::TAO::Portable_Server::ImR_Client_Adapter
-    {
-    public:
-      // Used to force the initialization of the PortableServer code.
-      static int Initializer (void);
-
-      /// ImplRepo helper method, notify the ImplRepo on startup
-      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
-
-      /// ImplRepo helper method, notify the ImplRepo on shutdown
-      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
-
-    private:
-      /// Implementation Repository Server Object
-      ServerObject_i *server_object_;
-    };
-
-    ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
-    ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
-
-    #if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-    typedef int (*TAO_Module_Initializer) (void);
-
-    static TAO_Module_Initializer
-    TAO_Requires_ImR_Client_Initializer =
-      &TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer;
-
-    #else
-
-    static int
-    TAO_Requires_ImR_Client_Initializer =
-      TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer ();
-
-    #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
deleted file mode 100644
index ca566711e42..00000000000
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   ImplRepo.pidl
- *
- * $Id$
- *
- * This file was used to generate the code in ImplRepo{A,C,S}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl -GA -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Sc -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
- *
- */
-//=============================================================================
-
-#include "ServerObject.pidl"
-
-module ImplementationRepository
-{
-  // = Exceptions
-
-  /// Object already bound in the Implementation Repository
-  exception AlreadyRegistered {};
-
-  /// The server could not be restarted.
-  exception CannotActivate
-  {
-    string reason;
-  };
-
-  /// Object not found in the Implementation Repository
-  exception NotFound {};
-
-  /// One environment variable/value pair.
-  struct EnvironmentVariable
-  {
-    string name;
-    string value;
-  };
-
-  /// Complete Environment.
-  typedef sequence<EnvironmentVariable> EnvironmentList;
-
-  /// The type of Activation
-  enum ActivationMode {NORMAL, MANUAL, PER_CLIENT, AUTO_START};
-
-  /// Options used to start up the server.
-  struct StartupOptions
-  {
-    /// Startup command (program name and arguments).
-    string command_line;
-
-    /// Environment Variables.
-    EnvironmentList environment;
-
-    /// Working directory.
-    string working_directory;
-
-    /// Activation Mode
-    ActivationMode activation;
-
-    /// Name of the activator
-    string activator;
-
-    /// Number of retries allowed
-    long start_limit;
-  };
-
-  struct ServerInformation
-  {
-    /// Server name.
-    string server;
-
-    /// How to start up the server.
-    StartupOptions startup;
-
-    /// This is used in places that require a partial IOR with
-    /// just the ObjectKey missing.
-    string partial_ior;
-  };
-
-  typedef sequence <ServerInformation> ServerInformationList;
-
-  /**
-    * @brief The Server Information Iterator Interface
-    *
-    * Interface for iterating over servers returned with
-    * Administration::list ().
-    */
-  interface ServerInformationIterator
-  {
-    /// This operation returns at most the requested number of
-    /// servers.
-    /// If how_many == 0, then returns all servers
-    boolean next_n (in unsigned long how_many,
-                    out ServerInformationList servers);
-
-    /// This operation destroys the iterator.
-    void destroy ();
-  };
-
-  /**
-    * @brief The Implementation Repository Administration Interface
-    *
-    * This interface exports all the administration functionality of
-    * the Implementation Repository.
-    */
-  interface Administration
-  {
-    /// Activate server that is named <server>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.  The <CannotActivate> exception
-    /// is raised when <server> is found in the Repository but could not be
-    /// activated.
-    void activate_server (in string server)
-      raises (NotFound, CannotActivate);
-
-    /// Add/Update the the <server>
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
-    void add_or_update_server (in string server, in StartupOptions options)
-      raises(NotFound);
-
-    /// Remove <server> from the Implementation Repository.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
-    void remove_server (in string server)
-      raises (NotFound);
-
-    /// Tries to shutdown the server, first gracefully, then ungracefully.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
-    void shutdown_server (in string server)
-      raises (NotFound);
-
-    /// Used to notify the Implementation Repository that <server> is alive
-    /// and well at <partial_ior>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
-    void server_is_running (in string server,
-                            in string partial_ior,
-                            in ServerObject server_object)
-      raises (NotFound);
-
-    /// Used to tell the Implementation Repository that <server> is shutting
-    /// down.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
-
-    void server_is_shutting_down (in string server)
-      raises (NotFound);
-
-    /// Returns the startup information for a given <server>.
-    void find (in string server, out ServerInformation info);
-
-    /// Returns at most <how_many> servers in <server_list>.  If there
-    /// are additional servers, they can be received through the
-    /// <server_iterator>.  If there are no more servers, then
-    /// <server_iterator> is null.
-    /// If how_many == 0, then returns all servers.
-    void list (in unsigned long how_many,
-               out ServerInformationList server_list,
-               out ServerInformationIterator server_iterator);
-
-    /// Shutdown the ImR, optionally shutting down registered
-    /// activators and servers first.
-    oneway void shutdown(in boolean activators, in boolean servers);
-  };
-};
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
deleted file mode 100644
index 2d3a83d6e60..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ /dev/null
@@ -1,1071 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ImplRepoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_AlreadyRegistered = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_AlreadyRegistered (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-    "AlreadyRegistered",
-    _tao_fields_ImplementationRepository_AlreadyRegistered,
-    0);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
-    &_tao_tc_ImplementationRepository_AlreadyRegistered;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
-  {
-    { "reason", &CORBA::_tc_string }
- 
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_CannotActivate (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/CannotActivate:1.0",
-    "CannotActivate",
-    _tao_fields_ImplementationRepository_CannotActivate,
-    1);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_CannotActivate =
-    &_tao_tc_ImplementationRepository_CannotActivate;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_NotFound = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_NotFound (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/NotFound:1.0",
-    "NotFound",
-    _tao_fields_ImplementationRepository_NotFound,
-    0);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_NotFound =
-    &_tao_tc_ImplementationRepository_NotFound;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_EnvironmentVariable[] =
-  {
-    { "name", &CORBA::_tc_string },
-    { "value", &CORBA::_tc_string }
- 
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_EnvironmentVariable (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/EnvironmentVariable:1.0",
-    "EnvironmentVariable",
-    _tao_fields_ImplementationRepository_EnvironmentVariable,
-    2);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
-    &_tao_tc_ImplementationRepository_EnvironmentVariable;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
-#define _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      ImplementationRepository_EnvironmentList_0 (
-        CORBA::tk_sequence,
-        &ImplementationRepository::_tc_EnvironmentVariable,
-        0U);
- 
-    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
-      &ImplementationRepository_EnvironmentList_0;
- 
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_EnvironmentList (
-    CORBA::tk_alias,
-    "IDL:ImplementationRepository/EnvironmentList:1.0",
-    "EnvironmentList",
-    &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
-    &_tao_tc_ImplementationRepository_EnvironmentList;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_ImplementationRepository_ActivationMode[] =
-  {
-    "NORMAL",
-    "MANUAL",
-    "PER_CLIENT",
-    "AUTO_START"
- 
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ActivationMode (
-    "IDL:ImplementationRepository/ActivationMode:1.0",
-    "ActivationMode",
-    _tao_enumerators_ImplementationRepository_ActivationMode,
-    4);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ActivationMode =
-    &_tao_tc_ImplementationRepository_ActivationMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_StartupOptions[] =
-  {
-    { "command_line", &CORBA::_tc_string },
-    { "environment", &ImplementationRepository::_tc_EnvironmentList },
-    { "working_directory", &CORBA::_tc_string },
-    { "activation", &ImplementationRepository::_tc_ActivationMode },
-    { "activator", &CORBA::_tc_string },
-    { "start_limit", &CORBA::_tc_long }
- 
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_StartupOptions (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/StartupOptions:1.0",
-    "StartupOptions",
-    _tao_fields_ImplementationRepository_StartupOptions,
-    6);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_StartupOptions =
-    &_tao_tc_ImplementationRepository_StartupOptions;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_ServerInformation[] =
-  {
-    { "server", &CORBA::_tc_string },
-    { "startup", &ImplementationRepository::_tc_StartupOptions },
-    { "partial_ior", &CORBA::_tc_string }
- 
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformation (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/ServerInformation:1.0",
-    "ServerInformation",
-    _tao_fields_ImplementationRepository_ServerInformation,
-    3);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformation =
-    &_tao_tc_ImplementationRepository_ServerInformation;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
-#define _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      ImplementationRepository_ServerInformationList_0 (
-        CORBA::tk_sequence,
-        &ImplementationRepository::_tc_ServerInformation,
-        0U);
- 
-    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
-      &ImplementationRepository_ServerInformationList_0;
- 
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformationList (
-    CORBA::tk_alias,
-    "IDL:ImplementationRepository/ServerInformationList:1.0",
-    "ServerInformationList",
-    &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
-    &_tao_tc_ImplementationRepository_ServerInformationList;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformationIterator (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/ServerInformationIterator:1.0",
-    "ServerInformationIterator");
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
-    &_tao_tc_ImplementationRepository_ServerInformationIterator;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_Administration (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/Administration:1.0",
-    "Administration");
- 
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_Administration =
-    &_tao_tc_ImplementationRepository_Administration;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
- 
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
- 
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
- 
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::AlreadyRegistered &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert_copy (
-      _tao_any,
-      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-      ImplementationRepository::_tc_AlreadyRegistered,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::AlreadyRegistered *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert (
-      _tao_any,
-      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-      ImplementationRepository::_tc_AlreadyRegistered,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::AlreadyRegistered *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::AlreadyRegistered *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::AlreadyRegistered *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::extract (
-        _tao_any,
-        ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-        ImplementationRepository::_tc_AlreadyRegistered,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
- 
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
- 
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
- 
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::CannotActivate &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert_copy (
-      _tao_any,
-      ImplementationRepository::CannotActivate::_tao_any_destructor,
-      ImplementationRepository::_tc_CannotActivate,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::CannotActivate *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert (
-      _tao_any,
-      ImplementationRepository::CannotActivate::_tao_any_destructor,
-      ImplementationRepository::_tc_CannotActivate,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::CannotActivate *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::CannotActivate *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::CannotActivate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::extract (
-        _tao_any,
-        ImplementationRepository::CannotActivate::_tao_any_destructor,
-        ImplementationRepository::_tc_CannotActivate,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
- 
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
- 
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
- 
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::NotFound &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert_copy (
-      _tao_any,
-      ImplementationRepository::NotFound::_tao_any_destructor,
-      ImplementationRepository::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::NotFound *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert (
-      _tao_any,
-      ImplementationRepository::NotFound::_tao_any_destructor,
-      ImplementationRepository::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::NotFound *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::NotFound *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::NotFound *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::extract (
-        _tao_any,
-        ImplementationRepository::NotFound::_tao_any_destructor,
-        ImplementationRepository::_tc_NotFound,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentVariable &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert_copy (
-      _tao_any,
-      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-      ImplementationRepository::_tc_EnvironmentVariable,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentVariable *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert (
-      _tao_any,
-      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-      ImplementationRepository::_tc_EnvironmentVariable,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentVariable *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::EnvironmentVariable *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentVariable *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::extract (
-        _tao_any,
-        ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-        ImplementationRepository::_tc_EnvironmentVariable,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert_copy (
-      _tao_any,
-      ImplementationRepository::EnvironmentList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert (
-      _tao_any,
-      ImplementationRepository::EnvironmentList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::EnvironmentList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::extract (
-        _tao_any,
-        ImplementationRepository::EnvironmentList::_tao_any_destructor,
-        TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ActivationMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::insert (
-      _tao_any,
-      ImplementationRepository::_tc_ActivationMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ActivationMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
-        _tao_any,
-        ImplementationRepository::_tc_ActivationMode,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::StartupOptions &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert_copy (
-      _tao_any,
-      ImplementationRepository::StartupOptions::_tao_any_destructor,
-      ImplementationRepository::_tc_StartupOptions,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::StartupOptions *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert (
-      _tao_any,
-      ImplementationRepository::StartupOptions::_tao_any_destructor,
-      ImplementationRepository::_tc_StartupOptions,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::StartupOptions *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::StartupOptions *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::StartupOptions *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::extract (
-        _tao_any,
-        ImplementationRepository::StartupOptions::_tao_any_destructor,
-        ImplementationRepository::_tc_StartupOptions,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformation &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert_copy (
-      _tao_any,
-      ImplementationRepository::ServerInformation::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformation,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformation *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformation::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformation,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformation *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::ServerInformation *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformation *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformation::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerInformation,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformationList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert_copy (
-      _tao_any,
-      ImplementationRepository::ServerInformationList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformationList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::ServerInformationList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformationList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformationList::_tao_any_destructor,
-        TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr _tao_elem
-  )
-{
-  ImplementationRepository::ServerInformationIterator_ptr _tao_objptr =
-    ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformationIterator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerInformationIterator,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::Administration>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr _tao_elem
-  )
-{
-  ImplementationRepository::Administration_ptr _tao_objptr =
-    ImplementationRepository::Administration::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::Administration>::insert (
-      _tao_any,
-      ImplementationRepository::Administration::_tao_any_destructor,
-      ImplementationRepository::_tc_Administration,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::Administration>::extract (
-        _tao_any,
-        ImplementationRepository::Administration::_tao_any_destructor,
-        ImplementationRepository::_tc_Administration,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
deleted file mode 100644
index 62e31a92d1c..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ /dev/null
@@ -1,1921 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ImplRepoC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.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 "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
- 
-  template<>
-  class  Arg_Traits<ImplementationRepository::ServerObject>
-    : public
-        Object_Arg_Traits_T<
-            ImplementationRepository::ServerObject_ptr,
-            ImplementationRepository::ServerObject_var,
-            ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::StartupOptions>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::StartupOptions,
-            ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::ServerInformation>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::ServerInformation,
-            ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::ServerInformationList>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::ServerInformationList,
-            ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
- 
-  template<>
-  class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
-    : public
-        Object_Arg_Traits_T<
-            ImplementationRepository::ServerInformationIterator_ptr,
-            ImplementationRepository::ServerInformationIterator_var,
-            ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
-  : CORBA::UserException (
-        "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-        "AlreadyRegistered"
-      )
-{
-}
-
-ImplementationRepository::AlreadyRegistered::~AlreadyRegistered (void)
-{
-}
-
-ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-ImplementationRepository::AlreadyRegistered&
-ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void ImplementationRepository::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AlreadyRegistered *_tao_tmp_pointer =
-    static_cast<AlreadyRegistered *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-ImplementationRepository::AlreadyRegistered *
-ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception *_tao_excp)
-{
-  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)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::ImplementationRepository::AlreadyRegistered, 0);
-  return retval;
-}
-
-CORBA::Exception *
-ImplementationRepository::AlreadyRegistered::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::ImplementationRepository::AlreadyRegistered (*this),
-      0
-    );
-  return result;
-}
-
-void ImplementationRepository::AlreadyRegistered::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void ImplementationRepository::AlreadyRegistered::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void ImplementationRepository::AlreadyRegistered::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_tao_type (void) const
-{
-  return ::ImplementationRepository::_tc_AlreadyRegistered;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-ImplementationRepository::CannotActivate::CannotActivate (void)
-  : CORBA::UserException (
-        "IDL:ImplementationRepository/CannotActivate:1.0",
-        "CannotActivate"
-      )
-{
-}
-
-ImplementationRepository::CannotActivate::~CannotActivate (void)
-{
-}
-
-ImplementationRepository::CannotActivate::CannotActivate (const ::ImplementationRepository::CannotActivate &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->reason = CORBA::string_dup (_tao_excp.reason.in ());
-}
-
-ImplementationRepository::CannotActivate&
-ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->reason = CORBA::string_dup (_tao_excp.reason.in ());
-  return *this;
-}
-
-void ImplementationRepository::CannotActivate::_tao_any_destructor (void *_tao_void_pointer)
-{
-  CannotActivate *_tao_tmp_pointer =
-    static_cast<CannotActivate *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-ImplementationRepository::CannotActivate *
-ImplementationRepository::CannotActivate::_downcast (CORBA::Exception *_tao_excp)
-{
-  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)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::ImplementationRepository::CannotActivate, 0);
-  return retval;
-}
-
-CORBA::Exception *
-ImplementationRepository::CannotActivate::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::ImplementationRepository::CannotActivate (*this),
-      0
-    );
-  return result;
-}
-
-void ImplementationRepository::CannotActivate::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void ImplementationRepository::CannotActivate::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void ImplementationRepository::CannotActivate::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-
-ImplementationRepository::CannotActivate::CannotActivate (
-    const char * _tao_reason
-  )
-  : CORBA::UserException (
-        "IDL:ImplementationRepository/CannotActivate:1.0",
-        "CannotActivate"
-      )
-{
-  this->reason = CORBA::string_dup (_tao_reason);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_tao_type (void) const
-{
-  return ::ImplementationRepository::_tc_CannotActivate;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-ImplementationRepository::NotFound::NotFound (void)
-  : CORBA::UserException (
-        "IDL:ImplementationRepository/NotFound:1.0",
-        "NotFound"
-      )
-{
-}
-
-ImplementationRepository::NotFound::~NotFound (void)
-{
-}
-
-ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::NotFound &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-ImplementationRepository::NotFound&
-ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void ImplementationRepository::NotFound::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NotFound *_tao_tmp_pointer =
-    static_cast<NotFound *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-ImplementationRepository::NotFound *
-ImplementationRepository::NotFound::_downcast (CORBA::Exception *_tao_excp)
-{
-  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)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::ImplementationRepository::NotFound, 0);
-  return retval;
-}
-
-CORBA::Exception *
-ImplementationRepository::NotFound::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::ImplementationRepository::NotFound (*this),
-      0
-    );
-  return result;
-}
-
-void ImplementationRepository::NotFound::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void ImplementationRepository::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void ImplementationRepository::NotFound::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
- 
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::NotFound::_tao_type (void) const
-{
-  return ::ImplementationRepository::_tc_NotFound;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
-
-void
-ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  EnvironmentVariable *_tao_tmp_pointer =
-    static_cast<EnvironmentVariable *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
-
-ImplementationRepository::EnvironmentList::EnvironmentList (void)
-{}
-
-ImplementationRepository::EnvironmentList::EnvironmentList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
-      >
-    (max)
-{}
-
-ImplementationRepository::EnvironmentList::EnvironmentList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    ImplementationRepository::EnvironmentVariable * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
-      >
-    (max, length, buffer, release)
-{}
-
-ImplementationRepository::EnvironmentList::EnvironmentList (
-    const EnvironmentList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
-      >
-    (seq)
-{}
-
-ImplementationRepository::EnvironmentList::~EnvironmentList (void)
-{}
-
-void ImplementationRepository::EnvironmentList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  EnvironmentList * _tao_tmp_pointer =
-    static_cast<EnvironmentList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
-
-void
-ImplementationRepository::StartupOptions::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  StartupOptions *_tao_tmp_pointer =
-    static_cast<StartupOptions *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
-
-void
-ImplementationRepository::ServerInformation::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ServerInformation *_tao_tmp_pointer =
-    static_cast<ServerInformation *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
-
-ImplementationRepository::ServerInformationList::ServerInformationList (void)
-{}
-
-ImplementationRepository::ServerInformationList::ServerInformationList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
-      >
-    (max)
-{}
-
-ImplementationRepository::ServerInformationList::ServerInformationList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    ImplementationRepository::ServerInformation * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
-      >
-    (max, length, buffer, release)
-{}
-
-ImplementationRepository::ServerInformationList::ServerInformationList (
-    const ServerInformationList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
-      >
-    (seq)
-{}
-
-ImplementationRepository::ServerInformationList::~ServerInformationList (void)
-{}
-
-void ImplementationRepository::ServerInformationList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ServerInformationList * _tao_tmp_pointer =
-    static_cast<ServerInformationList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for ImplementationRepository::ServerInformationIterator.
-
-ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate (
-    ImplementationRepository::ServerInformationIterator_ptr p
-  )
-{
-  return ImplementationRepository::ServerInformationIterator::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release (
-    ImplementationRepository::ServerInformationIterator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void)
-{
-  return ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
-    ::CORBA::ULong how_many,
-    ::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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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;
-}
-
-void
-ImplementationRepository::ServerInformationIterator::_tao_release (ServerInformationIterator_ptr obj)
-{
-  CORBA::release (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 true; // 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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for ImplementationRepository::Administration.
-
-ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate (
-    ImplementationRepository::Administration_ptr p
-  )
-{
-  return ImplementationRepository::Administration::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<ImplementationRepository::Administration>::release (
-    ImplementationRepository::Administration_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void)
-{
-  return ImplementationRepository::Administration::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
-    ImplementationRepository::Administration_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::activate_server (
-    const char * server
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
-    {
-      {
-        "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,
-      2,
-      "activate_server",
-      15,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
-      2
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::add_or_update_server (
-    const char * server,
-    const ::ImplementationRepository::StartupOptions & options
-    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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_options
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] =
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "add_or_update_server",
-      20,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::remove_server (
-    const char * server
-    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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "remove_server",
-      13,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::shutdown_server (
-    const char * server
-    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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "shutdown_server",
-      15,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::server_is_running (
-    const char * server,
-    const char * partial_ior,
-    ::ImplementationRepository::ServerObject_ptr server_object
-    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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior (partial_ior);
-  TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_partial_ior,
-      &_tao_server_object
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "server_is_running",
-      17,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::server_is_shutting_down (
-    const char * server
-    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< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server
-    };
- 
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "server_is_shutting_down",
-      23,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::find (
-    const char * server,
-    ::ImplementationRepository::ServerInformation_out info
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-    }
- 
-  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
-    {
-      ImplementationRepository_Administration_setup_collocation ();
-    }
- 
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_info
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "find",
-      4,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::list (
-    ::CORBA::ULong how_many,
-    ::ImplementationRepository::ServerInformationList_out server_list,
-    ::ImplementationRepository::ServerInformationIterator_out server_iterator
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-    }
- 
-  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
-    {
-      ImplementationRepository_Administration_setup_collocation ();
-    }
- 
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
-  TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
-  TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_how_many,
-      &_tao_server_list,
-      &_tao_server_iterator
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      4,
-      "list",
-      4,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
- 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::shutdown (
-    ::CORBA::Boolean activators,
-    ::CORBA::Boolean servers
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-    }
- 
-  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
-    {
-      ImplementationRepository_Administration_setup_collocation ();
-    }
- 
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators (activators);
-  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers (servers);
- 
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_activators,
-      &_tao_servers
-    };
- 
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "shutdown",
-      8,
-      this->the_TAO_Administration_Proxy_Broker_,
-      TAO::TAO_ONEWAY_INVOCATION
-    );
- 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ImplementationRepository::Administration::Administration (void)
- : the_TAO_Administration_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_Administration_setup_collocation ();
-}
-
-void
-ImplementationRepository::Administration::ImplementationRepository_Administration_setup_collocation ()
-{
-  if (::ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Administration_Proxy_Broker_ =
-        ::ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-ImplementationRepository::Administration::~Administration (void)
-{}
-
-void
-ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Administration *_tao_tmp_pointer =
-    static_cast<Administration *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Administration>::narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/Administration:1.0",
-        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Administration>::unchecked_narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/Administration:1.0",
-        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
- 
-  return obj;
-}
-
-void
-ImplementationRepository::Administration::_tao_release (Administration_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-ImplementationRepository::Administration::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:ImplementationRepository/Administration:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* ImplementationRepository::Administration::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/Administration:1.0";
-}
-
-CORBA::Boolean
-ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::AlreadyRegistered &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::AlreadyRegistered&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::CannotActivate &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.reason.in ())
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::CannotActivate &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.reason.out ())
-  );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::NotFound &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::NotFound&
-  )
-{
-  return true;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::EnvironmentVariable &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.name.in ()) &&
-    (strm << _tao_aggregate.value.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::EnvironmentVariable &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.name.out ()) &&
-    (strm >> _tao_aggregate.value.out ());
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
-#define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::EnvironmentList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
- 
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
- 
-      return _tao_marshal_flag;
-    }
- 
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::EnvironmentList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
- 
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
- 
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
- 
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
- 
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
- 
-      return _tao_marshal_flag;
- 
-    }
- 
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, ImplementationRepository::ActivationMode _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, ImplementationRepository::ActivationMode & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
- 
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
-    }
- 
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::StartupOptions &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.command_line.in ()) &&
-    (strm << _tao_aggregate.environment) &&
-    (strm << _tao_aggregate.working_directory.in ()) &&
-    (strm << _tao_aggregate.activation) &&
-    (strm << _tao_aggregate.activator.in ()) &&
-    (strm << _tao_aggregate.start_limit);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::StartupOptions &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.command_line.out ()) &&
-    (strm >> _tao_aggregate.environment) &&
-    (strm >> _tao_aggregate.working_directory.out ()) &&
-    (strm >> _tao_aggregate.activation) &&
-    (strm >> _tao_aggregate.activator.out ()) &&
-    (strm >> _tao_aggregate.start_limit);
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerInformation &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.server.in ()) &&
-    (strm << _tao_aggregate.startup) &&
-    (strm << _tao_aggregate.partial_ior.in ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerInformation &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.server.out ()) &&
-    (strm >> _tao_aggregate.startup) &&
-    (strm >> _tao_aggregate.partial_ior.out ());
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
-#define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerInformationList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
- 
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
- 
-      return _tao_marshal_flag;
-    }
- 
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerInformationList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
- 
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
- 
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
- 
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return true;
-        }
- 
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
- 
-      return _tao_marshal_flag;
- 
-    }
- 
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
- 
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
- 
-  typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
- 
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
-      );
- 
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::Administration_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::Administration_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
- 
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
- 
-  typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
- 
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
-      );
- 
-  return 1;
-}
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
deleted file mode 100644
index dc542c79243..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ /dev/null
@@ -1,1095 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_IMPLREPOC_H_
-#define _TAO_IDL_IMPLREPOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "imr_client_export.h"
-#include "ServerObjectC.h"
-
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IMR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace ImplementationRepository
-{
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
- 
-  class TAO_IMR_Client_Export AlreadyRegistered : public CORBA::UserException
-  {
-  public:
- 
-    AlreadyRegistered (void);
-    AlreadyRegistered (const AlreadyRegistered &);
-    ~AlreadyRegistered (void);
-
-    AlreadyRegistered &operator= (const AlreadyRegistered &);
- 
-    static void _tao_any_destructor (void *);
- 
-    static AlreadyRegistered *_downcast (CORBA::Exception *);
-    static const AlreadyRegistered *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
- 
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
-#define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
- 
-  class TAO_IMR_Client_Export CannotActivate : public CORBA::UserException
-  {
-  public:
- 
-    TAO_String_Manager reason;
-    CannotActivate (void);
-    CannotActivate (const CannotActivate &);
-    ~CannotActivate (void);
-
-    CannotActivate &operator= (const CannotActivate &);
- 
-    static void _tao_any_destructor (void *);
- 
-    static CannotActivate *_downcast (CORBA::Exception *);
-    static const CannotActivate *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
- 
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
- 
-    CannotActivate (
-        const char * _tao_reason
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
-#define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
- 
-  class TAO_IMR_Client_Export NotFound : public CORBA::UserException
-  {
-  public:
- 
-    NotFound (void);
-    NotFound (const NotFound &);
-    ~NotFound (void);
-
-    NotFound &operator= (const NotFound &);
- 
-    static void _tao_any_destructor (void *);
- 
-    static NotFound *_downcast (CORBA::Exception *);
-    static const NotFound *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
- 
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
-  struct EnvironmentVariable;
- 
-  typedef
-    TAO_Var_Var_T<
-        EnvironmentVariable
-      >
-    EnvironmentVariable_var;
- 
-  typedef
-    TAO_Out_T<
-        EnvironmentVariable,
-        EnvironmentVariable_var
-      >
-    EnvironmentVariable_out;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
-  struct TAO_IMR_Client_Export EnvironmentVariable
-  {
-    typedef EnvironmentVariable_var _var_type;
- 
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager name;
-    TAO_String_Manager value;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
- 
-  class EnvironmentList;
- 
-  typedef
-    TAO_VarSeq_Var_T<
-        EnvironmentList,
-        EnvironmentVariable
-      >
-    EnvironmentList_var;
- 
-  typedef
-    TAO_Seq_Out_T<
-        EnvironmentList,
-        EnvironmentList_var,
-        EnvironmentVariable
-      >
-    EnvironmentList_out;
- 
-  class TAO_IMR_Client_Export EnvironmentList
-    : public
-        TAO_Unbounded_Sequence<
-            EnvironmentVariable
-          >
-  {
-  public:
-    EnvironmentList (void);
-    EnvironmentList (CORBA::ULong max);
-    EnvironmentList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        EnvironmentVariable* buffer,
-        CORBA::Boolean release = 0
-      );
-    EnvironmentList (const EnvironmentList &);
-    ~EnvironmentList (void);
- 
-    static void _tao_any_destructor (void *);
- 
-    typedef EnvironmentList_var _var_type;
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/enum_ch.cpp:57
- 
-  enum ActivationMode
-  {
-    NORMAL,
-    MANUAL,
-    PER_CLIENT,
-    AUTO_START
-  };
- 
-  typedef ActivationMode &ActivationMode_out;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
- 
-  // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
-  struct StartupOptions;
- 
-  typedef
-    TAO_Var_Var_T<
-        StartupOptions
-      >
-    StartupOptions_var;
- 
-  typedef
-    TAO_Out_T<
-        StartupOptions,
-        StartupOptions_var
-      >
-    StartupOptions_out;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
-  struct TAO_IMR_Client_Export StartupOptions
-  {
-    typedef StartupOptions_var _var_type;
- 
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager command_line;
-    ImplementationRepository::EnvironmentList environment;
-    TAO_String_Manager working_directory;
-    ImplementationRepository::ActivationMode activation;
-    TAO_String_Manager activator;
-    CORBA::Long start_limit;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
- 
-  // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
-  struct ServerInformation;
- 
-  typedef
-    TAO_Var_Var_T<
-        ServerInformation
-      >
-    ServerInformation_var;
- 
-  typedef
-    TAO_Out_T<
-        ServerInformation,
-        ServerInformation_var
-      >
-    ServerInformation_out;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
-  struct TAO_IMR_Client_Export ServerInformation
-  {
-    typedef ServerInformation_var _var_type;
- 
-    static void _tao_any_destructor (void *);
-    TAO_String_Manager server;
-    ImplementationRepository::StartupOptions startup;
-    TAO_String_Manager partial_ior;
-  };
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
- 
-  class ServerInformationList;
- 
-  typedef
-    TAO_VarSeq_Var_T<
-        ServerInformationList,
-        ServerInformation
-      >
-    ServerInformationList_var;
- 
-  typedef
-    TAO_Seq_Out_T<
-        ServerInformationList,
-        ServerInformationList_var,
-        ServerInformation
-      >
-    ServerInformationList_out;
- 
-  class TAO_IMR_Client_Export ServerInformationList
-    : public
-        TAO_Unbounded_Sequence<
-            ServerInformation
-          >
-  {
-  public:
-    ServerInformationList (void);
-    ServerInformationList (CORBA::ULong max);
-    ServerInformationList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServerInformation* buffer,
-        CORBA::Boolean release = 0
-      );
-    ServerInformationList (const ServerInformationList &);
-    ~ServerInformationList (void);
- 
-    static void _tao_any_destructor (void *);
- 
-    typedef ServerInformationList_var _var_type;
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
- 
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
- 
-  class ServerInformationIterator;
-  typedef ServerInformationIterator *ServerInformationIterator_ptr;
- 
-  typedef
-    TAO_Objref_Var_T<
-        ServerInformationIterator
-      >
-    ServerInformationIterator_var;
- 
-  typedef
-    TAO_Objref_Out_T<
-        ServerInformationIterator
-      >
-    ServerInformationIterator_out;
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
- 
-  class TAO_IMR_Client_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 void _tao_release (ServerInformationIterator_ptr obj);
- 
-    static ServerInformationIterator_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static ServerInformationIterator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static ServerInformationIterator_ptr _nil (void)
-    {
-      return static_cast<ServerInformationIterator_ptr> (0);
-    }
- 
-    static void _tao_any_destructor (void *);
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual CORBA::Boolean next_n (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out servers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
- 
-    virtual CORBA::Boolean _is_a (
-        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
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
- 
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
- 
-  class Administration;
-  typedef Administration *Administration_ptr;
- 
-  typedef
-    TAO_Objref_Var_T<
-        Administration
-      >
-    Administration_var;
- 
-  typedef
-    TAO_Objref_Out_T<
-        Administration
-      >
-    Administration_out;
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
- 
-  class TAO_IMR_Client_Export Administration
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<Administration>;
-    typedef Administration_ptr _ptr_type;
-    typedef Administration_var _var_type;
- 
-    // The static operations.
-    static Administration_ptr _duplicate (Administration_ptr obj);
- 
-    static void _tao_release (Administration_ptr obj);
- 
-    static Administration_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static Administration_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static Administration_ptr _nil (void)
-    {
-      return static_cast<Administration_ptr> (0);
-    }
- 
-    static void _tao_any_destructor (void *);
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void activate_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void add_or_update_server (
-        const char * server,
-        const ::ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void remove_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void shutdown_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void server_is_running (
-        const char * server,
-        const char * partial_ior,
-        ::ImplementationRepository::ServerObject_ptr server_object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void server_is_shutting_down (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void find (
-        const char * server,
-        ::ImplementationRepository::ServerInformation_out info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void list (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out server_list,
-        ::ImplementationRepository::ServerInformationIterator_out server_iterator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual void shutdown (
-        ::CORBA::Boolean activators,
-        ::CORBA::Boolean servers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
- 
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
- 
-  protected:
-    // Concrete interface only.
-    Administration (void);
- 
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void ImplementationRepository_Administration_setup_collocation (void);
- 
-    // Concrete non-local interface only.
-    Administration (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
- 
-    // Non-local interface only.
-    Administration (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
- 
-    virtual ~Administration (void);
- 
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Administration (const Administration &);
- 
-    void operator= (const Administration &);
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module ImplementationRepository
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:139
-
-extern TAO_IMR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IMR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
- 
-  template<>
-  struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
-  {
-    static ::ImplementationRepository::ServerInformationIterator_ptr duplicate (
-        ::ImplementationRepository::ServerInformationIterator_ptr
-      );
-    static void release (
-        ::ImplementationRepository::ServerInformationIterator_ptr
-      );
-    static ::ImplementationRepository::ServerInformationIterator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::ImplementationRepository::ServerInformationIterator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
- 
-  template<>
-  struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
-  {
-    static ::ImplementationRepository::Administration_ptr duplicate (
-        ::ImplementationRepository::Administration_ptr
-      );
-    static void release (
-        ::ImplementationRepository::Administration_ptr
-      );
-    static ::ImplementationRepository::Administration_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::ImplementationRepository::Administration_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
-#define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const ImplementationRepository::EnvironmentList &
-  );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::EnvironmentList &
-  );
-
-#endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, ImplementationRepository::ActivationMode);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
-#define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const ImplementationRepository::ServerInformationList &
-  );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::ServerInformationList &
-  );
-
-#endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
deleted file mode 100644
index 6b7e1bc5fff..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
-
-ACE_INLINE
-ImplementationRepository::Administration::Administration (
-    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_Administration_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_Administration_setup_collocation ();
-}
-
-ACE_INLINE
-ImplementationRepository::Administration::Administration (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Administration_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
deleted file mode 100644
index 3df3311909e..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ /dev/null
@@ -1,2919 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_IMPLREPOS_CPP_
-#define _TAO_IDL_IMPLREPOS_CPP_
-
-
-#include "ImplRepoS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.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/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.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 "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
- 
-  template<>
-  class  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:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
- 
-  template<>
-  class 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:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
- 
-  template<>
-  class 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:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
- 
-  template<>
-  class 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_
- 
-  template<>
-  class  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:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
- 
-  template<>
-  class  Arg_Traits<ImplementationRepository::ServerObject>
-    : public
-        Object_Arg_Traits_T<
-            ImplementationRepository::ServerObject_ptr,
-            ImplementationRepository::ServerObject_var,
-            ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::StartupOptions>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::StartupOptions,
-            ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::ServerInformation>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::ServerInformation,
-            ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
- 
-  // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
- 
-  template<>
-  class Arg_Traits<ImplementationRepository::ServerInformationList>
-    : public
-        Var_Size_Arg_Traits_T<
-            ImplementationRepository::ServerInformationList,
-            ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
- 
-  template<>
-  class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
-    : public
-        Object_Arg_Traits_T<
-            ImplementationRepository::ServerInformationIterator_ptr,
-            ImplementationRepository::ServerInformationIterator_var,
-            ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
-
-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: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  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 TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      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 TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel, 0},
-      {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n},
-      {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy},
-      {"",0,0},{"",0,0},
-      {"_component", &POA_ImplementationRepository::ServerInformationIterator::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel, 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];
-        }
-    }
-  return 0;
-}
-
-static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
-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;
-}
-
-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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj,
-    forward_obj,
-    args,
-    num_args,
-    op,
-    op_len,
-    strategy
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
-
-TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  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)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-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 () =
-    dynamic_cast<POA_ImplementationRepository::ServerInformationIterator_ptr>
-      (servant)
-    ->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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::ServerInformationIterator_ptr>
-    (servant)
-  ->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
-
-POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
-  : TAO_ServantBase ()
-{
-  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)
-{
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class next_n_ServerInformationIterator
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline next_n_ServerInformationIterator (
-      POA_ImplementationRepository::ServerInformationIterator * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
-      TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
-        TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
- 
-      retval =
-        this->servant_->next_n (
-          arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::ServerInformationIterator * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_how_many,
-      &_tao_servers
-    };
- 
-  static size_t const nargs = 3;
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-
-  next_n_ServerInformationIterator command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class destroy_ServerInformationIterator
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline destroy_ServerInformationIterator (
-      POA_ImplementationRepository::ServerInformationIterator * servant)
-      : servant_ (servant)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->servant_->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::ServerInformationIterator * const servant_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
- 
-  static size_t const nargs = 1;
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-
-  destroy_ServerInformationIterator command (
-    impl);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _is_a_ServerInformationIterator_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_ServerInformationIterator_Upcall_Command (
-      POA_ImplementationRepository::ServerInformationIterator * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
- 
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::ServerInformationIterator * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
-  _is_a_ServerInformationIterator_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _non_existent_ServerInformationIterator_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_ServerInformationIterator_Upcall_Command (
-      POA_ImplementationRepository::ServerInformationIterator * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
- 
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::ServerInformationIterator * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
- 
-  static size_t const nargs = 1;
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
-  _non_existent_ServerInformationIterator_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest & server_request,
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
- 
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
- 
-  _tao_adapter->dispose (_tao_retval);
- 
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _get_component_ServerInformationIterator_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_ServerInformationIterator_Upcall_Command (
-      POA_ImplementationRepository::ServerInformationIterator * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
- 
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::ServerInformationIterator * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
- 
-  static size_t const nargs = 1;
- 
-  POA_ImplementationRepository::ServerInformationIterator * const impl =
-    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
-  _get_component_ServerInformationIterator_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
-
-void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
-    TAO_ServerRequest & req,
-    void * servant_upcall
-    ACE_ENV_ARG_DECL
-  )
-{
-  this->synchronous_upcall_dispatch (req,
-                                     servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
-
-ImplementationRepository::ServerInformationIterator *
-POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
- 
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
- 
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
- 
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
- 
-  typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-// TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
-
-class TAO_ImplementationRepository_Administration_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: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26,  0,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26,  5,
-     26, 26,  0,  9,  0,  5, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 10, 26,  0,
-     26, 26, 26,  0, 26, 26, 26, 26, 26, 26,
-     26, 26,  0,  4, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26,
-#else
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26,  0, 26,  5, 26, 26,
-      0,  9,  0,  5, 26, 26, 26, 26, 10, 26,
-      0, 26, 26, 26,  0,  0,  4, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 13,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 23,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 25,
-      HASH_VALUE_RANGE = 22,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 17
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"find", &POA_ImplementationRepository::Administration::find_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find},
-      {"",0,0},{"",0,0},{"",0,0},
-      {"shutdown", &POA_ImplementationRepository::Administration::shutdown_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown},
-      {"",0,0},
-      {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0},
-      {"",0,0},{"",0,0},
-      {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server},
-      {"_component", &POA_ImplementationRepository::Administration::_component_skel, 0},
-      {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server},
-      {"",0,0},
-      {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0},
-      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
-      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0},
-      {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
-      {"",0,0},
-      {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running},
-      {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down},
-      {"",0,0},
-      {"add_or_update_server", &POA_ImplementationRepository::Administration::add_or_update_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_update_server},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      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];
-        }
-    }
-  return 0;
-}
-
-static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void)
-{
-  static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
-  strategized_proxy_broker;
- 
-  return &strategized_proxy_broker;
-}
-
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO_Administration_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_ImplementationRepository::_TAO_Administration_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;
-}
-
-void
-POA_ImplementationRepository::_TAO_Administration_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj,
-    forward_obj,
-    args,
-    num_args,
-    op,
-    op_len,
-    strategy
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
-
-TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker ();
-}
-
-int
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (size_t)
-{
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
-    ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
- 
-  return 0;
-}
-
-static int
-ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Administration_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound,
-    ::ImplementationRepository::CannotActivate
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->activate_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_update_server (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->add_or_update_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->remove_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->shutdown_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->server_is_running (
-        ((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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->server_is_shutting_down (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->find (
-        ((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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->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 ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->shutdown (
-        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
-
-POA_ImplementationRepository::Administration::Administration (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_ImplementationRepository_Administration_optable;
-}
-
-POA_ImplementationRepository::Administration::Administration (const Administration& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_ImplementationRepository::Administration::~Administration (void)
-{
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class activate_server_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline activate_server_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      this->servant_->activate_server (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::activate_server_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound,
-      ImplementationRepository::_tc_CannotActivate
-    };
-  static size_t const nexceptions = 2;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  activate_server_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class add_or_update_server_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline add_or_update_server_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< ::ImplementationRepository::StartupOptions, TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
-      this->servant_->add_or_update_server (
-        arg_1
-        , arg_2
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::add_or_update_server_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server,
-      &_tao_options
-    };
- 
-  static size_t const nargs = 3;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  add_or_update_server_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class remove_server_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline remove_server_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      this->servant_->remove_server (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::remove_server_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  remove_server_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class shutdown_server_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline shutdown_server_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      this->servant_->shutdown_server (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::shutdown_server_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  shutdown_server_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class server_is_running_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline server_is_running_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< ::ImplementationRepository::ServerObject, TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          3);
- 
-      this->servant_->server_is_running (
-        arg_1
-        , arg_2
-        , arg_3
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::server_is_running_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server,
-      &_tao_partial_ior,
-      &_tao_server_object
-    };
- 
-  static size_t const nargs = 4;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  server_is_running_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class server_is_shutting_down_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline server_is_shutting_down_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      this->servant_->server_is_shutting_down (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  server_is_shutting_down_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class find_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline find_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type arg_2 =
-        TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformation, TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
-      this->servant_->find (
-        arg_1
-        , arg_2
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::find_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_server,
-      &_tao_info
-    };
- 
-  static size_t const nargs = 3;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  find_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class list_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline list_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
-        TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
-      TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type arg_3 =
-        TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationIterator, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type> (
-          this->operation_details_,
-          this->args_,
-          3);
- 
-      this->servant_->list (
-        arg_1
-        , arg_2
-        , arg_3
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::list_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_how_many,
-      &_tao_server_list,
-      &_tao_server_iterator
-    };
- 
-  static size_t const nargs = 4;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  list_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class shutdown_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline shutdown_Administration (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          2);
- 
-      this->servant_->shutdown (
-        arg_1
-        , arg_2
-        ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::shutdown_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators;
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_activators,
-      &_tao_servers
-    };
- 
-  static size_t const nargs = 3;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-
-  shutdown_Administration command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _is_a_Administration_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_Administration_Upcall_Command (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
-      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
- 
- 
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
- 
-  static size_t const nargs = 2;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
-  _is_a_Administration_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _non_existent_Administration_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_Administration_Upcall_Command (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
- 
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
- 
-  static size_t const nargs = 1;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
-  _non_existent_Administration_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest & server_request,
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
- 
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
- 
-  _tao_adapter->dispose (_tao_retval);
- 
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
-  class _get_component_Administration_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_Administration_Upcall_Command (
-      POA_ImplementationRepository::Administration * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
- 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
- 
- 
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
- 
-    }
- 
-  private:
-    POA_ImplementationRepository::Administration * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
- 
-}
-void POA_ImplementationRepository::Administration::_component_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
- 
- 
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
- 
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
- 
-  static size_t const nargs = 1;
- 
-  POA_ImplementationRepository::Administration * const impl =
-    static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
-  _get_component_Administration_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
- 
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-}
-
-CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:ImplementationRepository/Administration:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/Administration:1.0";
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
-
-void POA_ImplementationRepository::Administration::_dispatch (
-    TAO_ServerRequest & req,
-    void * servant_upcall
-    ACE_ENV_ARG_DECL
-  )
-{
-  this->synchronous_upcall_dispatch (req,
-                                     servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
-
-ImplementationRepository::Administration *
-POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
- 
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
- 
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
- 
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
- 
-  typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h
deleted file mode 100644
index 8435f8704d6..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ /dev/null
@@ -1,727 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_IMPLREPOS_H_
-#define _TAO_IDL_IMPLREPOS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ImplRepoC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_ImplementationRepository
-{
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
- 
-  class ServerInformationIterator;
-  typedef ServerInformationIterator *ServerInformationIterator_ptr;
- 
-  class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-  class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
- 
-  class TAO_IMR_Client_Export ServerInformationIterator
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    ServerInformationIterator (void);
- 
-  public:
-    // Useful for template programming.
-    typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
-    typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
-    typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
- 
-    ServerInformationIterator (const ServerInformationIterator& rhs);
-    virtual ~ServerInformationIterator (void);
- 
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
- 
-    ::ImplementationRepository::ServerInformationIterator *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    virtual const char* _interface_repository_id (void) const;
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual CORBA::Boolean next_n (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out servers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
- 
-    static void next_n_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
- 
-    static void destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-  };
- 
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
-  //
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
- 
-  class TAO_IMR_Client_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
-  ///////////////////////////////////////////////////////////////////////
- 
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
- 
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
- 
-  class TAO_IMR_Client_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
- 
-    virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
-      ));
-  };
- 
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
- 
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
- 
-  class Administration;
-  typedef Administration *Administration_ptr;
- 
-  class _TAO_Administration_Direct_Proxy_Impl;
-  class _TAO_Administration_Strategized_Proxy_Broker;
- 
-  class TAO_IMR_Client_Export Administration
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    Administration (void);
- 
-  public:
-    // Useful for template programming.
-    typedef ::ImplementationRepository::Administration _stub_type;
-    typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type;
-    typedef ::ImplementationRepository::Administration_var _stub_var_type;
- 
-    Administration (const Administration& rhs);
-    virtual ~Administration (void);
- 
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
- 
-    ::ImplementationRepository::Administration *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
- 
-    virtual const char* _interface_repository_id (void) const;
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void activate_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      )) = 0;
- 
-    static void activate_server_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void add_or_update_server (
-        const char * server,
-        const ::ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
- 
-    static void add_or_update_server_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void remove_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
- 
-    static void remove_server_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void shutdown_server (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
- 
-    static void shutdown_server_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void server_is_running (
-        const char * server,
-        const char * partial_ior,
-        ::ImplementationRepository::ServerObject_ptr server_object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
- 
-    static void server_is_running_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void server_is_shutting_down (
-        const char * server
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
- 
-    static void server_is_shutting_down_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void find (
-        const char * server,
-        ::ImplementationRepository::ServerInformation_out info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
- 
-    static void find_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void list (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out server_list,
-        ::ImplementationRepository::ServerInformationIterator_out server_iterator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
- 
-    static void list_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual void shutdown (
-        ::CORBA::Boolean activators,
-        ::CORBA::Boolean servers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
- 
-    static void shutdown_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-  };
- 
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
-  //
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
- 
-  class TAO_IMR_Client_Export _TAO_Administration_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public:
-    _TAO_Administration_Strategized_Proxy_Broker (void);
- 
-    virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
- 
-    TAO::Collocation_Strategy
-    get_strategy (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
- 
-    void
-    dispatch (
-        CORBA::Object_ptr obj,
-        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_Administration_Strategized_Proxy_Broker *
-    the_TAO_Administration_Strategized_Proxy_Broker (void);
-  };
- 
-  //
-  //            End Strategized Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
- 
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
- 
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
- 
-  class TAO_IMR_Client_Export _TAO_Administration_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_Administration_Direct_Proxy_Impl (void);
- 
-    virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    activate_server (
-        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
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    add_or_update_server (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    remove_server (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    shutdown_server (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    server_is_running (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    server_is_shutting_down (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    find (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    list (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
- 
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
-    static void
-    shutdown (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
- 
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
- 
- 
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
-
-} // module ImplementationRepository
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:995
-
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
deleted file mode 100644
index d7a1355fae7..00000000000
--- a/TAO/tao/ImR_Client/ServerObject.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   ServerObject.pidl
- *
- * $Id$
- *
- * This file was used to generate the code in ServerObject{A,C,S}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl -Ssi -Gp -GA -Gd -Ge 1 -Sc -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
- *
- */
-//=============================================================================
-
-module ImplementationRepository
-{
-  /**
-   * @brief Server Side IR Object
-   *
-   * This object, which exists on the servers that use the
-   * Implementation Repository (IR), is used to control or check the
-   * status of the server by the IR.
-   */
-
-  interface ServerObject
-  {
-    /// Check the liveness of a server.
-    void ping ();
-
-    /// Try to shutdown the server gracefully.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/tao/ImR_Client/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
deleted file mode 100644
index 153a0c83393..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectA.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServerObjectC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerObject (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/ServerObject:1.0",
-    "ServerObject");
-  
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerObject =
-    &_tao_tc_ImplementationRepository_ServerObject;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr _tao_elem
-  )
-{
-  ImplementationRepository::ServerObject_ptr _tao_objptr =
-    ImplementationRepository::ServerObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
-      _tao_any,
-      ImplementationRepository::ServerObject::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
-        _tao_any,
-        ImplementationRepository::ServerObject::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerObject,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp
deleted file mode 100644
index 7f5897daad1..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectC.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ServerObjectC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Basic_Arguments.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "ServerObjectC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for ImplementationRepository::ServerObject.
-
-ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
-    ImplementationRepository::ServerObject_ptr p
-  )
-{
-  return ImplementationRepository::ServerObject::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
-    ImplementationRepository::ServerObject_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void)
-{
-  return ImplementationRepository::ServerObject::_nil ();
-}
-
-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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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::TAO_ONEWAY_INVOCATION
-    );
-  
-  _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;
-}
-
-void
-ImplementationRepository::ServerObject::_tao_release (ServerObject_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-ImplementationRepository::ServerObject::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:ImplementationRepository/ServerObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // 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
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ()))
-    {
-      return false;
-    }
-  
-  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;
-}
diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
deleted file mode 100644
index 74a5178c5f4..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectC.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_SERVEROBJECTC_H_
-#define _TAO_IDL_SERVEROBJECTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "imr_client_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_IMR_Client_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace ImplementationRepository
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#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
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-  
-  class TAO_IMR_Client_Export ServerObject
-    : public virtual CORBA::Object
-  {
-  public:
-    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 void _tao_release (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 static_cast<ServerObject_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void ping (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        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
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerObject;
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module ImplementationRepository
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:139
-
-extern TAO_IMR_Client_Export
-TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
-  
-  template<>
-  struct TAO_IMR_Client_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 */
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "ServerObjectC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl
deleted file mode 100644
index cbfc85bee96..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectC.inl
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
-
-ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (
-    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_ServerObject_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_ServerObject_setup_collocation ();
-}
-
-ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ServerObject_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
deleted file mode 100644
index 0efb994538d..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// .\be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_SERVEROBJECTS_CPP_
-#define _TAO_IDL_SERVEROBJECTS_CPP_
-
-
-#include "ServerObjectS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.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/TypeCode_SArg_Traits.h"
-#include "tao/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/Basic_Arguments.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
-
-class TAO_ImplementationRepository_ServerObject_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: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_ImplementationRepository_ServerObject_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, 16,  5, 16,  0, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16,  0, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  0,  0, 16, 16, 16, 16, 16, 16,
-     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,
-     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,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 13,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 15,
-      HASH_VALUE_RANGE = 12,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 10
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"ping", &POA_ImplementationRepository::ServerObject::ping_skel, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping},
-      {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel, 0},
-      {"",0,0},{"",0,0},
-      {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown},
-      {"",0,0},
-      {"_component", &POA_ImplementationRepository::ServerObject::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel, 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];
-        }
-    }
-  return 0;
-}
-
-static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\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)
-{
-  static POA_ImplementationRepository::_TAO_ServerObject_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_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_ImplementationRepository::_TAO_ServerObject_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;
-}
-
-void
-POA_ImplementationRepository::_TAO_ServerObject_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:999
-
-TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker ();
-}
-
-int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
-{
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
-    ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-  
-  return 0;
-}
-
-static int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::ServerObject_ptr>
-    (servant)
-  ->ping (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::ServerObject_ptr>
-    (servant)
-  ->shutdown (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
-
-POA_ImplementationRepository::ServerObject::ServerObject (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_ImplementationRepository_ServerObject_optable;
-}
-
-POA_ImplementationRepository::ServerObject::ServerObject (const ServerObject& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_ImplementationRepository::ServerObject::~ServerObject (void)
-{
-}
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class ping_ServerObject
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline ping_ServerObject (
-      POA_ImplementationRepository::ServerObject * servant)
-      : servant_ (servant)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->servant_->ping (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      
-    }
-  
-  private:
-    POA_ImplementationRepository::ServerObject * const servant_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::ServerObject::ping_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< void>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-
-  ping_ServerObject command (
-    impl);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class shutdown_ServerObject
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline shutdown_ServerObject (
-      POA_ImplementationRepository::ServerObject * servant)
-      : servant_ (servant)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->servant_->shutdown (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      
-    }
-  
-  private:
-    POA_ImplementationRepository::ServerObject * const servant_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::ServerObject::shutdown_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< void>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-
-  shutdown_ServerObject command (
-    impl);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _is_a_ServerObject_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_ServerObject_Upcall_Command (
-      POA_ImplementationRepository::ServerObject * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_ImplementationRepository::ServerObject * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
-  _is_a_ServerObject_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _non_existent_ServerObject_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_ServerObject_Upcall_Command (
-      POA_ImplementationRepository::ServerObject * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_ImplementationRepository::ServerObject * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
-  _non_existent_ServerObject_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-
-
-// TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest & server_request, 
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_component_ServerObject_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_ServerObject_Upcall_Command (
-      POA_ImplementationRepository::ServerObject * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_ImplementationRepository::ServerObject * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_ImplementationRepository::ServerObject * const impl =
-    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
-  _get_component_ServerObject_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:ImplementationRepository/ServerObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/ServerObject:1.0";
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_ImplementationRepository::ServerObject::_dispatch (
-    TAO_ServerRequest & req,
-    void * servant_upcall
-    ACE_ENV_ARG_DECL
-  )
-{
-  this->synchronous_upcall_dispatch (req,
-                                     servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:891
-
-ImplementationRepository::ServerObject *
-POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
-  CORBA::Boolean _tao_opt_colloc =
-    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;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h
deleted file mode 100644
index 630959d12cb..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectS.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_SERVEROBJECTS_H_
-#define _TAO_IDL_SERVEROBJECTS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ServerObjectC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
-  
-  class ServerObject;
-  typedef ServerObject *ServerObject_ptr;
-  
-  class _TAO_ServerObject_Direct_Proxy_Impl;
-  class _TAO_ServerObject_Strategized_Proxy_Broker;
-  
-  class TAO_IMR_Client_Export ServerObject
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    ServerObject (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;
-    
-    ServerObject (const ServerObject& rhs);
-    virtual ~ServerObject (void);
-    
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    ::ImplementationRepository::ServerObject *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void ping (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void ping_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void shutdown_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_IMR_Client_Export _TAO_ServerObject_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public: 
-    _TAO_ServerObject_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_ServerObject_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_ServerObject_Strategized_Proxy_Broker *
-    the_TAO_ServerObject_Strategized_Proxy_Broker (void);
-  };
-  
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_IMR_Client_Export _TAO_ServerObject_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_ServerObject_Direct_Proxy_Impl (void);
-    
-    virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    ping (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    shutdown (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
-
-} // module ImplementationRepository
-
-// TAO_IDL - Generated from 
-// .\be\be_codegen.cpp:995
-
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
deleted file mode 100644
index 1899c8afe02..00000000000
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#include "tao/ImR_Client/ServerObject_i.h"
-#include "tao/PortableServer/Root_POA.h"
-
-ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
-                                PortableServer::POA_ptr poa)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-void
-ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-ServerObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Note : We want our child POAs to be able to unregister themselves from
-  // the ImR, so we must destroy them before shutting down the orb.
-  poa_->destroy(1, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-PortableServer::POA_ptr
-ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
deleted file mode 100644
index e1266d1e8db..00000000000
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//=============================================================================
-/**
- *  @file    ServerObject_i.h
- *
- *  $Id$
- *
- *  @author  Darrell Brunsch and Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_IMPLREPO_I_H
-#define TAO_IMPLREPO_I_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ImR_Client/ServerObjectS.h"
-#include "tao/ImR_Client/imr_client_export.h"
-
-/**
- * @class ServerObject_i
- *
- * @brief Class for pinging a server.  Implementation Repository uses
- * this to communicate with the IMR registered servers.
- *
- * \nosubgrouping
- *
- **/
-class TAO_IMR_Client_Export ServerObject_i
-  : public POA_ImplementationRepository::ServerObject,
-    public PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor.
-  ServerObject_i (CORBA::ORB_ptr orb,
-                  PortableServer::POA_ptr poa);
-
-  /// Ping method.
-  void ping (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Shutdown the server.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  /// Our ORB.  We need this member in case we need to shutdown the
-  /// server.
-  CORBA::ORB_var orb_;
-
-  /// POA that we are registered with.
-  PortableServer::POA_var poa_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IMPLREPO_I_H */
diff --git a/TAO/tao/ImR_Client/TAO_IMR_Client.rc b/TAO/tao/ImR_Client/TAO_IMR_Client.rc
deleted file mode 100644
index 64272160de5..00000000000
--- a/TAO/tao/ImR_Client/TAO_IMR_Client.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "IMR_Client\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_IMR_ClientDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_IMR_Client.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in b/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in
deleted file mode 100644
index 700ed7136ad..00000000000
--- a/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_ImR_Client
-Description: TAO Implementation Repository Client Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_ImR_Client
-Cflags: -I${includedir}
diff --git a/TAO/tao/ImR_Client/imr_client_export.h b/TAO/tao/ImR_Client/imr_client_export.h
deleted file mode 100644
index be4ed299190..00000000000
--- a/TAO/tao/ImR_Client/imr_client_export.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_IMR_CLIENT_EXPORT_H
-#define TAO_IMR_CLIENT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_IMR_CLIENT_HAS_DLL)
-#    define TAO_IMR_CLIENT_HAS_DLL 0
-#  endif /* ! TAO_IMR_CLIENT_HAS_DLL */
-#else
-#  if !defined (TAO_IMR_CLIENT_HAS_DLL)
-#    define TAO_IMR_CLIENT_HAS_DLL 1
-#  endif /* ! TAO_IMR_CLIENT_HAS_DLL */
-#endif
-
-#if defined (TAO_IMR_CLIENT_HAS_DLL) && (TAO_IMR_CLIENT_HAS_DLL == 1)
-#  if defined (TAO_IMR_CLIENT_BUILD_DLL)
-#    define TAO_IMR_Client_Export ACE_Proper_Export_Flag
-#    define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_IMR_CLIENT_BUILD_DLL */
-#    define TAO_IMR_Client_Export ACE_Proper_Import_Flag
-#    define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IMR_CLIENT_BUILD_DLL */
-#else /* TAO_IMR_CLIENT_HAS_DLL == 1 */
-#  define TAO_IMR_Client_Export
-#  define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T)
-#  define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IMR_CLIENT_HAS_DLL == 1 */
-
-#endif /* TAO_IMR_CLIENT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
deleted file mode 100644
index 61999fb1a11..00000000000
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-#include "Incoming_Message_Queue.h"
-#include "debug.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/Malloc_Base.h"
-
-
-#if !defined (__ACE_INLINE__)
-# include "Incoming_Message_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Incoming_Message_Queue,
-           "$Id$")
-
-TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
-  : last_added_ (0),
-    size_ (0),
-    orb_core_ (orb_core)
-{
-}
-
-TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
-{
-  const int sz = this->size_;
-
-  // Delete all the nodes left behind
-  for (int i = 0;
-       i < sz;
-       ++i)
-    {
-      TAO_Queued_Data *qd = this->dequeue_head ();
-      TAO_Queued_Data::release (qd);
-    }
-}
-
-size_t
-TAO_Incoming_Message_Queue::copy_tail (ACE_Message_Block &block)
-{
-  // The size of message that is copied
-  size_t n = 0;
-
-  if (this->size_ > 0)
-    {
-      // Check to see if the length of the incoming block is less than
-      // that of the <missing_data_> of the tail.
-      if ((CORBA::Long)block.length () < this->last_added_->missing_data_)
-        {
-          n = block.length ();
-        }
-      else
-        {
-          n = this->last_added_->missing_data_;
-        }
-
-      // Do the copy
-      this->last_added_->msg_block_->copy (block.rd_ptr (),
-                                            n);
-
-      // Decerement the missing data
-      this->last_added_->missing_data_ -= n;
-    }
-
-  return n;
-}
-
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::dequeue_head (void)
-{
-  if (this->size_ == 0)
-    return 0;
-
-  // Get the node on the head of the queue...
-  TAO_Queued_Data *head = this->last_added_->next_;
-
-  // Reset the head node..
-  this->last_added_->next_ = head->next_;
-
-  // Decrease the size and reset last_added_ if empty
-  if (--this->size_ == 0)
-    this->last_added_ = 0;
-
-  return head;
-}
-
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::dequeue_tail (void)
-{
-  // This is a bit painful stuff...
-  if (this->size_ == 0)
-    return 0;
-
-  // Get the node on the head of the queue...
-  TAO_Queued_Data *head =
-    this->last_added_->next_;
-
-  while (head->next_ != this->last_added_)
-    {
-      head = head->next_;
-    }
-
-  // Put the head in tmp.
-  head->next_ = this->last_added_->next_;
-
-  TAO_Queued_Data *ret_qd = this->last_added_;
-
-  this->last_added_ = head;
-
-  // Decrease the size
-  if (--this->size_ == 0)
-    this->last_added_ = 0;
-
- return ret_qd;
-}
-
-int
-TAO_Incoming_Message_Queue::enqueue_tail (TAO_Queued_Data *nd)
-{
-  if (this->size_ == 0)
-    {
-      this->last_added_ = nd;
-      this->last_added_->next_ = this->last_added_;
-    }
-  else
-    {
-      nd->next_ = this->last_added_->next_;
-      this->last_added_->next_ = nd;
-      this->last_added_ = nd;
-    }
-
-  ++ this->size_;
-  return 0;
-}
-
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::Octet major,
-                                                 CORBA::Octet minor) const
-{
-  TAO_Queued_Data *found = 0;
-  if (this->last_added_ != 0)
-    {
-      TAO_Queued_Data *qd = this->last_added_->next_;
-
-      do {
-        if (qd->more_fragments_ &&
-            qd->major_version_ == major && qd->minor_version_ == minor)
-          {
-            found = qd;
-          }
-        else
-          {
-            qd = qd->next_;
-          }
-      } while (found == 0 && qd != this->last_added_->next_);
-    }
-
-  return found;
-}
-
-TAO_Queued_Data *
-TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::ULong request_id) const
-{
-  TAO_Queued_Data *found = 0;
-  if (this->last_added_ != 0)
-    {
-      TAO_Queued_Data *qd = this->last_added_->next_;
-
-      do {
-        if (qd->more_fragments_ && qd->request_id_ == request_id)
-          {
-            found = qd;
-          }
-        else
-          {
-            qd = qd->next_;
-          }
-      } while (found == 0 && qd != this->last_added_->next_);
-    }
-
-  return found;
-}
-
-
-/************************************************************************/
-// Methods  for TAO_Queued_Data
-/************************************************************************/
-
-/*!
-  \brief Allocate and return a new empty message block of size \a new_size mimicking parameters of \a mb.
-
-  This function allocates a new aligned message block using the same
-  allocators and flags as found in \a mb.  The size of the new message
-  block is at least \a new_size; the size may be adjusted up in order
-  to accomodate alignment requirements and still fit \a new_size bytes
-  into the aligned buffer.
-
-  \param mb message block whose parameters should be mimicked
-  \param new_size size of the new message block (will be adjusted for proper alignment)
-  \return an aligned message block with rd_ptr sitting at correct alignment spot, 0 on failure
-
-  \author Thanks to Rich Seibel for helping implement the public API for ACE_Message_Block!
- */
-static ACE_Message_Block*
-clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
-{
-  // Calculate the required size of the cloned block with alignment
-  size_t aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
-
-  // Get the allocators
-  ACE_Allocator *data_allocator;
-  ACE_Allocator *data_block_allocator;
-  ACE_Allocator *message_block_allocator;
-  mb->access_allocators (data_allocator,
-                         data_block_allocator,
-                         message_block_allocator);
-
-  // Create a new Message Block
-  ACE_Message_Block *nb;
-  ACE_NEW_MALLOC_RETURN (nb,
-                         static_cast<ACE_Message_Block*> (
-                                         message_block_allocator->malloc (
-                                           sizeof (ACE_Message_Block))),
-                         ACE_Message_Block(aligned_size,
-                                           mb->msg_type(),
-                                           mb->cont(),
-                                           0, //we want the data block created
-                                           data_allocator,
-                                           mb->locking_strategy(),
-                                           mb->msg_priority(),
-                                           mb->msg_execution_time (),
-                                           mb->msg_deadline_time (),
-                                           data_block_allocator,
-                                           message_block_allocator),
-                         0);
-
-  ACE_CDR::mb_align (nb);
-
-  // Copy the flags over, but be SURE to clear the DONT_DELETE flag, since
-  // we just dynamically allocated the two things.
-  nb->set_flags (mb->flags());
-  nb->clr_flags (ACE_Message_Block::DONT_DELETE);
-
-  return nb;
-}
-
-TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc)
-  : msg_block_ (0),
-    missing_data_ (0),
-    byte_order_ (0),
-    major_version_ (0),
-    minor_version_ (0),
-    more_fragments_ (0),
-    request_id_ (0),
-    msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
-    next_ (0),
-    allocator_ (alloc)
-{
-}
-
-TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb,
-                                  ACE_Allocator *alloc)
-  : msg_block_ (mb),
-    missing_data_ (0),
-    byte_order_ (0),
-    major_version_ (0),
-    minor_version_ (0),
-    more_fragments_ (0),
-    request_id_ (0),
-    msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR),
-    next_ (0),
-    allocator_ (alloc)
-{
-}
-
-TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd)
-  : msg_block_ (qd.msg_block_->duplicate ()),
-    missing_data_ (qd.missing_data_),
-    byte_order_ (qd.byte_order_),
-    major_version_ (qd.major_version_),
-    minor_version_ (qd.minor_version_),
-    more_fragments_ (qd.more_fragments_),
-    request_id_ (qd.request_id_),
-    msg_type_ (qd.msg_type_),
-    next_ (0),
-    allocator_ (qd.allocator_)
-{
-}
-
-/*static*/
-TAO_Queued_Data *
-TAO_Queued_Data::make_queued_data (ACE_Allocator *alloc)
-{
-  TAO_Queued_Data *qd = 0;
-
-  if (alloc)
-    {
-      ACE_NEW_MALLOC_RETURN (qd,
-                             static_cast<TAO_Queued_Data *> (
-                               alloc->malloc (sizeof (TAO_Queued_Data))),
-                             TAO_Queued_Data (alloc),
-                             0);
-
-      return qd;
-    }
-
-  // No allocator, so use the global pool!
-  // @@ TODO: We should be removing this at some point of time!
-  if (TAO_debug_level == 4)
-    {
-      // This debug is for testing purposes!
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Queued_Data::get_queued_data\n"
-                  "Using global pool for allocation \n"));
-    }
-
-  ACE_NEW_RETURN (qd,
-                  TAO_Queued_Data,
-                  0);
-
-  return qd;
-}
-
-/*static*/
-void
-TAO_Queued_Data::release (TAO_Queued_Data *qd)
-{
-  //// TODO
-  ACE_Message_Block::release (qd->msg_block_);
-
-  if (qd->allocator_)
-    {
-      ACE_DES_FREE (qd,
-                    qd->allocator_->free,
-                    TAO_Queued_Data);
-
-      return;
-    }
-
-  // @@todo: Need to be removed at some point of time!
-  if (TAO_debug_level == 4)
-    {
-      // This debug is for testing purposes!
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Queued_Data[%d]::release\n",
-                  "Using global pool for releasing \n"));
-    }
-  delete qd;
-
-}
-
-
-TAO_Queued_Data *
-TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
-{
-  // Check to see if the underlying block is on the stack. If not it
-  // is fine. If the datablock is on stack, try to make a copy of that
-  // before doing a duplicate.
-  // @@ todo: Theoretically this should be within the Message Block,
-  // but we dont have much scope to do this in that mess. Probably in
-  // the next stage of MB rewrite we should be okay
-  ACE_Message_Block::Message_Flags fl =
-    sqd.msg_block_->self_flags ();
-
-  if (ACE_BIT_ENABLED (fl,
-                       ACE_Message_Block::DONT_DELETE))
-    (void) TAO_Queued_Data::replace_data_block (*sqd.msg_block_);
-
-
-  TAO_Queued_Data *qd = 0;
-
-  if (sqd.allocator_)
-    {
-      ACE_NEW_MALLOC_RETURN (qd,
-                             static_cast<TAO_Queued_Data *> (
-                               sqd.allocator_->malloc (sizeof (TAO_Queued_Data))),
-                             TAO_Queued_Data (sqd),
-                             0);
-
-      return qd;
-    }
-
-  // No allocator, so use the global pool!
-  // @@ TODO: We should be removing this at some point of time!
-  if (TAO_debug_level == 4)
-    {
-      // This debug is for testing purposes!
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Queued_Data[%d]::duplicate\n",
-                  "Using global pool for allocation \n"));
-    }
-
-  ACE_NEW_RETURN (qd,
-                  TAO_Queued_Data (sqd),
-                  0);
-
-  return qd;
-}
-
-void
-TAO_Queued_Data::consolidate (void)
-{
-  // Is this a chain of fragments?
-  if (this->more_fragments_ && this->msg_block_->cont () != 0)
-    {
-      // Create a message block big enough to hold the entire chain
-      ACE_Message_Block *dest = clone_mb_nocopy_size (
-                                      this->msg_block_,
-                                      this->msg_block_->total_length ());
-
-      // Reset the cont() parameter.  We have cloned the message
-      // block but not the chain as we will no longer have chain.
-      dest->cont (0);
-
-      // Use ACE_CDR to consolidate the chain for us
-      ACE_CDR::consolidate (dest, this->msg_block_);
-
-      // free the original message block chain
-      this->msg_block_->release ();
-
-      // Set the message block to the new consolidated message block
-      this->msg_block_ = dest;
-      this->more_fragments_ = 0;
-    }
-}
-
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
deleted file mode 100644
index c5ca740eb13..00000000000
--- a/TAO/tao/Incoming_Message_Queue.h
+++ /dev/null
@@ -1,246 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Incoming_Message_Queue.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_INCOMING_MESSAGE_QUEUE_H
-#define TAO_INCOMING_MESSAGE_QUEUE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "ace/Message_Block.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/// Forward declarations
-class ACE_Allocator;
-class TAO_ORB_Core;
-class TAO_Queued_Data;
-class TAO_Transport;
-
-/**
- * @class TAO_Incoming_Message_Queue
- *
- * @brief A queue of the messages in the incoming data path.
- *
- * Please read the documentation in the TAO_Transport class to find
- * out more about the design of the incoming data path.
- *
- * Under certain conditions TAO may have to maintain a queue
- * per-connection. This queue is drained by the pluggable
- * protocols framework, normally under control of the ACE_Reactor, but
- * other configurations are conceivable.
- *
- * The memory that is allocated for holding the messages comes from
- * the global pool for the following reasons
- *
- * - the thread that reads a part of the message would not be the same
- *   thread that reads and fills the rest of the message
- * - the thread that actually processes the message can be totally
- *   different.
- *
- */
-
-class TAO_Export TAO_Incoming_Message_Queue
-{
-public:
-
-  /// Constructor.
-  TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core);
-
-  /// Destructor.
-  ~TAO_Incoming_Message_Queue (void);
-
-  /// Adding and deleting a node from the queue.
-  TAO_Queued_Data *dequeue_head (void);
-  TAO_Queued_Data *dequeue_tail (void);
-  int enqueue_tail (TAO_Queued_Data *nd);
-
-  /// Copy message from @a block to the tail of the queue. The size
-  /// of message that is copied to the tail node is returned. The
-  /// number of bytes copied depends on the amount of bytes needed to
-  /// make the tail node consistent.
-  size_t copy_tail (ACE_Message_Block &block);
-
-  /// Return the length of the queue..
-  CORBA::ULong queue_length (void);
-
-  /*!
-    @name Node Inspection Predicates
-
-    \brief These methods allow inspection of head and tail nodes for "completeness".
-
-    These methods check to see whether the node on the head or tail is
-    "complete" and ready for further processing.  See each method's
-    documentation for its definition of "complete".
-  */
-  //@{
-  /*!
-    "complete" == the GIOP message at the tail is not missing any data (it may be a complete GIOP Fragment, though)
-
-    \retval -1 queue is empty
-    \retval 0  tail is not "complete"
-    \retval 1  tail is "complete"
-  */
-  int is_tail_complete (void);
-
-  /*!
-
-    "complete" == the GIOP message at the head is not missing any data
-    AND, if it's the first message in a series of GIOP fragments, all
-    the fragments have been received, parsed, and placed into the
-    queue
-
-    \retval -1 if queue is empty
-    \retval 0  if head is not "complete"
-    \retval 1  if head is "complete"
-   */
-  int is_head_complete (void);
-  //@}
-
-  /*!
-    \brief Check to see if the message at the tail (complete or incomplete) is a GIOP Fragment.
-   */
-  int is_tail_fragmented (void);
-
-  /// Return the size of data that is missing in tail of the queue.
-  size_t missing_data_tail (void) const;
-
-  /// Find the first fragment that matches the GIOP version
-  TAO_Queued_Data *find_fragment_chain (CORBA::Octet major,
-                                        CORBA::Octet minor) const;
-
-  /// Find the first fragment that matches the request id
-  TAO_Queued_Data *find_fragment_chain (CORBA::ULong request_id) const;
-
-private:
-
-  friend class TAO_Transport;
-
-private:
-  /*!
-    \brief A circular linked list of messages awaiting processing.
-
-    \a last_message_added_ points to the most recent message added to
-    the list.  The earliest addition can be easily accessed via
-    \a last_message_added_->next_.
-   */
-  TAO_Queued_Data *last_added_;
-
-  /// The size of the queue
-  CORBA::ULong size_;
-
-  /// Copy of our ORB Core
-  TAO_ORB_Core *orb_core_;
-};
-
-/************************************************************************/
-
-/**
- * @class TAO_Queued_Data
- *
- * @brief Represents a node in the queue of incoming messages.
- *
- * This class contains necessary information about a message that is
- * stored in the queue. Such a node can be used by the incoming thread
- * from the reactor to dequeue and process the message by sending it
- * to the higher layers of the ORB.
- *
- * The ACE_Message_Block contained within this class may contain a chain
- * of message blocks (usually when GIOP fragments are involved).  In that
- * case consolidate () needs to be called prior to being sent to higher
- * layers of the ORB when the GIOP fragment chain is complete.
- */
-
-class TAO_Export TAO_Queued_Data
-{
-public:
-  /// Default Constructor
-  TAO_Queued_Data (ACE_Allocator *alloc = 0);
-
-  /// Constructor.
-  TAO_Queued_Data (ACE_Message_Block *mb, ACE_Allocator *alloc = 0);
-
-  /// Copy constructor.
-  TAO_Queued_Data (const TAO_Queued_Data &qd);
-
-  /// Creation of a node in the queue.
-  static TAO_Queued_Data* make_queued_data (ACE_Allocator *alloc = 0);
-
-  /// Deletion of a node from the queue.
-  static void release (TAO_Queued_Data *qd);
-
-  /// Duplicate ourselves. This creates a copy of ourselves on the
-  /// heap and returns a pointer to the duplicated node.
-  static TAO_Queued_Data* duplicate (TAO_Queued_Data &qd);
-
-  /// Consolidate this fragments chained message blocks into one.
-  void consolidate (void);
-
-public:
-  /// The message block that contains the message.
-  ACE_Message_Block *msg_block_;
-
-  /*!
-    @name Missing Data details
-
-    The \a missing_data_ member contains the number of bytes of
-    data missing from \a msg_block_.
-   */
-  //@{
-  /*! Data missing in the above message that hasn't been read or processed yet. */
-  CORBA::Long missing_data_;
-  //@}
-
-  /// The byte order of the message that is stored in the node.
-  CORBA::Octet byte_order_;
-
-  /// Many protocols like GIOP have a major and minor version
-  /// information that would be needed to read and decipher the
-  /// message.
-  CORBA::Octet major_version_;
-  CORBA::Octet minor_version_;
-
-  /// Some messages can be fragmented by the protocol (this is an ORB
-  /// level fragmentation on top of the TCP/IP fragmentation. This
-  /// member indicates whether the message that we have recd. and
-  /// queue already has more fragments that is missing..
-  CORBA::Octet more_fragments_;
-
-  /// The fragment request id
-  CORBA::ULong request_id_;
-
-  /// The message type of the message
-  TAO_Pluggable_Message_Type msg_type_;
-
-  /// Pounter to the next element in the queue.
-  TAO_Queued_Data *next_;
-
-private:
-  /// Replace the datablock with a one allocated on the heap or
-  /// allocator
-  static void replace_data_block (ACE_Message_Block &mb);
-
-private:
-
-  /// The allocator used to allocate this class.
-  ACE_Allocator *allocator_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "Incoming_Message_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_INCOMING_MESSAGE_QUEUE_H*/
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
deleted file mode 100644
index 99bcb4978d3..00000000000
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-//$Id$
-// -*- C++ -*-
-/************************************************************************/
-// Methods for TAO_Incoming_Message_Queue
-/************************************************************************/
-ACE_INLINE CORBA::ULong
-TAO_Incoming_Message_Queue::queue_length (void)
-{
-  return this->size_;
-}
-
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_tail_complete (void)
-{
-  // If the size is 0 return -1
-  if (this->size_ == 0)
-    return -1;
-
-  if (this->size_ &&
-      this->last_added_->missing_data_ == 0)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_head_complete (void)
-{
-  if (this->size_ == 0)
-    return -1;
-
-  if (this->size_  &&
-      this->last_added_->next_->missing_data_ == 0 &&
-      !this->last_added_->next_->more_fragments_)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Incoming_Message_Queue::is_tail_fragmented (void)
-{
-  if (this->size_ == 0)
-    return 0;
-
-  if (this->size_  &&
-      this->last_added_->more_fragments_)
-    return 1;
-
-  return 0;
-}
-
-ACE_INLINE size_t
-TAO_Incoming_Message_Queue::missing_data_tail (void) const
-{
-  if (this->size_ != 0)
-    return this->last_added_->missing_data_;
-
-  return 0;
-}
-
-
-/************************************************************************/
-// Methods  for TAO_Queued_Data
-/************************************************************************/
-
-/*static*/
-ACE_INLINE void
-TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb)
-{
-  size_t newsize =
-    ACE_CDR::total_length (&mb, 0) + ACE_CDR::MAX_ALIGNMENT;
-
-  ACE_Data_Block *db =
-    mb.data_block ()->clone_nocopy ();
-
-  if (db->size (newsize) == -1)
-    return;
-
-  ACE_Message_Block tmp (db);
-  ACE_CDR::mb_align (&tmp);
-
-  tmp.copy (mb.rd_ptr (), mb.length());
-  mb.data_block (tmp.data_block ()->duplicate ());
-
-  mb.rd_ptr (tmp.rd_ptr ());
-  mb.wr_ptr (tmp.wr_ptr ());
-
-  // Remove the DONT_DELETE flags from mb
-  mb.clr_self_flags (ACE_Message_Block::DONT_DELETE);
-}
diff --git a/TAO/tao/Interceptor.pidl b/TAO/tao/Interceptor.pidl
deleted file mode 100644
index f2a028db841..00000000000
--- a/TAO/tao/Interceptor.pidl
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file Interceptor.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the Interceptor
- * components in the ORB.
- *
- * This file was used to generate the code in InterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Interceptor.pidl
- *
- */
-
-#ifndef _INTERCEPTOR_IDL_
-#define _INTERCEPTOR_IDL_
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface Interceptor
-  {
-    readonly attribute string name;
-    void destroy ();
-  };
-};
-
-#endif  /* _INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/InterceptorA.cpp b/TAO/tao/InterceptorA.cpp
deleted file mode 100644
index d386dfcfff3..00000000000
--- a/TAO/tao/InterceptorA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "InterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_Interceptor (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/Interceptor:1.0",
-    "Interceptor");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_Interceptor =
-    &_tao_tc_PortableInterceptor_Interceptor;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::Interceptor_ptr _tao_objptr =
-    PortableInterceptor::Interceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::Interceptor>::insert (
-      _tao_any,
-      PortableInterceptor::Interceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_Interceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::Interceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::Interceptor>::extract (
-        _tao_any,
-        PortableInterceptor::Interceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_Interceptor,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
deleted file mode 100644
index 44b3d8034fe..00000000000
--- a/TAO/tao/InterceptorC.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "InterceptorC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::Interceptor.
-
-PortableInterceptor::Interceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate (
-    PortableInterceptor::Interceptor_ptr p
-  )
-{
-  return PortableInterceptor::Interceptor::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::release (
-    PortableInterceptor::Interceptor_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::Interceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void)
-{
-  return PortableInterceptor::Interceptor::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal (
-    PortableInterceptor::Interceptor_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::Interceptor::Interceptor (void)
-{}
-
-PortableInterceptor::Interceptor::~Interceptor (void)
-{}
-
-void 
-PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Interceptor *_tao_tmp_pointer =
-    static_cast<Interceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Interceptor::_nil ();
-    }
-  
-  Interceptor_ptr proxy =
-    dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
-  return Interceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Interceptor::_nil ();
-    }
-  
-  Interceptor_ptr proxy =
-    dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
-  return Interceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::Interceptor::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::Interceptor::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/Interceptor:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
deleted file mode 100644
index 78df4da266c..00000000000
--- a/TAO/tao/InterceptorC.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_INTERCEPTORC_H_
-#define _TAO_IDL_ORIG_INTERCEPTORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
-  
-  class Interceptor;
-  typedef Interceptor *Interceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Interceptor
-      >
-    Interceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Interceptor
-      >
-    Interceptor_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-  
-  class TAO_Export Interceptor
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Interceptor_ptr _ptr_type;
-    typedef Interceptor_var _var_type;
-    
-    // The static operations.
-    static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-    
-    static void _tao_release (Interceptor_ptr obj);
-    
-    static Interceptor_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Interceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Interceptor_ptr _nil (void)
-    {
-      return static_cast<Interceptor_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Interceptor (void);
-    
-    virtual ~Interceptor (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Interceptor (const Interceptor &);
-    
-    void operator= (const Interceptor &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Interceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::Interceptor>
-  {
-    static ::PortableInterceptor::Interceptor_ptr duplicate (
-        ::PortableInterceptor::Interceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::Interceptor_ptr
-      );
-    static ::PortableInterceptor::Interceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::Interceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/InterceptorS.h b/TAO/tao/InterceptorS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/InterceptorS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
deleted file mode 100644
index 320edf4e01f..00000000000
--- a/TAO/tao/Interceptor_List.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// $Id$
-
-#include "tao/Interceptor_List.h"
-
-ACE_RCSID (tao,
-           Interceptor_List,
-           "$Id$")
-
-#include "tao/InterceptorC.h"
-#include "tao/SystemException.h"
-#include "tao/ORB_Constants.h"
-#include "ace/os_include/os_stddef.h"
-#include "ace/OS_NS_string.h"
-
-namespace TAO
-{
-  template <typename InterceptorType>
-  Interceptor_List<InterceptorType>::Interceptor_List (void)
-  {
-  }
-
-  template <typename InterceptorType>
-  size_t
-  Interceptor_List<InterceptorType>::add_interceptor_i (
-      PortableInterceptor::Interceptor_ptr interceptor
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName))
-  {
-    if (!CORBA::is_nil (interceptor))
-      {
-        const size_t old_len = this->interceptors_.size ();
-
-        // Don't bother checking the name for duplicates if no
-        // interceptors have been registered.  This saves an
-        // allocation.
-        if (old_len > 0)
-          {
-            /// If the Interceptor is not anonymous, make sure an
-            /// Interceptor with the same isn't already registered.
-            CORBA::String_var name =
-              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (0);
-
-            if (ACE_OS::strlen (name.in ()) != 0)
-              {
-                // @@ This simple search algorithm isn't the greatest
-                //    thing in the world, but since we only register
-                //    interceptors when bootstrapping an ORB, there will
-                //    be no runtime penalty.
-                //
-                //    Another source of inefficiency is that
-                //    Interceptors duplicate their name each time the
-                //    name() accessor is called!  This can slow down
-                //    bootstrap time noticeably when registering a huge
-                //    number of interceptors.  We could cache the names
-                //    somewhere, but since this is only a bootstrapping
-                //    issue there's no rush to implement such a scheme.
-
-                // Prevent interceptors with the same name from being
-                // registered.  Anonymous interceptors are okay.
-                for (size_t i = 0; i < old_len; ++i)
-                  {
-                    CORBA::String_var existing_name =
-                      this->interceptor (i)->name ();
-
-                    if (ACE_OS::strcmp (existing_name.in (),
-                                        name.in ()) == 0)
-                      {
-                        ACE_THROW_RETURN
-                          (PortableInterceptor::ORBInitInfo::DuplicateName (),
-                           0);
-                      }
-                  }
-              }
-          }
-
-        /// Increase the length of the Interceptor sequence by one.
-        const size_t new_len = old_len + 1;
-        this->interceptors_.size (new_len);
-        return old_len;
-      }
-    else
-      {
-        ACE_THROW_RETURN (
-            CORBA::INV_OBJREF (
-                CORBA::SystemException::_tao_minor_code (
-                    0,
-                    EINVAL
-                  ),
-                CORBA::COMPLETED_NO
-              ),
-            0
-          );
-      }
-  }
-
-  template <typename InterceptorType>
-  PortableInterceptor::Interceptor_ptr
-  Interceptor_List<InterceptorType>::interceptor (size_t index)
-  {
-    return this->interceptors_[index].in ();
-  }
-
-  template <typename InterceptorType>
-  void
-  Interceptor_List<InterceptorType>::add_interceptor (
-    InterceptorType_ptr_type interceptor
-    ACE_ENV_ARG_DECL)
-  {
-    const size_t index = this->add_interceptor_i (interceptor
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->interceptors_[index] = InterceptorType::_duplicate (interceptor);
-  }
-
-  template <typename InterceptorType>
-  typename Interceptor_List<InterceptorType>::TYPE &
-  Interceptor_List<InterceptorType>::interceptors (void)
-  {
-    return this->interceptors_;
-  }
-}
diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h
deleted file mode 100644
index 4b6679aea49..00000000000
--- a/TAO/tao/Interceptor_List.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Interceptor_List.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-// ===================================================================
-
-#ifndef TAO_INTERCEPTOR_LIST_H
-#define TAO_INTERCEPTOR_LIST_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Array_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Array_Base.h"
-#include "ORBInitInfoC.h"
-
-namespace PortableInterceptor
-{
-  class Interceptor;
-  typedef Interceptor *Interceptor_ptr;
-}
-
-namespace TAO
-{
-  /**
-   * @class Interceptor_List
-   *
-   * @brief Template for portable interceptor lists.
-   *
-   * Template for the various portable interceptor lists used
-   * internally by TAO.
-   */
-  template <typename InterceptorType>
-  class Interceptor_List
-  {
-  public:
-    /// Define the traits for the underlying portable interceptor array.
-    typedef typename InterceptorType::_var_type InterceptorType_var_type;
-    typedef typename InterceptorType::_ptr_type InterceptorType_ptr_type;
-    typedef ACE_Array_Base<InterceptorType_var_type> TYPE;
-
-    /// Constructor.
-    Interceptor_List (void);
-
-    /// Register an interceptor.
-    void add_interceptor (InterceptorType_ptr_type i
-                          ACE_ENV_ARG_DECL);
-
-    /// Return reference to the underlying Portable Interceptor array.
-    TYPE & interceptors (void);
-
-  protected:
-
-    /// Register an in interceptor with interceptor list.
-    size_t add_interceptor_i (
-        PortableInterceptor::Interceptor_ptr interceptor
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ORBInitInfo::DuplicateName));
-
-    /// Return the interceptor in sequence element @a index.
-    PortableInterceptor::Interceptor_ptr interceptor (size_t index);
-
-  private:
-    /// Dynamic array of registered interceptors.
-    TYPE interceptors_;
-
-  };
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Interceptor_List.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Interceptor_List.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_INTERCEPTOR_LIST_H */
diff --git a/TAO/tao/InterfaceDef.pidl b/TAO/tao/InterfaceDef.pidl
deleted file mode 100644
index 81eacc638e7..00000000000
--- a/TAO/tao/InterfaceDef.pidl
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file InterfaceDef.pidl
- *
- * $Id$
- *
- * @brief Define the CORBA::InterfaceDef type.
- *
- * This file is used to provide a definition for the CORBA::InterfaceDef
- * type, it is *NOT* pre-compiled, but included from other
- * pre-compiled files.
- *
- */
-
-#ifndef TAO_CORBA_INTERFACEDEF_PIDL
-#define TAO_CORBA_INTERFACEDEF_PIDL
-
-#include <InterfaceDef.pidl>
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface InterfaceDef;
-};
-
-#pragma prefix ""
-
-#endif /* TAO_CORBA_INTERFACEDEF_PIDL */
diff --git a/TAO/tao/InvalidName.pidl b/TAO/tao/InvalidName.pidl
deleted file mode 100644
index 67546d33943..00000000000
--- a/TAO/tao/InvalidName.pidl
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @file InvalidName.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::InvalidName
- * exception.
- *
- * This file is used to generate parts of the code in ORB.{h,i,cpp},
- * using the following command:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        InvalidName.pidl
- *
- * and then:
- *
- * patch < diffs/InvalidName.diff
- *
- * The code left in InvalidNameC.{h,i,cpp} must then be inserted into
- * the ORB.{h,i,cpp} files.  This sucks, but it is a direct result of
- * the way the spec is defined, the ORB 'pseudo-interface' cannot be
- * automatically generated, but it is better to automatically generate
- * the exception, otherwise they are always out of date when compared
- * to the rest of ACE+TAO.
- *
- */
-#ifndef TAO_CORBA_INVALIDNAME_PIDL
-#define TAO_CORBA_INVALIDNAME_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  local interface ORB
-  {
-    /**
-     * @exception InvalidName
-     *
-     * @brief UserException for resolve_initial_references()
-     *
-     * This exception is thrown if an 'invalid name' is passed to
-     * the CORBA::ORB::resolve_initial_references() operation.
-     */
-    exception InvalidName {};
-  };
-};
-
-#pragma prefix ""
-
-#endif /* TAO_CORBA_INVALIDNAME_PIDL */
diff --git a/TAO/tao/InvalidSlot.pidl b/TAO/tao/InvalidSlot.pidl
deleted file mode 100644
index bd82c726aa5..00000000000
--- a/TAO/tao/InvalidSlot.pidl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file InvalidSlot.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled InvalidSlot
- *
- * This file was used to generate the code in InvalidSlotC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          InvalidSlot.pidl
- */
-
-#ifndef _INVALID_SLOT_PIDL_
-#define _INVALID_SLOT_PIDL_
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  exception InvalidSlot {};
-};
-
-#endif  /* _INVALID_SLOT_PIDL_ */
diff --git a/TAO/tao/InvalidSlotA.cpp b/TAO/tao/InvalidSlotA.cpp
deleted file mode 100644
index 611548c2169..00000000000
--- a/TAO/tao/InvalidSlotA.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "InvalidSlotC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_InvalidSlot = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_InvalidSlot (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
-    "InvalidSlot",
-    _tao_fields_PortableInterceptor_InvalidSlot,
-    0);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
-    &_tao_tc_PortableInterceptor_InvalidSlot;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::InvalidSlot &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert_copy (
-      _tao_any,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor,
-      PortableInterceptor::_tc_InvalidSlot,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::InvalidSlot *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert (
-      _tao_any,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor,
-      PortableInterceptor::_tc_InvalidSlot,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::InvalidSlot *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::InvalidSlot *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::InvalidSlot *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::extract (
-        _tao_any,
-        PortableInterceptor::InvalidSlot::_tao_any_destructor,
-        PortableInterceptor::_tc_InvalidSlot,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/InvalidSlotC.cpp b/TAO/tao/InvalidSlotC.cpp
deleted file mode 100644
index 9315a2123de..00000000000
--- a/TAO/tao/InvalidSlotC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "InvalidSlotC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::InvalidSlot::InvalidSlot (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
-        "InvalidSlot"
-      )
-{
-}
-
-PortableInterceptor::InvalidSlot::~InvalidSlot (void)
-{
-}
-
-PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableInterceptor::InvalidSlot&
-PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidSlot *_tao_tmp_pointer =
-    static_cast<InvalidSlot *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidSlot *> (_tao_excp);
-}
-
-const PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidSlot *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::InvalidSlot, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::InvalidSlot::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::InvalidSlot (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::InvalidSlot::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::InvalidSlot::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::InvalidSlot::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_tao_type (void) const
-{
-  return ::PortableInterceptor::_tc_InvalidSlot;
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::InvalidSlot &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableInterceptor::InvalidSlot&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/InvalidSlotC.h b/TAO/tao/InvalidSlotC.h
deleted file mode 100644
index 6661c034224..00000000000
--- a/TAO/tao/InvalidSlotC.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_INVALIDSLOTC_H_
-#define _TAO_IDL_ORIG_INVALIDSLOTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
-#define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-  
-  class TAO_Export InvalidSlot : public CORBA::UserException
-  {
-  public:
-    
-    InvalidSlot (void);
-    InvalidSlot (const InvalidSlot &);
-    ~InvalidSlot (void);
-
-    InvalidSlot &operator= (const InvalidSlot &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static InvalidSlot *_downcast (CORBA::Exception *);
-    static const InvalidSlot *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/InvalidSlotS.h b/TAO/tao/InvalidSlotS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/InvalidSlotS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
deleted file mode 100644
index 5220db65940..00000000000
--- a/TAO/tao/Invocation_Adapter.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-//$Id$
-
-#include "Invocation_Adapter.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "Stub.h"
-#include "ORB_Core.h"
-#include "Synch_Invocation.h"
-#include "debug.h"
-#include "Collocated_Invocation.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "Collocation_Proxy_Broker.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Invocation_Adapter,
-           "$Id$")
-
-namespace TAO
-{
-  void
-  Invocation_Adapter::invoke (TAO::Exception_Data *ex_data,
-                              unsigned long ex_count
-                              ACE_ENV_ARG_DECL)
-  {
-    // Should stub object be refcounted here?
-    TAO_Stub *stub =
-      this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    TAO_Operation_Details op_details (this->operation_,
-                                      this->op_len_,
-                                      this->number_args_ != 0,
-                                      this->args_,
-                                      this->number_args_,
-                                      ex_data,
-                                      ex_count);
-
-    this->invoke_i (stub,
-                    op_details
-                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  Invocation_Adapter::invoke_i (TAO_Stub *stub,
-                                TAO_Operation_Details &details
-                                ACE_ENV_ARG_DECL)
-  {
-    // Cache the target to a local variable.
-    CORBA::Object_var effective_target =
-      CORBA::Object::_duplicate (this->target_);
-
-    // Initial state
-    TAO::Invocation_Status status = TAO_INVOKE_START;
-
-    ACE_Time_Value *max_wait_time = 0;
-
-    while (status == TAO_INVOKE_START ||
-           status == TAO_INVOKE_RESTART)
-      {
-        // Default we go to remote
-        Collocation_Strategy strat = TAO_CS_REMOTE_STRATEGY;
-
-        // If we have a collocated proxy broker we look if we maybe
-        // can use a collocated invocation.  Similarly, if the
-        // target object reference contains a pointer to a servant,
-        // the object reference also refers to a collocated object.
-        if (cpb_ != 0 || effective_target->_servant () != 0)
-          {
-            strat =
-              TAO_ORB_Core::collocation_strategy (effective_target.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-
-        if (strat == TAO_CS_REMOTE_STRATEGY ||
-            strat == TAO_CS_LAST)
-          {
-            status =
-              this->invoke_remote_i (stub,
-                                     details,
-                                     effective_target,
-                                     max_wait_time
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-        else
-          {
-            if (strat == TAO_CS_THRU_POA_STRATEGY)
-              {
-                (void) this->set_response_flags (stub,
-                                                 details);
-              }
-
-            status =
-              this->invoke_collocated_i (stub,
-                                         details,
-                                         effective_target,
-                                         strat
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-
-        if (status == TAO_INVOKE_RESTART)
-          {
-            details.reset_request_service_info ();
-            details.reset_reply_service_info ();
-
-            if (TAO_debug_level > 2)
-              {
-                ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Invocation_Adapter::invoke_i, "
-                  "handling forwarded locations \n"));
-              }
-          }
-      }
-  }
-
-  bool
-  Invocation_Adapter::get_timeout (TAO_Stub *stub,
-                                   ACE_Time_Value &timeout)
-  {
-    bool has_timeout = false;
-    this->target_->orb_core ()->call_timeout_hook (stub,
-                                                   has_timeout,
-                                                   timeout);
-
-    return has_timeout;
-  }
-
-  TAO_Stub *
-  Invocation_Adapter::get_stub (ACE_ENV_SINGLE_ARG_DECL) const
-  {
-    TAO_Stub * const stub =
-      this->target_->_stubobj ();
-
-    if (stub == 0)
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        stub);
-
-    return stub;
-  }
-
-  Invocation_Status
-  Invocation_Adapter::invoke_collocated_i (TAO_Stub *stub,
-                                           TAO_Operation_Details &details,
-                                           CORBA::Object_var &effective_target,
-                                           Collocation_Strategy strat
-                                           ACE_ENV_ARG_DECL)
-  {
-    // To make a collocated call we must have a collocated proxy broker, the
-    // invoke_i() will make sure that we only come here when we have one
-    ACE_ASSERT (cpb_ != 0
-                || (strat == TAO_CS_THRU_POA_STRATEGY
-                    && effective_target->_servant () != 0));
-
-    // Initial state
-    TAO::Invocation_Status status = TAO_INVOKE_START;
-
-    Collocated_Invocation coll_inv (this->target_,
-                                    effective_target.in (),
-                                    stub,
-                                    details,
-                                    this->type_ == TAO_TWOWAY_INVOCATION);
-
-    status =
-      coll_inv.invoke (this->cpb_,
-                       strat
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (status == TAO_INVOKE_RESTART &&
-        coll_inv.is_forwarded ())
-      {
-        effective_target =
-            coll_inv.steal_forwarded_reference ();
-
-        (void) this->object_forwarded (effective_target,
-                                       stub
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-      }
-
-    return status;
-  }
-
-  void
-  Invocation_Adapter::set_response_flags (
-    TAO_Stub *stub,
-    TAO_Operation_Details &details)
-  {
-    switch (this->type_)
-      {
-      case TAO_ONEWAY_INVOCATION:
-        {
-          // Grab the syncscope policy from the ORB.
-          Messaging::SyncScope sync_scope;
-
-          bool has_synchronization = false;
-
-          stub->orb_core ()->call_sync_scope_hook (stub,
-                                                   has_synchronization,
-                                                   sync_scope);
-          if (has_synchronization)
-            details.response_flags (CORBA::Octet (sync_scope));
-          else
-            details.response_flags (
-              CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT));
-          break;
-        }
-      case TAO_TWOWAY_INVOCATION:
-        {
-          // @@note: Need to change this to something better. Too many
-          // hash defines meaning the same things.
-          details.response_flags (TAO_TWOWAY_RESPONSE_FLAG);
-          break;
-        }
-      }
-
-    return;
-  }
-
-  Invocation_Status
-  Invocation_Adapter::invoke_remote_i (TAO_Stub *stub,
-                                       TAO_Operation_Details &details,
-                                       CORBA::Object_var &effective_target,
-                                       ACE_Time_Value *&max_wait_time
-                                       ACE_ENV_ARG_DECL)
-  {
-    ACE_Time_Value tmp_wait_time;
-    bool is_timeout  =
-      this->get_timeout (stub,
-                         tmp_wait_time);
-
-    if (is_timeout)
-      max_wait_time = &tmp_wait_time;
-
-    (void) this->set_response_flags (stub,
-                                     details);
-
-    // Create the resolver which will pick (or create) for us a
-    // transport and a profile from the effective_target.
-    Profile_Transport_Resolver resolver (
-      effective_target.in (),
-      stub,
-      (details.response_flags () != Messaging::SYNC_NONE));
-
-    resolver.resolve (max_wait_time
-                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    // Update the request id now that we have a transport
-    details.request_id (resolver.transport ()->tms ()->request_id ());
-
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-    if (this->type_ == TAO_ONEWAY_INVOCATION)
-      {
-        return this->invoke_oneway (details,
-                                    effective_target,
-                                    resolver,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
-      }
-    else if (this->type_ == TAO_TWOWAY_INVOCATION)
-      {
-        return this->invoke_twoway (details,
-                                    effective_target,
-                                    resolver,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
-      }
-
-    return s;
-  }
-
-  Invocation_Status
-  Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details,
-                                     CORBA::Object_var &effective_target,
-                                     Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
-  {
-    // Simple sanity check
-    if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION ||
-        this->type_ != TAO_TWOWAY_INVOCATION)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    TAO::Synch_Twoway_Invocation synch (this->target_,
-                                        r,
-                                        details);
-
-    Invocation_Status status =
-      synch.remote_twoway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (status == TAO_INVOKE_RESTART &&
-        synch.is_forwarded ())
-      {
-        effective_target =
-          synch.steal_forwarded_reference ();
-
-        this->object_forwarded (effective_target,
-                                r.stub ()
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-      }
-
-    return status;
-  }
-
-  Invocation_Status
-  Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details,
-                                     CORBA::Object_var &effective_target,
-                                     Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
-  {
-    TAO::Synch_Oneway_Invocation synch (this->target_,
-                                        r,
-                                        details);
-
-    Invocation_Status s =
-      synch.remote_oneway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s == TAO_INVOKE_RESTART &&
-        synch.is_forwarded ())
-      {
-        effective_target =
-          synch.steal_forwarded_reference ();
-
-        this->object_forwarded (effective_target,
-                                r.stub ()
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-      }
-
-    return s;
-  }
-
-  void
-  Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
-                                        TAO_Stub *stub
-                                        ACE_ENV_ARG_DECL)
-  {
-    // The object pointer has to be changed to a TAO_Stub pointer
-    // in order to obtain the profiles.
-    TAO_Stub *stubobj =
-      effective_target->_stubobj ();
-
-    if (stubobj == 0)
-      ACE_THROW (CORBA::INTERNAL (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-          errno),
-        CORBA::COMPLETED_NO));
-
-
-    // Reset the profile in the stubs
-    stub->add_forward_profiles (stubobj->base_profiles ());
-
-    if (stub->next_profile () == 0)
-      ACE_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-          errno),
-        CORBA::COMPLETED_NO));
-
-    return;
-  }
-} // End namespace TAO
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
deleted file mode 100644
index d9f3ad21c1e..00000000000
--- a/TAO/tao/Invocation_Adapter.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Invocation_Adapter.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_INVOCATION_ADAPTER_H
-#define TAO_INVOCATION_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Global_Macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// @NOTE: Do not include any headers unessarily here.
-#include "ace/CORBA_macros.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Invocation_Utils.h"
-#include "tao/Collocation_Strategy.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-
-struct TAO_Exception_Data;
-class TAO_Operation_Details;
-class TAO_Stub;
-class ACE_Time_Value;
-
-
-namespace  CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-
-  class Environment;
-}
-
-namespace TAO
-{
-  class Argument;
-  struct Exception_Data;
-  class Collocation_Proxy_Broker;
-  class Profile_Transport_Resolver;
-
-  /**
-   * @class Invocation_Adapter
-   *
-   * @brief Generic interface for the invocation object visible to the
-   * IDL compiler.
-   *
-   * The main objective of this class is to adapt the type and
-   * invocation specific information declared in the IDL by the
-   * application and convert them as CORBA invocations to the target
-   * object. Implementation of this class knows how to make
-   * invocations on a collocated or a remote object.
-   *
-   * This adapter class serves as the base class for various types of
-   * invocations like AMI, DII, DSI etc. Adapter classes for AMI, DII,
-   * DSI inherit from this class and their local behavioural
-   * information before kicking off an invocation.
-   *
-   * @@ More info..
-   * Wafer thin inclusions
-   * All stuff created on stack
-   * Only handles starts and restarts
-   *
-   */
-  class TAO_Export Invocation_Adapter
-  {
-  public:
-    /// The only constructor used by the IDL compiler, and only way to
-    /// create this adapter.
-    /**
-     * @param target Points to the object on which this invocation is
-     * being invoked.
-     *
-     * @param args Array of pointers to the argument list in the
-     * operation declaration. this includes the return, inout and out
-     * arguments.
-     *
-     * @param arg_number Number of arguments in the above array. This
-     * is the number of elements in the above array.
-     *
-     * @param operation The name of the operation being invoked.
-     *
-     * @param op_len Number of charecters in the operation name. This
-     * is an optimization which helps us to avoid calling strlen ()
-     * while creating a message format.
-     *
-     * @param cpb The collocation proxy broker for the target if one
-     * exists. This is useful especially to route the call to the
-     * collocated target.
-     *
-     * @param type The operation type which could be a oneway or two
-     * way operation. This information is available in the IDL file.
-     *
-     * @param mode Invocation mode. This information is also available
-     * in the IDL file and in the generated code.
-     */
-    Invocation_Adapter (CORBA::Object_ptr target,
-                        Argument **args,
-                        int arg_number,
-                        const char *operation,
-                        int op_len,
-                        Collocation_Proxy_Broker *cpb,
-                        TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION,
-                        TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
-
-    virtual ~Invocation_Adapter (void);
-
-    /// Invoke the target, and used by the generated code.
-    /**
-     * The implementation decides whether the target is remote or
-     * collocated and takes the right decision.
-     *
-     * @param ex Array of exception data declared by the application
-     * in their IDL.
-     *
-     * @param ex_count Number of elements in the array.
-     */
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
-  protected:
-    /**
-     * The stub pointer passed to this call has all the details about
-     * the object to which the invocation needs to be routed to. The
-     * implementation of this method looks if we are collocated or not
-     * and takes care of reinvoking the target if it receives
-     * forwarding information or if the first invocation fails
-     * for some reason, like a loss of connection during send () etc.
-     */
-    virtual void invoke_i (TAO_Stub *stub,
-                           TAO_Operation_Details &details
-                           ACE_ENV_ARG_DECL);
-
-    /**
-     * @name Helper methods for making different types of invocations.
-     *
-     * These methods useful for various types of invocations like
-     * SII, AMI, DII and DSI. All the subclasses implement these
-     * methods to get the right behaviour at their level.
-     */
-    //@{
-
-    /// Helper method that prepares the necessary stuff for a remote
-    /// invocation.
-
-    /*
-     * This method does the following essential activities needed for
-     * a remote invocation.
-     *
-     * - Extracts the roundtrip timeout policies set in the ORB or
-     *   Object or at the thread level
-     * - Uses the target information to pick a profile and a transport
-     *   object on which the invocation needs to be sent
-     *
-     * - Checks whether the operation is a oneway or twoway and
-     *   delegates the call.
-     */
-    virtual Invocation_Status invoke_remote_i (
-        TAO_Stub *stub,
-        TAO_Operation_Details &details,
-        CORBA::Object_var &effective_target,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-
-    /// Make a collocated call.
-    /**
-     * This method creates an object that takes care of making collocated
-     * invocations and calls invoke () on it. If the invoke ()
-     * returns with a location forwarded reply we return a restart
-     *
-     * @param stub The stub object on which the invocation is made.
-     *
-     * @param details The operations details of the operation that is being
-     * invoked.
-     */
-    virtual Invocation_Status invoke_collocated_i (
-        TAO_Stub *stub,
-        TAO_Operation_Details &details,
-        CORBA::Object_var &effective_target,
-        Collocation_Strategy strat
-        ACE_ENV_ARG_DECL);
-
-    /// Helper method to make a two way invocation.
-    /**
-     * This method creates a synchronous twoway invocation object to
-     * which the actual task of request handling is delegated. Once
-     * the invocation returns this method checks whether the request
-     * is forwarded to a new location.
-     */
-    virtual Invocation_Status invoke_twoway (
-        TAO_Operation_Details &details,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-
-    /// Helper method to make a one way invocation.
-    /**
-     * This method creates a synchronous oneway invocation object to
-     * which the actual task of request handling is delegated. Once
-     * the invocation returns this method checks whether the request
-     * is forwarded to a new location to take appropriate action.
-     */
-    virtual Invocation_Status invoke_oneway (
-        TAO_Operation_Details &details,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-    //@}
-
-    /// Helper function that extracts the roundtrip timeout policies
-    /// set in the ORB.
-    bool get_timeout (TAO_Stub *stub,
-                      ACE_Time_Value &val);
-
-    /// Helper method that extracts TAO_Stub from the target object.
-    TAO_Stub *get_stub (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// Helper method that takes care of setting the profiles within
-    /// the stub object if the target gets forwarded
-    void object_forwarded (CORBA::Object_var &effective_target,
-                           TAO_Stub *stub
-                           ACE_ENV_ARG_DECL);
-
-    /// Helper method to set the response flags within @a details
-    void set_response_flags (TAO_Stub *stub,
-                             TAO_Operation_Details &details);
-
-  private:
-    /// Dont allow default initializations
-    Invocation_Adapter (void);
-
-    // Prevent copying
-    Invocation_Adapter (Invocation_Adapter const &);
-    Invocation_Adapter & operator= (const Invocation_Adapter &);
-
-  protected:
-
-    /// The target object on which this invocation is carried out.
-    CORBA::Object_ptr target_;
-
-    /// Array of arguments for this operation
-    Argument ** const args_;
-
-    /// Number of arguments for this operation.
-    /**
-     * This includes the return values too
-     */
-    int const number_args_;
-
-    /// Name of the operation.
-    char const * operation_;
-
-    /// String length of the operation name.
-    int const op_len_;
-    
-    /// Collocation proxy broker for this operation.
-    Collocation_Proxy_Broker * const cpb_;
-
-    /// The invocation type
-    Invocation_Type const type_;
-
-    /// The invocation mode
-    Invocation_Mode const mode_;
-
-  };
-} // End namespace TAO
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl
deleted file mode 100644
index b0de6095f2b..00000000000
--- a/TAO/tao/Invocation_Adapter.inl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- C++ -*-
-// $Id$
-namespace TAO
-{
-  ACE_INLINE
-  Invocation_Adapter::Invocation_Adapter (
-      CORBA::Object *target,
-      Argument **args,
-      int arg_number,
-      const char *operation,
-      int op_len,
-      Collocation_Proxy_Broker *p,
-      Invocation_Type type,
-      Invocation_Mode mode)
-
-    : target_ (target)
-    , args_ (args)
-    , number_args_  (arg_number)
-    , operation_ (operation)
-    , op_len_ (op_len)
-    , cpb_ (p)
-    , type_ (type)
-    , mode_ (mode)
-  {
-  }
-
-  ACE_INLINE
-  Invocation_Adapter::~Invocation_Adapter (void)
-  {
-  }
-}
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
deleted file mode 100644
index 46caafc77e9..00000000000
--- a/TAO/tao/Invocation_Base.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-#include "Invocation_Base.h"
-#include "Stub.h"
-#include "operation_details.h"
-#include "ORB_Core.h"
-#include "TypeCode.h"
-#include "DynamicC.h"
-#include "SystemException.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "RequestInfo_Util.h"
-#endif /*TAO_HAS_INTERCEPTORS*/
-
-#if !defined (__ACE_INLINE__)
-# include "Invocation_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Invocation_Base,
-           "$Id$")
-
-namespace TAO
-{
-  Invocation_Base::Invocation_Base (CORBA::Object_ptr ot,
-                                    CORBA::Object_ptr t,
-                                    TAO_Stub *stub,
-                                    TAO_Operation_Details &details,
-                                    bool response_expected)
-    : details_ (details)
-    , forwarded_to_ (0)
-    , response_expected_ (response_expected)
-    , otarget_ (ot)
-    , target_ (t)
-    , orb_core_ (stub->orb_core ())
-    , stub_ (stub)
-#if TAO_HAS_INTERCEPTORS == 1
-    , adapter_ (orb_core_->client_request_interceptors (),
-                this)
-    , req_info_ (this)
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-  {
-  }
-
-  Invocation_Base::~Invocation_Base (void)
-  {
-  }
-
-  TAO_Service_Context &
-  Invocation_Base::request_service_context (void)
-  {
-    return this->details_.request_service_context ();
-  }
-
-  TAO_Service_Context &
-  Invocation_Base::reply_service_context (void)
-  {
-    return this->details_.reply_service_context ();
-  }
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-  char *
-  Invocation_Base::operation_name (void)
-  {
-    return const_cast<char *> (this->details_.opname ());
-  }
-
-  Dynamic::ParameterList *
-  Invocation_Base::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;
-
-    if (this->details_.parameter_list (*parameter_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_parameter_list._retn ();
-  }
-
-  Dynamic::ExceptionList *
-  Invocation_Base::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the argument 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;
-
-    if (this->details_.exception_list (*exception_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_exception_list._retn ();
-  }
-
-  CORBA::Any *
-  Invocation_Base::result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the result on demand.
-    static const 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;
-
-    if (this->details_.result (result_any) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_result_any._retn ();
-  }
-
-  CORBA::Octet
-  Invocation_Base::sync_scope (void) const
-  {
-    return this->details_.response_flags ();
-  }
-
-  Invocation_Status
-  Invocation_Base::send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_TRY
-      {
-        this->adapter_.send_request (&this->req_info_
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // This is a begin interception point
-        ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-        (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // This is a begin interception point
-        ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (this->forwarded_to_.in ())
-      return TAO_INVOKE_RESTART;
-
-    // What are the other cases??
-    return TAO_INVOKE_SUCCESS;
-  }
-
-  Invocation_Status
-  Invocation_Base::receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_TRY
-      {
-        this->adapter_.receive_reply (&this->req_info_
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-        (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    const PortableInterceptor::ReplyStatus status =
-      this->req_info_.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (status == PortableInterceptor::LOCATION_FORWARD ||
-        status == PortableInterceptor::TRANSPORT_RETRY)
-      return TAO_INVOKE_RESTART;
-
-    return TAO_INVOKE_SUCCESS;
-  }
-
-
-  Invocation_Status
-  Invocation_Base::receive_other_interception (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_TRY
-      {
-        this->adapter_.receive_other (&this->req_info_
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-        (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (this->forwarded_to_.in ())
-      return TAO_INVOKE_RESTART;
-
-    return TAO_INVOKE_SUCCESS;
-  }
-
-  PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_any_exception (CORBA::Exception *ex
-                                         ACE_ENV_ARG_DECL)
-  {
-    this->req_info_.exception (ex);
-
-    this->adapter_.receive_exception (&this->req_info_
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN);
-
-    const PortableInterceptor::ReplyStatus status =
-      this->req_info_.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (status);
-
-    return status;
-  }
-
-  PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_all_exception (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    CORBA::UNKNOWN ex;
-
-    this->req_info_.exception (&ex);
-
-    this->adapter_.receive_exception (&this->req_info_
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN);
-
-    const PortableInterceptor::ReplyStatus status =
-      this->req_info_.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (status);
-
-    return status;
-  }
-
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-}
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
deleted file mode 100644
index dccb182f438..00000000000
--- a/TAO/tao/Invocation_Base.h
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Invocation_Base.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_INVOCATION_BASE_H
-#define TAO_INVOCATION_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Invocation_Utils.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientRequestInterceptor_Adapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-namespace Dynamic
-{
-  class ExceptionList;
-  class ParameterList;
-}
-
-class TAO_Service_Context;
-class TAO_Operation_Details;
-class TAO_Stub;
-
-namespace TAO
-{
-  class Invocation_Adapter;
-
-  /**
-   * @class Invocation_Base
-   *
-   * @brief The base class for the invocation object
-   *
-   * This class is the base of the invocation object hiererachy. This
-   * hierarchy is classified  based on the type of invocation and the
-   * mode of invocation. One of the objects from the hierarchy is
-   * created on the stack for every invocation.
-   *
-   * In addition this class encapsulates the essential details that
-   * are required for PortableInterceptors to function
-   * correctly. Further this class also provides some helper and
-   * accessor methods that are used by clients.
-   *
-   */
-  class TAO_Export Invocation_Base
-  {
-  public:
-    virtual ~Invocation_Base (void);
-
-    //@{
-    /// Accessor and mutator methods
-    TAO_ORB_Core *orb_core (void) const;
-
-    TAO_Stub *stub (void) const;
-
-    /// Accessor and mutator methods for forwarded object
-    /// locations.
-    /**
-     * These access methods have to be public so that the
-     * PortableInterceptor can use them
-     */
-    CORBA::Object_ptr forwarded_reference (void);
-    void forwarded_reference (CORBA::Object_ptr o);
-
-    /// Accessors for the service context list.
-    /**
-     * The service context lists are actually cached
-     * elsewhere. Providing this accessor helps the PI to access this
-     * list in both remote and collocated mode.
-     */
-    TAO_Service_Context &request_service_context (void);
-    TAO_Service_Context &reply_service_context (void);
-
-    /// Return the forwarded object location by loosing ownership.
-    CORBA::Object_ptr steal_forwarded_reference (void);
-
-    /// Did the invocation got forwarded to a new location?
-    bool is_forwarded (void) const;
-
-    /// Mutator to set the reply status of the invocation.
-    void reply_received (Invocation_Status s);
-
-    /// Return the effective target of the invocation.
-    /**
-     * Please see the PortableInterceptor specification in the CORBA
-     * spec to understand what effective target means.
-     */
-    CORBA::Object_ptr effective_target (void) const;
-
-    /// Return the target object
-    CORBA::Object_ptr target (void) const;
-
-    /// Does this invocation return a response?
-    CORBA::Boolean  response_expected (void) const;
-    //@}
-
-  protected:
-    /**
-     * @param otarget The original target on which this invocation
-     * was started.
-     *
-     * @param target the target on which this invocation is flowing
-     * ie. the effective target
-     *
-     * @param op operation details of the invocation on @a target
-     *
-     * @param response_expected flag to indicate whether the
-     * operation encapsulated by @a op returns a response or not.
-     */
-    Invocation_Base (CORBA::Object_ptr otarget,
-                     CORBA::Object_ptr target,
-                     TAO_Stub *stub,
-                     TAO_Operation_Details &op,
-                     bool response_expected);
-
-  protected:
-    /// The operation details on which we are operating on.
-    TAO_Operation_Details &details_;
-
-    /// Forwarded object reference.
-    CORBA::Object_var forwarded_to_;
-
-    /// Is response expected?
-    bool response_expected_;
-
-  private:
-
-    ACE_UNIMPLEMENTED_FUNC (Invocation_Base & operator= (const Invocation_Base &))
-
-  private:
-    //@{
-    /**
-     * The following object reference pointers are *not*
-     * duplicated. They are cached for portable interceptors, and they
-     * just live for the lifetime of the request. Hence there is no
-     * point in duplicating the pointers.
-     */
-    /// The original target on which the invocation was started.
-    CORBA::Object_ptr otarget_;
-
-    /// The effective target on which the invocation is on.
-    CORBA::Object_ptr target_;
-
-    /// Cache the ORB_Core
-    TAO_ORB_Core *orb_core_;
-
-    TAO_Stub *stub_;
-    //@}
-
-    /// Operations invoked by the
-    /// PortableInterceptor::ClientRequestInfo object to get details
-    /// about the operation and related stuff.
-    //@{
-#if TAO_HAS_INTERCEPTORS == 1
-  public:
-    /// Return the name of the operation.
-    char *operation_name (void);
-
-    /// Return the list of arguments as a ParameterList
-    /**
-     * It is declared virtual so that the DynamicInterface can use its
-     * own way of creating the ParameterList.
-     */
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the list of exceptions declared as a ExceptionList
-    Dynamic::ExceptionList *exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the result of the operation as an Any.
-    CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the syncscope policy of the operation.
-    CORBA::Octet sync_scope (void) const;
-
-  protected:
-    /// Helper method to invoke send_request interception call to all
-    /// the registered interceptors.
-    Invocation_Status send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Helper method to invoke receive_reply interception call to all
-    /// the registered interceptors.
-    Invocation_Status receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Helper method to invoke receive_other interception call to all
-    /// the registered interceptors.
-    Invocation_Status receive_other_interception (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Helper methods to handle interception calls when exceptions
-    /// are thrown by the PortableInterceptor.
-    PortableInterceptor::ReplyStatus
-        handle_any_exception (CORBA::Exception *e
-                              ACE_ENV_ARG_DECL);
-
-    PortableInterceptor::ReplyStatus
-        handle_all_exception (ACE_ENV_SINGLE_ARG_DECL);
-
-  protected:
-    /// The client requestor adapter and the request info object for
-    /// making calls on all the registered interceptors.
-    ClientRequestInterceptor_Adapter adapter_;
-    TAO_ClientRequestInfo_i req_info_;
-
-
-#endif /*TAO_HAS_INTERCEPTORS*/
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "Invocation_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_INVOCATION_BASE_H*/
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
deleted file mode 100644
index d94053f3c18..00000000000
--- a/TAO/tao/Invocation_Base.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-// $Id$
-namespace TAO
-{
-  ACE_INLINE TAO_ORB_Core *
-  Invocation_Base::orb_core (void) const
-  {
-    return this->orb_core_;
-  }
-
-  ACE_INLINE TAO_Stub *
-  Invocation_Base::stub (void) const
-  {
-    return this->stub_;
-  }
-
-  ACE_INLINE void
-  Invocation_Base::forwarded_reference (CORBA::Object_ptr o)
-  {
-    this->forwarded_to_ = CORBA::Object::_duplicate (o);
-  }
-
-  ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::forwarded_reference (void)
-  {
-    return CORBA::Object::_duplicate (this->forwarded_to_.in ());
-  }
-
-  ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::steal_forwarded_reference (void)
-  {
-    return this->forwarded_to_._retn ();
-  }
-
-  ACE_INLINE void
-  Invocation_Base::reply_received (Invocation_Status s)
-  {
-#if TAO_HAS_INTERCEPTORS == 1
-    this->req_info_.reply_status (s);
-#endif /*TAO_HAS_INTERCEPTORS*/
-    ACE_UNUSED_ARG (s);
-  }
-
-  ACE_INLINE bool
-  Invocation_Base::is_forwarded (void) const
-  {
-    return (this->forwarded_to_.in () != 0);
-  }
-
-  ACE_INLINE CORBA::Boolean
-  Invocation_Base::response_expected (void) const
-  {
-    return this->response_expected_;
-  }
-
-  ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::target (void) const
-  {
-    return this->otarget_;
-  }
-
-  ACE_INLINE CORBA::Object_ptr
-  Invocation_Base::effective_target (void) const
-  {
-    return this->target_;
-  }
-
-
-
-}
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
deleted file mode 100644
index 0a31ce06b74..00000000000
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-//$Id$
-#include "tao/Invocation_Endpoint_Selectors.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "Base_Transport_Property.h"
-#include "Profile_Transport_Resolver.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           Invocation_Endpoint_Selectors,
-           "$Id$")
-
-TAO_Invocation_Endpoint_Selector::TAO_Invocation_Endpoint_Selector (void)
-{
-}
-
-TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
-{
-}
-
-// ****************************************************************
-
-TAO_Default_Endpoint_Selector::TAO_Default_Endpoint_Selector (void)
-{
-}
-
-TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
-{
-}
-
-void
-TAO_Default_Endpoint_Selector::select_endpoint (
-    TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
-{
-  do
-    {
-      r->profile (r->stub ()->profile_in_use ());
-
-      // Check whether we need to do a blocked wait or we have a
-      // non-blocked wait and we support that.  If this is not the
-      // case we can't use this profile so try the next.
-      if (r->blocked_connect () ||
-         (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
-        {
-          const size_t endpoint_count =
-            r->profile ()->endpoint_count ();
-
-          TAO_Endpoint *ep =
-            r->profile ()->endpoint ();
-
-          for (size_t i = 0; i < endpoint_count; ++i)
-            {
-              TAO_Base_Transport_Property desc (ep);
-              const bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-
-              // Check if the connect has completed.
-              if (retval)
-                return;
-
-              // Go to the next endpoint in this profile.
-              ep = ep->next ();
-            }
-        }
-    }
-  while (r->stub ()->next_profile_retry () != 0);
-
-  // If we get here, we completely failed to find an endpoint selector
-  // that we know how to use, so throw an exception.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
-}
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
deleted file mode 100644
index 776d6bc8411..00000000000
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Invocation_Endpoint_Selectors.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_INVOCATION_ENDPOINT_SELECTOR_H
-#define TAO_INVOCATION_ENDPOINT_SELECTOR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-
-class TAO_MProfile;
-class ACE_Time_Value;
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-}
-
-namespace CORBA
-{
-  class Exception;
-  class Environment;
-}
-/**
- * @class TAO_Invocation_Endpoint_Selector
- *
- * @brief Defines the interface for policy-based endpoint selection
- * strategies.
- *
- * Selects/reselects server endpoint for an Invocation.  Different
- * concrete strategies perform selection based on different
- * policies.
- * @par
- * All endpoint selection strategies are stateless objects - any
- * necessary state is stored in Invocation's
- * @c endpoint_selection_state_.
- */
-class TAO_Export TAO_Invocation_Endpoint_Selector
-{
-public:
-  /// Constructor.
-  TAO_Invocation_Endpoint_Selector (void);
-
-  /// Destructor.
-  virtual ~TAO_Invocation_Endpoint_Selector (void);
-
-  /// Select the endpoint and set @a r's @c profile_
-  virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL) = 0;
-
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Default_Endpoint_Selector
- *
- * @brief Default strategy for endpoint selection.
- *
- * This strategy is used when there are no policies set or when
- * the only policy set is RTCORBA::PriorityModelPolicy and its
- * value is RTCORBA::SERVER_DECLARED.
- * The strategy is to try the first endpoint from the first
- * profile in the IOR.  If that doesn't work, try the next
- * profile, and so on.
- */
-class TAO_Export TAO_Default_Endpoint_Selector :
-  public TAO_Invocation_Endpoint_Selector
-{
-public:
-  /// Constructor.
-  TAO_Default_Endpoint_Selector (void);
-
-  /// Destructor.
-  virtual ~TAO_Default_Endpoint_Selector (void);
-
-  virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
-};
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h
deleted file mode 100644
index 083f69cc0b1..00000000000
--- a/TAO/tao/Invocation_Utils.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Invocation_Utils.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_INVOCATION_UTILS_H
-#define TAO_INVOCATION_UTILS_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  enum Invocation_Status
-    {
-      /// Initial state of the FSM in the invocation class.
-      TAO_INVOKE_START = 0,
-      /// The request must be restarted, a temporary failure has
-      /// occured.
-      TAO_INVOKE_RESTART,
-      /// invoke() call successful. Final state of the FSM.
-      TAO_INVOKE_SUCCESS,
-      /// Received a user exception from the remote object, and this
-      /// is one of the final states.
-      TAO_INVOKE_USER_EXCEPTION,
-      /// Received a system exception from the remote object or the
-      /// PI and it is one of the final states
-      TAO_INVOKE_SYSTEM_EXCEPTION,
-      /// Invocation failed. It is a final state.
-      TAO_INVOKE_FAILURE
-    };
-
-  /// Enums for invocation types
-  enum Invocation_Type {
-    /// A simple oneway invocation
-    TAO_ONEWAY_INVOCATION,
-    /// A simple twoway invocation
-    TAO_TWOWAY_INVOCATION
-  };
-
-  /// Enum for invocation modes
-  enum Invocation_Mode {
-    /// Standard synchronous twoway
-    TAO_SYNCHRONOUS_INVOCATION,
-    /// Asynchronous twoway with callback model for collecting the
-    /// replies.
-    TAO_ASYNCHRONOUS_CALLBACK_INVOCATION,
-    /// Asynchronous twoway with poller model for collecting the
-    /// replies.
-    /// @note This is not supported in TAO now
-    TAO_ASYNCHRONOUS_POLLER_INVOCATION,
-    /// Types of DII
-    TAO_DII_INVOCATION,
-    TAO_DII_DEFERRED_INVOCATION
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_INVOCATION_UTILS_H */
diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp
deleted file mode 100644
index 492ed96e02a..00000000000
--- a/TAO/tao/LF_CH_Event.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "LF_CH_Event.h"
-
-ACE_RCSID(tao,
-          LF_Invocation_Event,
-          "$Id$")
-
-TAO_LF_CH_Event::TAO_LF_CH_Event (void)
-  : TAO_LF_Event (),
-    prev_state_ (TAO_LF_Event::LFS_IDLE)
-
-{
-}
-
-TAO_LF_CH_Event::~TAO_LF_CH_Event (void)
-{
-}
-
-void
-TAO_LF_CH_Event::state_changed_i (int new_state)
-{
-  if (this->state_ == new_state)
-    return;
-
-    // Validate the state change
-  if (this->state_ == TAO_LF_Event::LFS_IDLE)
-    {
-      // From the LFS_IDLE state we can only become active.
-      if (new_state == TAO_LF_Event::LFS_CONNECTION_WAIT)
-        {
-          this->prev_state_ = this->state_;
-          this->state_ = new_state;
-        }
-      return;
-    }
-  else if (this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT)
-    {
-      // Only a few states are possible from CONNECTION_WAIT states
-      if (new_state == TAO_LF_Event::LFS_CONNECTION_CLOSED
-          || new_state == TAO_LF_Event::LFS_SUCCESS)
-        {
-          this->prev_state_ = this->state_;
-          this->state_ = new_state;
-        }
-
-      return;
-    }
-  else if (this->state_ == TAO_LF_Event::LFS_SUCCESS)
-    {
-      if (new_state == TAO_LF_Event::LFS_CONNECTION_CLOSED)
-        {
-          this->prev_state_ = this->state_;
-          this->state_ = new_state;
-        }
-      return;
-    }
-  else if (this->state_ == TAO_LF_Event::LFS_TIMEOUT)
-    {
-      if (new_state == TAO_LF_Event::LFS_CONNECTION_CLOSED)
-        {
-          // Dont reset the previous state
-          this->state_ = new_state;
-        }
-    }
-  return;
-}
-
-
-int
-TAO_LF_CH_Event::successful (void) const
-{
-  if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT)
-    return this->state_ == TAO_LF_Event::LFS_SUCCESS;
-
-  return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
-}
-
-int
-TAO_LF_CH_Event::error_detected (void) const
-{
-  if (this->prev_state_ == TAO_LF_Event::LFS_CONNECTION_WAIT)
-    return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
-
-  return 0;
-}
-
-void
-TAO_LF_CH_Event::set_state (int new_state)
-{
-  // @@ NOTE: Is this still required?
-  if (this->is_state_final () == 0
-      && new_state == TAO_LF_Event::LFS_TIMEOUT)
-    {
-      this->state_ = new_state;
-    }
-}
-
-
-int
-TAO_LF_CH_Event::is_state_final (void)
-{
-  return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED;
-}
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
deleted file mode 100644
index af303857916..00000000000
--- a/TAO/tao/LF_CH_Event.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_CH_Event.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_CH_EVENT_H
-#define TAO_LF_CH_EVENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "LF_Event.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_LF_CH_Event
- *
- * @brief Use the Leader/Follower loop to wait for one specific event
- * in the invocation path.
- *
- * Concrete event types and manipulation class which is used for
- * connection handling purposes.
- */
-class TAO_Export TAO_LF_CH_Event: public TAO_LF_Event
-{
-public:
-  /// Constructor
-  TAO_LF_CH_Event (void);
-
-  /// Destructor
-  virtual ~TAO_LF_CH_Event (void);
-
-  //@{
-  /// Return 1 if the condition was satisfied successfully, 0 if it
-  /// has not
-  int successful (void) const;
-
-  /// Return 1 if an error was detected while waiting for the
-  /// event
-  int error_detected (void) const;
-
-
-  /// Reset the state, irrespective of the previous states
-  void reset_state (int new_state);
-
-protected:
-
-  /// Check whether we have reached the final state..
-  virtual int is_state_final (void);
-
-  //@}
-private:
-  /// Validate and change the state
-  /*
-   * This concrete class uses the following states declared in the
-   * class TAO_LF_Event to transition states
-   *
-   * LFS_IDLE                  - The event is created, and is in
-   *                             initial  state.
-   *
-   * LFS_CONNECTION_WAIT       - The event is waiting for connection
-   *                             completion and it can transition to
-   *                             any of the following states, all the
-   *                             states are final.
-   *
-   * LFS_SUCCESS               - The event, connection establishment, has
-   *                             completed successfully.
-   *
-   * LFS_TIMEOUT               - The event has timed out.
-   *
-   * LFS_CONNECTION_CLOSED     - The connection was closed since
-   *                             an error occured while trying to
-   *                             establish connection
-   *
-   *  Event State Diagram
-   *  -------------------
-   *                              |----> CLOSED
-   *                              |        ^
-   *                              |        |
-   *   IDLE ---> CONNECTION_WAIT--|        |
-   *                              |        |
-   *                              |        |
-   *                              |----> SUCESS
-   *
-   * Timeouts can occur while waiting for connections.
-   *
-   */
-  virtual void state_changed_i (int new_state);
-
-  /// Set the state irrespective of anything.
-  virtual void set_state (int new_state);
-
-private:
-
-  /// The previous state that the LF_CH_Event was in
-  int prev_state_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_CH_EVENT_H */
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
deleted file mode 100644
index 3acdc624452..00000000000
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "LF_Connect_Strategy.h"
-#include "Connection_Handler.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "Transport.h"
-#include "ace/Synch_Options.h"
-
-ACE_RCSID(tao,
-          LF_Connect_Strategy,
-          "$Id$")
-
-TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy (
-    TAO_ORB_Core *orb_core)
-  : TAO_Connect_Strategy (orb_core)
-{
-}
-
-TAO_LF_Connect_Strategy::~TAO_LF_Connect_Strategy (void)
-{
-}
-
-void
-TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
-                                        ACE_Synch_Options &options)
-{
-  if (timeout != 0)
-    {
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   *timeout);
-    }
-  else
-    {
-      // Making it sure it is blocking.
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   ACE_Time_Value::zero);
-    }
-}
-
-int
-TAO_LF_Connect_Strategy::wait (TAO_Connection_Handler *ch,
-                               ACE_Time_Value *max_wait_time)
-{
-  ACE_ASSERT (ch != 0);
-
-  return this->wait (ch->transport (),
-                     max_wait_time);
-}
-
-int
-TAO_LF_Connect_Strategy::wait (TAO_Transport *transport,
-                               ACE_Time_Value *max_wait_time)
-{
-  // Basically the connection was EINPROGRESS, but before we could
-  // wait for it some other thread detected a failure and cleaned up
-  // the connection handler.
-  if (transport == 0)
-    return -1;
-
-  TAO_Connection_Handler *ch =
-    transport->connection_handler ();
-
-  TAO_Leader_Follower &leader_follower =
-    this->orb_core_->leader_follower ();
-
-  int result =
-    leader_follower.wait_for_event (ch,
-                                    transport,
-                                    max_wait_time);
-
-  // Set the result.
-  if (ch->error_detected () && result != -1)
-    result = -1;
-
-  return result;
-}
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
deleted file mode 100644
index 5ca99679939..00000000000
--- a/TAO/tao/LF_Connect_Strategy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Connect_Strategy.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_CONNECT_STRATEGY_H
-#define TAO_LF_CONNECT_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "Connect_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Connector;
-class ACE_Time_Value;
-class ACE_Synch_Options;
-
-/**
- * @class TAO_LF_Connect_Strategy
- *
- * @brief Concrete implementation of a connect strategy that waits on
- *  the leader-follower during asynch connects
- */
-
-class TAO_Export TAO_LF_Connect_Strategy : public TAO_Connect_Strategy
-{
-public:
-  /// Constructor
-  TAO_LF_Connect_Strategy (TAO_ORB_Core *orb);
-
-  /// Destructor
-  ~TAO_LF_Connect_Strategy (void);
-
-  /*
-   * Concrete implementation for this class. Please see
-   * Connect_Strategy.h for details
-   */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
-
-  virtual int wait (TAO_Connection_Handler *ch,
-                    ACE_Time_Value *val);
-
-  virtual int wait (TAO_Transport *ch,
-                    ACE_Time_Value *val);
-
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_LF_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
deleted file mode 100644
index be8e2cf2ca8..00000000000
--- a/TAO/tao/LF_Event.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-// $Id$
-#include "LF_Event.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Event.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Event, 
-           "$Id$")
-
-TAO_LF_Event::TAO_LF_Event (void)
-  : state_ (TAO_LF_Event::LFS_IDLE)
-  , follower_ (0)
-{
-}
-
-TAO_LF_Event::~TAO_LF_Event (void)
-{
-}
-
-void
-TAO_LF_Event::state_changed (int new_state)
-{
-  if (this->follower_ == 0)
-    {
-      this->state_changed_i (new_state);
-    }
-  else
-    {
-      TAO_Leader_Follower &leader_follower =
-        this->follower_->leader_follower ();
-
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock ());
-
-      if (this->is_state_final () == 0)
-        {
-          this->state_changed_i (new_state);
-
-          /// Sort of double-checked optimization..
-          if (this->follower_ != 0)
-            this->follower_->signal ();
-        }
-    }
-}
-
-
-void
-TAO_LF_Event::set_state (int new_state)
-{
-  this->state_ = new_state;
-}
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
deleted file mode 100644
index e5ada5292e6..00000000000
--- a/TAO/tao/LF_Event.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Event.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_EVENT_H
-#define TAO_LF_EVENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_LF_Follower;
-
-/**
- * @class TAO_LF_Event
- *
- * @brief Use the Leader/Follower loop to wait for one specific event.
- *
- * The Leader/Follower event loop is used to wait for incoming
- * responses, as well as to wait for all the data to be flushed.
- * This class encapsulates this event loop. It uses Template Method to
- * parametrize the 'waited for' predicate (i.e. reply received or
- * message sent or connection establishment etc.)
- *
- * @todo Implementing the Leader/Followers loop in this class, as
- * well as the callbacks to communicate that an event has completed
- * leads to excessive coupling.  A better design would use a separate
- * class to signal the events, that would allow us to remove the
- * Leader/Followers logic from the ORB.  However, that requires other
- * major changes and it somewhat complicates the design.
- *
- */
-class TAO_Export TAO_LF_Event
-{
-public:
-
-  friend class TAO_Leader_Follower;
-
-  /// Constructor
-  TAO_LF_Event (void);
-
-  /// Destructor
-  virtual ~TAO_LF_Event (void);
-
-  /// Bind a follower
-  /**
-   * An event can be waited on by at most one follower thread, this
-   * method is used to bind the waiting thread to the event, in order
-   * to let the event signal any important state changes.
-   *
-   * @return -1 if the LF_Event is already bound, 0 otherwise
-   */
-  int bind (TAO_LF_Follower *follower);
-
-  /// Unbind the follower
-  int unbind (void);
-
-  //@{
-  /** @name State management
-   *
-   * A Leader/Followers event goes through several states during its
-   * lifetime. We use an enum to represent those states and state
-   * changes are validated according to the rules defined in the
-   * concrete classes. We treat the states as finite states in a
-   * FSM. The possible sequence of states through which the FSM
-   * migrates is defined in the concrete classes.
-   */
-  enum {
-    /// The event is created, and is in initial state
-    LFS_IDLE = 0,
-    /// The event is active
-    LFS_ACTIVE,
-    /// The event is waiting for connection completion.
-    LFS_CONNECTION_WAIT,
-    /// The event has completed successfully
-    LFS_SUCCESS,
-    /// A failure has been detected while the event was active
-    LFS_FAILURE,
-    /// The event has timed out
-    LFS_TIMEOUT,
-    /// The connection was closed.
-    LFS_CONNECTION_CLOSED
-  };
-
-  /**
-   * Virtual methods for this class hierarchy..
-   */
-  /// Accessor to change the state. The state isnt changed unless
-  /// certain conditions are satisfied.
-  void state_changed (int new_state);
-
-  /// Return 1 if the condition was satisfied successfully, 0 if it
-  /// has not
-  virtual int successful (void) const = 0 ;
-
-  /// Return 1 if an error was detected while waiting for the
-  /// event
-  virtual int error_detected (void) const = 0;
-
-  /// Check if we should keep waiting.
-  int keep_waiting (void);
-  //@}
-
-  /// Reset the state, irrespective of the previous states
-  void reset_state (int new_state);
-
-protected:
-
-  /// Validate the state change
-  virtual void state_changed_i (int new_state) = 0;
-
-  /// Check whether we have reached the final state..
-  virtual int is_state_final (void) = 0;
-
-private:
-
-  /// Set the state irrespective of anything.
-  virtual void set_state (int new_state);
-
-protected:
-  /// The current state
-  int state_;
-
-  /// The bounded follower
-  TAO_LF_Follower *follower_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "LF_Event.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_EVENT_H */
diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl
deleted file mode 100644
index d6509c68430..00000000000
--- a/TAO/tao/LF_Event.inl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE int
-TAO_LF_Event::bind (TAO_LF_Follower *follower)
-{
-  if (this->follower_ != 0)
-    return -1;
-  this->follower_ = follower;
-  return 0;
-}
-
-ACE_INLINE int
-TAO_LF_Event::unbind (void)
-{
-  if (this->follower_ == 0)
-    return -1;
-  this->follower_ = 0;
-  return 0;
-}
-
-ACE_INLINE void
-TAO_LF_Event::reset_state (int new_state)
-{
-  this->state_ = new_state;
-}
-
-ACE_INLINE int
-TAO_LF_Event::keep_waiting (void)
-{
-  return (this->successful () == 0) && (this->error_detected () == 0);
-}
diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp
deleted file mode 100644
index a9fdf03c2ad..00000000000
--- a/TAO/tao/LF_Event_Binder.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Event_Binder.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Event_Binder.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Event_Binder, 
-           "$Id$")
-
-TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void)
-{
-  this->event_->unbind ();
-}
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
deleted file mode 100644
index 7dea4a58f61..00000000000
--- a/TAO/tao/LF_Event_Binder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Event_Binder.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_EVENT_BINDER_H
-#define TAO_LF_EVENT_BINDER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Event.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_LF_Follower;
-
-/**
- * @brief Implement an auto_ptr-like class for the TAO_LF_Followers
- * allocated via a TAO_Leader_Follower set.
- *
- * The Leader/Follower set is a factory for TAO_LF_Follower objects
- */
-class TAO_Export TAO_LF_Event_Binder
-{
-public:
-  /// Constructor
-  TAO_LF_Event_Binder (TAO_LF_Event *event,
-                       TAO_LF_Follower *folloer);
-
-  /// Destructor
-  ~TAO_LF_Event_Binder (void);
-
-private:
-  /// Keep a reference to the leader follower
-  TAO_LF_Event *event_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Event_Binder.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_EVENT_BINDER_H */
diff --git a/TAO/tao/LF_Event_Binder.inl b/TAO/tao/LF_Event_Binder.inl
deleted file mode 100644
index 12389b6c8cb..00000000000
--- a/TAO/tao/LF_Event_Binder.inl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event,
-                                          TAO_LF_Follower *follower)
-  : event_ (event)
-{
-  this->event_->bind (follower);
-}
-
-
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
deleted file mode 100644
index 42e295f27ed..00000000000
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Event_Loop_Thread_Helper.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Event_Loop_Thread_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Event_Loop_Thread_Helper, 
-           "$Id$")
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h
deleted file mode 100644
index c51bf5495a8..00000000000
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Event_Loop_Thread_Helper.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_EVENT_LOOP_THREAD_HELPER_H
-#define TAO_LF_EVENT_LOOP_THREAD_HELPER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @brief Helper class to enter and exit the Leader/Followers event
- * loop.
- *
- * Uses the Guard idiom to enter and exit the Leader/Followers event
- * loop.
- */
-class TAO_Export TAO_LF_Event_Loop_Thread_Helper
-{
-public:
-  /// Constructor
-  TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Follower &leader_follower,
-                                   TAO_LF_Strategy &lf_strategy,
-                                   ACE_Time_Value *max_wait_time);
-
-  /// Destructor
-  ~TAO_LF_Event_Loop_Thread_Helper (void);
-
-  /// Calls <set_event_loop_thread> on the leader/followers object.
-  int event_loop_return (void) const;
-
-private:
-  /// Reference to leader/followers object.
-  TAO_Leader_Follower &leader_follower_;
-
-  /// The Leader/Follower Strategy used by this ORB.
-  TAO_LF_Strategy &lf_strategy_;
-
-  /// Remembers the status returned while trying to enter the event
-  /// loop.
-  int event_loop_return_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Event_Loop_Thread_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_EVENT_LOOP_THREAD_HELPER_H */
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
deleted file mode 100644
index 62b5eada2d5..00000000000
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO_LF_Event_Loop_Thread_Helper::
-    TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Follower &leader_follower,
-                                     TAO_LF_Strategy &lf_strategy,
-                                     ACE_Time_Value *max_wait_time)
-      : leader_follower_ (leader_follower)
-      , lf_strategy_ (lf_strategy)
-{
-  this->event_loop_return_ =
-    this->lf_strategy_.set_event_loop_thread (max_wait_time, leader_follower_);
-}
-
-ACE_INLINE
-TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void)
-{
-  int call_reset = (this->event_loop_return_ == 0);
-  this->lf_strategy_.reset_event_loop_thread (call_reset,
-                                              this->leader_follower_);
-}
-
-ACE_INLINE int
-TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const
-{
-  return this->event_loop_return_;
-}
diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp
deleted file mode 100644
index ad9e3891d58..00000000000
--- a/TAO/tao/LF_Follower.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Follower.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Follower, 
-           "$Id$")
-
-TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower)
-  : leader_follower_ (leader_follower)
-  , condition_ (leader_follower.lock ())
-{
-}
-
-TAO_LF_Follower::~TAO_LF_Follower (void)
-{
-}
-
-int
-TAO_LF_Follower::signal (void)
-{
-  // We *must* remove ourselves from the list of followers, otherwise
-  // we could get signalled twice: to wake up as a follower and as the
-  // next leader.
-  // The follower may not be there if the reply is received while
-  // the consumer is not yet waiting for it (i.e. it send the
-  // request but has not blocked to receive the reply yet).
-  // Ignore errors.
-  (void) this->leader_follower_.remove_follower (this);
-
-  return this->condition_.signal ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Intrusive_List_Node<TAO_LF_Follower>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Intrusive_List_Node<TAO_LF_Follower>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h
deleted file mode 100644
index efd4a0ccbf0..00000000000
--- a/TAO/tao/LF_Follower.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Follower.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_FOLLOWER_H
-#define TAO_LF_FOLLOWER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Intrusive_List_Node.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Condition_Thread_Mutex.h"
-#include "ace/Synch_Traits.h"
-
-#include "tao/TAO_Export.h"
-
-class TAO_Leader_Follower;
-
-/**
- * @class TAO_LF_Follower
- *
- * @brief Represent a thread blocked, as a follower, in the
- *        Leader/Followers set.
- *
- * @todo Currently this class offers little abstraction, the follower
- * loop should be implemented by this class.
- *
- */
-class TAO_Export TAO_LF_Follower 
-  : public ACE_Intrusive_List_Node<TAO_LF_Follower>
-{
-public:
-  /// Constructor
-  TAO_LF_Follower (TAO_Leader_Follower &leader_follower);
-
-  /// Destructor
-  ~TAO_LF_Follower (void);
-
-  /// Access the leader follower that owns this follower
-  TAO_Leader_Follower &leader_follower (void);
-
-  /// Wait until on the underlying condition variable
-  int wait (ACE_Time_Value *tv);
-
-  /// Signal the underlying condition variable
-  int signal (void);
-
-private:
-  /// The Leader/Follower set this Follower belongs to
-  TAO_Leader_Follower &leader_follower_;
-
-  /// Condition variable used to
-  ACE_SYNCH_CONDITION condition_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Follower.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_FOLLOWER_H */
diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl
deleted file mode 100644
index b7e612b94ee..00000000000
--- a/TAO/tao/LF_Follower.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_Leader_Follower &
-TAO_LF_Follower::leader_follower (void)
-{
-  return this->leader_follower_;
-}
-
-ACE_INLINE int
-TAO_LF_Follower::wait (ACE_Time_Value *tv)
-{
-  return this->condition_.wait (tv);
-}
diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp
deleted file mode 100644
index 99659ea63b9..00000000000
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Follower_Auto_Adder.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Follower_Auto_Adder.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Follower_Auto_Adder, 
-           "$Id$")
-
-TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void)
-{
-  this->leader_follower_.remove_follower (this->follower_);
-}
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
deleted file mode 100644
index 468bec0c1d0..00000000000
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Follower_Auto_Adder.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_FOLLOWER_AUTO_ADDER_H
-#define TAO_LF_FOLLOWER_AUTO_ADDER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Follower.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Leader_Follower.h"
-
-/**
- * @brief Implement an auto_adder-like class for the TAO_LF_Followers
- * allocated via a TAO_Leader_Follower set.
- *
- * The Leader/Follower set is a factory for TAO_LF_Follower objects
- */
-class TAO_Export TAO_LF_Follower_Auto_Adder
-{
-public:
-  /// Constructor
-  TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &,
-                              TAO_LF_Follower *follower);
-
-  /// Destructor
-  ~TAO_LF_Follower_Auto_Adder (void);
-
-private:
-  /// Keep a reference to the leader follower
-  TAO_Leader_Follower &leader_follower_;
-
-  /// The follower
-  TAO_LF_Follower *follower_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Follower_Auto_Adder.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_FOLLOWER_AUTO_ADDER_H */
diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl
deleted file mode 100644
index 62817754d77..00000000000
--- a/TAO/tao/LF_Follower_Auto_Adder.inl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_LF_Follower_Auto_Adder::
-    TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &lf,
-                                TAO_LF_Follower *follower)
-  : leader_follower_ (lf)
-  , follower_ (follower)
-{
-  (void) this->leader_follower_.add_follower (this->follower_);
-}
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp
deleted file mode 100644
index df1c8f51980..00000000000
--- a/TAO/tao/LF_Follower_Auto_Ptr.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Follower_Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Follower_Auto_Ptr.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Follower_Auto_Ptr, 
-           "$Id$")
-
-TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void)
-{
-  this->leader_follower_.release_follower (this->follower_);
-}
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h
deleted file mode 100644
index b1b13f5499b..00000000000
--- a/TAO/tao/LF_Follower_Auto_Ptr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Follower_Auto_Ptr.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_FOLLOWER_AUTO_PTR_H
-#define TAO_LF_FOLLOWER_AUTO_PTR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Follower.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Leader_Follower.h"
-
-/**
- * @brief Implement an auto_ptr-like class for the TAO_LF_Followers
- * allocated via a TAO_Leader_Follower set.
- *
- * The Leader/Follower set is a factory for TAO_LF_Follower objects
- */
-class TAO_Export TAO_LF_Follower_Auto_Ptr
-{
-public:
-  /// Constructor
-  TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &);
-
-  /// Destructor
-  ~TAO_LF_Follower_Auto_Ptr (void);
-
-  /// Implement the smart pointer methods
-  TAO_LF_Follower *get (void);
-  TAO_LF_Follower *operator->(void);
-  operator TAO_LF_Follower *(void);
-
-private:
-  /// Keep a reference to the leader follower
-  TAO_Leader_Follower &leader_follower_;
-
-  /// The follower
-  TAO_LF_Follower *follower_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Follower_Auto_Ptr.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_FOLLOWER_AUTO_PTR_H */
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl
deleted file mode 100644
index 43deadfca37..00000000000
--- a/TAO/tao/LF_Follower_Auto_Ptr.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf)
-  : leader_follower_ (lf)
-  , follower_ (leader_follower_.allocate_follower ())
-{
-}
-
-ACE_INLINE TAO_LF_Follower *
-TAO_LF_Follower_Auto_Ptr::get (void)
-{
-  return this->follower_;
-}
-
-ACE_INLINE TAO_LF_Follower *
-TAO_LF_Follower_Auto_Ptr::operator-> (void)
-{
-  return this->follower_;
-}
-
-ACE_INLINE
-TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void)
-{
-  return this->follower_;
-}
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
deleted file mode 100644
index 5dcd5a60402..00000000000
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-#include "LF_Invocation_Event.h"
-
-ACE_RCSID(tao,
-          LF_Invocation_Event,
-          "$Id$")
-
-TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void)
-  : TAO_LF_Event ()
-{
-}
-
-TAO_LF_Invocation_Event::~TAO_LF_Invocation_Event (void)
-{
-}
-
-void
-TAO_LF_Invocation_Event::state_changed_i (int new_state)
-{
-  if (this->state_ == new_state)
-    return;
-
-  // Validate the state change
-  if (this->state_ == TAO_LF_Event::LFS_IDLE)
-    {
-      // From the LFS_IDLE state we can only become active.
-      if (new_state == TAO_LF_Event::LFS_ACTIVE
-          || new_state == TAO_LF_Event::LFS_CONNECTION_CLOSED)
-        this->state_ = new_state;
-      return;
-    }
-  else if (this->state_ == TAO_LF_Event::LFS_ACTIVE)
-    {
-      // From LFS_ACTIVE we can only move to a few states
-      if (new_state != TAO_LF_Event::LFS_IDLE)
-        {
-          if (new_state == TAO_LF_Event::LFS_CONNECTION_CLOSED)
-            {
-              this->state_ = TAO_LF_Event::LFS_FAILURE;
-            }
-          else
-            {
-              this->state_ = new_state;
-            }
-        }
-      return;
-    }
-  else if (this->state_ == TAO_LF_Event::LFS_SUCCESS
-           || this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED)
-    {
-      // From the two states above we can go back to ACTIVE, as when a
-      // request is restarted.
-      if (new_state == TAO_LF_Event::LFS_ACTIVE)
-        {
-          this->state_ = new_state;
-        }
-      return;
-    }
-  else/* if (this->state_ == TAO_LF_Event::LFS_TIMEOUT || FAILURE */
-    {
-      // Other states are final..
-    }
-
-}
-
-int
-TAO_LF_Invocation_Event::successful (void) const
-{
-  return this->state_ == TAO_LF_Event::LFS_SUCCESS;
-}
-
-int
-TAO_LF_Invocation_Event::error_detected (void) const
-{
-  return (this->state_ == TAO_LF_Event::LFS_FAILURE
-          || this->state_ == TAO_LF_Event::LFS_TIMEOUT
-          || this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED);
-}
-
-int
-TAO_LF_Invocation_Event::is_state_final (void)
-{
-  if (this->state_ == TAO_LF_Event::LFS_TIMEOUT ||
-      this->state_ == TAO_LF_Event::LFS_FAILURE)
-    return 1;
-
-  return 0;
-}
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
deleted file mode 100644
index 98a836f5506..00000000000
--- a/TAO/tao/LF_Invocation_Event.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Invocation_Event.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_INVOCATION_EVENT_H
-#define TAO_LF_INVOCATION_EVENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "LF_Event.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_LF_Invocation_Event
- *
- * @brief Use the Leader/Follower loop to wait for one specific event
- * in the invocation path.
- *
- * Concrete event types and manipulation class through which the
- * invocation data path would flow. Typically state changes of
- * interest include whether a message has arrived, or timedout waiting
- * for a message or if the cionnection is closed waiting for a
- * message. Details of the states are documented within the class.
- *
- */
-class TAO_Export TAO_LF_Invocation_Event: public TAO_LF_Event
-{
-public:
-  /// Constructor
-  TAO_LF_Invocation_Event (void);
-
-  /// Destructor
-  virtual ~TAO_LF_Invocation_Event (void);
-
-  /// Return 1 if the condition was satisfied successfully, 0 if it
-  /// has not
-  int successful (void) const;
-
-  /// Return 1 if an error was detected while waiting for the
-  /// event
-  int error_detected (void) const;
-  //@}
-
-protected:
-
-  /// Validate and perform the state change
-  /*
-   * This concrete class uses the following states declared in the
-   * class TAO_LF_Event
-   *
-   * LFS_IDLE    - The event is created, and is in initial state.
-   * LFS_ACTIVE  - The event is active and it can transition to any of
-   *               the following states, all the states are final.
-   * LFS_SUCCESS - The event has completed successfully.
-   * LFS_FAILURE - A failure has been detected while the event was
-   *               active.
-   * LFS_TIMEOUT - The event has timed out.
-   * LFS_CONNECTION_CLOSED - The connection was closed when the state
-   *                         was active.
-   *
-   */
-  virtual void state_changed_i (int new_state);
-
-private:
-  /// Check whether we have reached the final state..
-  int is_state_final (void);
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_INVOCATION_EVENT_H */
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
deleted file mode 100644
index 2deb35e08eb..00000000000
--- a/TAO/tao/LF_Strategy.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Strategy.h"
-
-ACE_RCSID (tao,
-           LF_Strategy,
-           "$Id$")
-
-TAO_LF_Strategy::~TAO_LF_Strategy (void)
-{
-}
diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h
deleted file mode 100644
index 6b665bff5f1..00000000000
--- a/TAO/tao/LF_Strategy.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Strategy.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_STRATEGY_H
-#define TAO_LF_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Time_Value;
-class TAO_Leader_Follower;
-
-/**
- * @brief Strategize Leader/Follower manipulations in the ORB event
- * loop.
- *
- * The ORB event loop must participate in the Leader/Followers
- * protocol, but only if that concurrency model is configured,
- * otherwise performance suffers.
- *
- * This class strategizes the ORB behavior in this respect.
- */
-class TAO_Export TAO_LF_Strategy
-{
-public:
-  /// Destructor
-  virtual ~TAO_LF_Strategy (void);
-
-  /// The current thread will handle an upcall
-  /**
-   * Threads that handle requests can block for long periods of time,
-   * causing deadlocks if they don't elect a new leader before
-   * starting the upcall the system can become non-responsive or
-   * dead-lock.
-   */
-  virtual void set_upcall_thread (TAO_Leader_Follower &) = 0;
-
-  /// The current thread is entering the reactor event loop
-  /**
-   * Threads that block in the reactor event loop become "server"
-   * threads for the Leader/Follower set.  They must be flagged
-   * specially because they do not wait for one specific event, but
-   * for any event whatsoever.
-   */
-  virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
-                                     TAO_Leader_Follower &) = 0;
-
-  /// The current thread is leaving the event loop
-  /**
-   * When the thread leaves the event loop a new leader must be
-   * elected.
-   */
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_STRATEGY_H */
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
deleted file mode 100644
index 4b82afc1df5..00000000000
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/LF_Strategy_Complete.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/LF_Strategy_Complete.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           LF_Strategy_Complete, 
-           "$Id$")
-
-TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void)
-{
-}
-
-void
-TAO_LF_Strategy_Complete::set_upcall_thread (TAO_Leader_Follower &lf)
-{
-  lf.set_upcall_thread ();
-}
-
-int
-TAO_LF_Strategy_Complete::set_event_loop_thread (ACE_Time_Value *tv,
-                                                 TAO_Leader_Follower &lf)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, lf.lock (), -1);
-
-  return lf.set_event_loop_thread (tv);
-}
-
-void
-TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset,
-                                                   TAO_Leader_Follower &lf)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lf.lock ());
-
-  if (call_reset)
-    lf.reset_event_loop_thread ();
-
-  int result = lf.elect_new_leader ();
-
-  if (result == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("TAO (%P|%t) Failed to wake up ")
-                ACE_TEXT ("a follower thread\n")));
-}
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
deleted file mode 100644
index a0c1f4cf21d..00000000000
--- a/TAO/tao/LF_Strategy_Complete.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Strategy_Complete.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_STRATEGY_COMPLETE_H
-#define TAO_LF_STRATEGY_COMPLETE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @brief A concrete TAO_LF_Strategy for ORB configurations that use
- * the Leader/Followers event loop.
- */
-class TAO_Export TAO_LF_Strategy_Complete : public TAO_LF_Strategy
-{
-public:
-  /// Constructor
-  TAO_LF_Strategy_Complete (void);
-
-  //@{
-  /** @name Virtual Methods
-   *
-   * Please check the documentation in TAO_LF_Strategy
-   */
-  virtual ~TAO_LF_Strategy_Complete (void);
-
-  virtual void set_upcall_thread (TAO_Leader_Follower &);
-  virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
-                                     TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/LF_Strategy_Complete.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_STRATEGY_COMPLETE_H */
diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl
deleted file mode 100644
index 240b3ba5dd0..00000000000
--- a/TAO/tao/LF_Strategy_Complete.inl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_LF_Strategy_Complete::TAO_LF_Strategy_Complete (void)
-{
-}
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
deleted file mode 100644
index 4f814cbd1fa..00000000000
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#include "LRU_Connection_Purging_Strategy.h"
-#include "Transport.h"
-
-ACE_RCSID (tao, 
-           LRU_Connection_Purging_Strategy, 
-           "$Id$")
-
-TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy (
-                                                           int cache_maximum)
- : TAO_Connection_Purging_Strategy (cache_maximum),
-   order_ (0)
-{
-}
-
-
-TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void)
-{
-}
-
-
-void
-TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
-{
-  transport->purging_order (this->order_++);
-}
-
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h
deleted file mode 100644
index 07f1fdfd307..00000000000
--- a/TAO/tao/LRU_Connection_Purging_Strategy.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// ================================================================
-/**
- *  @file   LRU_Connection_Purging_Strategy.h
- *
- *  $Id$
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- */
-// ================================================================
-
-#ifndef TAO_LRU_PURGING_STRATEGY_H
-#define TAO_LRU_PURGING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Connection_Purging_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// ****************************************************************
-
-/**
- * @class TAO_LRU_Connection_Purging_Strategy
- *
- * @brief The Least Recently Used connection purging strategy
- *
- * This class maintains it's own count which is applied to the
- * item passed in.  This way, the least recently used transport
- * has the smallest ordering number and will therefore be purged
- * first.
- */
-
-class TAO_Export TAO_LRU_Connection_Purging_Strategy 
-  : public TAO_Connection_Purging_Strategy
-{
-public:
-  /// The constructor
-  TAO_LRU_Connection_Purging_Strategy (int cache_maximum);
-
-  /// The destructor
-  virtual ~TAO_LRU_Connection_Purging_Strategy (void);
-
-  /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
-
-private:
-  /// The ordering information for each transport in the cache
-  unsigned long order_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LRU_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
deleted file mode 100644
index f3c6c725631..00000000000
--- a/TAO/tao/Leader_Follower.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-// $Id$
-
-#include "ace/Countdown_Time.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/Reactor.h"
-
-#include "tao/Leader_Follower.h"
-#include "tao/LF_Follower_Auto_Ptr.h"
-#include "tao/LF_Follower_Auto_Adder.h"
-#include "tao/LF_Event_Binder.h"
-#include "tao/debug.h"
-#include "tao/Transport.h"
-#include "tao/GUIResource_Factory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Leader_Follower.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Leader_Follower,
-           "$Id$")
-
-TAO_Leader_Follower::~TAO_Leader_Follower (void)
-{
-  while (!this->follower_free_list_.empty ())
-    {
-      TAO_LF_Follower *follower =
-        this->follower_free_list_.pop_front ();
-      delete follower;
-    }
-  // Hand the reactor back to the resource factory.
-  // use GUI reactor factory if available
-  if ( this->orb_core_->gui_resource_factory () )
-    this->orb_core_->gui_resource_factory ()->reclaim_reactor (this->reactor_);
-  else
-    this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_);
-
-  this->reactor_ = 0;
-}
-
-TAO_LF_Follower *
-TAO_Leader_Follower::allocate_follower (void)
-{
-  if (!this->follower_free_list_.empty ())
-    return this->follower_free_list_.pop_front ();
-
-  return new TAO_LF_Follower (*this);
-}
-
-void
-TAO_Leader_Follower::release_follower (TAO_LF_Follower *follower)
-{
-  this->follower_free_list_.push_front (follower);
-}
-
-int
-TAO_Leader_Follower::elect_new_leader_i (void)
-{
-  TAO_LF_Follower* follower =
-    this->follower_set_.head ();
-
-#if defined (TAO_DEBUG_LEADER_FOLLOWER)
-  ACE_DEBUG ((LM_DEBUG,
-              "TAO (%P|%t) LF::elect_new_leader_i - "
-              "follower is %x\n",
-              follower));
-#endif /* TAO_DEBUG_LEADER_FOLLOWER */
-
-  return follower->signal ();
-}
-
-int
-TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wait_time)
-{
-  int result = 0;
-  ACE_Countdown_Time countdown (max_wait_time);
-
-  // Note that we are waiting.
-  ++this->event_loop_threads_waiting_;
-
-  while (this->client_thread_is_leader_ &&
-         result != -1)
-    {
-      if (max_wait_time == 0)
-        {
-          if (this->event_loop_threads_condition_.wait () == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t): TAO_Leader_Follower::wait_for_client_leader_to_complete - ")
-                          ACE_TEXT ("Condition variable wait failed\n")));
-
-              result = -1;
-            }
-        }
-      else
-        {
-          countdown.update ();
-          ACE_Time_Value tv = ACE_OS::gettimeofday ();
-          tv += *max_wait_time;
-          if (this->event_loop_threads_condition_.wait (&tv) == -1)
-            {
-              if (errno != ETIME)
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("TAO (%P|%t): TAO_Leader_Follower::wait_for_client_leader_to_complete - ")
-                            ACE_TEXT ("Condition variable wait failed\n")));
-
-              result = -1;
-            }
-        }
-    }
-
-  // Reset waiting state.
-  --this->event_loop_threads_waiting_;
-
-  return result;
-}
-
-ACE_Reactor *
-TAO_Leader_Follower::reactor (void)
-{
-  if (this->reactor_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0);
-      if (this->reactor_ == 0)
-        {
-          // use GUI reactor factory if available
-          if ( this->orb_core_->gui_resource_factory () )
-            this->reactor_ =
-              this->orb_core_->gui_resource_factory ()->get_reactor ();
-          else
-            this->reactor_ =
-              this->orb_core_->resource_factory ()->get_reactor ();
-        }
-    }
-  return this->reactor_;
-}
-
-void
-TAO_Leader_Follower::set_client_thread (void)
-{
-  // If we were a leader thread or an event loop thread, give up
-  // leadership.
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->event_loop_thread_ ||
-      tss->client_leader_thread_)
-    {
-      --this->leaders_;
-    }
-
-  if (this->clients_ == 0 &&
-      this->orb_core_->has_shutdown () &&
-      !this->orb_core_->resource_factory ()->drop_replies_during_shutdown ())
-    {
-      // The ORB has shutdown and we are the first client after
-      // that. This means that the reactor is disabled, we must
-      // re-enable it if we want to receive any replys...
-      this->orb_core_->reactor ()->reset_reactor_event_loop ();
-    }
-  this->clients_++;
-}
-
-void
-TAO_Leader_Follower::reset_client_thread (void)
-{
-  // If we were a leader thread or an event loop thread, take back
-  // leadership.
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->event_loop_thread_ ||
-      tss->client_leader_thread_)
-    {
-      ++this->leaders_;
-    }
-
-  this->clients_--;
-  if (this->clients_ == 0 &&
-      this->orb_core_->has_shutdown ())
-    {
-      // The ORB has shutdown and we are the last client thread, we
-      // must stop the reactor to ensure that any server threads go
-      // away.
-      this->orb_core_->reactor ()->end_reactor_event_loop ();
-    }
-}
-
-int
-TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
-                                     TAO_Transport *transport,
-                                     ACE_Time_Value *max_wait_time)
-{
-  // Obtain the lock.
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), -1);
-
-  ACE_Countdown_Time countdown (max_wait_time);
-
-  // Optmize the first iteration [no access to errno]
-  int result = 1;
-
-  // For some cases the transport may dissappear like when waiting for
-  // connection to be initiated or closed. So cache the id.
-  // @@ NOTE: This is not completely safe either. We will be fine for
-  // cases that dont access the id ie. when debug level is off but
-  // with debugging level on we are on a sticky wicket. Hopefully none
-  // of our users should run TAO with debugging enabled like they did
-  // in PathFinder
-  size_t t_id = 0;
-
-  if (TAO_debug_level)
-    {
-      t_id = transport->id ();
-    }
-
-  {
-    // Calls this->set_client_thread () on construction and
-    // this->reset_client_thread () on destruction.
-    TAO_LF_Client_Thread_Helper client_thread_helper (*this);
-    ACE_UNUSED_ARG (client_thread_helper);
-
-    // Check if there is a leader.  Note that it cannot be us since we
-    // gave up our leadership when we became a client.
-    if (this->leader_available ())
-      {
-        // = Wait as a follower.
-
-        // Grab a follower:
-        TAO_LF_Follower_Auto_Ptr follower (*this);
-        if (follower.get () == 0)
-          return -1;
-
-        if (TAO_debug_level >= 5)
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                      " (follower), cond <%x>\n",
-                      t_id, follower.get ()));
-
-        // Bound the follower and the LF_Event, this is important to
-        // get a signal when the event terminates
-        TAO_LF_Event_Binder event_binder (event, follower.get ());
-
-        while (event->keep_waiting () &&
-               this->leader_available ())
-          {
-            // Add ourselves to the list, do it everytime we wake up
-            // from the CV loop. Because:
-            //
-            // - The leader thread could have elected us as the new
-            // leader.
-            // - Before we can assume the role another thread becomes
-            // the leader
-            // - But our condition variable could have been removed
-            // already, if we don't add it again we will never wake
-            // up.
-            //
-            // Notice that we can have spurious wake ups, in that case
-            // adding the leader results in an error, that must be
-            // ignored.
-            // You may be thinking of not removing the condition
-            // variable in the code that sends the signal, but
-            // removing it here, that does not work either, in that
-            // case the condition variable may be used twice:
-            //
-            //  - Wake up because its reply arrived
-            //  - Wake up because it must become the leader
-            //
-            // but only the first one has any effect, so the leader is
-            // lost.
-            //
-
-            TAO_LF_Follower_Auto_Adder auto_adder (*this, follower);
-
-            if (max_wait_time == 0)
-              {
-                if (follower->wait (max_wait_time) == -1)
-                  {
-                    if (TAO_debug_level >= 5)
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, "
-                                  " (follower) [no timer, cond failed]\n",
-                                  t_id));
-
-                    // @@ Michael: What is our error handling in this case?
-                    //             We could be elected as leader and
-                    //             no leader would come in?
-                    return -1;
-                  }
-              }
-            else
-              {
-                countdown.update ();
-                ACE_Time_Value tv = ACE_OS::gettimeofday ();
-                tv += *max_wait_time;
-                if (follower->wait (&tv) == -1)
-                  {
-                    if (TAO_debug_level >= 5)
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "TAO (%P|%t) - Leader_Follower[%d]::wait, "
-                                  "(follower) [has timer, follower failed]\n",
-                                  t_id ));
-
-                    // If we have timedout set the state in the
-                    // LF_Event. We call the non-locking,
-                    // no-signalling method on LF_Event.
-                    if (errno == ETIME)
-                        // We have timedout
-                        event->set_state (TAO_LF_Event::LFS_TIMEOUT);
-
-                    if (!event->successful ())
-                      {
-                        // Remove follower can fail because either
-                        // 1) the condition was satisfied (i.e. reply
-                        //    received or queue drained), or
-                        // 2) somebody elected us as leader, or
-                        // 3) the connection got closed.
-                        //
-                        // Therefore:
-                        // If remove_follower fails and the condition
-                        // was not satisfied, we know that we got
-                        // elected as a leader.
-                        // But we got a timeout, so we cannot become
-                        // the leader, therefore, we have to select a
-                        // new leader.
-                        //
-
-                        if (this->elect_new_leader () == -1
-                            && TAO_debug_level > 0)
-                          {
-                            ACE_ERROR ((LM_ERROR,
-                                        "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, "
-                                        "elect_new_leader failed\n",
-                                        t_id ));
-                          }
-                      }
-
-
-                    return -1;
-                  }
-              }
-          }
-
-        countdown.update ();
-
-        // @@ Michael: This is an old comment why we do not want to
-        //             remove the follower here.
-        // We should not remove the follower here, we *must* remove it when
-        // we signal it so the same condition is not signalled for
-        // both wake up as a follower and as the next leader.
-
-        if (TAO_debug_level >= 5)
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                      " done (follower), successful %d\n",
-                      t_id,
-                      event->successful ()));
-
-        // Now somebody woke us up to become a leader or to handle our
-        // input. We are already removed from the follower queue.
-
-        if (event->successful ())
-          return 0;
-
-        if (event->error_detected ())
-          return -1;
-
-        // FALLTHROUGH
-        // We only get here if we woke up but the reply is not
-        // complete yet, time to assume the leader role....
-        // i.e. ACE_ASSERT (event->successful () == 0);
-      }
-
-    // = Leader Code.
-
-    // The only way to reach this point is if we must become the
-    // leader, because there is no leader or we have to update to a
-    // leader or we are doing nested upcalls in this case we do
-    // increase the refcount on the leader in TAO_ORB_Core.
-
-    // Calls this->set_client_leader_thread () on
-    // construction and this->reset_client_leader_thread ()
-    // on destruction.  Note that this may increase the refcount of
-    // the leader.
-    TAO_LF_Client_Leader_Thread_Helper client_leader_thread_helper (*this);
-    ACE_UNUSED_ARG (client_leader_thread_helper);
-
-    {
-      ACE_GUARD_RETURN (ACE_Reverse_Lock<TAO_SYNCH_MUTEX>, rev_mon,
-                        this->reverse_lock (), -1);
-
-      // Become owner of the reactor.
-      ACE_Reactor *reactor = this->reactor_;
-      reactor->owner (ACE_Thread::self ());
-
-      // Run the reactor event loop.
-
-      if (TAO_debug_level >= 5)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                    " (leader) enter reactor event loop\n",
-                    t_id));
-
-      // If we got our event, no need to run the event loop any
-      // further.
-      while (event->keep_waiting ())
-        {
-          // Run the event loop.
-          result = reactor->handle_events (max_wait_time);
-
-          // Did we timeout? If so, stop running the loop.
-          if (result == 0 &&
-              max_wait_time != 0 &&
-              *max_wait_time == ACE_Time_Value::zero)
-            break;
-
-          // Other errors? If so, stop running the loop.
-          if (result == -1)
-            break;
-
-          // Otherwise, keep going...
-        }
-
-      if (TAO_debug_level >= 5)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                    " (leader) exit reactor event loop\n",
-                    t_id));
-    }
-  }
-  //
-  // End artificial scope for auto_ptr like helpers calling:
-  // this->reset_client_thread () and (maybe)
-  // this->reset_client_leader_thread ().
-  //
-
-  // Wake up the next leader, we cannot do that in handle_input,
-  // because the woken up thread would try to get into handle_events,
-  // which is at the time in handle_input still occupied. But do it
-  // before checking the error in <result>, even if there is an error
-  // in our input we should continue running the loop in another
-  // thread.
-
-  if (this->elect_new_leader () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                       " failed to elect new leader\n",
-                       t_id),
-                      -1);
-
-  if (result == -1 && !this->reactor_->reactor_event_loop_done ())
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
-                       " handle_events failed\n",
-                       t_id),
-                      -1);
-
-  // Return an error if there was a problem receiving the reply...
-  if (max_wait_time != 0)
-    {
-      if (!event->successful ()
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-      else if (event->error_detected ())
-        {
-          // If the time did not expire yet, but we get a failure,
-          // e.g. the connections closed, we should still return an error.
-          result = -1;
-        }
-    }
-  else
-    {
-      /**
-       * There should be no reason to reset the value of result
-       * here. If there was an error in handle_events () that the
-       * leader saw, I (Bala) beleave it should be propogated to the
-       * clients.
-       * result = 0;
-       */
-      if (event->error_detected ())
-        {
-          result = -1;
-        }
-    }
-
-  return result;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Intrusive_List<TAO_LF_Follower>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Intrusive_List<TAO_LF_Follower>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h
deleted file mode 100644
index b5ac1d96e5c..00000000000
--- a/TAO/tao/Leader_Follower.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Leader_Follower.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_LEADER_FOLLOWER_H
-#define TAO_LEADER_FOLLOWER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/os_include/os_errno.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB_Core.h"
-#include "tao/New_Leader_Generator.h"
-#include "tao/LF_Follower.h"
-#include "ace/Reverse_Lock_T.h"
-#include "ace/Intrusive_List.h"
-#include "ace/Intrusive_List_Node.h"
-
-class TAO_LF_Event;
-class TAO_Transport;
-// class TAO_LF_Follower;
-
-/**
- * @class TAO_Leader_Follower
- *
- * @brief TAO_Leader_Follower
- *
- * TAO_Leader_Follower
- */
-class TAO_Export TAO_Leader_Follower
-{
-public:
-  /// Constructor
-  TAO_Leader_Follower (TAO_ORB_Core *orb_core,
-                       TAO_New_Leader_Generator *new_leader_generator = 0);
-
-  /// Destructor
-  ~TAO_Leader_Follower (void);
-
-  /// The current thread has become a server thread (i.e. called
-  /// ORB::run), update any flags and counters.
-  int set_event_loop_thread (ACE_Time_Value *max_wait_time);
-
-  /// The current thread is not a server thread anymore, reset any
-  /// flags and counters.
-  void reset_event_loop_thread (void);
-
-  /// This thread is going to perform an upcall, it will no longer be
-  /// an event loop thread.
-  void set_upcall_thread (void);
-
-  /// Is there any thread running as a leader?
-  int leader_available (void) const;
-
-  /// A server thread is making a request.
-  void set_client_thread (void);
-
-  /// A server thread has finished is making a request.
-  void reset_client_thread (void);
-
-  /// Wait on the Leader/Followers loop until one event happens.
-  /**
-   * @param event The event we wait for, the loop iterates until the
-   * event is sucessful, or it fails due to timeout, and error or a
-   * connection closed.
-   * @param transport The transport attached to the event
-   * @param max_wait_time Limit the time spent on the loop
-   * @param return Returns -1 on error, 0 or non-zero value
-   *  otherwise.
-   *
-   * @todo Document this better, split the Follower code to the
-   * TAO_LF_Follower class, we probably don't need the transport
-   * object.
-   */
-  int wait_for_event (TAO_LF_Event *event,
-                      TAO_Transport *transport,
-                      ACE_Time_Value *max_wait_time);
-
-  /// The current thread has become the leader thread in the
-  /// client side leader-follower set.
-  void set_client_leader_thread (void) ;
-
-  /// The current thread is no longer the leader thread in the client
-  /// side leader-follower set.
-  void reset_client_leader_thread (void) ;
-
-  /// sets the thread ID of the leader thread in the leader-follower
-  /// model
-  void set_client_leader_thread (ACE_thread_t thread_ID);
-
-  /// checks if we are a leader thread
-  int is_client_leader_thread (void) const;
-
-  /**
-   * A leader thread is relinquishing its role, unless there are more
-   * leader threads running pick up a follower (if there is any) to
-   * play the leader role.
-   */
-  int elect_new_leader (void);
-
-  /** @name Follower creation/destructions
-   *
-   * The Leader/Followers set acts as a factory for the Follower
-   * objects.  Followers are used to represent a thread blocked
-   * waiting in the Follower set.
-   *
-   * The Leader/Followers abstraction keeps a list of the waiting
-   * followers, so it can wake up one when the leader thread stops
-   * handling events.
-   *
-   * For performance reasons the Leader/Followers set uses a pool (or
-   * free-list) to keep Follower objects unattached to any thread.  It
-   * could be tempting to use TSS to keep such followers, after all a
-   * thread can only need one such Follower object, however, that does
-   * not work with multiple Leader/Followers sets, consult this bug
-   * report for more details:
-   *
-   * http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=296
-   *
-   */
-  //@{
-  /// Allocate a new follower to the caller.
-  TAO_LF_Follower *allocate_follower (void);
-
-  /// The caller has finished using a follower.
-  void release_follower (TAO_LF_Follower *);
-  //@}
-
-  /** @name Follower Set Operations
-   *
-   */
-  //@{
-  /// Add a new follower to the set
-  void add_follower (TAO_LF_Follower *follower);
-
-  /// Removes a follower from the leader-follower set
-  void remove_follower (TAO_LF_Follower *follower);
-
-  /// Checks if there are any followers available
-  /**
-   * @return 1 if there follower set is not empty
-   */
-  int follower_available (void) const;
-
-  //@}
-
-  /// Get a reference to the underlying mutex
-  TAO_SYNCH_MUTEX &lock (void);
-
-  /// Provide a pre-initialized reverse lock for the Leader/Followers
-  /// set.
-  /**
-   * The Leader/Followers set mutex must be release during some long
-   * running operations.  This helper class simplifies the process of
-   * releasing and reacquiring said mutex.
-   */
-  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void);
-
-  /// Check if there are any client threads running
-  int has_clients (void) const;
-
-  /// Accesor to the reactor
-  ACE_Reactor *reactor (void);
-
-  /// Called when we are out of leaders.
-  void no_leaders_available (void);
-
-private:
-  /// Shortcut to obtain the TSS resources of the orb core.
-  TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const;
-
-  /// Wait for the client leader to complete.
-  int wait_for_client_leader_to_complete (ACE_Time_Value *max_wait_time);
-
-  /**
-   * Implement the reset_event_loop_thread() method, once the TSS
-   * resources have been acquired.
-   * Also used in the set_upcall_thread.
-   */
-  void reset_event_loop_thread_i (TAO_ORB_Core_TSS_Resources *tss);
-
-  /** @name Follower Set Operations
-   *
-   */
-  //@{
-  /// Remote a follower from the Followers set and promote it to the
-  /// leader role.
-  /**
-   * This is a helper routine for elect_new_leader(), after verifying
-   * that all the pre-conditions are satisfied the Follower set is
-   * changed and the promoted Follower is signaled.
-   */
-  int elect_new_leader_i (void);
-
-  //@}
-
-private:
-  /// The orb core
-  TAO_ORB_Core *orb_core_;
-
-  /// To synchronize access to the members.
-  TAO_SYNCH_MUTEX lock_;
-
-  /// do protect the access to the following three members
-  ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock_;
-
-  /// Implement the Leader/Followers set using an intrusive list
-  typedef ACE_Intrusive_List<TAO_LF_Follower> Follower_Set;
-  Follower_Set follower_set_;
-
-  /// Use a free list to allocate and release Follower objects
-  Follower_Set follower_free_list_;
-
-  /**
-   * Count the number of active leaders.
-   * There could be many leaders in the thread pool (i.e. calling
-   * ORB::run), and the same leader could show up multiple times as it
-   * receives nested upcalls and sends more requests.
-   */
-  int leaders_;
-
-  /// Count the number of active clients, this is useful to know when
-  /// to deactivate the reactor
-  int clients_;
-
-  /// The reactor
-  ACE_Reactor *reactor_;
-
-  /// Is a client thread the current leader?
-  int client_thread_is_leader_;
-
-  /// Are server threads waiting for the client leader to complete?
-  int event_loop_threads_waiting_;
-
-  /// Condition variable for server threads waiting for the client
-  /// leader to complete.
-  TAO_SYNCH_CONDITION event_loop_threads_condition_;
-
-  /// Leader/Follower class uses this method to notify the system that
-  /// we are out of leaders.
-  TAO_New_Leader_Generator *new_leader_generator_;
-};
-
-class TAO_Export TAO_LF_Client_Thread_Helper
-{
-public:
-  /// Constructor
-  TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &leader_follower);
-
-  /// Destructor
-  ~TAO_LF_Client_Thread_Helper (void);
-
-private:
-  /// Reference to leader/followers object.
-  TAO_Leader_Follower &leader_follower_;
-};
-
-class TAO_Export TAO_LF_Client_Leader_Thread_Helper
-{
-public:
-  /// Constructor
-  TAO_LF_Client_Leader_Thread_Helper (TAO_Leader_Follower &leader_follower);
-
-  /// Destructor
-  ~TAO_LF_Client_Leader_Thread_Helper (void);
-
-private:
-  /// Reference to leader/followers object.
-  TAO_Leader_Follower &leader_follower_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Leader_Follower.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LEADER_FOLLOWER_H */
diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i
deleted file mode 100644
index cdc68d7e7bd..00000000000
--- a/TAO/tao/Leader_Follower.i
+++ /dev/null
@@ -1,219 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core,
-                                          TAO_New_Leader_Generator *new_leader_generator)
-  : orb_core_ (orb_core),
-    reverse_lock_ (lock_),
-    leaders_ (0),
-    clients_ (0),
-    reactor_ (0),
-    client_thread_is_leader_ (0),
-    event_loop_threads_waiting_ (0),
-    event_loop_threads_condition_ (lock_),
-    new_leader_generator_ (new_leader_generator)
-{
-}
-
-ACE_INLINE TAO_ORB_Core_TSS_Resources *
-TAO_Leader_Follower::get_tss_resources (void) const
-{
-  return this->orb_core_->get_tss_resources ();
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::follower_available (void) const
-{
-  return !this->follower_set_.empty ();
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::no_leaders_available (void)
-{
-  if (this->new_leader_generator_)
-    this->new_leader_generator_->no_leaders_available ();
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::elect_new_leader (void)
-{
-  if (this->leaders_ == 0)
-    {
-      if (this->event_loop_threads_waiting_)
-        {
-          return this->event_loop_threads_condition_.broadcast ();
-        }
-      else if (this->follower_available ())
-        {
-          return this->elect_new_leader_i ();
-        }
-      else
-        {
-          this->no_leaders_available ();
-        }
-    }
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::set_event_loop_thread (ACE_Time_Value *max_wait_time)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-
-  // Make sure that there is no other client thread run the show.  If
-  // we are the client thread running the show, then it is ok.
-  if (this->client_thread_is_leader_ &&
-      tss->client_leader_thread_ == 0)
-    {
-      int result =
-        this->wait_for_client_leader_to_complete (max_wait_time);
-
-      if (result != 0)
-        return result;
-    }
-
-  // If <event_loop_thread_> == 0 and <client_leader_thread_> == 0, we
-  // are running the event loop for the first time.  Therefore,
-  // increment the leaders.  Otherwise, simply increment
-  // <event_loop_thread_> since either (a) if <event_loop_thread_> !=
-  // 0 this is a nested call to the event loop, or (b)
-  // <client_leader_thread_> != 0 this is a call to the event loop
-  // while we are a client leader.
-  if (tss->event_loop_thread_ == 0 &&
-      tss->client_leader_thread_ == 0)
-    ++this->leaders_;
-
-  ++tss->event_loop_thread_;
-
-  return 0;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_event_loop_thread_i (TAO_ORB_Core_TSS_Resources *tss)
-{
-  // Always decrement <event_loop_thread_>. If <event_loop_thread_>
-  // reaches 0 and we are not a client leader, we are done with our
-  // duties of running the event loop. Therefore, decrement the
-  // leaders.  Otherwise, we just got done with a nested call to the
-  // event loop or a call to the event loop when we were the client
-  // leader.
-  --tss->event_loop_thread_;
-
-  if (tss->event_loop_thread_ == 0 &&
-      tss->client_leader_thread_ == 0)
-    --this->leaders_;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_event_loop_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss->event_loop_thread_ > 0)
-    this->reset_event_loop_thread_i (tss);
-}
-
-ACE_INLINE TAO_SYNCH_MUTEX &
-TAO_Leader_Follower::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::set_upcall_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-
-  if (tss->event_loop_thread_ > 0)
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock ());
-      this->reset_event_loop_thread_i (tss);
-
-      this->elect_new_leader ();
-    }
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::leader_available (void) const
-{
-  return this->leaders_ != 0;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::set_client_leader_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  ++this->leaders_;
-  ++this->client_thread_is_leader_;
-  ++tss->client_leader_thread_;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::reset_client_leader_thread (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  --tss->client_leader_thread_;
-  --this->leaders_;
-  --this->client_thread_is_leader_;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::is_client_leader_thread (void) const
-{
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  return tss->client_leader_thread_ != 0;
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::add_follower (TAO_LF_Follower *follower)
-{
-  this->follower_set_.push_back (follower);
-}
-
-ACE_INLINE void
-TAO_Leader_Follower::remove_follower (TAO_LF_Follower *follower)
-{
-  this->follower_set_.remove (follower);
-}
-
-ACE_INLINE ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &
-TAO_Leader_Follower::reverse_lock (void)
-{
-  return this->reverse_lock_;
-}
-
-ACE_INLINE int
-TAO_Leader_Follower::has_clients (void) const
-{
-  return this->clients_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_LF_Client_Thread_Helper::TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &leader_follower)
-  : leader_follower_ (leader_follower)
-{
-  this->leader_follower_.set_client_thread ();
-}
-
-ACE_INLINE
-TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper (void)
-{
-  this->leader_follower_.reset_client_thread ();
-}
-
-ACE_INLINE
-TAO_LF_Client_Leader_Thread_Helper::TAO_LF_Client_Leader_Thread_Helper (TAO_Leader_Follower &leader_follower)
-  : leader_follower_ (leader_follower)
-{
-  this->leader_follower_.set_client_leader_thread ();
-}
-
-ACE_INLINE
-TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void)
-{
-  this->leader_follower_.reset_client_leader_thread ();
-}
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
deleted file mode 100644
index 5c01508a736..00000000000
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/Leader_Follower_Flushing_Strategy.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Transport.h"
-#include "tao/Queued_Message.h"
-
-ACE_RCSID (tao, 
-           Leader_Follower_Flushing_Strategy, 
-           "$Id$")
-
-int
-TAO_Leader_Follower_Flushing_Strategy::schedule_output (TAO_Transport *transport)
-{
-  return transport->schedule_output_i ();
-}
-
-int
-TAO_Leader_Follower_Flushing_Strategy::cancel_output (
-    TAO_Transport *transport
-  )
-{
-  return transport->cancel_output_i ();
-}
-
-int
-TAO_Leader_Follower_Flushing_Strategy::flush_message (
-    TAO_Transport *transport,
-    TAO_Queued_Message *msg,
-    ACE_Time_Value *max_wait_time
-  )
-{
-  TAO_Leader_Follower &leader_follower =
-    transport->orb_core ()->leader_follower ();
-  return leader_follower.wait_for_event (msg, transport, max_wait_time);
-}
-
-int
-TAO_Leader_Follower_Flushing_Strategy::flush_transport (
-    TAO_Transport *transport
-  )
-{
-  // @todo This is not the right way to do this....
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_ORB_Core *orb_core = transport->orb_core ();
-
-      while (!transport->queue_is_empty ())
-        {
-          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (result == -1)
-            return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h
deleted file mode 100644
index ab2f4094968..00000000000
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Leader_Follower_Flushing_Strategy.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H
-#define TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "Flushing_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Leader_Follower_Flushing_Strategy
- *
- * @brief Implement a flushing strategy that uses the Leader/Follower
- *        set.
- */
-class TAO_Export TAO_Leader_Follower_Flushing_Strategy 
-  : public TAO_Flushing_Strategy
-{
-public:
-  virtual int schedule_output (TAO_Transport *transport);
-  virtual int cancel_output (TAO_Transport *transport);
-  virtual int flush_message (TAO_Transport *transport,
-                             TAO_Queued_Message *msg,
-                             ACE_Time_Value *max_wait_time);
-  virtual int flush_transport (TAO_Transport *transport);
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
deleted file mode 100644
index bba344b7c5a..00000000000
--- a/TAO/tao/LocalObject.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "LocalObject.h"
-
-#if !defined (__ACE_INLINE__)
-# include "LocalObject.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "SystemException.h"
-#include "debug.h"
-#include "ORB_Constants.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/Guard_T.h"
-
-ACE_RCSID (tao,
-           LocalObject,
-           "$Id$")
-
-CORBA::LocalObject::~LocalObject (void)
-{
-}
-
-void
-CORBA::LocalObject::_add_ref (void)
-{
-  // Do nothing as per CCM spec.
-}
-
-void
-CORBA::LocalObject::_remove_ref (void)
-{
-  // Do nothing as per CCM spec.
-}
-
-// Quickly hash an object reference's representation data.  Used to
-// create hash tables.
-
-CORBA::ULong
-CORBA::LocalObject::_hash (CORBA::ULong maximum
-                           ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Note that we reinterpret_cast to an "unsigned long" instead of
-  // CORBA::ULong since we need to first cast to an integer large
-  // enough to hold an address to avoid compile-time warnings on some
-  // 64-bit platforms.
-
-  const CORBA::ULong hash =
-    static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this));
-
-  return hash % maximum;
-}
-
-// Compare two object references to see if they point to the same
-// object.  Used in linear searches, as in hash buckets.
-//
-// XXX would be useful to also have a trivalued comparison predicate,
-// such as strcmp(), to allow more comparison algorithms.
-
-CORBA::Boolean
-CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj
-                                    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC (())
-{
-  return (other_obj == this) ? 1 : 0;
-}
-
-// TAO's extensions
-
-
-TAO::ObjectKey *
-CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (TAO_debug_level > 0)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("(%P|%t) Cannot get _key from a LocalObject!\n")));
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// NON_EXISTENT ... send a simple call to the object, which will
-// either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
-// the latter case, return FALSE.
-
-CORBA::Boolean
-CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  // Always return false.
-  return 0;
-}
-
-void
-CORBA::LocalObject::_create_request (CORBA::Context_ptr,
-                                     const char *,
-                                     CORBA::NVList_ptr,
-                                     CORBA::NamedValue_ptr,
-                                     CORBA::Request_ptr &,
-                                     CORBA::Flags
-                                     ACE_ENV_ARG_DECL)
-{
-  // @@ Correct minor code?  CCM spec says one thing CORBA spec says
-  //    another!
-  ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::LocalObject::_create_request (CORBA::Context_ptr,
-                                     const char *,
-                                     CORBA::NVList_ptr,
-                                     CORBA::NamedValue_ptr,
-                                     CORBA::ExceptionList_ptr,
-                                     CORBA::ContextList_ptr,
-                                     CORBA::Request_ptr &,
-                                     CORBA::Flags
-                                     ACE_ENV_ARG_DECL)
-{
-  // @@ Correct minor code?  CCM spec says one thing CORBA spec says
-  //    another!
-  ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Request_ptr
-CORBA::LocalObject::_request (const char *
-                              ACE_ENV_ARG_DECL)
-{
-  // @@ Correct minor code?  CCM spec says one thing CORBA spec says
-  //    another!
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Object_ptr
-CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::InterfaceDef_ptr
-CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::ImplementationDef_ptr
-CORBA::LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-CORBA::Policy_ptr
-CORBA::LocalObject::_get_policy (CORBA::PolicyType
-                                 ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Policy_ptr
-CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type
-                                        ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-CORBA::Object_ptr
-CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
-                                           CORBA::SetOverrideType
-                                           ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::PolicyList *
-CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
-                                           ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Boolean
-CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
-                                          ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-// ****************************************************************
-
-void
-TAO_Local_RefCounted_Object::_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->refcount_lock_);
-  ++this->refcount_;
-}
-
-void
-TAO_Local_RefCounted_Object::_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->refcount_lock_);
-    --this->refcount_;
-
-    if (this->refcount_ != 0)
-      return;
-  }
-
-  delete this;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::LocalObject>;
-  template class TAO_Pseudo_Out_T<CORBA::LocalObject, CORBA::LocalObject_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::LocalObject>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::LocalObject, CORBA::LocalObject_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
deleted file mode 100644
index 662f1471ab8..00000000000
--- a/TAO/tao/LocalObject.h
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file LocalObject.h
- *
- * $Id$
- *
- * Header file for CORBA's base "LocalObject" type.
- *
- * A "LocalObject" is an entity that can be the target of a local
- * invocation.  See the CORBA Component Model specification for
- * details.
- *
- * @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_CORBA_LOCALOBJECT_H
-#define TAO_CORBA_LOCALOBJECT_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Object.h"
-
-namespace CORBA
-{
-  class LocalObject;
-  typedef LocalObject *LocalObject_ptr;
-  typedef TAO_Pseudo_Var_T<LocalObject> LocalObject_var;
-  typedef TAO_Pseudo_Out_T<LocalObject, LocalObject_var> LocalObject_out;
-
-  /**
-   * @class LocalObject
-   *
-   * @note NW: It is not clear whether minimum CORBA should support
-   * LocalObject or not.  I think it should.
-   */
-  class TAO_Export LocalObject : public virtual CORBA::Object
-  {
-  public:
-
-    /// Destructor
-    virtual ~LocalObject (void);
-
-    /// Increment the ref count
-    static LocalObject_ptr _duplicate (LocalObject_ptr obj);
-
-    /// Return a NIL object
-    static LocalObject_ptr _nil (void);
-
-    /**
-     * @todo Narrowing a LocalObject to a CORBA::Object is broken
-     * right now.  The solution seems to be making CORBA::Object an
-     * abstract base class and create a CORBA::RemoteObject for
-     * regular object.  Or, even easier, add a @c is_local member into
-     * CORBA::Object.  I'll take the easier route for now.
-     */
-    static LocalObject_ptr _narrow (CORBA::Object_ptr obj
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-    /// Always returns false.
-    virtual CORBA::Boolean _non_existent (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Gets info about object from the Interface Repository.
-    virtual CORBA::InterfaceDef_ptr _get_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Throws NO_IMPLEMENT.
-    virtual CORBA::Object_ptr _get_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char * operation,
-                                  CORBA::NVList_ptr arg_list,
-                                  CORBA::NamedValue_ptr result,
-                                  CORBA::Request_ptr & request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char * operation,
-                                  CORBA::NVList_ptr arg_list,
-                                  CORBA::NamedValue_ptr result,
-                                  CORBA::ExceptionList_ptr exclist,
-                                  CORBA::ContextList_ptr ctxtlist,
-                                  CORBA::Request_ptr & request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Throws NO_IMPLEMENT.
-    virtual CORBA::Request_ptr _request (const char * operation
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Object_ptr _set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::PolicyList * _get_policy_overrides (
-        const CORBA::PolicyTypeSeq & types
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Boolean _validate_connection (
-        CORBA::PolicyList_out inconsistent_policies
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-    /**
-     * Return a hash value for this object.  The hash is based on the
-     * address of the object.  On non-32 bit platforms, the hash may
-     * be non-unique.
-     */
-    virtual CORBA::ULong _hash (CORBA::ULong maximum
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Try to determine if this object is the same as @c other_obj.
-     * This method relies on the representation of the object
-     * reference's private state.  Since that changes easily (when
-     * different ORB protocols are in use) there is no default
-     * implementation.
-     */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC (());
-
-    // = Reference count managment.
-    /// Increment the reference count.
-    virtual void _add_ref (void);
-
-    /// Decrement the reference count.
-    virtual void _remove_ref (void);
-
-    // = TAO extensions
-
-    /// Throws CORBA::NO_IMPLEMENT.
-    virtual TAO::ObjectKey * _key (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Useful for template programming.
-    typedef LocalObject_ptr _ptr_type;
-    typedef LocalObject_var _var_type;
-
-  protected:
-
-    /// Default constructor.
-    /**
-     * Make it protected to prevent instantiation of this class.
-     */
-    LocalObject (void);
-
-  private:
-
-    /**
-     * @name Unimplemented methods
-     */
-    //@{
-    LocalObject (const LocalObject &);
-    LocalObject & operator = (const LocalObject &);
-    //@}
-
-  };
-}   // End CORBA namespace
-
-/**
- * @class TAO_Local_RefCounted_Object
- *
- * @brief This class adds default reference counting to local
- *        objects.
- *
- * This is proprietary convenience class that implements reference
- * counting in locality constrained objects.
- */
-class TAO_Export TAO_Local_RefCounted_Object
-  : public virtual CORBA::LocalObject
-{
-public:
-
-  /// Increment reference count.
-  virtual void _add_ref (void);
-
-  /// Decrement reference count.
-  virtual void _remove_ref (void);
-
-protected:
-
-  // Default constructor.
-  /**
-   * Make it protected to prevent instantiation of this class.
-   */
-  TAO_Local_RefCounted_Object (void);
-
-private:
-
-  /**
-   * @name Unimplemented methods
-   */
-  //@{
-  TAO_Local_RefCounted_Object (const TAO_Local_RefCounted_Object &);
-  TAO_Local_RefCounted_Object & operator = (
-      const TAO_Local_RefCounted_Object &
-    );
-  //@}
-
-protected:
-
-  /// Mutex to protect reference count.
-  TAO_SYNCH_MUTEX refcount_lock_;
-
-  /// Number of outstanding references to this object.
-  CORBA::ULong refcount_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "LocalObject.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CORBA_LOCALOBJECT_H */
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
deleted file mode 100644
index b6d5816c85d..00000000000
--- a/TAO/tao/LocalObject.i
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-CORBA::LocalObject_ptr
-CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj)
-{
-  if (obj)
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-ACE_INLINE
-CORBA::LocalObject_ptr
-CORBA::LocalObject::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE
-CORBA::LocalObject_ptr
-CORBA::LocalObject::_narrow (CORBA::Object_ptr obj
-                             ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (obj->_is_local () != 0)
-    {
-      return CORBA::LocalObject::_duplicate (
-          dynamic_cast<CORBA::LocalObject_ptr> (obj)
-        );
-    }
-
-  return 0;
-}
-
-ACE_INLINE
-CORBA::LocalObject::LocalObject (void)
-  : Object (0)
-{
-}
-
-// =================================================================
-
-ACE_INLINE
-TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void)
-  : refcount_lock_ (),
-    refcount_ (1)
-{
-}
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
deleted file mode 100644
index 940f8347bc8..00000000000
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-#include "LocateRequest_Invocation.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "Stub.h"
-#include "Bind_Dispatcher_Guard.h"
-#include "Transport.h"
-#include "Synch_Reply_Dispatcher.h"
-#include "GIOP_Utils.h"
-#include "Profile.h"
-#include "ORB_Constants.h"
-
-#include "ace/Countdown_Time.h"
-
-ACE_RCSID (tao,
-           LocateRequest_Invocation,
-           "$Id$")
-
-namespace TAO
-{
-  LocateRequest_Invocation::LocateRequest_Invocation (
-      CORBA::Object_ptr otarget,
-      Profile_Transport_Resolver &resolver,
-      TAO_Operation_Details &detail
-    )
-    : Synch_Twoway_Invocation (otarget,
-                               resolver,
-                               detail)
-  {
-  }
-
-  Invocation_Status
-  LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time
-                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    ACE_Countdown_Time countdown (max_wait_time);
-
-    TAO_Synch_Reply_Dispatcher rd (this->resolver_.stub ()->orb_core (),
-                                   this->details_.reply_service_info ());
-
-    // Register a reply dispatcher for this invocation. Use the
-    // preallocated reply dispatcher.
-    TAO_Bind_Dispatcher_Guard dispatch_guard (this->details_.request_id (),
-                                              &rd,
-                                              this->resolver_.transport ()->tms ());
-
-    if (dispatch_guard.status () != 0)
-      {
-        // @@ What is the right way to handle this error? Do we need
-        // to call the interceptors in this case?
-        this->resolver_.transport ()->close_connection ();
-
-        ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
-                                           CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    TAO_Transport *transport =
-      this->resolver_.transport ();
-
-    TAO_OutputCDR &cdr =
-      transport->out_stream ();
-
-    int retval =
-      transport->generate_locate_request (tspec,
-                                          this->details_,
-                                          cdr);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (retval == -1)
-      return TAO_INVOKE_FAILURE;
-
-    countdown.update ();
-
-    Invocation_Status s =
-      this->send_message (cdr,
-                          TAO_Transport::TAO_TWOWAY_REQUEST,
-                          max_wait_time
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-
-    countdown.update ();
-
-    // For some strategies one may want to release the transport
-    // back to  cache. If the idling is successfull let the
-    // resolver about that.
-    if (this->resolver_.transport ()->idle_after_send ())
-      this->resolver_.transport_released ();
-
-    s =
-      this->wait_for_reply (max_wait_time,
-                            rd,
-                            dispatch_guard
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    s = this->check_reply (rd
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    // For some strategies one may want to release the transport
-    // back to  cache after receiving the reply. If the idling is
-    // successfull let the resolver about that.
-    if (this->resolver_.transport ()->idle_after_reply ())
-      this->resolver_.transport_released ();
-
-    return s;
-  }
-
-  Invocation_Status
-  LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd
-                                         ACE_ENV_ARG_DECL)
-  {
-    TAO_InputCDR &cdr =
-      rd.reply_cdr ();
-
-    // Set the translators
-    this->resolver_.transport ()->assign_translators (&cdr, 0);
-
-    switch (rd.reply_status ())
-      {
-      case TAO_GIOP_OBJECT_HERE:
-        break;
-      case TAO_GIOP_UNKNOWN_OBJECT:
-        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
-                                                   CORBA::COMPLETED_YES),
-                          TAO_INVOKE_FAILURE);
-      case TAO_GIOP_OBJECT_FORWARD:
-      case TAO_GIOP_OBJECT_FORWARD_PERM:
-        return this->location_forward (cdr
-                                       ACE_ENV_ARG_PARAMETER);
-
-      case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
-        {
-          // Pull the exception from the stream.
-          CORBA::String_var buf;
-
-          if ((cdr >> buf.inout ()) == 0)
-            {
-              // Could not demarshal the exception id, raise a local
-              // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                                CORBA::COMPLETED_MAYBE),
-                                TAO_INVOKE_SYSTEM_EXCEPTION);
-            }
-
-          // This kind of exception shouldn't happen with locate requests,
-          // but if it does, we turn it into a CORBA::UNKNOWN exception.
-          ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
-                                            CORBA::COMPLETED_YES),
-                            TAO_INVOKE_SYSTEM_EXCEPTION);
-        }
-      case TAO_GIOP_LOC_NEEDS_ADDRESSING_MODE:
-        {
-          // We have received an exception with a request to change the
-          // addressing mode. First let us read the mode that the
-          // server/agent asks for.
-          CORBA::Short addr_mode = 0;
-
-          if (cdr.read_short (addr_mode) == 0)
-            {
-              // Could not demarshal the addressing disposition, raise a local
-              // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
-                                                CORBA::COMPLETED_MAYBE),
-                                TAO_INVOKE_SUCCESS);
-            }
-
-          // Now set this addressing mode in the profile, so that
-          // the next invocation need not go through this.
-          this->resolver_.profile ()->addressing_mode (addr_mode
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_SUCCESS);
-
-          // Restart the invocation.
-          return TAO_INVOKE_RESTART;
-        }
-      }
-
-    return TAO_INVOKE_SUCCESS;
-  }
-}
diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h
deleted file mode 100644
index 9006ada4f05..00000000000
--- a/TAO/tao/LocateRequest_Invocation.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    LocateRequest_Invocation.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LOCATEREQUEST_INVOCATION_H
-#define TAO_LOCATEREQUEST_INVOCATION_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Global_Macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Synch_Invocation.h"
-
-class TAO_Synch_Reply_Dispatcher;
-
-namespace CORBA
-{
-  class SystemException;
-}
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-
-  /**
-   * @class LocateRequest_Invocation
-   *
-   * @brief Object created by TAO::LocateRequest_Invocation_Adapter to
-   * create and send LocateRequest invocation.
-   *
-   */
-  class TAO_Export LocateRequest_Invocation
-    : protected Synch_Twoway_Invocation
-  {
-  public:
-    /**
-     * @param otarget The target on which this invocation was
-     *  started.
-     *
-     * @param resolver Container of the profile and transport on
-     * which this invocation is on
-     *
-     * @param detail Operation details of the invocation on @a
-     * target. This is of no practical importance since it is not used
-     * in this class. This is just to keep our base class happy.
-     *
-     */
-    LocateRequest_Invocation (
-        CORBA::Object_ptr otarget,
-        Profile_Transport_Resolver &resolver,
-        TAO_Operation_Details &detail);
-
-    /// Start the invocation.
-    Invocation_Status invoke (ACE_Time_Value *max_wait_time
-                              ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-  private:
-    /// Helper to check the reply status
-    Invocation_Status check_reply (TAO_Synch_Reply_Dispatcher &rd
-                                   ACE_ENV_ARG_DECL);
-
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_LOCATEREQUEST_INVOCATION_H*/
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
deleted file mode 100644
index 527999bff53..00000000000
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "LocateRequest_Invocation_Adapter.h"
-#include "Profile_Transport_Resolver.h"
-#include "operation_details.h"
-#include "LocateRequest_Invocation.h"
-#include "Transport.h"
-#include "Transport_Mux_Strategy.h"
-#include "ORB_Core.h"
-
-ACE_RCSID (tao,
-           LocateRequest_Invocation_Adapter,
-           "$Id$")
-
-namespace TAO
-{
-  LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter (
-      CORBA::Object *target)
-    : target_ (target)
-      , list_ (0)
-  {
-  }
-
-  void
-  LocateRequest_Invocation_Adapter::invoke (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    CORBA::Object *effective_target = this->target_;
-
-    TAO_Stub *stub =
-      this->target_->_stubobj ();
-
-    if (stub == 0)
-      ACE_THROW (CORBA::INTERNAL (
-                     CORBA::SystemException::_tao_minor_code (
-                       0,
-                         EINVAL),
-                        CORBA::COMPLETED_NO));
-
-    ACE_Time_Value tmp_wait_time;
-    ACE_Time_Value *max_wait_time = 0;
-
-    bool is_timeout  =
-      this->get_timeout (tmp_wait_time);
-
-    if (is_timeout)
-      max_wait_time = &tmp_wait_time;
-
-    Invocation_Status s = TAO_INVOKE_START;
-
-    while (s == TAO_INVOKE_START ||
-           s == TAO_INVOKE_RESTART)
-      {
-        Profile_Transport_Resolver resolver (effective_target,
-                                             stub,
-                                             true);
-
-        ACE_TRY
-          {
-            resolver.init_inconsistent_policies (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            resolver.resolve (max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            // Dummy operation details that is used to instantiate the
-            // LocateRequest class.
-            TAO_Operation_Details op (0,
-                                      0,
-                                      0);
-
-            op.request_id (resolver.transport ()->tms ()->request_id ());
-            TAO::LocateRequest_Invocation synch (this->target_,
-                                                 resolver,
-                                                 op);
-
-            s = synch.invoke (max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        ACE_CATCH (CORBA::INV_POLICY, ex)
-          {
-            this->list_ =
-              resolver.steal_inconsistent_policies ();
-            ACE_RE_THROW;
-          }
-        ACE_CATCHANY
-          {
-            ACE_RE_THROW;
-          }
-        ACE_ENDTRY;
-        ACE_CHECK;
-      }
-
-    return;
-  }
-
-  CORBA::PolicyList *
-  LocateRequest_Invocation_Adapter::get_inconsistent_policies (void)
-  {
-    return this->list_._retn ();
-  }
-
-  bool
-  LocateRequest_Invocation_Adapter::get_timeout (ACE_Time_Value &timeout)
-  {
-    bool has_timeout = false;
-    this->target_->orb_core ()->call_timeout_hook (this->target_->_stubobj (),
-                                                   has_timeout,
-                                                   timeout);
-
-    return has_timeout;
-  }
-} // End namespace TAO
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
deleted file mode 100644
index 64d7a59bbea..00000000000
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    LocateRequest_Invocation_Adapter.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H
-#define TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Policy_ForwardC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-}
-
-class ACE_Time_Value;
-
-namespace TAO
-{
-  /**
-   * @class LocateRequest_Invocation_Adapter
-   *
-   * @brief Adapter class for locate request invocations.
-   *
-   *  This class provides a look and feel similar to the
-   *  TAO::Invocation_Adapter though the functionalities are
-   *  different. For the record, IDL compiler doesn't know the
-   *  existence of this class. This class is concerned with the
-   *  creation and invocation of locate request invocations to the
-   *  target object
-   *
-   * @todo Need to think what happens if the target is
-   *  collocated. Looks like there are no ways to utilize the
-   *  opportunity that may have been presented.
-   */
-  class TAO_Export LocateRequest_Invocation_Adapter
-  {
-  public:
-    LocateRequest_Invocation_Adapter (
-        CORBA::Object_ptr target);
-
-    /// Start the invocation on the target
-    void invoke (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Accessor to the inconsistent policy list
-    CORBA::PolicyList *get_inconsistent_policies (void);
-
-  private:
-
-    bool get_timeout (ACE_Time_Value &val);
-
-  private:
-    CORBA::Object_ptr target_;
-    CORBA::PolicyList_var list_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl
deleted file mode 100644
index 0a25b452072..00000000000
--- a/TAO/tao/LongDoubleSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in LongDoubleSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongDoubleSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_LONG_DOUBLE_SEQ_IDL
-#define TAO_CORBA_LONG_DOUBLE_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<long double> LongDoubleSeq;
-};
-
-#endif  /* TAO_CORBA_LONG_DOUBLE_SEQ_IDL */
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
deleted file mode 100644
index d67d995c9ab..00000000000
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongDoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongDoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longdouble,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongDoubleSeq_0 =
-      &CORBA_LongDoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongDoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongDoubleSeq:1.0",
-    "LongDoubleSeq",
-    &TAO::TypeCode::tc_CORBA_LongDoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq =
-    &_tao_tc_CORBA_LongDoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongDoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::extract (
-        _tao_any,
-        CORBA::LongDoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp
deleted file mode 100644
index cb378c5b054..00000000000
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "LongDoubleSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_LONGDOUBLESEQ_CS_)
-#define _CORBA_LONGDOUBLESEQ_CS_
-
-CORBA::LongDoubleSeq::LongDoubleSeq (void)
-{}
-
-CORBA::LongDoubleSeq::LongDoubleSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongDouble
-      >
-    (max)
-{}
-
-CORBA::LongDoubleSeq::LongDoubleSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::LongDouble * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongDouble
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::LongDoubleSeq::LongDoubleSeq (
-    const LongDoubleSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongDouble
-      >
-    (seq)
-{}
-
-CORBA::LongDoubleSeq::~LongDoubleSeq (void)
-{}
-
-void CORBA::LongDoubleSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  LongDoubleSeq * _tao_tmp_pointer =
-    static_cast<LongDoubleSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_
-#define _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LongDoubleSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LongDoubleSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */
diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h
deleted file mode 100644
index bdcba518788..00000000000
--- a/TAO/tao/LongDoubleSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_LONGDOUBLESEQC_H_
-#define _TAO_IDL_ORIG_LONGDOUBLESEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_LONGDOUBLESEQ_CH_)
-#define _CORBA_LONGDOUBLESEQ_CH_
-  
-  class LongDoubleSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        LongDoubleSeq,
-        CORBA::LongDouble
-      >
-    LongDoubleSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        LongDoubleSeq,
-        LongDoubleSeq_var,
-        CORBA::LongDouble
-      >
-    LongDoubleSeq_out;
-  
-  class TAO_Export LongDoubleSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::LongDouble
-          >
-  {
-  public:
-    LongDoubleSeq (void);
-    LongDoubleSeq (CORBA::ULong max);
-    LongDoubleSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::LongDouble* buffer, 
-        CORBA::Boolean release = 0
-      );
-    LongDoubleSeq (const LongDoubleSeq &);
-    ~LongDoubleSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef LongDoubleSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongDoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongDoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongDoubleSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
-#define _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::LongDoubleSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::LongDoubleSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/LongDoubleSeqS.h b/TAO/tao/LongDoubleSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/LongDoubleSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl
deleted file mode 100644
index 3e25280acba..00000000000
--- a/TAO/tao/LongLongSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in LongLongSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongLongSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_LONGLONG_SEQ_IDL
-#define TAO_CORBA_LONGLONG_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<long long> LongLongSeq;
-};
-
-#endif  /* TAO_CORBA_LONGLONG_SEQ_IDL */
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
deleted file mode 100644
index 949e1dbef95..00000000000
--- a/TAO/tao/LongLongSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longlong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongLongSeq_0 =
-      &CORBA_LongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongLongSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongLongSeq:1.0",
-    "LongLongSeq",
-    &TAO::TypeCode::tc_CORBA_LongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongLongSeq =
-    &_tao_tc_CORBA_LongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::extract (
-        _tao_any,
-        CORBA::LongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp
deleted file mode 100644
index 28fa3e318f1..00000000000
--- a/TAO/tao/LongLongSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "LongLongSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_LONGLONGSEQ_CS_)
-#define _CORBA_LONGLONGSEQ_CS_
-
-CORBA::LongLongSeq::LongLongSeq (void)
-{}
-
-CORBA::LongLongSeq::LongLongSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongLong
-      >
-    (max)
-{}
-
-CORBA::LongLongSeq::LongLongSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::LongLong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongLong
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::LongLongSeq::LongLongSeq (
-    const LongLongSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::LongLong
-      >
-    (seq)
-{}
-
-CORBA::LongLongSeq::~LongLongSeq (void)
-{}
-
-void CORBA::LongLongSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  LongLongSeq * _tao_tmp_pointer =
-    static_cast<LongLongSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_LongLongSeq_CPP_
-#define _TAO_CDR_OP_CORBA_LongLongSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LongLongSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LongLongSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */
diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h
deleted file mode 100644
index 2d5de085d1b..00000000000
--- a/TAO/tao/LongLongSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_LONGLONGSEQC_H_
-#define _TAO_IDL_ORIG_LONGLONGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_LONGLONGSEQ_CH_)
-#define _CORBA_LONGLONGSEQ_CH_
-  
-  class LongLongSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        LongLongSeq,
-        CORBA::LongLong
-      >
-    LongLongSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        LongLongSeq,
-        LongLongSeq_var,
-        CORBA::LongLong
-      >
-    LongLongSeq_out;
-  
-  class TAO_Export LongLongSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::LongLong
-          >
-  {
-  public:
-    LongLongSeq (void);
-    LongLongSeq (CORBA::ULong max);
-    LongLongSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::LongLong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    LongLongSeq (const LongLongSeq &);
-    ~LongLongSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef LongLongSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongLongSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongLongSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_LongLongSeq_H_
-#define _TAO_CDR_OP_CORBA_LongLongSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::LongLongSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::LongLongSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/LongLongSeqS.h b/TAO/tao/LongLongSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/LongLongSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/LongSeq.pidl b/TAO/tao/LongSeq.pidl
deleted file mode 100644
index 5bff724288b..00000000000
--- a/TAO/tao/LongSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in LongSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          LongSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_LONG_SEQ_IDL
-#define TAO_CORBA_LONG_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<long> LongSeq;
-};
-
-#endif  /* TAO_CORBA_LONG_SEQ_IDL */
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
deleted file mode 100644
index 58a674d9360..00000000000
--- a/TAO/tao/LongSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_long,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongSeq_0 =
-      &CORBA_LongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongSeq:1.0",
-    "LongSeq",
-    &TAO::TypeCode::tc_CORBA_LongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongSeq =
-    &_tao_tc_CORBA_LongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongSeq>::extract (
-        _tao_any,
-        CORBA::LongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp
deleted file mode 100644
index 39069521124..00000000000
--- a/TAO/tao/LongSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "LongSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_LONGSEQ_CS_)
-#define _CORBA_LONGSEQ_CS_
-
-CORBA::LongSeq::LongSeq (void)
-{}
-
-CORBA::LongSeq::LongSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Long
-      >
-    (max)
-{}
-
-CORBA::LongSeq::LongSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Long * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Long
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::LongSeq::LongSeq (
-    const LongSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Long
-      >
-    (seq)
-{}
-
-CORBA::LongSeq::~LongSeq (void)
-{}
-
-void CORBA::LongSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  LongSeq * _tao_tmp_pointer =
-    static_cast<LongSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_LongSeq_CPP_
-#define _TAO_CDR_OP_CORBA_LongSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LongSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LongSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
deleted file mode 100644
index 4e027ef765a..00000000000
--- a/TAO/tao/LongSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_LONGSEQC_H_
-#define _TAO_IDL_ORIG_LONGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_LONGSEQ_CH_)
-#define _CORBA_LONGSEQ_CH_
-  
-  class LongSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        LongSeq,
-        CORBA::Long
-      >
-    LongSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        LongSeq,
-        LongSeq_var,
-        CORBA::Long
-      >
-    LongSeq_out;
-  
-  class TAO_Export LongSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Long
-          >
-  {
-  public:
-    LongSeq (void);
-    LongSeq (CORBA::ULong max);
-    LongSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Long* buffer, 
-        CORBA::Boolean release = 0
-      );
-    LongSeq (const LongSeq &);
-    ~LongSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef LongSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_LongSeq_H_
-#define _TAO_CDR_OP_CORBA_LongSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::LongSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::LongSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/LongSeqS.h b/TAO/tao/LongSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/LongSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
deleted file mode 100644
index 1861059ef62..00000000000
--- a/TAO/tao/MCAST_Parser.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-#include "MCAST_Parser.h"
-#include "default_ports.h"
-#include "ORB_Core.h"
-#include "ORB.h"
-#include "Environment.h"
-#include "debug.h"
-
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Dgram.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined(__ACE_INLINE__)
-#include "MCAST_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           MCAST_Parser,
-           "$Id$")
-
-
-static const char mcast_prefix[] = "mcast:";
-
-TAO_MCAST_Parser::~TAO_MCAST_Parser (void)
-{
-}
-
-
-int
-TAO_MCAST_Parser::match_prefix (const char *ior_string) const
-{
-  return (ACE_OS::strncmp (ior_string,
-                           ::mcast_prefix,
-                           sizeof (::mcast_prefix) - 1) == 0);
-}
-
-CORBA::Object_ptr
-TAO_MCAST_Parser::parse_string (const char *ior,
-                                CORBA::ORB_ptr orb
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const char *mcast_name =
-    ior + sizeof (::mcast_prefix) + 1;
-
-  assign_to_variables (mcast_name);
-
-  /*
-   * Now that we got the global variables.
-   * we can invoke multicast_to_service and multicast_query
-   */
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-
-  CORBA::UShort port = (CORBA::UShort) ACE_OS::atoi (this->mcast_port_.in
-                                                     ());
-
-  ACE_Time_Value *timeout = orb->get_timeout ();
-
-  object = multicast_to_service (service_name_.in (),
-                                 port,
-                                 this->mcast_address_.in (),
-                                 this->mcast_ttl_.in (),
-                                 this->mcast_nic_.in (),
-                                 orb,
-                                 timeout
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return object;
-}
-
-CORBA::Object_ptr
-TAO_MCAST_Parser::multicast_to_service (const char *service_name,
-                                        u_short port,
-                                        const char *mcast_address,
-                                        const char *mcast_ttl,
-                                        const char *mcast_nic,
-                                        CORBA::ORB_ptr orb,
-                                        ACE_Time_Value *timeout
-                                        ACE_ENV_ARG_DECL)
-{
-  char buf[2048];
-  char *ior = buf;
-
-  CORBA::String_var cleaner;
-
-  CORBA::Object_var return_value =
-    CORBA::Object::_nil ();
-
-  // Use UDP multicast to locate the  service.
-  int result = this->multicast_query (ior,
-                                      service_name,
-                                      port,
-                                      mcast_address,
-                                      mcast_ttl,
-                                      mcast_nic,
-                                      timeout,
-                                      orb);
-
-  // If the IOR didn't fit into <buf>, memory for it was dynamically
-  // allocated - make sure it gets deallocated.
-  if (ior != buf)
-    cleaner = ior;
-
-  if (result == 0)
-    {
-      // Convert IOR to an object reference.
-      return_value =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-
-  // Return object reference.
-  return return_value._retn ();
-}
-
-int
-TAO_MCAST_Parser::multicast_query (char *&buf,
-                                   const char *service_name,
-                                   u_short port,
-                                   const char *mcast_address,
-                                   const char *mcast_ttl,
-                                   const char *mcast_nic,
-                                   ACE_Time_Value *timeout,
-                                   CORBA::ORB_ptr orb)
-{
-  ACE_INET_Addr my_addr;
-  ACE_SOCK_Acceptor acceptor;
-  ACE_SOCK_Stream stream;
-  ACE_SOCK_Dgram dgram;
-
-  ssize_t result = 0;
-
-  // Bind listener to any port and then find out what the port was.
-  if (acceptor.open (ACE_Addr::sap_any) == -1
-      || acceptor.get_local_addr (my_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("acceptor.open () || ")
-                  ACE_TEXT ("acceptor.get_local_addr () failed\n")));
-      result = -1;
-    }
-  else
-    {
-      ACE_INET_Addr multicast_addr (port,
-                                    mcast_address);
-
-      // Set the address if multicast_discovery_endpoint option
-      // is specified for the Naming Service.
-      ACE_CString mde (orb->orb_core ()->orb_params ()
-                       ->mcast_discovery_endpoint ());
-
-      if (ACE_OS::strcasecmp (service_name,
-                              "NameService") == 0
-          && mde.length () != 0)
-        if (multicast_addr.set (mde.c_str()) == -1)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT("ORB.cpp: Multicast address setting failed\n")));
-            stream.close ();
-            dgram.close ();
-            acceptor.close ();
-            return -1;
-          }
-
-      // Open the datagram.
-      if (dgram.open (ACE_Addr::sap_any) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to open the Datagram!\n")));
-          result = -1;
-        }
-      else
-        {
-          // Set NIC
-          dgram.set_nic (mcast_nic);
-
-          // Set TTL
-#if defined (ACE_WIN32)
-          // MS Windows expects an int.
-          int mcast_ttl_optval = ACE_OS::atoi (mcast_ttl);
-#else
-          // Apparently all other platforms expect an unsigned char
-          // (0-255).
-          unsigned char mcast_ttl_optval = ACE_OS::atoi (mcast_ttl);
-#endif  /* ACE_WIN32 */
-          if (dgram.ACE_SOCK::set_option (
-                IPPROTO_IP,
-                IP_MULTICAST_TTL,
-                &mcast_ttl_optval,
-                sizeof (mcast_ttl_optval)) != 0)
-            result = -1;
-
-          // Convert the acceptor port into network byte order.
-          ACE_UINT16 response_port =
-            (ACE_UINT16) ACE_HTONS (my_addr.get_port_number ());
-
-          // Length of service name we will send.
-          CORBA::Short data_len =
-            (CORBA::Short) ACE_HTONS (ACE_OS::strlen (service_name) + 1);
-
-          // Vector we will send.  It contains: 1) length of service
-          // name string, 2)port on which we are listening for
-          // replies, and 3) name of service we are looking for.
-          const int iovcnt = 3;
-          iovec iovp[iovcnt];
-
-          // The length of service name string.
-          iovp[0].iov_base = (char *) &data_len;
-          iovp[0].iov_len  = sizeof (CORBA::Short);
-
-          // The port at which we are listening.
-          iovp[1].iov_base = (char *) &response_port;
-          iovp[1].iov_len  = sizeof (ACE_UINT16);
-
-          // The service name string.
-          iovp[2].iov_base = (char *) service_name;
-          iovp[2].iov_len  =
-            static_cast<u_long> (ACE_OS::strlen (service_name) + 1);
-
-          // Send the multicast.
-          result = dgram.send (iovp,
-                               iovcnt,
-                               multicast_addr);
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\nsent multicast request.")));
-
-          // Check for errors.
-          if (result == -1)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("%p\n"),
-                        ACE_TEXT ("error sending IIOP multicast")));
-          else
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("\n%N; Sent multicast.")
-                            ACE_TEXT ("# of bytes sent is %d.\n"),
-                            result));
-              // Wait for response until timeout.
-              ACE_Time_Value tv (
-                timeout == 0
-                ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-                : *timeout);
-
-              // Accept reply connection from server.
-              if (acceptor.accept (stream,
-                                   0,
-                                   &tv) == -1)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              ACE_TEXT ("%p\n"),
-                              ACE_TEXT ("multicast_query: unable to accept")));
-                  result = -1;
-                }
-              else
-                {
-                  // Receive the IOR.
-
-                  // IOR length.
-                  CORBA::Short ior_len;
-                  result = stream.recv_n (&ior_len,
-                                          sizeof ior_len,
-                                          0,
-                                          &tv);
-                  if (result != sizeof (ior_len))
-                    {
-                      ACE_ERROR ((LM_ERROR,
-                                  ACE_TEXT ("%p\n"),
-                                  ACE_TEXT ("multicast_query: unable to receive ")
-                                  ACE_TEXT ("ior length")));
-                      result = -1;
-                    }
-                  else
-                    {
-                      // Allocate more space for the ior if we don't
-                      // have enough.
-                      ior_len = (CORBA::Short) ACE_NTOHS (ior_len);
-                      if (ior_len > TAO_DEFAULT_IOR_SIZE)
-                        {
-                          buf = CORBA::string_alloc (ior_len);
-                          if (buf == 0)
-                            {
-                              ACE_ERROR ((LM_ERROR,
-                                          ACE_TEXT ("%p\n"),
-                                          ACE_TEXT ("multicast_query: unable to ")
-                                          ACE_TEXT ("allocate memory")));
-                              result = -1;
-                            }
-                        }
-
-                      if (result != -1)
-                        {
-                          // Receive the ior.
-                          result = stream.recv_n (buf,
-                                                  ior_len,
-                                                  0,
-                                                  &tv);
-                          if (result == -1)
-                            ACE_ERROR ((LM_ERROR,
-                                        ACE_TEXT ( "%p\n"),
-                                        ACE_TEXT ("error reading ior")));
-                          else if (TAO_debug_level > 0)
-                            ACE_DEBUG ((LM_DEBUG,
-                                        ACE_TEXT ("%N: service resolved to IOR <%s>\n"),
-                                        ACE_TEXT_CHAR_TO_TCHAR (buf)));
-                        }
-                    }
-                }
-            }
-        }
-        if (result == -1)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT("\nmulticast discovery of %s failed.\n"),
-                        ACE_TEXT_CHAR_TO_TCHAR (service_name)));
-
-            if (ACE_OS::strcasecmp (service_name,
-                                    "NameService") == 0)
-             {
-               ACE_ERROR ((LM_ERROR,
-                           ACE_TEXT("Specify -m 1 when starting Naming_Service,\n")
-                           ACE_TEXT("or see http://www.theaceorb.com/faq/#115\n")
-                           ACE_TEXT("for using NameService without multicast.\n\n")));
-             }
-          }
-    }
-
-  // Clean up.
-  stream.close ();
-  dgram.close ();
-  acceptor.close ();
-
-  return result == -1 ? -1 : 0;
-}
-
-void
-TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
-{
-  /*
-   * The format now is "multicast_address:port:nicaddress:ttl/object_key"
-   */
-  ACE_CString mcast_name_cstring (mcast_name);
-
-  int pos_colon1 = mcast_name_cstring.find (':', 0);
-
-  if (pos_colon1 == 0)
-    {
-      const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
-      this->mcast_address_ = default_addr;
-    }
-  else
-    {
-      this->mcast_address_ =
-        mcast_name_cstring.substring (0,
-                                      pos_colon1).c_str ();
-    }
-  mcast_name_cstring =
-    mcast_name_cstring.substring (pos_colon1 + 1,
-                                  mcast_name_cstring.length() -
-                                  pos_colon1);
-
-  int pos_colon2 = mcast_name_cstring.find (':', 0);
-
-  if (pos_colon2 == 0)
-    {
-      /*
-       * If the port is not specified, use the default.
-       * The default multicast port is the same as the default port
-       * no. for Naming_Service, for now. But for other services,
-       * check and modify the default values as needed.
-       */
-      char default_port[33];
-
-      int trial_port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-
-      if (mcast_name_cstring.find ("InterfaceRepository") !=
-          ACE_CString::npos)
-        {
-          trial_port = TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT;
-        }
-      else if (mcast_name_cstring.find ("ImplRepoService") !=
-               ACE_CString::npos)
-        {
-           trial_port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
-        }
-      else if (mcast_name_cstring.find ("TradingService") !=
-               ACE_CString::npos)
-        {
-           trial_port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT;
-        }
-
-
-      ACE_OS::itoa (trial_port, default_port, 10);
-
-      this->mcast_port_ = (const char *) default_port;
-    }
-  else
-    {
-      this->mcast_port_ = mcast_name_cstring.substring (0,
-                                                        pos_colon2).c_str ();
-    }
-
-  mcast_name_cstring =
-    mcast_name_cstring.substring (pos_colon2 + 1,
-                                  mcast_name_cstring.length() - pos_colon2);
-
-
-  int pos_colon3 = mcast_name_cstring.find (':', 0);
-
-  this->mcast_nic_ =
-    mcast_name_cstring.substring (0,
-                                  pos_colon3).c_str ();
-
-  mcast_name_cstring =
-    mcast_name_cstring.substring (pos_colon3 + 1,
-                                  mcast_name_cstring.length() - pos_colon3);
-
-  int pos_colon4 = mcast_name_cstring.find ('/', 0);
-
-  if (pos_colon4 == 0)
-    {
-      // And, the default TTL to be 1
-      const char *default_ttl = "1";
-      this->mcast_ttl_ = default_ttl;
-    }
-  else
-    {
-      this->mcast_ttl_ =
-        mcast_name_cstring.substring (0,
-                                      pos_colon4).c_str ();
-    }
-  mcast_name_cstring =
-    mcast_name_cstring.substring (pos_colon4,
-                                  mcast_name_cstring.length() - pos_colon4);
-
-  this->service_name_ =
-    mcast_name_cstring.substring (1,
-                                  mcast_name_cstring.length()
-                                  -1).c_str ();
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser,
-                       ACE_TEXT ("MCAST_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_MCAST_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_MCAST_Parser)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
deleted file mode 100644
index 4dc327b33b5..00000000000
--- a/TAO/tao/MCAST_Parser.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   MCAST_Parser.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla (gontla_p@ociweb.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_MCAST_PARSER_H
-#define TAO_MCAST_PARSER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_String.h"
-#include "tao/IOR_Parser.h"
-
-/**
- * @class TAO_MCAST_Parser
- *
- * @brief Implements the <mcast:> IOR format
- *
- * This class implements the <mcast:> IOR format.
- * It is dynamically loaded by the ORB and used to parse the
- * string to separate the individual <obj_addr> from the list of object
- * addresses <obj_addr_list>.
- */
-class TAO_Export TAO_MCAST_Parser : public TAO_IOR_Parser
-{
-public:
-  /// Constructor
-  TAO_MCAST_Parser (void);
-
-  /// The destructor
-  virtual ~TAO_MCAST_Parser (void);
-
-  /// = The IOR_Parser methods, please read the documentation in
-  ///   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
-
-  /// Parse the ior-string that is passed.
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  CORBA::Object_ptr multicast_to_service (const char *service_name,
-                                          CORBA::UShort port,
-                                          const char *mcast_address,
-                                          const char *mcast_ttl,
-                                          const char *mcast_nic,
-                                          CORBA::ORB_ptr orb,
-                                          ACE_Time_Value *timeout
-                                          ACE_ENV_ARG_DECL_NOT_USED);
-
-  int multicast_query (char *&buf,
-                       const char *service_name,
-                       u_short port,
-                       const char *mcast_address,
-                       const char *mcast_ttl,
-                       const char *mcast_nic,
-                       ACE_Time_Value *timeout,
-                       CORBA::ORB_ptr orb);
-
-  /* Simple method to assign values to the global members:
-     mcast_address_, mcast_port_, mcast_nic_, mcast_ttl_ */
-  void assign_to_variables (const char * &mcast_name_ptr);
-
-  // Global private variables
-  CORBA::String_var mcast_address_;
-  CORBA::String_var mcast_port_;
-  CORBA::String_var mcast_nic_;
-  CORBA::String_var mcast_ttl_;
-  CORBA::String_var service_name_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "MCAST_Parser.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser)
-ACE_FACTORY_DECLARE (TAO, TAO_MCAST_Parser)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MCAST_PARSER_H */
diff --git a/TAO/tao/MCAST_Parser.i b/TAO/tao/MCAST_Parser.i
deleted file mode 100644
index c2a5c736f82..00000000000
--- a/TAO/tao/MCAST_Parser.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_MCAST_Parser::TAO_MCAST_Parser (void)
-{
-}
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
deleted file mode 100644
index cc6fb34f23d..00000000000
--- a/TAO/tao/MProfile.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-#include "tao/MProfile.h"
-#include "tao/Environment.h"
-#include "tao/Profile.h"
-#include "tao/PolicyC.h"
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/Guard_T.h"
-
-ACE_RCSID (tao,
-           MProfile,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /* __ACE_INLINE__ */
-
-
-TAO_MProfile::~TAO_MProfile (void)
-{
-  if (this->policy_list_ != 0)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      const CORBA::ULong len = this->policy_list_->length ();
-      for (CORBA::ULong i = 0; i < len; ++i)
-        {
-          ACE_TRY
-            {
-              (*this->policy_list_)[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // Ignore all exceptions to allow other policies to be
-              // destroyed.
-            }
-          ACE_ENDTRY;
-        }
-
-      delete this->policy_list_;
-    }
-
-  this->cleanup ();
-}
-
-void
-TAO_MProfile::cleanup (void)
-{
-  if (this->pfiles_ != 0)
-    {
-      for (TAO_PHandle i = 0; i < this->last_; ++i)
-        if (this->pfiles_[i])
-          this->pfiles_[i]->_decr_refcnt ();
-      delete [] this->pfiles_;
-      this->pfiles_ = 0;
-    }
-
-  this->current_ = 0;
-  this->size_ = 0;
-  this->last_ = 0;
-}
-
-int
-TAO_MProfile::set (CORBA::ULong sz)
-{
-  if (sz == 0)
-    {
-      this->cleanup ();
-      return 0;
-    }
-
-  // See if we already have an existing profile list or if we need to
-  // get ridof what we have.
-  if (this->size_ != 0)
-    {
-      // Release all of our profiles.
-
-      for (TAO_PHandle h = 0;
-           h < this->size_;
-           ++h)
-        if (this->pfiles_[h])
-          {
-            this->pfiles_[h]->_decr_refcnt ();
-            this->pfiles_[h] = 0;
-          }
-
-      // Next see if we can reuse our profile list memory
-      if (this->size_ < sz)
-        {
-          // we cant reuse memory since the current array is too small!
-          delete [] this->pfiles_;
-
-          ACE_NEW_RETURN (this->pfiles_,
-                          TAO_Profile *[sz],
-                          -1);
-          this->size_ = sz;
-        }
-      // else , leave this->size and this->pfiles alone!
-    }
-  else
-    {
-      // first time, initialize!
-      ACE_NEW_RETURN (this->pfiles_,
-                      TAO_Profile *[sz],
-                      -1);
-      this->size_ = sz;
-    }
-
-  this->last_ = 0;
-  this->current_ = 0;
-
-  for (TAO_PHandle i = 0; i != this->size_; ++i)
-    this->pfiles_[i] = 0;
-
-  return this->size_;
-}
-
-int
-TAO_MProfile::set (const TAO_MProfile &mprofile)
-{
-  // NOTE: We use mprofile->last_ instead of mprofile->size_ to set
-  // this->size_.  This is so we can use set () to trim a profile
-  // list!!
-
-  this->set (mprofile.last_);
-
-  // set indexes ...
-  this->last_ = mprofile.last_;
-
-  // These are set in set (ULong);
-  // this->current_ = 0;
-  // this->forward_from_ = 0;
-
-  // Now reference all profiles.
-  for (TAO_PHandle h = 0; h < this->last_; ++h)
-    {
-      this->pfiles_[h] = mprofile.pfiles_[h];
-      if (this->pfiles_[h] != 0)
-        this->pfiles_[h]->_incr_refcnt ();
-    }
-
-  return 1;
-}
-
-// Not thread safe!
-int
-TAO_MProfile::grow (CORBA::ULong sz)
-{
-  if (sz <= this->size_)
-    return 0;
-
-  // get the additional space
-  TAO_Profile **new_pfiles, **old_pfiles;
-  ACE_NEW_RETURN (new_pfiles,
-                  TAO_Profile *[sz],
-                  -1);
-
-  old_pfiles = this->pfiles_;
-
-  // got it, now copy profiles
-  for (TAO_PHandle h = 0; h < this->size_; ++h)
-    {
-      new_pfiles[h] = old_pfiles[h];
-      old_pfiles[h] = 0;
-    }
-
-  this->pfiles_ = new_pfiles;
-  this->size_ = sz;
-  delete [] old_pfiles;
-
-  return 0;
-}
-
-int
-TAO_MProfile::add_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    {
-      if (this->grow (this->size_ + 1) < 0)
-        return -1;
-    }
-
-  pfiles_[last_++] = pfile;
-
-  if (pfile && pfile->_incr_refcnt () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) Unable to increment reference ")
-                       ACE_TEXT ("count in add_profile!\n")),
-                      -1);
-
-  return last_ - 1;
-}
-
-int
-TAO_MProfile::add_profiles (TAO_MProfile *pfiles)
-{
-  // this->size_ == total number of profiles we can hold
-  // this->last_ == the index of the last profile
-  CORBA::ULong space = this->size_ - this->last_;
-
-  if (space < pfiles->last_)
-    {
-      // we need to grow!
-     if (this->grow (this->last_ + pfiles->last_) < 0)
-       return -1;
-    }
-
-  // copy over profiles
-  for (TAO_PHandle h = 0; h < pfiles->last_; ++h)
-    {
-      if (this->add_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
-}
-
-
-// the layout for a full list of 7 Profiles.
-//
-// last_ == one past the last valid entry, so if the list has 2
-//          profiles then last_ equals 2.
-// current_ == index of the next profile to be returned (or one past
-//             the last returned.
-//
-// this->size_ = 7; current_ = 3; last_ = 7
-//   0, 1, 2, 3, 4, 5, 6}
-// { _, _, _, _, ..., _}
-//
-int
-TAO_MProfile::remove_profile (const TAO_Profile *pfile)
-{
-  TAO_PHandle h;
-  int found = 0;
-  for (h = 0; h < this->last_; ++h)
-    {
-      if (this->pfiles_[h]->is_equivalent (pfile))
-        { // remove it!
-          TAO_Profile *old = this->pfiles_[h];
-          this->pfiles_[h] = 0;
-          old->_decr_refcnt ();
-          // shift other profiles up one
-          // note, if h == last_ - 1 then do nothing.
-          for (TAO_PHandle inner = h; inner < this->last_ - 1; ++inner)
-            {
-              this->pfiles_[inner] = this->pfiles_[inner + 1];
-            }
-          // subtract 1 from last_ to indicate we have one fewer profiles
-          this->last_--;
-          found = 1;
-          break;
-        }
-    }
-  if ( found == 0)
-    return -1; // profile not found.
-  return 0;
-}
-
-int
-TAO_MProfile::remove_profiles (const TAO_MProfile *pfiles)
-{
-  for (TAO_PHandle h = 0; h < pfiles->last_; ++h)
-    {
-      if (this->remove_profile (pfiles->pfiles_[h]) < 0)
-        return -1;
-    }
-  return 0;
-}
-
-CORBA::Boolean
-TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
-{
-  // Two profile lists are equivalent iff at least one of the profiles
-  // from the first list is_equivalent to at least one of the profiles
-  // from the second list!!
-  for (TAO_PHandle h1 = 0; h1 < this->last_; ++h1)
-    for (TAO_PHandle h2 = 0; h2 < rhs->last_; ++h2)
-      if (this->pfiles_[h1]->is_equivalent (rhs->pfiles_[h2]))
-        return 1;
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max
-                    ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong hashval = 0;
-
-  if (this->last_ == 0)
-    return 0;
-
-  for (TAO_PHandle h = 0; h < this->last_ ; ++h)
-    {
-      hashval += pfiles_[h]->hash (max
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  // The above hash function return an ULong between 0 and max here we
-  // simply take the average value and round.
-  //return hashval / this->last_;
-  // Changed to a mod value instead of an average.
-  return hashval % max;
-}
-
-void
-TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_NEW_THROW_EX (this->policy_list_,
-                    CORBA::PolicyList,
-                    CORBA::NO_MEMORY (0,
-                                      CORBA::COMPLETED_NO)
-                    );
-}
-
-void
-TAO_MProfile::init_policy_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The first time this method is called
-  // it causes the initialization of the policies
-  // for the current profile.
-
-  this->get_current_profile ()->get_policies (*this->policy_list_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->is_policy_list_initialized_ = 1;
-}
-
-CORBA::PolicyList *
-TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!this->is_policy_list_initialized_)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                        guard,
-                        this->mutex_,
-                        0);
-
-      if (this->policy_list_ == 0)
-        {
-          this->create_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          this->init_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-        }
-    }
-  CORBA::PolicyList *ret_val = 0;
-  ACE_NEW_THROW_EX (ret_val,
-                    CORBA::PolicyList (*this->policy_list_),
-                    CORBA::NO_MEMORY (0,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return ret_val;
-}
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
deleted file mode 100644
index fc0e1feb5d6..00000000000
--- a/TAO/tao/MProfile.h
+++ /dev/null
@@ -1,249 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     MProfile.h
- *
- *  $Id$
- *
- *   Keep track of profile lists
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_MPROFILE_H
-#define TAO_MPROFILE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Recursive_Thread_Mutex.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-// Forward declarations
-class TAO_Profile;
-namespace CORBA
-{
-  class PolicyList;
-
-  class Environment;
-}
-
-typedef CORBA::ULong TAO_PHandle;
-
-/**
- * @class TAO_MProfile
- *
- * @brief This class implements the basic interface for supporting
- * multiple profiles.
- *
- * Multiple profiles can be treated either as a circular queue or
- * a linear array of profiles.
- * It is assumed that locking will only be required when a profile
- * list is associated with a TAO_Stub.  Thus when the
- * TAO_Stub accepts ownership of an MProfile it also assumes
- * responsibility for controling access (i.e. locking).
- */
-class TAO_Export TAO_MProfile
-{
-public:
-  // = Initialization and termination methods.
-  TAO_MProfile (CORBA::ULong sz = 0);
-
-  /**
-   * **NOTE:  IF mprofiles->last_ > 0, THEN this->size_ will be set to
-   *          mprofiles->last_.  Otherwise this->size_ - mprofiles->size_.
-   *          Furthermore, current_ is set back to 0!  i.e. rewound.
-   * The reference count on any profiles in mprofiles is increment
-   * when their references (i.e. pointers) are copied.
-   */
-  TAO_MProfile (const TAO_MProfile &mprofiles);
-
-  /// Assigment operator.
-  TAO_MProfile& operator= (const TAO_MProfile& mprofiles);
-
-  /// Destructor: decrements reference count on all references
-  /// profiles!
-  ~TAO_MProfile (void);
-
-  /// Inits MProfile to hold sz TAO_Profiles.
-  /// NOT THREAD SAFE
-  int set (CORBA::ULong sz);
-
-  /**
-   * Inits this to the values of mprofile.  NOTE: We use
-   * mprofile->last_ instead of mprofile->size_ to set this->size_.
-   * This is so we can use set () to trim a profile list!!
-   * NOT THREAD SAFE
-   */
-  int set (const TAO_MProfile &mprofile);
-
-  /// increase the number of profiles this object can hold.
-  /// NOT THREAD SAFE
-  int grow (CORBA::ULong sz);
-
-  /// Treat as a circular list.
-  TAO_Profile *get_cnext (void);
-
-  /// Get next profile in list, return 0 at end of list.
-  TAO_Profile *get_next (void);
-
-  /// Assume a circular list of profiles.
-  TAO_Profile *get_cprev (void);
-
-  /// Get previous profile, stop at beginning of list and return 0.
-  TAO_Profile *get_prev (void);
-
-  /// Return a pointer to the current profile, will not increment
-  /// reference pointer.
-  TAO_Profile *get_current_profile (void);
-
-  /// Return a pointer to the profile referenced by handle void.
-  TAO_Profile *get_profile (TAO_PHandle handle);
-
-  // rem_profile (TAO_PHandle handle); let's wait.
-
-  /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void);
-
-  /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void) const;
-
-  /// Returns the number of profiles stored in the list (last_+1).
-  CORBA::ULong profile_count (void) const;
-
-  /// return the maximum number of profiles that can be stored in this
-  /// container, (size_+1)
-  CORBA::ULong size (void) const;
-
-  /// Return the profile at position <slot>.  If <slot> is out of range
-  /// it returns 0.
-  const TAO_Profile* get_profile (CORBA::ULong slot) const;
-
-  /// Sets the current slot back to 0.
-  void rewind (void);
-
-  /// Return the index of this entry or -1 if it can not be added.
-  /// reference count on profile in incremented!
-  int add_profile (TAO_Profile *pfile);
-
-  /// Return the index of this entry or -1 if it can not be added.
-  /// this object assumes ownership of this profile!!
-  int give_profile (TAO_Profile *pfile);
-
-  /// append the profiles in pfiles to this object.  The count
-  /// will be incremented on the individual profile objects.
-  int add_profiles (TAO_MProfile *pfiles);
-
-  /// remove from this MProfile any profiles which also appear in pfiles.
-  int remove_profile (const TAO_Profile *pfile);
-
-  /// remove from this MProfile any profiles which also appear in pfiles.
-  int remove_profiles (const TAO_MProfile *pfiles);
-
-  /// Set a pointer to the MProfile whose 'current' TAO_Profile was
-  /// forwarded This object is the set of forwarding profiles.
-  void forward_from (TAO_MProfile *mprofiles);
-
-  /// Returns a pointer to the profile which was forwarded.
-  TAO_MProfile *forward_from (void);
-
-  /**
-   * Returns true of there is at least one profile in first which
-   * is_equivalent with at least one profile in second.
-   * NON-THREAD SAFE, relies on some other entity to guarentee
-   * the profiles will not change during the call.
-   */
-  CORBA::Boolean is_equivalent (const TAO_MProfile *rhs);
-
-  /**
-   * use all registered profiles.  The hash() method is called on each
-   * profile and the results are averaged together.
-   * NON-THREAD SAFE.
-   */
-  CORBA::ULong hash (CORBA::ULong max
-                     ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// This method handle the dynamic allocation of the data member
-  /// <policy_list_>.
- void create_policy_list (ACE_ENV_SINGLE_ARG_DECL);
-
-public:
-
-  /// Sets the policies list associated with the profiles
-  /// owned by the TAO_MProfile.
-  void policy_list (CORBA::PolicyList *policy_list);
-
-  /// Gets the policies list associated with the profiles
-  /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-
-  /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  /// Stores the policy list for the profile of this MProfile.
-  friend class TAO_Profile;
-  CORBA::PolicyList *policy_list_;
-
-  CORBA::Boolean is_policy_list_initialized_;
-
-  /// Mutex used to make sure that only one policy list
-  /// is created.
-  TAO_SYNCH_RECURSIVE_MUTEX mutex_;
-
-protected:
-  /// return the complete list of profiles, this object retains
-  /// ownership!
-  TAO_Profile **pfiles (void) const;
-
-
-private:
-  /// Helper method to implement the destructor
-  void cleanup (void);
-
-private:
-
-  /**
-   * Used for chaning references when the current profile is
-   * forwarded.  Note, this will only be valid for an MProfile which
-   * contains a list of forward_profiles for some initial or base
-   * profile.  This is a backward reference to the profile list which
-   * received the relocate message.  The actual profile what was
-   * forwarded will be forward_from_->get_current_profile ()
-   */
-  TAO_MProfile  *forward_from_;
-
-  /// Actual list of profiles.
-  TAO_Profile **pfiles_;
-
-  /// Points to the next profile to be used.  0 ... size_
-  TAO_PHandle current_;
-
-  /// Max size of array
-  TAO_PHandle size_;
-
-  /// Index plus 1 of last valid entry!  May be < size_.
-  TAO_PHandle last_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /*__ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_MPROFILE_H */
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
deleted file mode 100644
index 48805e3c14d..00000000000
--- a/TAO/tao/MProfile.i
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
-  :  policy_list_ (0),
-     is_policy_list_initialized_ (0),
-     forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (sz);
-}
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
-  :  policy_list_ (0),
-     is_policy_list_initialized_ (0),
-     forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (mprofiles);
-}
-
-ACE_INLINE TAO_MProfile&
-TAO_MProfile::operator= (const TAO_MProfile& rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  this->set (rhs);
-  return *this;
-}
-
-// Cyclic get next.  It will simply cycle through the complete list.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cnext (void)
-{
-  if (last_ == 0)
-    return 0;
-
-  if (current_ == last_)
-    current_ = 0;
-
-  return pfiles_[current_++];
-}
-
-// This will return the next element until either null is found or the
-// end of list.  It then continues to return NULL until rewind.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_next (void)
-{
-  // Nolist or EndOfList
-  if (last_ == 0 || current_ == last_)
-    return 0;
-  else
-    return pfiles_[current_++];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cprev (void)
-{
-  if (last_ == 0)
-    return 0;
-  else if (last_ == 1)
-    current_=1;
-  else if (current_ > 1)
-    current_--;
-  else // current_ == 0 or 1, 0 => list never read before and == 1
-    current_ = last_;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_prev (void)
-{
-  if (last_ == 0 || current_ <= 1)
-    // No List of BeginningOfList
-    return 0;
-  if (current_ > 1)
-    current_--;
-
-  return pfiles_[current_ - 1];
-}
-
-// does not affect the current_ setting!
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_profile (TAO_PHandle handle)
-{
-  if (handle < last_)
-    return pfiles_[handle];
-  else
-    return 0;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_current_profile (void)
-{
-  if (last_ == 0)
-    return 0;
-  if (current_ == 0)
-    // means list has not been read before.
-    current_ = 1;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_PHandle
-TAO_MProfile::get_current_handle (void)
-{
-  if (current_ > 0)
-    return current_ - 1;
-  else
-    return 0;
-}
-
-ACE_INLINE TAO_PHandle
-TAO_MProfile::get_current_handle (void) const
-{
-  if (current_ > 0)
-    return current_ - 1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-TAO_MProfile::rewind (void)
-{
-  current_ = 0;
-}
-ACE_INLINE int
-TAO_MProfile::give_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    return -1;
-
-  pfiles_[last_++] = pfile;
-
-  return last_ - 1;
-}
-
-ACE_INLINE
-void
-TAO_MProfile::forward_from (TAO_MProfile *from)
-{
-  this->forward_from_ = from;
-}
-
-ACE_INLINE
-TAO_MProfile *
-TAO_MProfile::forward_from (void)
-{
-  return this->forward_from_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_MProfile::profile_count (void) const
-{
-  return this->last_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_MProfile::size (void) const
-{
-  return this->size_;
-}
-
-ACE_INLINE const TAO_Profile*
-TAO_MProfile::get_profile (CORBA::ULong slot) const
-{
-  if (slot >= this->last_)
-    return 0;
-  return this->pfiles_[slot];
-}
-
-ACE_INLINE TAO_Profile **
-TAO_MProfile::pfiles (void) const
-{
-  return this->pfiles_;
-}
-
-ACE_INLINE void
-TAO_MProfile::policy_list (CORBA::PolicyList *policy_list)
-{
-  this->policy_list_ = policy_list;
-}
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
deleted file mode 100644
index 1c1984cb4e5..00000000000
--- a/TAO/tao/Makefile.am
+++ /dev/null
@@ -1,2618 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
-
-includedir = @includedir@/tao
-pkgconfigdir = @libdir@/pkgconfig
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.TAO.am
-
-lib_LTLIBRARIES = libTAO.la
-
-libTAO_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_BUILD_DLL
-
-libTAO_la_SOURCES = \
-  Abstract_Servant_Base.cpp \
-  Acceptor_Filter.cpp \
-  Acceptor_Registry.cpp \
-  Adapter.cpp \
-  Adapter_Factory.cpp \
-  Adapter_Registry.cpp \
-  Alias_TypeCode_Static.cpp \
-  Any.cpp \
-  AnySeqA.cpp \
-  AnySeqC.cpp \
-  Any_Basic_Impl.cpp \
-  Any_Impl.cpp \
-  Any_SystemException.cpp \
-  Any_Unknown_IDL_Type.cpp \
-  Argument.cpp \
-  Asynch_Queued_Message.cpp \
-  Asynch_Reply_Dispatcher_Base.cpp \
-  Base_Transport_Property.cpp \
-  Basic_Arguments.cpp \
-  BiDir_Adapter.cpp \
-  Bind_Dispatcher_Guard.cpp \
-  Block_Flushing_Strategy.cpp \
-  Blocked_Connect_Strategy.cpp \
-  BooleanSeqA.cpp \
-  BooleanSeqC.cpp \
-  BoundsA.cpp \
-  BoundsC.cpp \
-  Buffering_Constraint_Policy.cpp \
-  CDR.cpp \
-  CDR_Encaps_Codec.cpp \
-  CONV_FRAMEA.cpp \
-  CONV_FRAMEC.cpp \
-  CORBALOC_Parser.cpp \
-  CORBANAME_Parser.cpp \
-  CORBA_String.cpp \
-  Cache_Entries.cpp \
-  CharSeqA.cpp \
-  CharSeqC.cpp \
-  Cleanup_Func_Registry.cpp \
-  ClientRequestInfo.cpp \
-  ClientRequestInfoA.cpp \
-  ClientRequestInfoC.cpp \
-  ClientRequestInfo_i.cpp \
-  ClientRequestInterceptorA.cpp \
-  ClientRequestInterceptorC.cpp \
-  ClientRequestInterceptor_Adapter.cpp \
-  Client_Strategy_Factory.cpp \
-  CodecFactory.cpp \
-  CodecFactory_ORBInitializer.cpp \
-  Codeset_Manager.cpp \
-  Codeset_Translator_Factory.cpp \
-  Collocated_Invocation.cpp \
-  Collocation_Resolver.cpp \
-  Connect_Strategy.cpp \
-  Connection_Handler.cpp \
-  Connection_Purging_Strategy.cpp \
-  Connector_Registry.cpp \
-  CurrentA.cpp \
-  CurrentC.cpp \
-  DLL_Parser.cpp \
-  Default_Collocation_Resolver.cpp \
-  Default_Endpoint_Selector_Factory.cpp \
-  Default_Protocols_Hooks.cpp \
-  Default_Stub_Factory.cpp \
-  Default_Thread_Lane_Resources_Manager.cpp \
-  DomainA.cpp \
-  DomainC.cpp \
-  DoubleSeqA.cpp \
-  DoubleSeqC.cpp \
-  DynamicA.cpp \
-  DynamicC.cpp \
-  Dynamic_Adapter.cpp \
-  Dynamic_ParameterA.cpp \
-  Dynamic_ParameterC.cpp \
-  Empty_Param_TypeCode.cpp \
-  Encodable.cpp \
-  Endpoint.cpp \
-  Endpoint_Selector_Factory.cpp \
-  Enum_TypeCode_Static.cpp \
-  Environment.cpp \
-  Exception.cpp \
-  Exclusive_TMS.cpp \
-  FILE_Parser.cpp \
-  Fault_Tolerance_Service.cpp \
-  FloatSeqA.cpp \
-  FloatSeqC.cpp \
-  Flushing_Strategy.cpp \
-  GIOPA.cpp \
-  GIOPC.cpp \
-  GIOP_Message_Base.cpp \
-  GIOP_Message_Generator_Parser.cpp \
-  GIOP_Message_Generator_Parser_10.cpp \
-  GIOP_Message_Generator_Parser_11.cpp \
-  GIOP_Message_Generator_Parser_12.cpp \
-  GIOP_Message_Generator_Parser_Impl.cpp \
-  GIOP_Message_Lite.cpp \
-  GIOP_Message_Locate_Header.cpp \
-  GIOP_Message_State.cpp \
-  GIOP_Message_Version.cpp \
-  GIOP_Utils.cpp \
-  GUIResource_Factory.cpp \
-  IFR_Client_Adapter.cpp \
-  IIOPA.cpp \
-  IIOPC.cpp \
-  IIOP_Acceptor.cpp \
-  IIOP_Connection_Handler.cpp \
-  IIOP_Connector.cpp \
-  IIOP_Endpoint.cpp \
-  IIOP_EndpointsA.cpp \
-  IIOP_EndpointsC.cpp \
-  IIOP_Factory.cpp \
-  IIOP_Lite_Factory.cpp \
-  IIOP_Profile.cpp \
-  IIOP_Transport.cpp \
-  IOPC.cpp \
-  IOP_CodecA.cpp \
-  IOP_CodecC.cpp \
-  IOP_IORA.cpp \
-  IOP_IORC.cpp \
-  IORInterceptor_Adapter.cpp \
-  IORInterceptor_Adapter_Factory.cpp \
-  IOR_Parser.cpp \
-  Incoming_Message_Queue.cpp \
-  InterceptorA.cpp \
-  InterceptorC.cpp \
-  InvalidSlotA.cpp \
-  InvalidSlotC.cpp \
-  Invocation_Adapter.cpp \
-  Invocation_Base.cpp \
-  Invocation_Endpoint_Selectors.cpp \
-  LF_CH_Event.cpp \
-  LF_Connect_Strategy.cpp \
-  LF_Event.cpp \
-  LF_Event_Binder.cpp \
-  LF_Event_Loop_Thread_Helper.cpp \
-  LF_Follower.cpp \
-  LF_Follower_Auto_Adder.cpp \
-  LF_Follower_Auto_Ptr.cpp \
-  LF_Invocation_Event.cpp \
-  LF_Strategy.cpp \
-  LF_Strategy_Complete.cpp \
-  LRU_Connection_Purging_Strategy.cpp \
-  Leader_Follower.cpp \
-  Leader_Follower_Flushing_Strategy.cpp \
-  LocalObject.cpp \
-  LocateRequest_Invocation.cpp \
-  LocateRequest_Invocation_Adapter.cpp \
-  LongDoubleSeqA.cpp \
-  LongDoubleSeqC.cpp \
-  LongLongSeqA.cpp \
-  LongLongSeqC.cpp \
-  LongSeqA.cpp \
-  LongSeqC.cpp \
-  MCAST_Parser.cpp \
-  MProfile.cpp \
-  Managed_Types.cpp \
-  Marshal.cpp \
-  Messaging_PolicyValueC.cpp \
-  Messaging_SyncScopeC.cpp \
-  Muxed_TMS.cpp \
-  NVList.cpp \
-  ORB.cpp \
-  ORBInitInfo.cpp \
-  ORBInitInfoA.cpp \
-  ORBInitInfoC.cpp \
-  ORBInitializerA.cpp \
-  ORBInitializerC.cpp \
-  ORBInitializer_Registry.cpp \
-  ORB_Core.cpp \
-  ORB_Core_Auto_Ptr.cpp \
-  ORB_Table.cpp \
-  Object.cpp \
-  ObjectIdListA.cpp \
-  ObjectIdListC.cpp \
-  ObjectKey_Table.cpp \
-  Object_KeyC.cpp \
-  Object_Loader.cpp \
-  Object_Proxy_Broker.cpp \
-  Object_Proxy_Impl.cpp \
-  Object_Ref_Table.cpp \
-  Objref_TypeCode_Static.cpp \
-  OctetSeqA.cpp \
-  OctetSeqC.cpp \
-  PICurrent.cpp \
-  PICurrent_Copy_Callback.cpp \
-  PICurrent_ORBInitializer.cpp \
-  PIForwardRequestA.cpp \
-  PIForwardRequestC.cpp \
-  PI_ForwardC.cpp \
-  ParameterModeA.cpp \
-  ParameterModeC.cpp \
-  Parser_Registry.cpp \
-  Pluggable_Messaging.cpp \
-  Pluggable_Messaging_Utils.cpp \
-  PolicyA.cpp \
-  PolicyC.cpp \
-  PolicyFactoryA.cpp \
-  PolicyFactoryC.cpp \
-  PolicyFactory_Registry.cpp \
-  Policy_ForwardA.cpp \
-  Policy_ForwardC.cpp \
-  Policy_Manager.cpp \
-  Policy_Set.cpp \
-  Policy_Validator.cpp \
-  PollableC.cpp \
-  PortableInterceptorA.cpp \
-  PortableInterceptorC.cpp \
-  PredefinedType_Seq_Tmplinst.cpp \
-  Principal.cpp \
-  Profile.cpp \
-  Profile_Transport_Resolver.cpp \
-  Protocol_Factory.cpp \
-  Protocols_Hooks.cpp \
-  Queued_Message.cpp \
-  Reactive_Connect_Strategy.cpp \
-  Reactive_Flushing_Strategy.cpp \
-  Refcounted_ObjectKey.cpp \
-  Remote_Invocation.cpp \
-  Remote_Object_Proxy_Broker.cpp \
-  Reply_Dispatcher.cpp \
-  RequestInfoA.cpp \
-  RequestInfoC.cpp \
-  RequestInfo_Util.cpp \
-  Request_Dispatcher.cpp \
-  Resource_Factory.cpp \
-  Resume_Handle.cpp \
-  Sequence.cpp \
-  Sequence_TypeCode_Static.cpp \
-  ServerRequestInfoA.cpp \
-  ServerRequestInfoC.cpp \
-  ServerRequestInterceptorA.cpp \
-  ServerRequestInterceptorC.cpp \
-  Server_Strategy_Factory.cpp \
-  Service_Callbacks.cpp \
-  Service_Context.cpp \
-  ServicesC.cpp \
-  Services_Activate.cpp \
-  ShortSeqA.cpp \
-  ShortSeqC.cpp \
-  Special_Basic_Arguments.cpp \
-  StringSeqA.cpp \
-  StringSeqC.cpp \
-  String_TypeCode_Static.cpp \
-  Struct_TypeCode_Static.cpp \
-  Stub.cpp \
-  Stub_Factory.cpp \
-  Sync_Strategies.cpp \
-  Synch_Invocation.cpp \
-  Synch_Queued_Message.cpp \
-  Synch_Refcountable.cpp \
-  Synch_Reply_Dispatcher.cpp \
-  SystemException.cpp \
-  SystemExceptionA.cpp \
-  TAOA.cpp \
-  TAOC.cpp \
-  TAO_Internal.cpp \
-  TAO_Server_Request.cpp \
-  TAO_Singleton_Manager.cpp \
-  TSS_Resources.cpp \
-  Tagged_Components.cpp \
-  Tagged_Profile.cpp \
-  Thread_Lane_Resources.cpp \
-  Thread_Lane_Resources_Manager.cpp \
-  Thread_Per_Connection_Handler.cpp \
-  TimeBaseA.cpp \
-  TimeBaseC.cpp \
-  Transport.cpp \
-  Transport_Acceptor.cpp \
-  Transport_Cache_Manager.cpp \
-  Transport_Connector.cpp \
-  Transport_Descriptor_Interface.cpp \
-  Transport_Mux_Strategy.cpp \
-  Transport_Timer.cpp \
-  True_RefCount_Policy.cpp \
-  TypeCode.cpp \
-  TypeCodeA.cpp \
-  TypeCodeFactory_Adapter.cpp \
-  TypeCode_CDR_Extraction.cpp \
-  TypeCode_Constants.cpp \
-  Typecode_typesC.cpp \
-  ULongLongSeqA.cpp \
-  ULongLongSeqC.cpp \
-  ULongSeqA.cpp \
-  ULongSeqC.cpp \
-  UShortSeqA.cpp \
-  UShortSeqC.cpp \
-  UTF16_BOM_Factory.cpp \
-  UTF16_BOM_Translator.cpp \
-  Union_TypeCode_Static.cpp \
-  UserException.cpp \
-  ValueModifierC.cpp \
-  Value_TypeCode_Static.cpp \
-  Valuetype_Adapter.cpp \
-  VisibilityA.cpp \
-  VisibilityC.cpp \
-  WCharSeqA.cpp \
-  WCharSeqC.cpp \
-  WStringSeqA.cpp \
-  WStringSeqC.cpp \
-  Wait_On_LF_No_Upcall.cpp \
-  Wait_On_Leader_Follower.cpp \
-  Wait_On_Reactor.cpp \
-  Wait_On_Read.cpp \
-  Wait_Strategy.cpp \
-  WrongTransactionA.cpp \
-  WrongTransactionC.cpp \
-  append.cpp \
-  debug.cpp \
-  default_client.cpp \
-  default_resource.cpp \
-  default_server.cpp \
-  operation_details.cpp \
-  orb_typesA.cpp \
-  orb_typesC.cpp \
-  params.cpp \
-  skip.cpp \
-  target_specification.cpp
-
-libTAO_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
-  Abstract_Servant_Base.h \
-  Acceptor_Filter.h \
-  Acceptor_Impl.cpp \
-  Acceptor_Impl.h \
-  Acceptor_Registry.h \
-  Acceptor_Registry.i \
-  Adapter.h \
-  Adapter_Factory.h \
-  Adapter_Registry.h \
-  Alias_TypeCode.cpp \
-  Alias_TypeCode.h \
-  Alias_TypeCode.inl \
-  Alias_TypeCode_Static.h \
-  Alias_TypeCode_Static.inl \
-  Allocator.h \
-  Any.h \
-  Any.i \
-  AnySeq.pidl \
-  AnySeqC.h \
-  AnySeqS.h \
-  Any_Arg_Traits.h \
-  Any_Array_Impl_T.cpp \
-  Any_Array_Impl_T.h \
-  Any_Array_Impl_T.inl \
-  Any_Basic_Impl.h \
-  Any_Basic_Impl_T.cpp \
-  Any_Basic_Impl_T.h \
-  Any_Basic_Impl_T.inl \
-  Any_Dual_Impl_T.cpp \
-  Any_Dual_Impl_T.h \
-  Any_Dual_Impl_T.inl \
-  Any_Impl.h \
-  Any_Impl_T.cpp \
-  Any_Impl_T.h \
-  Any_Impl_T.inl \
-  Any_Special_Impl_T.cpp \
-  Any_Special_Impl_T.h \
-  Any_Special_Impl_T.inl \
-  Any_SystemException.h \
-  Any_Unknown_IDL_Type.h \
-  Arg_Traits_T.h \
-  Argument.h \
-  Array_VarOut_T.cpp \
-  Array_VarOut_T.h \
-  Array_VarOut_T.inl \
-  Asynch_Queued_Message.h \
-  Asynch_Reply_Dispatcher_Base.h \
-  Asynch_Reply_Dispatcher_Base.i \
-  Auto_Functor.h \
-  BD_String_Argument_T.cpp \
-  BD_String_Argument_T.h \
-  BD_String_Argument_T.inl \
-  Base_Transport_Property.h \
-  Base_Transport_Property.inl \
-  Basic_Argument_T.cpp \
-  Basic_Argument_T.h \
-  Basic_Argument_T.inl \
-  Basic_Arguments.h \
-  Basic_Types.h \
-  BiDir_Adapter.h \
-  Bind_Dispatcher_Guard.h \
-  Bind_Dispatcher_Guard.i \
-  Block_Flushing_Strategy.h \
-  Blocked_Connect_Strategy.h \
-  BooleanSeq.pidl \
-  BooleanSeqC.h \
-  BooleanSeqS.h \
-  Bounds.pidl \
-  BoundsC.h \
-  Buffer_Allocator_T.cpp \
-  Buffer_Allocator_T.h \
-  Buffering_Constraint_Policy.h \
-  Buffering_Constraint_Policy.i \
-  CDR.h \
-  CDR.i \
-  CDR_Encaps_Codec.h \
-  CONV_FRAME.pidl \
-  CONV_FRAMEC.h \
-  CONV_FRAMES.h \
-  CONV_FRAMES_T.h \
-  CORBALOC_Parser.h \
-  CORBALOC_Parser.i \
-  CORBANAME_Parser.h \
-  CORBANAME_Parser.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  CORBA_methods.h \
-  Cache_Entries.h \
-  Cache_Entries.inl \
-  CharSeq.pidl \
-  CharSeqC.h \
-  CharSeqS.h \
-  Cleanup_Func_Registry.h \
-  Cleanup_Func_Registry.inl \
-  ClientRequestInfo.h \
-  ClientRequestInfo.inl \
-  ClientRequestInfo.pidl \
-  ClientRequestInfoC.h \
-  ClientRequestInfoS.h \
-  ClientRequestInfo_i.h \
-  ClientRequestInfo_i.inl \
-  ClientRequestInterceptor.pidl \
-  ClientRequestInterceptorC.h \
-  ClientRequestInterceptorS.h \
-  ClientRequestInterceptor_Adapter.h \
-  ClientRequestInterceptor_Adapter.inl \
-  Client_Strategy_Factory.h \
-  CodecFactory.h \
-  CodecFactory_ORBInitializer.h \
-  Codeset_Manager.h \
-  Codeset_Translator_Factory.h \
-  Codeset_Translator_Factory_T.cpp \
-  Codeset_Translator_Factory_T.h \
-  Collocated_Invocation.h \
-  Collocation_Proxy_Broker.h \
-  Collocation_Resolver.h \
-  Collocation_Strategy.h \
-  Condition.cpp \
-  Condition.h \
-  Condition.inl \
-  Connect_Strategy.h \
-  Connection_Handler.h \
-  Connection_Handler.inl \
-  Connection_Purging_Strategy.h \
-  Connection_Purging_Strategy.inl \
-  Connector_Impl.cpp \
-  Connector_Impl.h \
-  Connector_Registry.h \
-  Connector_Registry.i \
-  Current.pidl \
-  CurrentC.h \
-  CurrentS.h \
-  DLL_Parser.h \
-  DLL_Parser.i \
-  Default_Collocation_Resolver.h \
-  Default_Endpoint_Selector_Factory.h \
-  Default_Protocols_Hooks.h \
-  Default_Stub_Factory.h \
-  Default_Thread_Lane_Resources_Manager.h \
-  Domain.pidl \
-  DomainC.h \
-  DomainC.inl \
-  DoubleSeq.pidl \
-  DoubleSeqC.h \
-  DoubleSeqS.h \
-  Dynamic.pidl \
-  DynamicC.h \
-  DynamicS.h \
-  Dynamic_Adapter.h \
-  Dynamic_Parameter.pidl \
-  Dynamic_ParameterC.h \
-  Empty_Param_TypeCode.h \
-  Empty_Param_TypeCode.inl \
-  Encodable.h \
-  Endpoint.h \
-  Endpoint.i \
-  Endpoint_Selector_Factory.h \
-  Enum_TypeCode.cpp \
-  Enum_TypeCode.h \
-  Enum_TypeCode.inl \
-  Enum_TypeCode_Static.h \
-  Enum_TypeCode_Static.inl \
-  Environment.h \
-  Environment.i \
-  Exception.h \
-  Exception.i \
-  Exception_Data.h \
-  Exclusive_TMS.h \
-  FILE_Parser.h \
-  FILE_Parser.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Fixed_Array_Argument_T.cpp \
-  Fixed_Array_Argument_T.h \
-  Fixed_Array_Argument_T.inl \
-  Fixed_Size_Argument_T.cpp \
-  Fixed_Size_Argument_T.h \
-  Fixed_Size_Argument_T.inl \
-  Fixed_TypeCode.cpp \
-  Fixed_TypeCode.h \
-  Fixed_TypeCode.inl \
-  FloatSeq.pidl \
-  FloatSeqC.h \
-  FloatSeqS.h \
-  Flushing_Strategy.h \
-  GIOP.pidl \
-  GIOPC.h \
-  GIOPC.inl \
-  GIOPS.h \
-  GIOPS_T.h \
-  GIOP_Message_Base.h \
-  GIOP_Message_Generator_Parser.h \
-  GIOP_Message_Generator_Parser_10.h \
-  GIOP_Message_Generator_Parser_11.h \
-  GIOP_Message_Generator_Parser_12.h \
-  GIOP_Message_Generator_Parser_Impl.h \
-  GIOP_Message_Generator_Parser_Impl.inl \
-  GIOP_Message_Lite.h \
-  GIOP_Message_Locate_Header.h \
-  GIOP_Message_Locate_Header.i \
-  GIOP_Message_State.h \
-  GIOP_Message_State.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Utils.h \
-  GUIResource_Factory.h \
-  IFR_Client_Adapter.h \
-  IIOP.pidl \
-  IIOPC.h \
-  IIOP_Acceptor.h \
-  IIOP_Acceptor.i \
-  IIOP_Connection_Handler.h \
-  IIOP_Connector.h \
-  IIOP_Endpoint.h \
-  IIOP_Endpoint.i \
-  IIOP_Endpoints.pidl \
-  IIOP_EndpointsC.h \
-  IIOP_Factory.h \
-  IIOP_Lite_Factory.h \
-  IIOP_Profile.h \
-  IIOP_Transport.h \
-  IOP.pidl \
-  IOPC.h \
-  IOPS.h \
-  IOPS_T.h \
-  IOP_Codec.pidl \
-  IOP_CodecC.h \
-  IOP_IOR.pidl \
-  IOP_IORC.h \
-  IORInterceptor_Adapter.h \
-  IORInterceptor_Adapter_Factory.h \
-  IOR_Parser.h \
-  Incoming_Message_Queue.h \
-  Incoming_Message_Queue.inl \
-  Interceptor.pidl \
-  InterceptorC.h \
-  InterceptorS.h \
-  Interceptor_List.cpp \
-  Interceptor_List.h \
-  InterfaceDef.pidl \
-  InvalidName.pidl \
-  InvalidSlot.pidl \
-  InvalidSlotC.h \
-  InvalidSlotS.h \
-  Invocation_Adapter.h \
-  Invocation_Adapter.inl \
-  Invocation_Base.h \
-  Invocation_Base.inl \
-  Invocation_Endpoint_Selectors.h \
-  Invocation_Utils.h \
-  LF_CH_Event.h \
-  LF_Connect_Strategy.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Event_Binder.h \
-  LF_Event_Binder.inl \
-  LF_Event_Loop_Thread_Helper.h \
-  LF_Event_Loop_Thread_Helper.inl \
-  LF_Follower.h \
-  LF_Follower.inl \
-  LF_Follower_Auto_Adder.h \
-  LF_Follower_Auto_Adder.inl \
-  LF_Follower_Auto_Ptr.h \
-  LF_Follower_Auto_Ptr.inl \
-  LF_Invocation_Event.h \
-  LF_Strategy.h \
-  LF_Strategy_Complete.h \
-  LF_Strategy_Complete.inl \
-  LRU_Connection_Purging_Strategy.h \
-  Leader_Follower.h \
-  Leader_Follower.i \
-  Leader_Follower_Flushing_Strategy.h \
-  LocalObject.h \
-  LocalObject.i \
-  LocateRequest_Invocation.h \
-  LocateRequest_Invocation_Adapter.h \
-  LongDoubleSeq.pidl \
-  LongDoubleSeqC.h \
-  LongDoubleSeqS.h \
-  LongLongSeq.pidl \
-  LongLongSeqC.h \
-  LongLongSeqS.h \
-  LongSeq.pidl \
-  LongSeqC.h \
-  LongSeqS.h \
-  MCAST_Parser.h \
-  MCAST_Parser.i \
-  MProfile.h \
-  MProfile.i \
-  Managed_Types.h \
-  Managed_Types.i \
-  Marshal.h \
-  Marshal.i \
-  Messaging_PolicyValue.pidl \
-  Messaging_PolicyValueC.h \
-  Messaging_SyncScope.pidl \
-  Messaging_SyncScopeC.h \
-  Muxed_TMS.h \
-  NVList.h \
-  NVList.i \
-  New_Leader_Generator.h \
-  Null_RefCount_Policy.h \
-  ORB.h \
-  ORB.i \
-  ORBInitInfo.h \
-  ORBInitInfo.inl \
-  ORBInitInfo.pidl \
-  ORBInitInfoC.h \
-  ORBInitInfoS.h \
-  ORBInitializer.pidl \
-  ORBInitializerC.h \
-  ORBInitializerS.h \
-  ORBInitializer_Registry.h \
-  ORB_Constants.h \
-  ORB_Core.h \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  ORB_Table.h \
-  ORB_Table.inl \
-  Object.h \
-  Object.i \
-  ObjectIdList.pidl \
-  ObjectIdListC.h \
-  ObjectKey_Table.h \
-  Object_Argument_T.cpp \
-  Object_Argument_T.h \
-  Object_Argument_T.inl \
-  Object_Key.pidl \
-  Object_KeyC.h \
-  Object_Loader.h \
-  Object_Proxy_Broker.h \
-  Object_Proxy_Impl.h \
-  Object_Ref_Table.h \
-  Object_T.cpp \
-  Object_T.h \
-  Objref_TypeCode.cpp \
-  Objref_TypeCode.h \
-  Objref_TypeCode.inl \
-  Objref_TypeCode_Static.h \
-  Objref_TypeCode_Static.inl \
-  Objref_VarOut_T.cpp \
-  Objref_VarOut_T.h \
-  OctetSeq.pidl \
-  OctetSeqC.h \
-  OctetSeqS.h \
-  PICurrent.h \
-  PICurrent.inl \
-  PICurrent_Copy_Callback.h \
-  PICurrent_ORBInitializer.h \
-  PIForwardRequest.pidl \
-  PIForwardRequestC.h \
-  PIForwardRequestS.h \
-  PI_Forward.pidl \
-  PI_ForwardC.h \
-  ParameterMode.pidl \
-  ParameterModeC.h \
-  ParameterModeS.h \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Pluggable_Messaging.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Policy.pidl \
-  PolicyC.h \
-  PolicyC.inl \
-  PolicyFactory.pidl \
-  PolicyFactoryC.h \
-  PolicyFactoryS.h \
-  PolicyFactory_Registry.h \
-  PolicyS.h \
-  Policy_Forward.pidl \
-  Policy_ForwardC.h \
-  Policy_ForwardS.h \
-  Policy_Manager.h \
-  Policy_Manager.i \
-  Policy_Set.h \
-  Policy_Set.i \
-  Policy_Validator.h \
-  Pollable.pidl \
-  PollableC.h \
-  PollableS.h \
-  PortableInterceptor.h \
-  PortableInterceptor.pidl \
-  PortableInterceptorC.h \
-  PortableInterceptorS.h \
-  Principal.h \
-  Principal.i \
-  Profile.h \
-  Profile.i \
-  Profile_Transport_Resolver.h \
-  Profile_Transport_Resolver.inl \
-  Protocol_Factory.h \
-  Protocols_Hooks.h \
-  Pseudo_VarOut_T.cpp \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Queued_Message.h \
-  Queued_Message.inl \
-  Reactive_Connect_Strategy.h \
-  Reactive_Flushing_Strategy.h \
-  Recursive_Type_TypeCode.cpp \
-  Recursive_Type_TypeCode.h \
-  Recursive_Type_TypeCode.inl \
-  RefCount_Policy_Traits.h \
-  Refcounted_ObjectKey.h \
-  Refcounted_ObjectKey.inl \
-  Remote_Invocation.h \
-  Remote_Object_Proxy_Broker.h \
-  Reply_Dispatcher.h \
-  Reply_Dispatcher.i \
-  RequestInfo.pidl \
-  RequestInfoC.h \
-  RequestInfoS.h \
-  RequestInfo_Util.h \
-  Request_Dispatcher.h \
-  Resource_Factory.h \
-  Resume_Handle.h \
-  Resume_Handle.inl \
-  Seq_Out_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Sequence.h \
-  Sequence.i \
-  Sequence_T.cpp \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_TypeCode.cpp \
-  Sequence_TypeCode.h \
-  Sequence_TypeCode.inl \
-  Sequence_TypeCode_Static.h \
-  Sequence_TypeCode_Static.inl \
-  ServerRequestInfo.pidl \
-  ServerRequestInfoC.h \
-  ServerRequestInfoS.h \
-  ServerRequestInterceptor.pidl \
-  ServerRequestInterceptorC.h \
-  ServerRequestInterceptorS.h \
-  Server_Strategy_Factory.h \
-  Service_Callbacks.h \
-  Service_Context.h \
-  Service_Context.inl \
-  Services.pidl \
-  ServicesC.h \
-  ServicesS.h \
-  ServicesS_T.h \
-  Services_Activate.h \
-  ShortSeq.pidl \
-  ShortSeqC.h \
-  ShortSeqS.h \
-  Special_Basic_Argument_T.cpp \
-  Special_Basic_Argument_T.h \
-  Special_Basic_Argument_T.inl \
-  Special_Basic_Arguments.h \
-  StringSeq.pidl \
-  StringSeqC.h \
-  StringSeqS.h \
-  String_TypeCode.cpp \
-  String_TypeCode.h \
-  String_TypeCode.inl \
-  String_TypeCode_Static.h \
-  String_TypeCode_Static.inl \
-  String_TypeCode_Traits.h \
-  Struct_TypeCode.cpp \
-  Struct_TypeCode.h \
-  Struct_TypeCode.inl \
-  Struct_TypeCode_Static.h \
-  Struct_TypeCode_Static.inl \
-  Stub.h \
-  Stub.i \
-  Stub_Factory.h \
-  Sync_Strategies.h \
-  Synch_Invocation.h \
-  Synch_Invocation.inl \
-  Synch_Queued_Message.h \
-  Synch_Refcountable.h \
-  Synch_Refcountable.inl \
-  Synch_Reply_Dispatcher.h \
-  SystemException.h \
-  SystemException.inl \
-  TAO.pidl \
-  TAOC.h \
-  TAOS.h \
-  TAO_Export.h \
-  TAO_Internal.h \
-  TAO_Server_Request.h \
-  TAO_Server_Request.i \
-  TAO_Singleton.cpp \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TC_Constants_Forward.h \
-  TSS_Resources.h \
-  Tagged_Components.h \
-  Tagged_Components.i \
-  Tagged_Profile.h \
-  Tagged_Profile.i \
-  Thread_Lane_Resources.h \
-  Thread_Lane_Resources_Manager.h \
-  Thread_Per_Connection_Handler.h \
-  TimeBase.pidl \
-  TimeBaseC.h \
-  TimeBaseS.h \
-  Timeprobe.h \
-  Transport.h \
-  Transport.inl \
-  Transport_Acceptor.h \
-  Transport_Acceptor.inl \
-  Transport_Cache_Manager.h \
-  Transport_Cache_Manager.inl \
-  Transport_Connector.h \
-  Transport_Connector.inl \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  Transport_Mux_Strategy.h \
-  Transport_Timer.h \
-  True_RefCount_Policy.h \
-  True_RefCount_Policy.inl \
-  TypeCode.h \
-  TypeCode.inl \
-  TypeCodeFactory_Adapter.h \
-  TypeCode_Base_Attributes.cpp \
-  TypeCode_Base_Attributes.h \
-  TypeCode_Base_Attributes.inl \
-  TypeCode_CDR_Extraction.h \
-  TypeCode_Case.cpp \
-  TypeCode_Case.h \
-  TypeCode_Case.inl \
-  TypeCode_Case_T.cpp \
-  TypeCode_Case_T.h \
-  TypeCode_Case_T.inl \
-  TypeCode_Constants.h \
-  TypeCode_Struct_Field.h \
-  TypeCode_Traits.h \
-  TypeCode_Value_Field.h \
-  Typecode_types.pidl \
-  Typecode_typesC.h \
-  Typecode_typesS.h \
-  UB_String_Argument_T.cpp \
-  UB_String_Argument_T.h \
-  UB_String_Argument_T.inl \
-  UB_String_Arguments.h \
-  ULongLongSeq.pidl \
-  ULongLongSeqC.h \
-  ULongLongSeqS.h \
-  ULongSeq.pidl \
-  ULongSeqC.h \
-  ULongSeqS.h \
-  UShortSeq.pidl \
-  UShortSeqC.h \
-  UShortSeqS.h \
-  UTF16_BOM_Factory.h \
-  UTF16_BOM_Translator.h \
-  Union_TypeCode.cpp \
-  Union_TypeCode.h \
-  Union_TypeCode.inl \
-  Union_TypeCode_Static.h \
-  Union_TypeCode_Static.inl \
-  UserException.h \
-  UserException.inl \
-  ValueModifier.pidl \
-  ValueModifierC.h \
-  ValueModifierS.h \
-  Value_TypeCode.cpp \
-  Value_TypeCode.h \
-  Value_TypeCode.inl \
-  Value_TypeCode_Static.h \
-  Value_TypeCode_Static.inl \
-  Valuetype_Adapter.h \
-  VarOut_T.cpp \
-  VarOut_T.h \
-  VarOut_T.inl \
-  Var_Array_Argument_T.cpp \
-  Var_Array_Argument_T.h \
-  Var_Array_Argument_T.inl \
-  Var_Size_Argument_T.cpp \
-  Var_Size_Argument_T.h \
-  Var_Size_Argument_T.inl \
-  Version.h \
-  Visibility.pidl \
-  VisibilityC.h \
-  VisibilityS.h \
-  WCharSeq.pidl \
-  WCharSeqC.h \
-  WCharSeqS.h \
-  WStringSeq.pidl \
-  WStringSeqC.h \
-  WStringSeqS.h \
-  Wait_On_LF_No_Upcall.h \
-  Wait_On_Leader_Follower.h \
-  Wait_On_Reactor.h \
-  Wait_On_Read.h \
-  Wait_Strategy.h \
-  Wait_Strategy.inl \
-  WrongTransaction.pidl \
-  WrongTransactionC.h \
-  corba.h \
-  corbafwd.h \
-  debug.h \
-  default_client.h \
-  default_environment.h \
-  default_ports.h \
-  default_resource.h \
-  default_server.h \
-  objectid.h \
-  operation_details.h \
-  operation_details.i \
-  orb.idl \
-  orb_types.pidl \
-  orb_typesC.h \
-  orb_typesS.h \
-  orbconf.h \
-  params.h \
-  params.i \
-  target_specification.h \
-  target_specification.i \
-  varbase.h
-
-pkgconfig_DATA = TAO.pc
-
-TAO.pc: ${top_builddir}/config.status ${srcdir}/TAO.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO.pc.in
-
-EXTRA_DIST = \
-  TAO.pc.in \
-  tao.rc
-
-
-## Makefile.BiDir_GIOP.am
-
-lib_LTLIBRARIES += libTAO_BiDirGIOP.la
-
-libTAO_BiDirGIOP_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_BIDIRGIOP_BUILD_DLL
-
-libTAO_BiDirGIOP_la_SOURCES = \
-  BiDir_GIOP/BiDirGIOP.cpp \
-  BiDir_GIOP/BiDirPolicyC.cpp \
-  BiDir_GIOP/BiDirPolicy_Validator.cpp \
-  BiDir_GIOP/BiDir_ORBInitializer.cpp \
-  BiDir_GIOP/BiDir_PolicyFactory.cpp \
-  BiDir_GIOP/BiDir_Policy_i.cpp
-
-libTAO_BiDirGIOP_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_BiDirGIOP_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  BiDir_GIOP/BiDirGIOP.h \
-  BiDir_GIOP/BiDirPolicy.pidl \
-  BiDir_GIOP/BiDirPolicyC.h \
-  BiDir_GIOP/BiDirPolicy_Validator.h \
-  BiDir_GIOP/BiDir_ORBInitializer.h \
-  BiDir_GIOP/BiDir_PolicyFactory.h \
-  BiDir_GIOP/BiDir_Policy_i.h \
-  BiDir_GIOP/bidirgiop_export.h
-
-pkgconfig_DATA += TAO_BiDirGIOP.pc
-
-TAO_BiDirGIOP.pc: ${top_builddir}/config.status ${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/BiDir_GIOP/TAO_BiDirGIOP.pc.in
-
-EXTRA_DIST += \
-  BiDir_GIOP/TAO_BiDirGIOP.pc.in \
-  BiDir_GIOP/TAO_BiDir_GIOP.rc
-
-
-## Makefile.PortableServer.am
-
-lib_LTLIBRARIES += libTAO_PortableServer.la
-
-libTAO_PortableServer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_PORTABLESERVER_BUILD_DLL
-
-libTAO_PortableServer_la_SOURCES = \
-  PortableServer/Active_Object_Map.cpp \
-  PortableServer/Active_Object_Map_Entry.cpp \
-  PortableServer/Active_Policy_Strategies.cpp \
-  PortableServer/AdapterActivatorA.cpp \
-  PortableServer/AdapterActivatorC.cpp \
-  PortableServer/Adapter_Activator.cpp \
-  PortableServer/Basic_SArguments.cpp \
-  PortableServer/Collocated_Object_Proxy_Broker.cpp \
-  PortableServer/Creation_Time.cpp \
-  PortableServer/Default_Acceptor_Filter.cpp \
-  PortableServer/Default_Policy_Validator.cpp \
-  PortableServer/Default_Servant_Dispatcher.cpp \
-  PortableServer/Direct_Collocation_Upcall_Wrapper.cpp \
-  PortableServer/ForwardRequestA.cpp \
-  PortableServer/ForwardRequestC.cpp \
-  PortableServer/IdAssignmentPolicy.cpp \
-  PortableServer/IdAssignmentPolicyA.cpp \
-  PortableServer/IdAssignmentPolicyC.cpp \
-  PortableServer/IdAssignmentStrategy.cpp \
-  PortableServer/IdAssignmentStrategyFactoryImpl.cpp \
-  PortableServer/IdAssignmentStrategySystem.cpp \
-  PortableServer/IdAssignmentStrategyUser.cpp \
-  PortableServer/IdUniquenessPolicy.cpp \
-  PortableServer/IdUniquenessPolicyA.cpp \
-  PortableServer/IdUniquenessPolicyC.cpp \
-  PortableServer/IdUniquenessStrategyFactoryImpl.cpp \
-  PortableServer/IdUniquenessStrategyMultiple.cpp \
-  PortableServer/IdUniquenessStrategyUnique.cpp \
-  PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp \
-  PortableServer/ImR_Client_Adapter.cpp \
-  PortableServer/ImplicitActivationPolicy.cpp \
-  PortableServer/ImplicitActivationPolicyA.cpp \
-  PortableServer/ImplicitActivationPolicyC.cpp \
-  PortableServer/ImplicitActivationStrategy.cpp \
-  PortableServer/ImplicitActivationStrategyExplicit.cpp \
-  PortableServer/ImplicitActivationStrategyFactoryImpl.cpp \
-  PortableServer/ImplicitActivationStrategyImplicit.cpp \
-  PortableServer/Key_Adapters.cpp \
-  PortableServer/LifespanPolicy.cpp \
-  PortableServer/LifespanPolicyA.cpp \
-  PortableServer/LifespanPolicyC.cpp \
-  PortableServer/LifespanStrategy.cpp \
-  PortableServer/LifespanStrategyFactoryImpl.cpp \
-  PortableServer/LifespanStrategyPersistent.cpp \
-  PortableServer/LifespanStrategyPersistentFactoryImpl.cpp \
-  PortableServer/LifespanStrategyTransient.cpp \
-  PortableServer/LifespanStrategyTransientFactoryImpl.cpp \
-  PortableServer/Local_Servant_Base.cpp \
-  PortableServer/Non_Servant_Upcall.cpp \
-  PortableServer/ORT_Adapter.cpp \
-  PortableServer/ORT_Adapter_Factory.cpp \
-  PortableServer/Object_Adapter.cpp \
-  PortableServer/Object_Adapter_Factory.cpp \
-  PortableServer/Operation_Table.cpp \
-  PortableServer/Operation_Table_Binary_Search.cpp \
-  PortableServer/Operation_Table_Dynamic_Hash.cpp \
-  PortableServer/Operation_Table_Linear_Search.cpp \
-  PortableServer/Operation_Table_Perfect_Hash.cpp \
-  PortableServer/PICurrent_Guard.cpp \
-  PortableServer/POAManager.cpp \
-  PortableServer/POAManagerA.cpp \
-  PortableServer/POAManagerC.cpp \
-  PortableServer/POA_Cached_Policies.cpp \
-  PortableServer/POA_Current.cpp \
-  PortableServer/POA_Current_Impl.cpp \
-  PortableServer/POA_Guard.cpp \
-  PortableServer/POA_Policy_Set.cpp \
-  PortableServer/PS_CurrentA.cpp \
-  PortableServer/PS_CurrentC.cpp \
-  PortableServer/PS_ForwardA.cpp \
-  PortableServer/PS_ForwardC.cpp \
-  PortableServer/PolicyS.cpp \
-  PortableServer/PortableServer.cpp \
-  PortableServer/PortableServerA.cpp \
-  PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServer_Functions.cpp \
-  PortableServer/PortableServer_ORBInitializer.cpp \
-  PortableServer/PortableServer_PolicyFactory.cpp \
-  PortableServer/PortableServer_WFunctions.cpp \
-  PortableServer/Regular_POA.cpp \
-  PortableServer/RequestProcessingPolicy.cpp \
-  PortableServer/RequestProcessingPolicyA.cpp \
-  PortableServer/RequestProcessingPolicyC.cpp \
-  PortableServer/RequestProcessingStrategy.cpp \
-  PortableServer/RequestProcessingStrategyAOMOnly.cpp \
-  PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp \
-  PortableServer/RequestProcessingStrategyDefaultServant.cpp \
-  PortableServer/RequestProcessingStrategyDefaultServantFI.cpp \
-  PortableServer/RequestProcessingStrategyFactoryImpl.cpp \
-  PortableServer/RequestProcessingStrategyServantActivator.cpp \
-  PortableServer/RequestProcessingStrategyServantActivatorFI.cpp \
-  PortableServer/RequestProcessingStrategyServantLocator.cpp \
-  PortableServer/RequestProcessingStrategyServantLocatorFI.cpp \
-  PortableServer/RequestProcessingStrategyServantManager.cpp \
-  PortableServer/Root_POA.cpp \
-  PortableServer/ServantActivatorA.cpp \
-  PortableServer/ServantActivatorC.cpp \
-  PortableServer/ServantLocatorA.cpp \
-  PortableServer/ServantLocatorC.cpp \
-  PortableServer/ServantManagerA.cpp \
-  PortableServer/ServantManagerC.cpp \
-  PortableServer/ServantRetentionPolicy.cpp \
-  PortableServer/ServantRetentionPolicyA.cpp \
-  PortableServer/ServantRetentionPolicyC.cpp \
-  PortableServer/ServantRetentionStrategyFactoryImpl.cpp \
-  PortableServer/ServantRetentionStrategyNonRetain.cpp \
-  PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp \
-  PortableServer/ServantRetentionStrategyRetain.cpp \
-  PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp \
-  PortableServer/Servant_Base.cpp \
-  PortableServer/Servant_Dispatcher.cpp \
-  PortableServer/Servant_Upcall.cpp \
-  PortableServer/ServerInterceptorAdapter.cpp \
-  PortableServer/ServerRequestInfo.cpp \
-  PortableServer/Special_Basic_SArguments.cpp \
-  PortableServer/StrategyFactory.cpp \
-  PortableServer/ThreadPolicy.cpp \
-  PortableServer/ThreadPolicyA.cpp \
-  PortableServer/ThreadPolicyC.cpp \
-  PortableServer/ThreadStrategy.cpp \
-  PortableServer/ThreadStrategyFactoryImpl.cpp \
-  PortableServer/ThreadStrategyORBControl.cpp \
-  PortableServer/ThreadStrategySingle.cpp \
-  PortableServer/ThreadStrategySingleFactoryImpl.cpp \
-  PortableServer/UB_String_SArguments.cpp \
-  PortableServer/Upcall_Wrapper.cpp
-
-libTAO_PortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_PortableServer_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  PortableServer/Active_Object_Map.h \
-  PortableServer/Active_Object_Map.i \
-  PortableServer/Active_Object_Map_Entry.h \
-  PortableServer/Active_Policy_Strategies.h \
-  PortableServer/Active_Policy_Strategies.inl \
-  PortableServer/AdapterActivator.pidl \
-  PortableServer/AdapterActivatorC.h \
-  PortableServer/Adapter_Activator.h \
-  PortableServer/Any_SArg_Traits.h \
-  PortableServer/BD_String_SArgument_T.cpp \
-  PortableServer/BD_String_SArgument_T.h \
-  PortableServer/BD_String_SArgument_T.inl \
-  PortableServer/Basic_SArgument_T.cpp \
-  PortableServer/Basic_SArgument_T.h \
-  PortableServer/Basic_SArgument_T.inl \
-  PortableServer/Basic_SArguments.h \
-  PortableServer/Collocated_Object_Proxy_Broker.h \
-  PortableServer/Creation_Time.h \
-  PortableServer/Creation_Time.inl \
-  PortableServer/Default_Acceptor_Filter.h \
-  PortableServer/Default_Policy_Validator.h \
-  PortableServer/Default_Servant_Dispatcher.h \
-  PortableServer/Direct_Collocation_Upcall_Wrapper.h \
-  PortableServer/Fixed_Array_SArgument_T.cpp \
-  PortableServer/Fixed_Array_SArgument_T.h \
-  PortableServer/Fixed_Array_SArgument_T.inl \
-  PortableServer/Fixed_Size_SArgument_T.cpp \
-  PortableServer/Fixed_Size_SArgument_T.h \
-  PortableServer/Fixed_Size_SArgument_T.inl \
-  PortableServer/ForwardRequest.pidl \
-  PortableServer/ForwardRequestC.h \
-  PortableServer/IdAssignmentPolicy.h \
-  PortableServer/IdAssignmentPolicy.pidl \
-  PortableServer/IdAssignmentPolicyC.h \
-  PortableServer/IdAssignmentStrategy.h \
-  PortableServer/IdAssignmentStrategyFactory.h \
-  PortableServer/IdAssignmentStrategyFactoryImpl.h \
-  PortableServer/IdAssignmentStrategySystem.h \
-  PortableServer/IdAssignmentStrategyUser.h \
-  PortableServer/IdUniquenessPolicy.h \
-  PortableServer/IdUniquenessPolicy.pidl \
-  PortableServer/IdUniquenessPolicyC.h \
-  PortableServer/IdUniquenessStrategy.h \
-  PortableServer/IdUniquenessStrategyFactory.h \
-  PortableServer/IdUniquenessStrategyFactoryImpl.h \
-  PortableServer/IdUniquenessStrategyMultiple.h \
-  PortableServer/IdUniquenessStrategyUnique.h \
-  PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h \
-  PortableServer/ImR_Client_Adapter.h \
-  PortableServer/ImplicitActivationPolicy.h \
-  PortableServer/ImplicitActivationPolicy.pidl \
-  PortableServer/ImplicitActivationPolicyC.h \
-  PortableServer/ImplicitActivationStrategy.h \
-  PortableServer/ImplicitActivationStrategyExplicit.h \
-  PortableServer/ImplicitActivationStrategyFactory.h \
-  PortableServer/ImplicitActivationStrategyFactoryImpl.h \
-  PortableServer/ImplicitActivationStrategyImplicit.h \
-  PortableServer/Key_Adapters.h \
-  PortableServer/LifespanPolicy.h \
-  PortableServer/LifespanPolicy.pidl \
-  PortableServer/LifespanPolicyC.h \
-  PortableServer/LifespanStrategy.h \
-  PortableServer/LifespanStrategyFactory.h \
-  PortableServer/LifespanStrategyFactoryImpl.h \
-  PortableServer/LifespanStrategyPersistent.h \
-  PortableServer/LifespanStrategyPersistentFactoryImpl.h \
-  PortableServer/LifespanStrategyTransient.h \
-  PortableServer/LifespanStrategyTransientFactoryImpl.h \
-  PortableServer/Local_Servant_Base.h \
-  PortableServer/Local_Servant_Base.inl \
-  PortableServer/Non_Servant_Upcall.h \
-  PortableServer/Non_Servant_Upcall.inl \
-  PortableServer/ORT_Adapter.h \
-  PortableServer/ORT_Adapter_Factory.h \
-  PortableServer/Object_Adapter.h \
-  PortableServer/Object_Adapter.i \
-  PortableServer/Object_Adapter_Factory.h \
-  PortableServer/Object_SArg_Traits.h \
-  PortableServer/Object_SArgument_T.cpp \
-  PortableServer/Object_SArgument_T.h \
-  PortableServer/Object_SArgument_T.inl \
-  PortableServer/Operation_Table.h \
-  PortableServer/Operation_Table_Binary_Search.h \
-  PortableServer/Operation_Table_Dynamic_Hash.h \
-  PortableServer/Operation_Table_Linear_Search.h \
-  PortableServer/Operation_Table_Perfect_Hash.h \
-  PortableServer/PICurrent_Guard.h \
-  PortableServer/POAManager.h \
-  PortableServer/POAManager.i \
-  PortableServer/POAManager.pidl \
-  PortableServer/POAManagerC.h \
-  PortableServer/POA_Cached_Policies.h \
-  PortableServer/POA_Cached_Policies.i \
-  PortableServer/POA_Current.h \
-  PortableServer/POA_Current.inl \
-  PortableServer/POA_Current_Impl.h \
-  PortableServer/POA_Current_Impl.inl \
-  PortableServer/POA_Guard.h \
-  PortableServer/POA_Policy_Set.h \
-  PortableServer/POA_Policy_Set.i \
-  PortableServer/PS_Current.pidl \
-  PortableServer/PS_CurrentC.h \
-  PortableServer/PS_Forward.pidl \
-  PortableServer/PS_ForwardC.h \
-  PortableServer/PolicyS.h \
-  PortableServer/PolicyS_T.cpp \
-  PortableServer/PolicyS_T.h \
-  PortableServer/PolicyS_T.inl \
-  PortableServer/Policy_Creator_T.h \
-  PortableServer/Policy_Strategy.h \
-  PortableServer/PortableServer.h \
-  PortableServer/PortableServer.pidl \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h \
-  PortableServer/PortableServer_Functions.h \
-  PortableServer/PortableServer_ORBInitializer.h \
-  PortableServer/PortableServer_PolicyFactory.h \
-  PortableServer/PortableServer_WFunctions.h \
-  PortableServer/PortableServer_include.pidl \
-  PortableServer/PortableServer_includeC.h \
-  PortableServer/PortableServer_includeS.h \
-  PortableServer/Regular_POA.h \
-  PortableServer/Regular_POA.inl \
-  PortableServer/RequestProcessingPolicy.h \
-  PortableServer/RequestProcessingPolicy.pidl \
-  PortableServer/RequestProcessingPolicyC.h \
-  PortableServer/RequestProcessingStrategy.h \
-  PortableServer/RequestProcessingStrategyAOMOnly.h \
-  PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h \
-  PortableServer/RequestProcessingStrategyDefaultServant.h \
-  PortableServer/RequestProcessingStrategyDefaultServantFI.h \
-  PortableServer/RequestProcessingStrategyFactory.h \
-  PortableServer/RequestProcessingStrategyFactoryImpl.h \
-  PortableServer/RequestProcessingStrategyServantActivator.h \
-  PortableServer/RequestProcessingStrategyServantActivatorFI.h \
-  PortableServer/RequestProcessingStrategyServantLocator.h \
-  PortableServer/RequestProcessingStrategyServantLocatorFI.h \
-  PortableServer/RequestProcessingStrategyServantManager.h \
-  PortableServer/Root_POA.h \
-  PortableServer/Root_POA.inl \
-  PortableServer/ServantActivator.pidl \
-  PortableServer/ServantActivatorC.h \
-  PortableServer/ServantLocator.pidl \
-  PortableServer/ServantLocatorC.h \
-  PortableServer/ServantManager.pidl \
-  PortableServer/ServantManagerC.h \
-  PortableServer/ServantRetentionPolicy.h \
-  PortableServer/ServantRetentionPolicy.pidl \
-  PortableServer/ServantRetentionPolicyC.h \
-  PortableServer/ServantRetentionStrategy.h \
-  PortableServer/ServantRetentionStrategyFactory.h \
-  PortableServer/ServantRetentionStrategyFactoryImpl.h \
-  PortableServer/ServantRetentionStrategyNonRetain.h \
-  PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h \
-  PortableServer/ServantRetentionStrategyRetain.h \
-  PortableServer/ServantRetentionStrategyRetainFactoryImpl.h \
-  PortableServer/Servant_Base.h \
-  PortableServer/Servant_Base.i \
-  PortableServer/Servant_Dispatcher.h \
-  PortableServer/Servant_Location.h \
-  PortableServer/Servant_Upcall.h \
-  PortableServer/Servant_Upcall.inl \
-  PortableServer/ServerInterceptorAdapter.h \
-  PortableServer/ServerInterceptorAdapter.inl \
-  PortableServer/ServerRequestInfo.h \
-  PortableServer/ServerRequestInfo.inl \
-  PortableServer/Special_Basic_SArgument_T.cpp \
-  PortableServer/Special_Basic_SArgument_T.h \
-  PortableServer/Special_Basic_SArgument_T.inl \
-  PortableServer/Special_Basic_SArguments.h \
-  PortableServer/StrategyFactory.h \
-  PortableServer/ThreadPolicy.h \
-  PortableServer/ThreadPolicy.pidl \
-  PortableServer/ThreadPolicyC.h \
-  PortableServer/ThreadStrategy.h \
-  PortableServer/ThreadStrategyFactory.h \
-  PortableServer/ThreadStrategyFactoryImpl.h \
-  PortableServer/ThreadStrategyORBControl.h \
-  PortableServer/ThreadStrategySingle.h \
-  PortableServer/ThreadStrategySingleFactoryImpl.h \
-  PortableServer/TypeCode_SArg_Traits.h \
-  PortableServer/UB_String_SArgument_T.cpp \
-  PortableServer/UB_String_SArgument_T.h \
-  PortableServer/UB_String_SArgument_T.inl \
-  PortableServer/UB_String_SArguments.h \
-  PortableServer/Upcall_Command.h \
-  PortableServer/Upcall_Wrapper.h \
-  PortableServer/Var_Array_SArgument_T.cpp \
-  PortableServer/Var_Array_SArgument_T.h \
-  PortableServer/Var_Array_SArgument_T.inl \
-  PortableServer/Var_Size_SArgument_T.cpp \
-  PortableServer/Var_Size_SArgument_T.h \
-  PortableServer/Var_Size_SArgument_T.inl \
-  PortableServer/get_arg.h \
-  PortableServer/poa_macros.h \
-  PortableServer/portableserver_export.h
-
-pkgconfig_DATA += TAO_PortableServer.pc
-
-TAO_PortableServer.pc: ${top_builddir}/config.status ${srcdir}/PortableServer/TAO_PortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/PortableServer/TAO_PortableServer.pc.in
-
-EXTRA_DIST += \
-  PortableServer/TAO_PortableServer.pc.in \
-  PortableServer/TAO_PortableServer.rc
-
-
-## Makefile.IFR_Client.am
-
-lib_LTLIBRARIES += libTAO_IFR_Client.la
-
-libTAO_IFR_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IFR_CLIENT_BUILD_DLL
-
-libTAO_IFR_Client_la_SOURCES = \
-  IFR_Client/IFR_BaseA.cpp \
-  IFR_Client/IFR_BaseC.cpp \
-  IFR_Client/IFR_BasicA.cpp \
-  IFR_Client/IFR_BasicC.cpp \
-  IFR_Client/IFR_Client_Adapter_Impl.cpp \
-  IFR_Client/IFR_ComponentsA.cpp \
-  IFR_Client/IFR_ComponentsC.cpp \
-  IFR_Client/IFR_ExtendedA.cpp \
-  IFR_Client/IFR_ExtendedC.cpp
-
-libTAO_IFR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IFR_Client_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IFR_Client/IFR_Base.pidl \
-  IFR_Client/IFR_BaseC.h \
-  IFR_Client/IFR_BaseC.inl \
-  IFR_Client/IFR_BaseS.h \
-  IFR_Client/IFR_Basic.pidl \
-  IFR_Client/IFR_BasicC.h \
-  IFR_Client/IFR_BasicC.inl \
-  IFR_Client/IFR_Client_Adapter_Impl.h \
-  IFR_Client/IFR_Components.pidl \
-  IFR_Client/IFR_ComponentsC.h \
-  IFR_Client/IFR_ComponentsC.inl \
-  IFR_Client/IFR_Extended.pidl \
-  IFR_Client/IFR_ExtendedC.h \
-  IFR_Client/IFR_ExtendedC.inl \
-  IFR_Client/ifr_client_export.h
-
-pkgconfig_DATA += TAO_IFR_Client.pc
-
-TAO_IFR_Client.pc: ${top_builddir}/config.status ${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IFR_Client/TAO_IFR_Client.pc.in
-
-EXTRA_DIST += \
-  IFR_Client/TAO_IFR_Client.pc.in \
-  IFR_Client/TAO_IFR_Client.rc
-
-
-## Makefile.Domain.am
-
-lib_LTLIBRARIES += libTAO_Domain.la
-
-libTAO_Domain_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DOMAIN_BUILD_DLL
-
-libTAO_Domain_la_SOURCES = \
-  Domain/DomainS.cpp
-
-libTAO_Domain_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Domain_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_IFR_Client.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Domain/DomainS.h \
-  Domain/DomainS.inl \
-  Domain/DomainS_T.cpp \
-  Domain/DomainS_T.h \
-  Domain/DomainS_T.inl \
-  Domain/domain_export.h
-
-pkgconfig_DATA += TAO_Domain.pc
-
-TAO_Domain.pc: ${top_builddir}/config.status ${srcdir}/Domain/TAO_Domain.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Domain/TAO_Domain.pc.in
-
-EXTRA_DIST += \
-  Domain/TAO_Domain.pc.in \
-  Domain/TAO_Domain.rc
-
-
-## Makefile.DynamicAny.am
-
-lib_LTLIBRARIES += libTAO_DynamicAny.la
-
-libTAO_DynamicAny_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICANY_BUILD_DLL
-
-libTAO_DynamicAny_la_SOURCES = \
-  DynamicAny/DynAnyFactory.cpp \
-  DynamicAny/DynAny_i.cpp \
-  DynamicAny/DynArray_i.cpp \
-  DynamicAny/DynCommon.cpp \
-  DynamicAny/DynEnum_i.cpp \
-  DynamicAny/DynSequence_i.cpp \
-  DynamicAny/DynStruct_i.cpp \
-  DynamicAny/DynUnion_i.cpp \
-  DynamicAny/DynamicAny.cpp \
-  DynamicAny/DynamicAnyC.cpp
-
-libTAO_DynamicAny_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DynamicAny_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DynamicAny/DynAnyFactory.h \
-  DynamicAny/DynAny_i.h \
-  DynamicAny/DynArray_i.h \
-  DynamicAny/DynCommon.h \
-  DynamicAny/DynEnum_i.h \
-  DynamicAny/DynSequence_i.h \
-  DynamicAny/DynStruct_i.h \
-  DynamicAny/DynUnion_i.h \
-  DynamicAny/DynamicAny.h \
-  DynamicAny/DynamicAny.pidl \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/dynamicany_export.h
-
-pkgconfig_DATA += TAO_DynamicAny.pc
-
-TAO_DynamicAny.pc: ${top_builddir}/config.status ${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicAny/TAO_DynamicAny.pc.in
-
-EXTRA_DIST += \
-  DynamicAny/TAO_DynamicAny.pc.in \
-  DynamicAny/TAO_DynamicAny.rc
-
-
-## Makefile.Valuetype.am
-
-lib_LTLIBRARIES += libTAO_Valuetype.la
-
-libTAO_Valuetype_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_VALUETYPE_BUILD_DLL
-
-libTAO_Valuetype_la_SOURCES = \
-  Valuetype/AbstractBase.cpp \
-  Valuetype/AbstractBase_Invocation_Adapter.cpp \
-  Valuetype/Seq_Tmplinst.cpp \
-  Valuetype/ValueBase.cpp \
-  Valuetype/ValueFactory.cpp \
-  Valuetype/ValueFactory_Map.cpp \
-  Valuetype/Valuetype_Adapter_Impl.cpp
-
-libTAO_Valuetype_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Valuetype_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Valuetype/AbstractBase.h \
-  Valuetype/AbstractBase.inl \
-  Valuetype/AbstractBase_Invocation_Adapter.h \
-  Valuetype/AbstractBase_T.cpp \
-  Valuetype/AbstractBase_T.h \
-  Valuetype/Sequence_T.cpp \
-  Valuetype/Sequence_T.h \
-  Valuetype/Sequence_T.inl \
-  Valuetype/ValueBase.h \
-  Valuetype/ValueBase.inl \
-  Valuetype/ValueFactory.h \
-  Valuetype/ValueFactory_Map.h \
-  Valuetype/Value_CORBA_methods.h \
-  Valuetype/Value_VarOut_T.cpp \
-  Valuetype/Value_VarOut_T.h \
-  Valuetype/Valuetype_Adapter_Impl.h \
-  Valuetype/valuetype_export.h
-
-pkgconfig_DATA += TAO_Valuetype.pc
-
-TAO_Valuetype.pc: ${top_builddir}/config.status ${srcdir}/Valuetype/TAO_Valuetype.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Valuetype/TAO_Valuetype.pc.in
-
-EXTRA_DIST += \
-  Valuetype/TAO_Valuetype.pc.in \
-  Valuetype/TAO_Valuetype.rc
-
-
-## Makefile.Messaging.am
-
-lib_LTLIBRARIES += libTAO_Messaging.la
-
-libTAO_Messaging_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_MESSAGING_BUILD_DLL
-
-libTAO_Messaging_la_SOURCES = \
-  Messaging/AMH_Response_Handler.cpp \
-  Messaging/Asynch_Invocation.cpp \
-  Messaging/Asynch_Invocation_Adapter.cpp \
-  Messaging/Asynch_Reply_Dispatcher.cpp \
-  Messaging/Asynch_Timeout_Handler.cpp \
-  Messaging/Connection_Timeout_Policy_i.cpp \
-  Messaging/Messaging.cpp \
-  Messaging/MessagingA.cpp \
-  Messaging/MessagingC.cpp \
-  Messaging/MessagingS.cpp \
-  Messaging/Messaging_No_ImplA.cpp \
-  Messaging/Messaging_No_ImplC.cpp \
-  Messaging/Messaging_ORBInitializer.cpp \
-  Messaging/Messaging_PolicyFactory.cpp \
-  Messaging/Messaging_Policy_i.cpp \
-  Messaging/Messaging_RT_PolicyA.cpp \
-  Messaging/Messaging_RT_PolicyC.cpp \
-  Messaging/Messaging_SyncScope_PolicyA.cpp \
-  Messaging/Messaging_SyncScope_PolicyC.cpp \
-  Messaging/TAO_ExtA.cpp \
-  Messaging/TAO_ExtC.cpp
-
-libTAO_Messaging_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Messaging_la_LIBADD = \
-  libTAO_Valuetype.la \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Messaging/AMH_Response_Handler.h \
-  Messaging/Asynch_Invocation.h \
-  Messaging/Asynch_Invocation_Adapter.h \
-  Messaging/Asynch_Invocation_Adapter.inl \
-  Messaging/Asynch_Reply_Dispatcher.h \
-  Messaging/Asynch_Timeout_Handler.h \
-  Messaging/Connection_Timeout_Policy_i.h \
-  Messaging/Messaging.h \
-  Messaging/Messaging.pidl \
-  Messaging/MessagingC.h \
-  Messaging/MessagingC.inl \
-  Messaging/MessagingS.h \
-  Messaging/MessagingS_T.cpp \
-  Messaging/MessagingS_T.h \
-  Messaging/MessagingS_T.inl \
-  Messaging/Messaging_No_Impl.pidl \
-  Messaging/Messaging_No_ImplC.h \
-  Messaging/Messaging_ORBInitializer.h \
-  Messaging/Messaging_PolicyFactory.h \
-  Messaging/Messaging_Policy_i.h \
-  Messaging/Messaging_Policy_i.i \
-  Messaging/Messaging_RT_Policy.pidl \
-  Messaging/Messaging_RT_PolicyC.h \
-  Messaging/Messaging_SyncScope_Policy.pidl \
-  Messaging/Messaging_SyncScope_PolicyC.h \
-  Messaging/TAO_Ext.pidl \
-  Messaging/TAO_ExtC.h \
-  Messaging/messaging_export.h
-
-pkgconfig_DATA += TAO_Messaging.pc
-
-TAO_Messaging.pc: ${top_builddir}/config.status ${srcdir}/Messaging/TAO_Messaging.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Messaging/TAO_Messaging.pc.in
-
-EXTRA_DIST += \
-  Messaging/TAO_Messaging.pc.in \
-  Messaging/TAO_Messaging.rc
-
-
-## Makefile.DynamicInterface.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
-lib_LTLIBRARIES += libTAO_DynamicInterface.la
-
-libTAO_DynamicInterface_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICINTERFACE_BUILD_DLL
-
-libTAO_DynamicInterface_la_SOURCES = \
-  DynamicInterface/Context.cpp \
-  DynamicInterface/DII_Arguments.cpp \
-  DynamicInterface/DII_Invocation.cpp \
-  DynamicInterface/DII_Invocation_Adapter.cpp \
-  DynamicInterface/DII_Reply_Dispatcher.cpp \
-  DynamicInterface/Dynamic_Adapter_Impl.cpp \
-  DynamicInterface/Dynamic_Implementation.cpp \
-  DynamicInterface/ExceptionList.cpp \
-  DynamicInterface/Request.cpp \
-  DynamicInterface/Server_Request.cpp \
-  DynamicInterface/Unknown_User_Exception.cpp
-
-libTAO_DynamicInterface_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_DynamicInterface_la_LIBADD = \
-  libTAO_Messaging.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  DynamicInterface/Context.h \
-  DynamicInterface/Context.inl \
-  DynamicInterface/DII_Arguments.h \
-  DynamicInterface/DII_Arguments.inl \
-  DynamicInterface/DII_CORBA_methods.h \
-  DynamicInterface/DII_Invocation.h \
-  DynamicInterface/DII_Invocation.inl \
-  DynamicInterface/DII_Invocation_Adapter.h \
-  DynamicInterface/DII_Reply_Dispatcher.h \
-  DynamicInterface/Dynamic_Adapter_Impl.h \
-  DynamicInterface/Dynamic_Implementation.h \
-  DynamicInterface/ExceptionList.h \
-  DynamicInterface/ExceptionList.inl \
-  DynamicInterface/Request.h \
-  DynamicInterface/Request.inl \
-  DynamicInterface/Server_Request.h \
-  DynamicInterface/Server_Request.inl \
-  DynamicInterface/Unknown_User_Exception.h \
-  DynamicInterface/dynamicinterface_export.h
-
-pkgconfig_DATA += TAO_DynamicInterface.pc
-
-TAO_DynamicInterface.pc: ${top_builddir}/config.status ${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/DynamicInterface/TAO_DynamicInterface.pc.in
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  DynamicInterface/TAO_DynamicInterface.pc.in \
-  DynamicInterface/TAO_DynamicInterface.rc
-
-
-## Makefile.ObjRefTemplate.am
-
-lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
-
-libTAO_ObjRefTemplate_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ORT_BUILD_DLL
-
-libTAO_ObjRefTemplate_la_SOURCES = \
-  ObjRefTemplate/Default_ORTA.cpp \
-  ObjRefTemplate/Default_ORTC.cpp \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp \
-  ObjRefTemplate/ORT_Adapter_Impl.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateA.cpp \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp \
-  ObjRefTemplate/ObjectReferenceTemplate_i.cpp
-
-libTAO_ObjRefTemplate_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ObjRefTemplate_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ObjRefTemplate/Default_ORT.pidl \
-  ObjRefTemplate/Default_ORTC.h \
-  ObjRefTemplate/Default_ORTC.inl \
-  ObjRefTemplate/ORT_Adapter_Factory_Impl.h \
-  ObjRefTemplate/ORT_Adapter_Impl.h \
-  ObjRefTemplate/ObjectReferenceTemplate.h \
-  ObjRefTemplate/ObjectReferenceTemplate.pidl \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.inl \
-  ObjRefTemplate/ObjectReferenceTemplate_i.h \
-  ObjRefTemplate/ObjectReferenceTemplate_include.pidl \
-  ObjRefTemplate/ObjectReferenceTemplate_includeC.h \
-  ObjRefTemplate/ObjectReferenceTemplate_includeS.h \
-  ObjRefTemplate/ort_export.h
-
-pkgconfig_DATA += TAO_ObjRefTemplate.pc
-
-TAO_ObjRefTemplate.pc: ${top_builddir}/config.status ${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-
-EXTRA_DIST += \
-  ObjRefTemplate/TAO_ObjRefTemplate.pc.in \
-  ObjRefTemplate/TAO_ObjRefTemplate.rc
-
-
-## Makefile.IORInterceptor.am
-
-lib_LTLIBRARIES += libTAO_IORInterceptor.la
-
-libTAO_IORInterceptor_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORINTERCEPTOR_BUILD_DLL
-
-libTAO_IORInterceptor_la_SOURCES = \
-  IORInterceptor/IORInfo.cpp \
-  IORInterceptor/IORInfoC.cpp \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
-
-libTAO_IORInterceptor_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORInterceptor_la_LIBADD = \
-  libTAO_ObjRefTemplate.la \
-  libTAO_Valuetype.la \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORInterceptor/IORInfo.h \
-  IORInterceptor/IORInfo.inl \
-  IORInterceptor/IORInfo.pidl \
-  IORInterceptor/IORInfoC.h \
-  IORInterceptor/IORInterceptor.h \
-  IORInterceptor/IORInterceptor.pidl \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
-  IORInterceptor/IORInterceptor_Adapter_Impl.h \
-  IORInterceptor/iorinterceptor_export.h
-
-pkgconfig_DATA += TAO_IORInterceptor.pc
-
-TAO_IORInterceptor.pc: ${top_builddir}/config.status ${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORInterceptor/TAO_IORInterceptor.pc.in
-
-EXTRA_DIST += \
-  IORInterceptor/TAO_IORInterceptor.pc.in \
-  IORInterceptor/TAO_IORInterceptor.rc
-
-
-## Makefile.IORManipulation.am
-
-lib_LTLIBRARIES += libTAO_IORManip.la
-
-libTAO_IORManip_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORMANIP_BUILD_DLL
-
-libTAO_IORManip_la_SOURCES = \
-  IORManipulation/IORA.cpp \
-  IORManipulation/IORC.cpp \
-  IORManipulation/IORManip_Loader.cpp \
-  IORManipulation/IORManipulation.cpp
-
-libTAO_IORManip_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORManip_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORManipulation/IOR.pidl \
-  IORManipulation/IORC.h \
-  IORManipulation/IORManip_Loader.h \
-  IORManipulation/IORManipulation.h \
-  IORManipulation/ior_manip_export.h
-
-pkgconfig_DATA += TAO_IORManip.pc
-
-TAO_IORManip.pc: ${top_builddir}/config.status ${srcdir}/IORManipulation/TAO_IORManip.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORManipulation/TAO_IORManip.pc.in
-
-EXTRA_DIST += \
-  IORManipulation/TAO_IORManip.pc.in \
-  IORManipulation/TAO_IORManip.rc
-
-
-## Makefile.IORTable.am
-
-lib_LTLIBRARIES += libTAO_IORTable.la
-
-libTAO_IORTable_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORTABLE_BUILD_DLL
-
-libTAO_IORTable_la_SOURCES = \
-  IORTable/IORTable.cpp \
-  IORTable/IORTableC.cpp \
-  IORTable/IOR_Table_Impl.cpp \
-  IORTable/Table_Adapter.cpp
-
-libTAO_IORTable_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORTable_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  IORTable/IORTable.h \
-  IORTable/IORTable.pidl \
-  IORTable/IORTableC.h \
-  IORTable/IOR_Table_Impl.h \
-  IORTable/Table_Adapter.h \
-  IORTable/iortable_export.h
-
-pkgconfig_DATA += TAO_IORTable.pc
-
-TAO_IORTable.pc: ${top_builddir}/config.status ${srcdir}/IORTable/TAO_IORTable.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/IORTable/TAO_IORTable.pc.in
-
-EXTRA_DIST += \
-  IORTable/TAO_IORTable.pc.in \
-  IORTable/TAO_IORTable.rc
-
-
-## Makefile.ImR_Client.am
-
-lib_LTLIBRARIES += libTAO_ImR_Client.la
-
-libTAO_ImR_Client_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IMR_CLIENT_BUILD_DLL
-
-libTAO_ImR_Client_la_SOURCES = \
-  ImR_Client/ImR_Client.cpp \
-  ImR_Client/ImplRepoA.cpp \
-  ImR_Client/ImplRepoC.cpp \
-  ImR_Client/ImplRepoS.cpp \
-  ImR_Client/ServerObjectA.cpp \
-  ImR_Client/ServerObjectC.cpp \
-  ImR_Client/ServerObjectS.cpp \
-  ImR_Client/ServerObject_i.cpp
-
-libTAO_ImR_Client_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_ImR_Client_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  ImR_Client/ImR_Client.h \
-  ImR_Client/ImplRepo.pidl \
-  ImR_Client/ImplRepoC.h \
-  ImR_Client/ImplRepoC.inl \
-  ImR_Client/ImplRepoS.h \
-  ImR_Client/ServerObject.pidl \
-  ImR_Client/ServerObjectC.h \
-  ImR_Client/ServerObjectC.inl \
-  ImR_Client/ServerObjectS.h \
-  ImR_Client/ServerObject_i.h \
-  ImR_Client/imr_client_export.h
-
-pkgconfig_DATA += TAO_ImR_Client.pc
-
-TAO_ImR_Client.pc: ${top_builddir}/config.status ${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/ImR_Client/TAO_ImR_Client.pc.in
-
-EXTRA_DIST += \
-  ImR_Client/TAO_IMR_Client.rc \
-  ImR_Client/TAO_ImR_Client.pc.in
-
-
-## Makefile.RTCORBA.am
-
-if BUILD_RT_CORBA
-
-lib_LTLIBRARIES += libTAO_RTCORBA.la
-
-libTAO_RTCORBA_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTCORBA_BUILD_DLL
-
-libTAO_RTCORBA_la_SOURCES = \
-  RTCORBA/Continuous_Priority_Mapping.cpp \
-  RTCORBA/Direct_Priority_Mapping.cpp \
-  RTCORBA/Linear_Network_Priority_Mapping.cpp \
-  RTCORBA/Linear_Priority_Mapping.cpp \
-  RTCORBA/Multi_Priority_Mapping.cpp \
-  RTCORBA/Network_Priority_Mapping.cpp \
-  RTCORBA/Network_Priority_Mapping_Manager.cpp \
-  RTCORBA/Priority_Mapping.cpp \
-  RTCORBA/Priority_Mapping_Manager.cpp \
-  RTCORBA/RTCORBA.cpp \
-  RTCORBA/RTCORBAA.cpp \
-  RTCORBA/RTCORBAC.cpp \
-  RTCORBA/RT_Current.cpp \
-  RTCORBA/RT_Endpoint_Selector_Factory.cpp \
-  RTCORBA/RT_Endpoint_Utils.cpp \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.cpp \
-  RTCORBA/RT_Mutex.cpp \
-  RTCORBA/RT_ORB.cpp \
-  RTCORBA/RT_ORBInitializer.cpp \
-  RTCORBA/RT_ORB_Loader.cpp \
-  RTCORBA/RT_PolicyFactory.cpp \
-  RTCORBA/RT_Policy_i.cpp \
-  RTCORBA/RT_Protocols_Hooks.cpp \
-  RTCORBA/RT_Stub.cpp \
-  RTCORBA/RT_Stub_Factory.cpp \
-  RTCORBA/RT_Thread_Lane_Resources_Manager.cpp \
-  RTCORBA/RT_Transport_Descriptor.cpp \
-  RTCORBA/RT_Transport_Descriptor_Property.cpp \
-  RTCORBA/Thread_Pool.cpp
-
-libTAO_RTCORBA_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTCORBA_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTCORBA/Continuous_Priority_Mapping.h \
-  RTCORBA/Direct_Priority_Mapping.h \
-  RTCORBA/Linear_Network_Priority_Mapping.h \
-  RTCORBA/Linear_Priority_Mapping.h \
-  RTCORBA/Multi_Priority_Mapping.h \
-  RTCORBA/Network_Priority_Mapping.h \
-  RTCORBA/Network_Priority_Mapping_Manager.h \
-  RTCORBA/Network_Priority_Mapping_Manager.i \
-  RTCORBA/Priority_Mapping.h \
-  RTCORBA/Priority_Mapping_Manager.h \
-  RTCORBA/Priority_Mapping_Manager.i \
-  RTCORBA/RTCORBA.h \
-  RTCORBA/RTCORBA.pidl \
-  RTCORBA/RTCORBAC.h \
-  RTCORBA/RTCORBA_include.pidl \
-  RTCORBA/RTCORBA_includeC.h \
-  RTCORBA/RTCORBA_includeS.h \
-  RTCORBA/RT_Current.h \
-  RTCORBA/RT_Endpoint_Selector_Factory.h \
-  RTCORBA/RT_Endpoint_Utils.h \
-  RTCORBA/RT_Invocation_Endpoint_Selectors.h \
-  RTCORBA/RT_Mutex.h \
-  RTCORBA/RT_ORB.h \
-  RTCORBA/RT_ORBInitializer.h \
-  RTCORBA/RT_ORB_Loader.h \
-  RTCORBA/RT_PolicyFactory.h \
-  RTCORBA/RT_Policy_i.h \
-  RTCORBA/RT_Protocols_Hooks.h \
-  RTCORBA/RT_Stub.h \
-  RTCORBA/RT_Stub_Factory.h \
-  RTCORBA/RT_Thread_Lane_Resources_Manager.h \
-  RTCORBA/RT_Transport_Descriptor.h \
-  RTCORBA/RT_Transport_Descriptor.inl \
-  RTCORBA/RT_Transport_Descriptor_Property.h \
-  RTCORBA/RT_Transport_Descriptor_Property.inl \
-  RTCORBA/Thread_Pool.h \
-  RTCORBA/rtcorba_export.h \
-  RTCORBA/rtcorba_typedefs.h
-
-pkgconfig_DATA += TAO_RTCORBA.pc
-
-TAO_RTCORBA.pc: ${top_builddir}/config.status ${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTCORBA/TAO_RTCORBA.pc.in
-
-endif BUILD_RT_CORBA
-
-EXTRA_DIST += \
-  RTCORBA/TAO_RTCORBA.pc.in \
-  RTCORBA/TAO_RTCORBA.rc
-
-
-## Makefile.RTPortableServer.am
-
-if BUILD_RT_CORBA
-
-lib_LTLIBRARIES += libTAO_RTPortableServer.la
-
-libTAO_RTPortableServer_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTPORTABLESERVER_BUILD_DLL
-
-libTAO_RTPortableServer_la_SOURCES = \
-  RTPortableServer/RTPortableServer.cpp \
-  RTPortableServer/RTPortableServerA.cpp \
-  RTPortableServer/RTPortableServerC.cpp \
-  RTPortableServer/RT_Acceptor_Filters.cpp \
-  RTPortableServer/RT_Collocation_Resolver.cpp \
-  RTPortableServer/RT_Object_Adapter_Factory.cpp \
-  RTPortableServer/RT_POA.cpp \
-  RTPortableServer/RT_Policy_Validator.cpp \
-  RTPortableServer/RT_Servant_Dispatcher.cpp
-
-libTAO_RTPortableServer_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTPortableServer_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTPortableServer/RTPortableServer.h \
-  RTPortableServer/RTPortableServer.pidl \
-  RTPortableServer/RTPortableServerC.h \
-  RTPortableServer/RTPortableServerS.h \
-  RTPortableServer/RTPortableServer_include.pidl \
-  RTPortableServer/RTPortableServer_includeC.h \
-  RTPortableServer/RTPortableServer_includeS.h \
-  RTPortableServer/RT_Acceptor_Filters.h \
-  RTPortableServer/RT_Collocation_Resolver.h \
-  RTPortableServer/RT_Object_Adapter_Factory.h \
-  RTPortableServer/RT_POA.h \
-  RTPortableServer/RT_POA.i \
-  RTPortableServer/RT_Policy_Validator.h \
-  RTPortableServer/RT_Servant_Dispatcher.h \
-  RTPortableServer/rtportableserver_export.h
-
-pkgconfig_DATA += TAO_RTPortableServer.pc
-
-TAO_RTPortableServer.pc: ${top_builddir}/config.status ${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTPortableServer/TAO_RTPortableServer.pc.in
-
-endif BUILD_RT_CORBA
-
-EXTRA_DIST += \
-  RTPortableServer/TAO_RTPortableServer.pc.in \
-  RTPortableServer/TAO_RTPortableServer.rc
-
-
-## Makefile.RTScheduler.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_RT_CORBA
-
-lib_LTLIBRARIES += libTAO_RTScheduler.la
-
-libTAO_RTScheduler_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_RTSCHEDULER_BUILD_DLL
-
-libTAO_RTScheduler_la_SOURCES = \
-  RTScheduling/Current.cpp \
-  RTScheduling/Distributable_Thread.cpp \
-  RTScheduling/RTScheduler.cpp \
-  RTScheduling/RTSchedulerA.cpp \
-  RTScheduling/RTSchedulerC.cpp \
-  RTScheduling/RTScheduler_Initializer.cpp \
-  RTScheduling/RTScheduler_Loader.cpp \
-  RTScheduling/RTScheduler_Manager.cpp \
-  RTScheduling/Request_Interceptor.cpp
-
-libTAO_RTScheduler_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_RTScheduler_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO_RTCORBA.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  RTScheduling/Current.h \
-  RTScheduling/Distributable_Thread.h \
-  RTScheduling/RTScheduler.h \
-  RTScheduling/RTScheduler.pidl \
-  RTScheduling/RTSchedulerC.h \
-  RTScheduling/RTScheduler_Initializer.h \
-  RTScheduling/RTScheduler_Loader.h \
-  RTScheduling/RTScheduler_Manager.h \
-  RTScheduling/RTScheduler_Manager.i \
-  RTScheduling/RTScheduler_include.pidl \
-  RTScheduling/RTScheduler_includeC.h \
-  RTScheduling/Request_Interceptor.h \
-  RTScheduling/ThreadAction.h \
-  RTScheduling/rtscheduler_export.h
-
-pkgconfig_DATA += TAO_RTScheduler.pc
-
-TAO_RTScheduler.pc: ${top_builddir}/config.status ${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/RTScheduling/TAO_RTScheduler.pc.in
-
-endif BUILD_RT_CORBA
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  RTScheduling/TAO_RTScheduler.pc.in \
-  RTScheduling/TAO_RTScheduler.rc
-
-
-## Makefile.SmartProxies.am
-
-lib_LTLIBRARIES += libTAO_SmartProxies.la
-
-libTAO_SmartProxies_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_SMARTPROXIES_BUILD_DLL
-
-libTAO_SmartProxies_la_SOURCES = \
-  SmartProxies/Smart_Proxies.cpp
-
-libTAO_SmartProxies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_SmartProxies_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  SmartProxies/Smart_Proxies.h \
-  SmartProxies/Smart_Proxies.inl \
-  SmartProxies/smartproxies_export.h
-
-pkgconfig_DATA += TAO_SmartProxies.pc
-
-TAO_SmartProxies.pc: ${top_builddir}/config.status ${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/SmartProxies/TAO_SmartProxies.pc.in
-
-EXTRA_DIST += \
-  SmartProxies/SmartProxies.rc \
-  SmartProxies/TAO_SmartProxies.pc.in
-
-
-## Makefile.Strategies.am
-
-lib_LTLIBRARIES += libTAO_Strategies.la
-
-libTAO_Strategies_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_STRATEGIES_BUILD_DLL
-
-libTAO_Strategies_la_SOURCES = \
-  Strategies/DIOP_Acceptor.cpp \
-  Strategies/DIOP_Connection_Handler.cpp \
-  Strategies/DIOP_Connector.cpp \
-  Strategies/DIOP_Endpoint.cpp \
-  Strategies/DIOP_Factory.cpp \
-  Strategies/DIOP_Profile.cpp \
-  Strategies/DIOP_Transport.cpp \
-  Strategies/FIFO_Connection_Purging_Strategy.cpp \
-  Strategies/LFU_Connection_Purging_Strategy.cpp \
-  Strategies/LF_Strategy_Null.cpp \
-  Strategies/NULL_Connection_Purging_Strategy.cpp \
-  Strategies/SCIOP_Acceptor.cpp \
-  Strategies/SCIOP_Connection_Handler.cpp \
-  Strategies/SCIOP_Connector.cpp \
-  Strategies/SCIOP_Endpoint.cpp \
-  Strategies/SCIOP_Factory.cpp \
-  Strategies/SCIOP_Lite_Factory.cpp \
-  Strategies/SCIOP_Profile.cpp \
-  Strategies/SCIOP_Transport.cpp \
-  Strategies/SHMIOP_Acceptor.cpp \
-  Strategies/SHMIOP_Connection_Handler.cpp \
-  Strategies/SHMIOP_Connector.cpp \
-  Strategies/SHMIOP_Endpoint.cpp \
-  Strategies/SHMIOP_Factory.cpp \
-  Strategies/SHMIOP_Profile.cpp \
-  Strategies/SHMIOP_Transport.cpp \
-  Strategies/UIOP_Acceptor.cpp \
-  Strategies/UIOP_Connection_Handler.cpp \
-  Strategies/UIOP_Connector.cpp \
-  Strategies/UIOP_Endpoint.cpp \
-  Strategies/UIOP_Factory.cpp \
-  Strategies/UIOP_Lite_Factory.cpp \
-  Strategies/UIOP_Profile.cpp \
-  Strategies/UIOP_Transport.cpp \
-  Strategies/advanced_resource.cpp \
-  Strategies/sciop_endpointsC.cpp \
-  Strategies/uiop_endpointsC.cpp
-
-libTAO_Strategies_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Strategies_la_LIBADD = \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Strategies/DIOP_Acceptor.h \
-  Strategies/DIOP_Acceptor.i \
-  Strategies/DIOP_Connection_Handler.h \
-  Strategies/DIOP_Connector.h \
-  Strategies/DIOP_Endpoint.h \
-  Strategies/DIOP_Endpoint.i \
-  Strategies/DIOP_Factory.h \
-  Strategies/DIOP_Profile.h \
-  Strategies/DIOP_Transport.h \
-  Strategies/FIFO_Connection_Purging_Strategy.h \
-  Strategies/LFU_Connection_Purging_Strategy.h \
-  Strategies/LF_Strategy_Null.h \
-  Strategies/LF_Strategy_Null.inl \
-  Strategies/NULL_Connection_Purging_Strategy.h \
-  Strategies/SCIOP_Acceptor.h \
-  Strategies/SCIOP_Acceptor.i \
-  Strategies/SCIOP_Connection_Handler.h \
-  Strategies/SCIOP_Connector.h \
-  Strategies/SCIOP_Endpoint.h \
-  Strategies/SCIOP_Endpoint.i \
-  Strategies/SCIOP_Factory.h \
-  Strategies/SCIOP_Lite_Factory.h \
-  Strategies/SCIOP_Profile.h \
-  Strategies/SCIOP_Transport.h \
-  Strategies/SHMIOP_Acceptor.h \
-  Strategies/SHMIOP_Connection_Handler.h \
-  Strategies/SHMIOP_Connector.h \
-  Strategies/SHMIOP_Endpoint.h \
-  Strategies/SHMIOP_Endpoint.i \
-  Strategies/SHMIOP_Factory.h \
-  Strategies/SHMIOP_Profile.h \
-  Strategies/SHMIOP_Transport.h \
-  Strategies/UIOP_Acceptor.h \
-  Strategies/UIOP_Connection_Handler.h \
-  Strategies/UIOP_Connector.h \
-  Strategies/UIOP_Endpoint.h \
-  Strategies/UIOP_Endpoint.i \
-  Strategies/UIOP_Factory.h \
-  Strategies/UIOP_Lite_Factory.h \
-  Strategies/UIOP_Profile.h \
-  Strategies/UIOP_Transport.h \
-  Strategies/advanced_resource.h \
-  Strategies/sciop_endpoints.pidl \
-  Strategies/sciop_endpointsC.h \
-  Strategies/strategies_export.h \
-  Strategies/uiop_endpoints.pidl \
-  Strategies/uiop_endpointsC.h
-
-pkgconfig_DATA += TAO_Strategies.pc
-
-TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in
-
-EXTRA_DIST += \
-  Strategies/TAO_Strategies.pc.in \
-  Strategies/TAO_Strategies.rc
-
-
-## Makefile.TAO_FlResource.am
-
-if BUILD_ACE_FLREACTOR
-if BUILD_FL
-if BUILD_GL
-if BUILD_X11
-
-lib_LTLIBRARIES += libTAO_FlResource.la
-
-libTAO_FlResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_FLRESOURCE_BUILD_DLL
-
-libTAO_FlResource_la_SOURCES = \
-  FlResource_Factory.cpp \
-  FlResource_Loader.cpp
-
-libTAO_FlResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_FlResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace//libACE_FlReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  FlResource_Factory.h \
-  FlResource_Loader.h \
-  TAO_FlResource_Export.h
-
-endif BUILD_X11
-endif BUILD_GL
-endif BUILD_FL
-endif BUILD_ACE_FLREACTOR
-
-## Makefile.TAO_QtResource.am
-
-if BUILD_ACE_QTREACTOR
-if BUILD_QT
-
-lib_LTLIBRARIES += libTAO_QtResource.la
-
-libTAO_QtResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(QTDIR)/include \
-  -DQT_THREAD_SUPPORT \
-  -DTAO_QTRESOURCE_BUILD_DLL
-
-libTAO_QtResource_la_SOURCES = \
-  QtResource_Factory.cpp \
-  QtResource_Loader.cpp
-
-libTAO_QtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_QtResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace//libACE_QtReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  -lqt-mt
-
-nobase_include_HEADERS += \
-  QtResource_Factory.h \
-  QtResource_Loader.h \
-  TAO_QtResource_Export.h
-
-endif BUILD_QT
-endif BUILD_ACE_QTREACTOR
-
-## Makefile.TAO_TkResource.am
-
-if BUILD_ACE_TKREACTOR
-if BUILD_TK
-
-lib_LTLIBRARIES += libTAO_TkResource.la
-
-libTAO_TkResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TKRESOURCE_BUILD_DLL
-
-libTAO_TkResource_la_SOURCES = \
-  TkResource_Factory.cpp \
-  TkResource_Loader.cpp
-
-libTAO_TkResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TkResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace//libACE_TkReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TAO_TkResource_Export.h \
-  TkResource_Factory.h \
-  TkResource_Loader.h
-
-endif BUILD_TK
-endif BUILD_ACE_TKREACTOR
-
-## Makefile.TAO_XtResource.am
-
-if BUILD_ACE_XTREACTOR
-if BUILD_X11
-if BUILD_XT
-
-lib_LTLIBRARIES += libTAO_XtResource.la
-
-libTAO_XtResource_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_XTRESOURCE_BUILD_DLL
-
-libTAO_XtResource_la_SOURCES = \
-  XtResource_Factory.cpp \
-  XtResource_Loader.cpp
-
-libTAO_XtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_XtResource_la_LIBADD = \
-  $(ACE_BUILDDIR)/ace//libACE_XtReactor.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TAO_XtResource_Export.h \
-  XtResource_Factory.h \
-  XtResource_Loader.h
-
-endif BUILD_XT
-endif BUILD_X11
-endif BUILD_ACE_XTREACTOR
-
-## Makefile.TypeCodeFactory.am
-
-lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
-
-libTAO_TypeCodeFactory_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_TYPECODEFACTORY_BUILD_DLL
-
-libTAO_TypeCodeFactory_la_SOURCES = \
-  TypeCodeFactory/Recursive_TypeCode.cpp \
-  TypeCodeFactory/TypeCodeFactoryA.cpp \
-  TypeCodeFactory/TypeCodeFactoryC.cpp \
-  TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp \
-  TypeCodeFactory/TypeCodeFactory_Loader.cpp \
-  TypeCodeFactory/TypeCodeFactory_i.cpp
-
-libTAO_TypeCodeFactory_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_TypeCodeFactory_la_LIBADD = \
-  libTAO_IFR_Client.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  TypeCodeFactory/Recursive_TypeCode.h \
-  TypeCodeFactory/Recursive_TypeCode.inl \
-  TypeCodeFactory/TypeCodeFactory.pidl \
-  TypeCodeFactory/TypeCodeFactoryC.h \
-  TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h \
-  TypeCodeFactory/TypeCodeFactory_Loader.h \
-  TypeCodeFactory/TypeCodeFactory_i.h \
-  TypeCodeFactory/typecodefactory_export.h
-
-pkgconfig_DATA += TAO_TypeCodeFactory.pc
-
-TAO_TypeCodeFactory.pc: ${top_builddir}/config.status ${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-
-EXTRA_DIST += \
-  TypeCodeFactory/TAO_TypeCodeFactory.pc.in \
-  TypeCodeFactory/TypeCodeFactory.rc
-
-
-## Makefile.Utils.am
-
-lib_LTLIBRARIES += libTAO_Utils.la
-
-libTAO_Utils_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_UTILS_BUILD_DLL
-
-libTAO_Utils_la_SOURCES = \
-  Utils/Implicit_Deactivator.cpp \
-  Utils/ORB_Destroyer.cpp \
-  Utils/ORB_Manager.cpp \
-  Utils/PolicyList_Destroyer.cpp \
-  Utils/RIR_Narrow.cpp \
-  Utils/Servant_Var.cpp \
-  Utils/Server_Main.cpp
-
-libTAO_Utils_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Utils_la_LIBADD = \
-  libTAO_PortableServer.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  Utils/Auto_Functor.h \
-  Utils/Implicit_Deactivator.h \
-  Utils/ORB_Destroyer.h \
-  Utils/ORB_Manager.h \
-  Utils/PolicyList_Destroyer.h \
-  Utils/PolicyList_Destroyer.inl \
-  Utils/RIR_Narrow.h \
-  Utils/Servant_Var.h \
-  Utils/Servant_Var.inl \
-  Utils/Server_Main.h \
-  Utils/utils_export.h
-
-pkgconfig_DATA += TAO_Utils.pc
-
-TAO_Utils.pc: ${top_builddir}/config.status ${srcdir}/TAO_Utils.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_Utils.pc.in
-
-EXTRA_DIST += \
-  TAO_Utils.pc.in
-
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
deleted file mode 100644
index 5c2b8ed152f..00000000000
--- a/TAO/tao/Managed_Types.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-#include "tao/Managed_Types.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Managed_Types.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Managed_Types,
-           "$Id$")
-
-// assignment from CORBA::String_var makes a copy
-TAO_String_Manager&
-TAO_String_Manager::operator= (const CORBA::String_var &var)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (var.in ());
-  return *this;
-}
-
-// assignment from String_var
-TAO_SeqElem_String_Manager&
-TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
-{
-  if (this->release_)
-    {
-      CORBA::string_free (*this->ptr_);
-    }
-
-  *this->ptr_ = CORBA::string_dup (var.in ());
-  return *this;
-}
-
-// ****************************************************************
-
-// assignment from CORBA::WString_var makes a copy
-TAO_WString_Manager&
-TAO_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
-
-// assignment from WString_var
-TAO_SeqElem_WString_Manager&
-TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  if (this->release_)
-    {
-      CORBA::wstring_free (*this->ptr_);
-    }
-
-  *this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
deleted file mode 100644
index 61e0814dd67..00000000000
--- a/TAO/tao/Managed_Types.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Managed_Types.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_MANAGED_TYPES_H
-#define TAO_MANAGED_TYPES_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/CORBA_String.h"
-
-/****************************************************************/
-
-/**
- * @class TAO_String_Manager
- *
- * @brief Manager for strings.
- *
- * This class implements the generic string manager and is used in the C++
- * mapping of "struct" members that are of type "string". The difference
- * between this class and the CORBA::String_var class is that the default
- * constructor initializes the underlying string to an empty string in this
- * class whereas it is a NUL string for the _var class.
- */
-class TAO_Export TAO_String_Manager
-{
-public:
-
-  /// default CTOR will initialize the underlying ptr_ to empty string.
-  TAO_String_Manager (void);
-
-  /// copy constructor
-  TAO_String_Manager (const TAO_String_Manager &);
-
-  /// destructor
-  ~TAO_String_Manager (void);
-
-  /// assignment from another managed type
-  TAO_String_Manager &operator= (const TAO_String_Manager&);
-
-  /// assignment from var type will make a copy
-  TAO_String_Manager &operator= (const CORBA::String_var&);
-
-  /// assignment from a constant char* will make a copy
-  TAO_String_Manager &operator= (const char *);
-
-  /// assignment from char* will not make a copy. The String_Manager will now
-  /// own the string.
-  TAO_String_Manager &operator= (char *);
-
-  /// cast  (read-only)
-  operator const char*() const;
-
-  /// for in parameter.
-  const char *in (void) const;
-
-  /// for inout parameter.
-  char *&inout (void);
-
-  /// for out parameter.
-  char *&out (void);
-
-  /// for string of return type.
-  char *_retn (void);
-
-private:
-  /// The underlying string
-  char *ptr_;
-
-};
-
-/****************************************************************/
-
-/**
- * @class TAO_SeqElem_String_Manager
- *
- * @brief TAO_SeqElem_String_Manager
- *
- * Manager for strings that are the element type of sequences.
- * Similar to the mapping for sequences of objects (and other
- * pseudo objects) the mapping for sequences of strings requires
- * an auxiliar class or <Manager> to handle the allocation and
- * deallocation of the string.  The main difference with respect
- * to String_var classes is that automatic release is not
- * controlled on a per-item basis, but for the sequence as a
- * whole.  The difference wrt Object_Manager is that strings are
- * duplicated using CORBA::string_dup () as opposed to
- * T::_duplicate(), and released using CORBA::string_free()
- * instead of CORBA::release()
- * This class implements the generic string manager and is used to
- * instantiate the proper sequence types.
- * This class will have the same semantics as the string manager classes
- * defined earlier with respect to the various assignment
- * operators. However, the freeing of old storage will be dependent on the
- * "release" value of the parent sequence class.
- */
-class TAO_Export TAO_SeqElem_String_Manager
-{
-public:
-  friend class TAO_Unbounded_String_Sequence;
-
-  // @@ Giving friendship to a template is not implemented on several
-  // compilers:
-  // friend template<CORBA::ULong MAX>
-  //   class TAO_Bounded_String_Sequence<TAO_SeqElem_String_Manager,MAX>;
-
-  /// copy constructor
-  TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &);
-
-  /// constructor from address of an element
-  TAO_SeqElem_String_Manager (char **buffer, CORBA::Boolean release);
-
-  /// destructor
-  ~TAO_SeqElem_String_Manager (void);
-
-  /// assignment from another managed type
-  TAO_SeqElem_String_Manager &operator= (const TAO_SeqElem_String_Manager&);
-
-  /// assignment from var type will make a copy
-  TAO_SeqElem_String_Manager &operator= (const CORBA::String_var&);
-
-  /// assignment from a constant char* will make a copy
-  TAO_SeqElem_String_Manager &operator= (const char *);
-
-  /// assignment from char* will not make a copy. The SeqElem_String_Manager will now
-  /// own the string.
-  TAO_SeqElem_String_Manager &operator= (char *);
-
-  /// cast  (read-only)
-  operator const char*() const;
-
-  /// for in parameter.
-  const char *in (void) const;
-
-  /// for inout parameter.
-  char *&inout (void);
-
-  /// for out parameter.
-  char *&out (void);
-
-  /// for string of return type.
-  char *_retn (void);
-
-private:
-  /// Address of string element from the parent's buffer.
-  char **ptr_;
-
-  /// control memory managment semantics.
-  CORBA::Boolean release_;
-
-  // following are now allowed since these managed class will be used only by
-  // the [] operator of the sequence class. The [] operator will not use the
-  // following ctors to instantiate the managed instance
-
-  /// default ctor
-  TAO_SeqElem_String_Manager (void);
-
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_WString_Manager
- *
- * @brief Manager for wide strings.
- *
- * This class implements the generic wstring manager and is used
- * in the C++ mapping of "struct" members that are of type
- * "wstring".
- * The difference between this class and the CORBA::WString_var
- * class is that the default constructor initializes the
- * underlying wstring to an empty string in this class whereas it
- * is a NUL wstring for the _var class.
- */
-class TAO_Export TAO_WString_Manager
-{
-public:
-
-  /// default CTOR will initialize the underlying ptr_ to empty string.
-  TAO_WString_Manager (void);
-
-  /// copy constructor
-  TAO_WString_Manager (const TAO_WString_Manager &);
-
-  /// destructor
-  ~TAO_WString_Manager (void);
-
-  /// assignment from another managed type
-  TAO_WString_Manager &operator= (const TAO_WString_Manager&);
-
-  /// assignment from var type will make a copy
-  TAO_WString_Manager &operator= (const CORBA::WString_var&);
-
-  /// assignment from a constant wchar* will make a copy
-  TAO_WString_Manager &operator= (const CORBA::WChar *);
-
-  /// assignment from wchar* will not make a copy. The WString_Manager
-  /// will now own the string.
-  TAO_WString_Manager &operator= (CORBA::WChar *);
-
-  /// cast  (read-only)
-  operator const CORBA::WChar*() const;
-
-  /// for in parameter.
-  const CORBA::WChar *in (void) const;
-
-  /// for inout parameter.
-  CORBA::WChar *&inout (void);
-
-  /// for out parameter.
-  CORBA::WChar *&out (void);
-
-  /// for string of return type.
-  CORBA::WChar *_retn (void);
-
-private:
-  /// The underlying wide string
-  CORBA::WChar *ptr_;
-
-};
-
-/****************************************************************/
-
-/**
- * @class TAO_SeqElem_WString_Manager
- *
- * @brief TAO_SeqElem_WString_Manager
- *
- * Manager for strings that are the element type of sequences.
- * Similar to the mapping for sequences of objects (and other
- * pseudo objects) the mapping for sequences of strings requires
- * an auxiliar class or <Manager> to handle the allocation and
- * deallocation of the string.  The main difference with respect
- * to WString_var classes is that automatic release is not
- * controlled on a per-item basis, but for the sequence as a
- * whole.  The difference wrt Object_Manager is that strings are
- * duplicated using CORBA::WString_dup () as opposed to
- * T::_duplicate(), and released using CORBA::WString_free()
- * instead of CORBA::release()
- * This class implements the generic string manager and is used to
- * instantiate the proper sequence types.
- * This class will have the same semantics as the string manager
- * classes defined earlier with respect to the various assignment
- * operators. However, the freeing of old storage will be
- * dependent on the "release" value of the parent sequence class.
- */
-class TAO_Export TAO_SeqElem_WString_Manager
-{
-public:
-  friend class TAO_Unbounded_WString_Sequence;
-
-  // @@ Giving friendship to a template is not implemented on several
-  // compilers:
-  // friend template<CORBA::ULong MAX>
-  //   class TAO_Bounded_WString_Sequence<TAO_SeqElem_WString_Manager,MAX>;
-
-  /// constructor from address of an element
-  TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                               CORBA::Boolean release);
-
-  /// copy constructor
-  TAO_SeqElem_WString_Manager (const TAO_SeqElem_WString_Manager &);
-
-  /// destructor
-  ~TAO_SeqElem_WString_Manager (void);
-
-  /// assignment from another managed type
-  TAO_SeqElem_WString_Manager &operator= (const TAO_SeqElem_WString_Manager&);
-
-  /// assignment from var type will make a copy
-  TAO_SeqElem_WString_Manager &operator= (const CORBA::WString_var&);
-
-  /// assignment from a constant char* will make a copy
-  TAO_SeqElem_WString_Manager &operator= (const CORBA::WChar *);
-
-  /// assignment from char* will not make a copy. The
-  /// SeqElem_WString_Manager will now own the string.
-  TAO_SeqElem_WString_Manager &operator= (CORBA::WChar *);
-
-  /// cast  (read-only)
-  operator const CORBA::WChar*() const;
-
-  /// for in parameter.
-  const CORBA::WChar *in (void) const;
-
-  /// for inout parameter.
-  CORBA::WChar *&inout (void);
-
-  /// for out parameter.
-  CORBA::WChar *&out (void);
-
-  /// for string of return type.
-  CORBA::WChar *_retn (void);
-
-private:
-  /// Address of string element from the parent's buffer.
-  CORBA::WChar **ptr_;
-
-  /// control memory managment semantics.
-  CORBA::Boolean release_;
-
-  // following are now allowed since these managed class will be used only by
-  // the [] operator of the sequence class. The [] operator will not use the
-  // following ctors to instantiate the managed instance
-
-  /// default ctor
-  TAO_SeqElem_WString_Manager (void);
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Managed_Types.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MANAGED_TYPES_H */
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
deleted file mode 100644
index 73f66c7cdf6..00000000000
--- a/TAO/tao/Managed_Types.i
+++ /dev/null
@@ -1,372 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Managed_Types.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-// ****************************************************************
-
-// default CTOR initializes to empty string
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager (void)
-  :  ptr_ (CORBA::string_dup (""))
-{
-}
-
-// copy ctor copies storage
-ACE_INLINE
-TAO_String_Manager::TAO_String_Manager (const TAO_String_Manager &rhs)
-  :  ptr_ (CORBA::string_dup (rhs.ptr_))
-{
-}
-
-// destructor
-ACE_INLINE
-TAO_String_Manager::~TAO_String_Manager (void)
-{
-  CORBA::string_free (this->ptr_);
-}
-
-// assignment
-ACE_INLINE TAO_String_Manager&
-TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (rhs.ptr_);
-  return *this;
-}
-
-// assignment from const char* makes a copy
-ACE_INLINE TAO_String_Manager &
-TAO_String_Manager::operator= (const char * p)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-// assignment from char* owns the string
-ACE_INLINE TAO_String_Manager &
-TAO_String_Manager::operator= (char * p)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_String_Manager::operator const char* (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-TAO_String_Manager::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_Manager::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_Manager::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-TAO_String_Manager::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-// copy ctor
-ACE_INLINE
-TAO_SeqElem_String_Manager::
-TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &rhs)
-  :  ptr_ (rhs.ptr_),
-     release_ (rhs.release_)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::TAO_SeqElem_String_Manager (char **buffer,
-                                                        CORBA::Boolean release)
-  :  ptr_ (buffer),
-     release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::~TAO_SeqElem_String_Manager (void)
-{
-}
-
-// assignment
-ACE_INLINE TAO_SeqElem_String_Manager&
-TAO_SeqElem_String_Manager::operator= (const TAO_SeqElem_String_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = CORBA::string_dup (*rhs.ptr_);
-  return *this;
-}
-
-// assignment from const char* will make copy
-ACE_INLINE TAO_SeqElem_String_Manager &
-TAO_SeqElem_String_Manager::operator= (const char *p)
-{
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-// assignment from char* will own it
-ACE_INLINE TAO_SeqElem_String_Manager &
-TAO_SeqElem_String_Manager::operator= (char *p)
-{
-  if (this->release_)
-    CORBA::string_free (*this->ptr_);
-  *this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager::operator const char* (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const char *
-TAO_SeqElem_String_Manager::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_SeqElem_String_Manager::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_SeqElem_String_Manager::out (void)
-{
-  CORBA::string_free (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-ACE_INLINE char *
-TAO_SeqElem_String_Manager::_retn (void)
-{
-  char *temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-// default CTOR initializes to empty string
-ACE_INLINE
-TAO_WString_Manager::TAO_WString_Manager (void)
-  :  ptr_ (0) // @@ CORBA::wstring_dup (""))
-{
-}
-
-// copy ctor copies storage
-ACE_INLINE
-TAO_WString_Manager::TAO_WString_Manager (const TAO_WString_Manager &rhs)
-  :  ptr_ (CORBA::wstring_dup (rhs.ptr_))
-{
-}
-
-// destructor
-ACE_INLINE
-TAO_WString_Manager::~TAO_WString_Manager (void)
-{
-  CORBA::wstring_free (this->ptr_);
-}
-
-// assignment
-ACE_INLINE TAO_WString_Manager&
-TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (rhs.ptr_);
-  return *this;
-}
-
-// assignment from const CORBA::WChar* makes a copy
-ACE_INLINE TAO_WString_Manager &
-TAO_WString_Manager::operator= (const CORBA::WChar * p)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-// assignment from CORBA::WChar* owns the string
-ACE_INLINE TAO_WString_Manager &
-TAO_WString_Manager::operator= (CORBA::WChar * p)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_WString_Manager::operator const CORBA::WChar* (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-TAO_WString_Manager::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_WString_Manager::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_WString_Manager::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-TAO_WString_Manager::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ****************************************************************
-
-// copy ctor
-ACE_INLINE
-TAO_SeqElem_WString_Manager::
-TAO_SeqElem_WString_Manager (const TAO_SeqElem_WString_Manager &rhs)
-  :  ptr_ (rhs.ptr_),
-     release_ (rhs.release_)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::
-    TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                                 CORBA::Boolean release)
-  :  ptr_ (buffer),
-     release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::~TAO_SeqElem_WString_Manager (void)
-{
-}
-
-// assignment
-ACE_INLINE TAO_SeqElem_WString_Manager&
-TAO_SeqElem_WString_Manager::operator= (const TAO_SeqElem_WString_Manager &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (*rhs.ptr_);
-  return *this;
-}
-
-// assignment from const CORBA::WChar* will make copy
-ACE_INLINE TAO_SeqElem_WString_Manager &
-TAO_SeqElem_WString_Manager::operator= (const CORBA::WChar *p)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
-}
-
-// assignment from CORBA::WChar* will own it
-ACE_INLINE TAO_SeqElem_WString_Manager &
-TAO_SeqElem_WString_Manager::operator= (CORBA::WChar *p)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager::operator const CORBA::WChar* (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-TAO_SeqElem_WString_Manager::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_SeqElem_WString_Manager::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-TAO_SeqElem_WString_Manager::out (void)
-{
-  CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-TAO_SeqElem_WString_Manager::_retn (void)
-{
-  CORBA::WChar *temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
deleted file mode 100644
index b63181880a5..00000000000
--- a/TAO/tao/Marshal.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    marshal.cpp
-//
-// = DESCRIPTION
-//   Implements the Marshal_Object class and the factory
-//
-//   The original encoder and decoder code now appears in files encode.cpp and
-//   decode.cpp
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Marshal, 
-           "$Id$")
-
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
-                                  TAO_InputCDR *stream
-                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
-                                    TAO_InputCDR *src,
-                                    TAO_OutputCDR *dest
-                                    ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
deleted file mode 100644
index 2fee59a0e01..00000000000
--- a/TAO/tao/Marshal.h
+++ /dev/null
@@ -1,455 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Marshal.h
- *
- *  $Id$
- *
- *   Classes that marshal various IDL data types.
- *
- *
- *  @author  Aniruddha S. Gokhale
- */
-//=============================================================================
-
-
-#ifndef TAO_MARSHAL_H
-#define TAO_MARSHAL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Environment;
-}
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-// = Forward declarations.
-class TAO_Marshal_Object;
-class TAO_Marshal_Primitive;
-class TAO_Marshal_Any;
-class TAO_Marshal_TypeCode;
-class TAO_Marshal_Principal;
-class TAO_Marshal_ObjRef;
-class TAO_Marshal_Struct;
-class TAO_Marshal_Union;
-class TAO_Marshal_String;
-class TAO_Marshal_Sequence;
-class TAO_Marshal_Array;
-class TAO_Marshal_Alias;
-class TAO_Marshal_Except;
-class TAO_Marshal_WString;
-class TAO_Marshal_Value;
-
-namespace TAO
-{
-  enum traverse_status
-    {
-      TRAVERSE_STOP,
-      TRAVERSE_CONTINUE
-    };
-}
-
-/**
- * @class TAO_Marshal_Object
- *
- * @brief TAO_Marshal_Object
- *
- * The Marshaling object that provides a common interface to the
- * CDR object for marshaling different IDL data types
- * Provides a set of virtual methods for appending and skipping
- * data over a CDR stream.
- */
-class TAO_Export TAO_Marshal_Object
-{
-public:
-  /// constructor
-  TAO_Marshal_Object (void);
-
-  /// destructor
-  virtual ~TAO_Marshal_Object (void);
-
-  /// skip entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc,
-                                            TAO_InputCDR *context
-                                            ACE_ENV_ARG_DECL);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL) = 0;
-
-  /// append entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc,
-                                              TAO_InputCDR *src,
-                                              TAO_OutputCDR *dest
-                                              ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL) = 0;
-};
-
-/**
- * @class TAO_Marshal_Primitive:
- *
- * @brief TAO_Marshal_Primitive
- *
- * marshaling primitives
- */
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Primitive (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Any:
- *
- * @brief TAO_Marshal_Any
- *
- * Marshal an Any
- */
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Any (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_TypeCode:
- *
- * @brief TAO_Marshal_TypeCode
- *
- * marshal a typecode
- */
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_TypeCode (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Principal:
- *
- * @brief TAO_Marshal_Principal
- *
- * marshal a principal
- */
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Principal (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_ObjRef:
- *
- * @brief TAO_Marshal_ObjRef
- *
- * marshal an object reference
- */
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_ObjRef (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Struct:
- *
- * @brief TAO_Marshal_Struct
- *
- * marshal a struct
- */
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Struct (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Union:
- *
- * @brief TAO_Marshal_Union
- *
- * marshal a union
- */
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Union (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_String:
- *
- * @brief TAO_Marshal_String
- *
- * marshal a string
- */
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_String (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Sequence:
- *
- * @brief TAO_Marshal_Sequence
- *
- * marshal a sequence
- */
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Sequence (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Array:
- *
- * @brief TAO_Marshal_Array
- *
- * marshal an array
- */
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Array (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Alias:
- *
- * @brief TAO_Marshal_Alias
- *
- * marshal an alias
- */
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Alias (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Except:
- *
- * @brief TAO_Marshal_Except
- *
- * marshal an exception
- */
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Except (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_WString
- *
- * @brief TAO_Marshal_WString
- *
- * marshal a wide string
- */
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_WString (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Value:
- *
- * @brief TAO_Marshal_Value
- *
- * marshal a valuetype
- */
-class TAO_Export TAO_Marshal_Value: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Value (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-
-private:
-  CORBA::Boolean nested_processing_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
deleted file mode 100644
index 8b78849a003..00000000000
--- a/TAO/tao/Marshal.i
+++ /dev/null
@@ -1,77 +0,0 @@
-//$Id$
-
-ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Value::TAO_Marshal_Value (void)
-  : nested_processing_ (0)
-{
-}
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
deleted file mode 100644
index 2f6db234f66..00000000000
--- a/TAO/tao/Messaging.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core, portableserver, valuetype {
-  sharedname   = TAO_Messaging
-  dynamicflags = TAO_MESSAGING_BUILD_DLL
-
-  Source_Files {
-    Messaging
-  }
-
-  Header_Files {
-    Messaging
-  }
-
-  Inline_Files {
-    Messaging
-  }
-
-  Template_Files {
-    Messaging
-  }
-
-  Resource_Files {
-    Messaging
-  }
-
-  PIDL_Files {
-    Messaging
-  }
-
-  Pkgconfig_Files {
-    Messaging/TAO_Messaging.pc.in
-  }
-}
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
deleted file mode 100644
index c80275366f3..00000000000
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// $Id$
-
-#include "tao/Messaging/AMH_Response_Handler.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Transport.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Pluggable_Messaging.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/GIOP_Utils.h"
-#include "tao/debug.h"
-#include "tao/Buffer_Allocator_T.h"
-#include "tao/SystemException.h"
-
-#include "ace/Copy_Disabled.h"
-
-TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
-  : mesg_base_ (0)
-  , request_id_ (0)
-  , transport_ (0)
-  , orb_core_ (0)
-  , argument_flag_ (1)
-  , exception_type_ (TAO_GIOP_NO_EXCEPTION)
-  , reply_status_ (TAO_RS_UNINITIALIZED)
-  , allocator_ (0)
-{
-}
-
-TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
-{
-  this->transport_->remove_reference ();
-
-  // Since we are destroying the object we put a huge lock around the
-  // whole destruction process (just paranoid).
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-
-    if (this->response_expected_ == 0) //oneway ?
-      {
-        return;
-      }
-
-    // If the ResponseHandler is being destroyed before a reply has
-    // been sent to the client, we send a system exception
-    // CORBA::NO_RESPONSE, with minor code to indicate the problem.
-    if (this->reply_status_ == TAO_RS_SENT)
-      {
-        return;
-      }
-
-    // If sending the exception to the client fails, then we just give
-    // up, release the transport and return.
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
-      {
-        CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
-                               (TAO_AMH_REPLY_LOCATION_CODE,
-                                EFAULT),
-                               CORBA::COMPLETED_NO);
-        this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHALL
-      {
-      }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  }
-}
-
-void
-TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request,
-                               TAO_AMH_BUFFER_ALLOCATOR* allocator)
-{
-  mesg_base_ = server_request.mesg_base_;
-  request_id_ = server_request.request_id_;
-  response_expected_  = server_request.response_expected_;
-  transport_ = server_request.transport ();
-  orb_core_ = server_request.orb_core ();
-  allocator_ = allocator;
-
-  this->transport_->add_reference ();
-}
-
-void
-TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
-      {
-        // Looks like someone is trying to call an AMH method
-        // more than once
-        //
-        // We assume that the servant has already processed the
-        // request and is now trying to send back the reply.  Hence we
-        // say that the operation has completed but let the server
-        // anyway that it is not doing something right.
-        ACE_THROW (CORBA::BAD_INV_ORDER
-                          (CORBA::SystemException::_tao_minor_code
-                                  (TAO_AMH_REPLY_LOCATION_CODE,
-                                   EEXIST),
-                           CORBA::COMPLETED_YES));
-      }
-  }
-
-  // Construct our reply generator.
-  TAO_Pluggable_Reply_Params_Base reply_params;
-  reply_params.request_id_ = this->request_id_;
-  reply_params.service_context_notowned (&(this->reply_service_context_.service_info ()));
-  reply_params.argument_flag_ = this->argument_flag_;
-
-  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
-    {
-      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
-    }
-  else
-    {
-      reply_params.reply_status_ = this->exception_type_;
-    }
-
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-
-    this->mesg_base_->generate_reply_header (this->_tao_out,
-                                             reply_params);
-
-    // We are done initialising the reply
-    this->reply_status_ = TAO_RS_INITIALIZED;
-  }
-
-}
-
-void
-TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
-{
-
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-
-    // If the reply has not been initialised, raise an exception to the
-    // server-app saying it is not doing something right.
-    if (this->reply_status_ != TAO_RS_INITIALIZED)
-      {
-        ACE_THROW (CORBA::BAD_INV_ORDER (
-                          CORBA::SystemException::_tao_minor_code (
-                                                  TAO_AMH_REPLY_LOCATION_CODE,
-                                                  ENOTSUP),
-                          CORBA::COMPLETED_YES));
-      }
-    this->reply_status_ = TAO_RS_SENDING;
-  }
-
-  // Send the message.
-  int result = this->transport_->send_message (this->_tao_out,
-                                               0,
-                                               TAO_Transport::TAO_REPLY);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          // No exception but some kind of error, yet a response
-          // is required.
-          ACE_ERROR ((
-                      LM_ERROR,
-                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"),
-                      ACE_TEXT ("TAO_AMH_Response_Handler::_tao_rh_send_reply")
-                      ));
-        }
-    }
-
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-    this->reply_status_ = TAO_RS_SENT;
-  }
-}
-
-void
-TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
-                                                  ACE_ENV_ARG_DECL)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
-      {
-        ACE_THROW (CORBA::BAD_INV_ORDER (
-                                         CORBA::SystemException::_tao_minor_code (
-                                                                                  TAO_AMH_REPLY_LOCATION_CODE,
-                                                                                  ENOTSUP),
-                                         CORBA::COMPLETED_YES));
-      }
-    this->reply_status_ = TAO_RS_SENDING;
-  }
-
-  TAO_Pluggable_Reply_Params_Base reply_params;
-  reply_params.request_id_ = this->request_id_;
-  reply_params.svc_ctx_.length (0);
-  reply_params.service_context_notowned (&this->reply_service_context_.service_info ());
-  reply_params.argument_flag_ = 1;
-  reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
-  // @@ It appears as if there should be a more efficient way to do
-  //    this: the caller already knows this because it is part of the
-  //    ExceptionHolder information.
-  if (CORBA::SystemException::_downcast (&ex))
-    reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
-
-  if (this->mesg_base_->generate_exception_reply (this->_tao_out,
-                                                  reply_params,
-                                                  ex) == -1)
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Send the Exception
-  if (this->transport_->send_message (this->_tao_out,
-                                      0,
-                                      TAO_Transport::TAO_REPLY) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
-                  ACE_TEXT ("TAO_AMH_Response_Handler: could not send exception reply\n")));
-    }
-
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-    this->reply_status_ = TAO_RS_SENT;
-  }
-}
-
-void
-TAO_AMH_Response_Handler::_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX,
-               mon,
-               this->refcount_lock_);
-
-    --this->refcount_;
-
-    if (this->refcount_ > 0)
-      return;
-  }
-
-  if (this->allocator_)
-    {
-      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_);
-
-      allocator.release(this);
-    }
-  else
-    {
-      delete this;
-    }
-
-  return;
-}
-
-namespace TAO
-{
-  void
-  ARH_Refcount_Functor::operator () (
-      TAO_AMH_Response_Handler *arh)
-    ACE_THROW_SPEC (())
-  {
-    (void) arh->_remove_ref ();
-  }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
deleted file mode 100644
index 678aa406821..00000000000
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ /dev/null
@@ -1,216 +0,0 @@
-// -*- C++ -*-
-
-// =========================================================================
-/**
- *  @file   AMH_Response_Handler.h
- *
- *  $Id$
- *
- *  @author Mayur Deshpande <mayur@ics.uci.edu>
- *
- */
-// =========================================================================
-
-#ifndef TAO_AMH_RESPONSE_HANDLER_H
-#define TAO_AMH_RESPONSE_HANDLER_H
-
-#include "messaging_export.h"
-
-#include "tao/Allocator.h"
-#include "tao/Service_Context.h"
-#include "tao/CDR.h"
-#include "tao/LocalObject.h"
-#include "tao/Buffer_Allocator_T.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Transport;
-class TAO_Pluggable_Messaging;
-class TAO_Output_CDR;
-class TAO_ORB_Core;
-class TAO_ServerRequest;
-class ACE_Allocator;
-
-typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
-
-/**
- * @class TAO_AMH_Response_Handler
- *
- * @brief Class representing an Asynchronous-Method-Handling (AMH)
- * ResponseHandler (RH) object.
- *
- * Class encapsulates state required to send a response back to the
- * client independent of the thread that originally created the state
- * on the activation-record.  Thus the required state (copied from
- * TAO_Server_Request) is 'stored' on the heap.
- *
- * One RH is created for every client request and the RH can be used
- * only once i.e.,  the asynchronous method can be called only once.
- * This class also encapsulates various initialisation and
- * response-sending functionality that is common to all RHs (generated
- * by the IDL compiler). Thus the IDL-compiler has to generate less
- * code which in turn reduces the overall code size for an
- * application.
- */
-class TAO_Messaging_Export TAO_AMH_Response_Handler
-// @@ Mayur, this is not the correct way to use
-//    TAO_LocalRefCounted_Object.  Application code is supposed to use
-//    it when necessary.  You're forcing applications to use a
-//    reference counted version of their AMH_Response_Handler.  This
-//    isn't consistent with the specified semantics detailed in the
-//    CCM spec.  Please remove this and place it where appropriate in
-//    your AMH tests and examples.
-  : virtual public TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor
-  TAO_AMH_Response_Handler ();
-
-  /// Destructor
-  /**
-   * Releases the transport and in case of an error, sends the appropriate
-   * exception back to the client
-   */
-  virtual ~TAO_AMH_Response_Handler (void);
-
-  /**
-   * Stores necessary information from a TAO_Server_Request onto the heap
-   */
-  virtual void init(TAO_ServerRequest &server_request,
-                    TAO_AMH_BUFFER_ALLOCATOR* allocator);
-
-  /// @name Mutators for refcount
-  //@{
-  virtual void _remove_ref (void);
-  //@}
-
-protected:
-
-  /// Sets up the various parameters in anticipation of returning a reply
-  /// to the client. return/OUT/INOUT arguments are marshalled into the
-  /// Output stream after this method has been called.
-  void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Sends the marshalled reply back to the client.
-  void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Send back an exception to the client.
-  void _tao_rh_send_exception (CORBA::Exception &ex
-                               ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// The outgoing CDR stream
-  /**
-   * The IDL-generated ResponseHandler implementations used this field
-   * to marshal the response.
-   * Making it a field instead of a public accessor makes the code in
-   * the generated ResponseHandler implementation a lot more readable.
-   */
-  TAO_OutputCDR _tao_out;
-
-private:
-
-  // Private and undefined, standard C++ idiom to prohibit copying.
-  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
-
-private:
-  /// Pointer to the original message-base
-  TAO_Pluggable_Messaging *mesg_base_;
-
-  /// Copy of the request-id of the original Server-Request
-  CORBA::ULong request_id_;
-
-  CORBA::Boolean response_expected_;
-
-  /// Handle to transport through which the reply will be sent
-  /// Copy of transport in original Server_Request
-  TAO_Transport *transport_;
-
-  /// A pointer to the ORB Core for the context where the request was
-  /// created.
-  TAO_ORB_Core *orb_core_;
-
-  /// The reply service context
-  TAO_Service_Context reply_service_context_;
-
-  /// Alwyas set to true (we always have something to return to the
-  /// client
-  // @@ Mayur: I think not!  This is used to generate padding in GIOP
-  //    1.2 messages (where the payload must start on an 8-byte
-  //    boundary.  But some replys have no payload (only header), in
-  //    those cases you cannot insert the padding.  We need the
-  //    ResponseHandler to set this field correctly!
-  CORBA::Boolean argument_flag_;
-
-  //  TAO_GIOP_ReplyStatusType exception_type_;
-  /// Exception type (will be NO_EXCEPTION in the majority of the
-  /// cases).
-  // @@ Mayur: I do not think we need this one, we can deduce the type
-  //    of reply depending on the _tao_rh_*() method called.
-  CORBA::ULong exception_type_;
-
-  /**
-   * Various states the ResponseHandler can be in.
-   *
-   * These states represent various states the RH can be in and
-   * the states are used not only in implementing the 'once-only semantics of
-   * RHs, but in making sure well the call thread-safe as well.
-   */
-  enum Reply_Status
-    {
-      TAO_RS_UNINITIALIZED,
-      TAO_RS_INITIALIZED,
-      TAO_RS_SENDING,
-      TAO_RS_SENT
-    };
-  Reply_Status reply_status_;
-  // I would use the "state pattern"..
-  // Carlos, Isn't that an overkill?
-  // @@ Mayur: it depends on what form of the "State Pattern" you
-  //    use.  The more generic form, as described in GoF, uses a class
-  //    for each state, super-elegant but indeed a bit heavy handed.
-  //    The lighter-weight form (using a state variable
-
-  /// Mutex to ensure the AMH-RH method call is thread-safe.
-  ACE_SYNCH_MUTEX mutex_;
-
-  /// Allocator used to allocate this object. If zero then we are allocated
-  /// from the heap
-  TAO_AMH_BUFFER_ALLOCATOR* allocator_;
-};
-
-namespace TAO
-{
-  /**
-   * @class ARH_Refcount_Functor
-   *
-   * @brief Functor for refcounting of TAO_AMH_Response_Handler
-   *
-   * This is used to safely handle the destruction of
-   * TAO_AMH_Response_Handler objects which are created on the
-   * heap. We cannot use auto_ptr <> since it calls delete on the
-   * pointer, and calling delete on TAO_AMH_Response_Handler *
-   * will not work. Hence this functor will be used with Auto_Functor
-   * class to handle the memory safely.
-   *
-   * @todo Ideally, this class can be a generic class. But that
-   * requires quite a bit of cleanup within TAO to be more useful.
-   */
-  class TAO_Messaging_Export ARH_Refcount_Functor
-  {
-  public:
-    void operator() (TAO_AMH_Response_Handler *arh)
-      ACE_THROW_SPEC (());
-  };
-
-}
-
-#endif /* TAO_AMH_RESPONSE_HANDLER_H */
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
deleted file mode 100644
index 5bf1ea0cd8c..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-//$Id$
-
-#include "Asynch_Invocation.h"
-#include "Asynch_Reply_Dispatcher.h"
-
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/Invocation_Utils.h"
-#include "tao/operation_details.h"
-#include "tao/Bind_Dispatcher_Guard.h"
-#include "tao/Transport.h"
-#include "tao/Muxed_TMS.h"
-#include "tao/Pluggable_Messaging.h"
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID (Messaging,
-           Asynch_Invocation,
-           "$Id$")
-
-namespace TAO
-{
-  Asynch_Remote_Invocation::Asynch_Remote_Invocation (
-      CORBA::Object_ptr otarget,
-      Profile_Transport_Resolver &resolver,
-      TAO_Operation_Details &detail,
-      TAO_Asynch_Reply_Dispatcher_Base *rd,
-      bool response_expected)
-    : Synch_Twoway_Invocation (otarget,
-                               resolver,
-                               detail,
-                               response_expected)
-      , safe_rd_ (rd)
-  {
-  }
-
-  Invocation_Status
-  Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
-                                               ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    TAO_OutputCDR &cdr =
-      this->resolver_.transport ()->messaging_object ()->out_stream ();
-
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-#if TAO_HAS_INTERCEPTORS == 1
-    s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-    // We have started the interception flow. We need to call the
-    // ending interception flow if things go wrong. The purpose of the
-    // try block is to take care of the cases when things go wrong.
-    ACE_TRY
-      {
-        this->write_header (tspec,
-                            cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (s);
-
-        this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (s);
-
-        // Register a reply dispatcher for this invocation. Use the
-        // preallocated reply dispatcher.
-        TAO_Bind_Dispatcher_Guard dispatch_guard (
-          this->details_.request_id (),
-          this->safe_rd_.get (),
-          this->resolver_.transport ()->tms ());
-
-        // Now that we have bound the reply dispatcher to the map, just
-        // loose ownership of the reply dispatcher.
-        this->safe_rd_.release ();
-
-        if (dispatch_guard.status () != 0)
-          {
-            // @@ What is the right way to handle this error? Do we need
-            // to call the interceptors in this case?
-            ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
-                                               CORBA::COMPLETED_NO),
-                              TAO_INVOKE_FAILURE);
-          }
-
-        // Do not unbind during destruction. We need the entry to be
-        // there in the map since the reply dispatcher depends on
-        // that. This is also a trigger to loose the ownership of the
-        // reply dispatcher.
-        dispatch_guard.status (TAO_Bind_Dispatcher_Guard::NO_UNBIND);
-
-        // Send it as a oneway request. It will make all the required
-        // paraphernalia within the ORB to fire, like buffering if
-        // send blocks etc.
-        s =
-          this->send_message (cdr,
-                              TAO_Transport::TAO_ONEWAY_REQUEST,
-                              max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-#if TAO_HAS_INTERCEPTORS == 1
-        // NOTE: We don't need to do the auto_ptr <> trick. We got here
-        // in the first place since the message was sent properly,
-        // which implies a reply would be available. Therefore the
-        // reply dispatcher should be available for another thread to
-        // collect and dispatch the reply. In MT cases, things are
-        // more hairy. Just imagine what happens when another thread
-        // is collecting the reply when we are happily invoking
-        // interceptors?
-
-        // Nothing great on here. If we get a restart during send or a
-        // proper send, we are supposed to call receiver_other ()
-        // interception point. So we do that here
-        Invocation_Status tmp =
-          this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // We got an error during the interception.
-        if (s == TAO_INVOKE_SUCCESS && tmp != TAO_INVOKE_SUCCESS)
-          s = tmp;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-        // If an error occurred just return. At this point all the
-        // endpoint interception would have been invoked. The callee
-        // would take care of the rest.
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
-
-        // NOTE: Not sure how things are handles with exclusive muxed
-        // strategy.
-        if (this->resolver_.transport ()->idle_after_send ())
-          (void) this->resolver_.transport_released ();
-
-      }
-    ACE_CATCHANY
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (status == PortableInterceptor::LOCATION_FORWARD ||
-            status == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else if (status == PortableInterceptor::SYSTEM_EXCEPTION
-            || status == PortableInterceptor::USER_EXCEPTION)
-#endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    return s;
-  }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#  if TAO_HAS_INTERCEPTORS == 1
-     template class TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor>;
-#  endif
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  if TAO_HAS_INTERCEPTORS == 1
-#    pragma instantiate TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor>
-#  endif
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
deleted file mode 100644
index b058c4c43a0..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Asynch_Invocation.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_ASYNCH_INVOCATION_H
-#define TAO_MESSAGING_ASYNCH_INVOCATION_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Messaging/messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Synch_Invocation.h"
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
-#include "ace/Global_Macros.h"
-#include "ace/Auto_Functor.h"
-
-class TAO_Operation_Details;
-class TAO_InputCDR;
-class ACE_Time_Value;
-class TAO_Asynch_Reply_Dispatcher_Base;
-
-namespace CORBA
-{
-  class SystemException;
-}
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-
-  class TAO_Messaging_Export Asynch_Remote_Invocation
-    : public Synch_Twoway_Invocation
-  {
-  public:
-    Asynch_Remote_Invocation (CORBA::Object_ptr otarget,
-                              Profile_Transport_Resolver &resolver,
-                              TAO_Operation_Details &detail,
-                              TAO_Asynch_Reply_Dispatcher_Base *rd,
-                              bool response_expected = true);
-
-    Invocation_Status remote_invocation (ACE_Time_Value *value
-                                         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-  protected:
-    // To prevent leaking memory from the reply dispatcher that we
-    // are given
-    ACE_Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base,
-                             ARDB_Refcount_Functor> safe_rd_;
-
-  };
-}
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_MESSAGING_ASYNCH_INVOCATION_H*/
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
deleted file mode 100644
index 52bcd0a134b..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//$Id$
-#include "Asynch_Invocation_Adapter.h"
-#include "Asynch_Reply_Dispatcher.h"
-#include "Asynch_Invocation.h"
-
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/operation_details.h"
-#include "tao/Stub.h"
-#include "tao/Transport.h"
-#include "tao/Muxed_TMS.h"
-#include "tao/ORB_Constants.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Thread_Lane_Resources.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Asynch_Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Messaging,
-           Asynch_Invocation_Adapter,
-           "$Id$")
-
-
-namespace TAO
-{
-  Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (CORBA::Object *target,
-                                                        Argument **args,
-                                                        int arg_number,
-                                                        const char *operation,
-                                                        int op_len,
-                                                        Collocation_Proxy_Broker *p,
-                                                        Invocation_Mode m)
-    : Invocation_Adapter (target,
-                          args,
-                          arg_number,
-                          operation,
-                          op_len,
-                          p,
-                          TAO_TWOWAY_INVOCATION,
-                          m)
-      , safe_rd_ ()
-  {
-  }
-
-  void
-  Asynch_Invocation_Adapter::invoke (
-      Messaging::ReplyHandler_ptr reply_handler_ptr,
-      const TAO_Reply_Handler_Skeleton &reply_handler_skel
-      ACE_ENV_ARG_DECL)
-  {
-    TAO_Stub *stub =
-      this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (TAO_debug_level >= 4)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Messaging (%P|%t) - Asynch_Invocation_Adapter::"
-                    "invoke\n"));
-      }
-
-    // If the reply handler is nil, we do not create a reply dispatcher.
-    // The ORB will drop replies to which it cannot associate a reply
-    // dispatcher.
-    if (!CORBA::is_nil (reply_handler_ptr))
-      {
-        // New reply dispatcher on the heap or allocator, because
-        // we will go out of scope and hand over the reply dispatcher
-        // to the ORB.
-
-        TAO_Asynch_Reply_Dispatcher *rd = 0;
-
-        // Get the allocator we could use.
-        ACE_Allocator* ami_allocator =
-          stub->orb_core ()->lane_resources().ami_response_handler_allocator();
-
-        // If we have an allocator, use it, else use the heap.
-        if (ami_allocator)
-          {
-            ACE_NEW_MALLOC (rd,
-                            static_cast<TAO_Asynch_Reply_Dispatcher *> (ami_allocator->malloc (sizeof (TAO_Asynch_Reply_Dispatcher))),
-                            TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
-                                                         reply_handler_ptr,
-                                                         stub->orb_core (),
-                                                         ami_allocator));
-          }
-        else
-          {
-            ACE_NEW (rd,
-                     TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
-                                                  reply_handler_ptr,
-                                                  stub->orb_core (),
-                                                  0));
-          }
-
-        if (rd == 0)
-          {
-            ACE_THROW (CORBA::NO_MEMORY ());
-          }
-
-        this->safe_rd_.reset (rd);
-      }
-
-    Invocation_Adapter::invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-
-  Invocation_Status
-  Asynch_Invocation_Adapter::invoke_twoway (
-      TAO_Operation_Details &op,
-      CORBA::Object_var &effective_target,
-      Profile_Transport_Resolver &r,
-      ACE_Time_Value *&max_wait_time
-      ACE_ENV_ARG_DECL)
-  {
-    // Simple sanity check
-    if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION ||
-        this->type_ != TAO_TWOWAY_INVOCATION)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-                TAO::VMCID,
-                EINVAL),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    if (this->safe_rd_.get ())
-      {
-        // Cache the  transport in the reply dispatcher
-        this->safe_rd_->transport (r.transport ());
-
-        // AMI Timeout Handling Begin
-        ACE_Time_Value tmp;
-
-        if (this->get_timeout (r.stub (),
-                               tmp))
-          {
-            this->safe_rd_->schedule_timer (
-                op.request_id (),
-                *max_wait_time
-                ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-          }
-      }
-
-    // Loose ownership of the reply dispatcher
-    TAO::Asynch_Remote_Invocation asynch (
-       effective_target.in (),
-       r,
-       op,
-       this->safe_rd_.release ());
-
-    Invocation_Status s =
-      asynch.remote_invocation (max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s == TAO_INVOKE_RESTART &&
-        asynch.is_forwarded ())
-      {
-        effective_target = asynch.steal_forwarded_reference ();
-
-        this->object_forwarded (effective_target,
-                                r.stub ()
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-      }
-
-    return s;
-  }
-
-} // End namespace TAO
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
deleted file mode 100644
index 43c9310ef76..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Asynch_Invocation_Adapter.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H
-#define TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Messaging/messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Messaging/Messaging.h"
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
-#include "tao/Invocation_Adapter.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Global_Macros.h"
-#include "ace/Auto_Functor.h"
-
-class TAO_Operation_Details;
-class TAO_Stub;
-class ACE_Time_Value;
-class TAO_Asynch_Reply_Dispatcher;
-class TAO_Asynch_Reply_Dispatcher_Base;
-
-namespace  CORBA
-{
-  class Object;
-  class Environment;
-  class SystemException;
-}
-
-namespace TAO
-{
-  class Argument;
-
-  class Collocation_Proxy_Broker;
-
-  /**
-   * @class Asynch_Invocation_Adapter
-   *
-   * @brief Generic interface for the invocation object visible to the
-   * IDL compiler.
-   *
-   */
-  class TAO_Messaging_Export Asynch_Invocation_Adapter : public Invocation_Adapter
-  {
-  public:
-    Asynch_Invocation_Adapter (
-        CORBA::Object *target,
-        Argument **args,
-        int arg_number,
-        const char *operation,
-        int op_len,
-        Collocation_Proxy_Broker *b,
-        TAO::Invocation_Mode mode = TAO_ASYNCHRONOUS_CALLBACK_INVOCATION);
-
-    void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr,
-                 const TAO_Reply_Handler_Skeleton &reply_handler_skel
-                 ACE_ENV_ARG_DECL);
-
-    virtual void invoke (TAO::Exception_Data *ex,
-                         unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
-  protected:
-
-    /**
-    virtual void invoke_collocated (TAO_Stub *,
-                                    TAO_Operation_Details &op
-                                    ACE_ENV_ARG_DECL);
-    **/
-
-    virtual Invocation_Status invoke_twoway (
-        TAO_Operation_Details &op,
-        CORBA::Object_var &effective_target,
-        Profile_Transport_Resolver &r,
-        ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
-
-  private:
-    /// Autofunctor to manage the reply dispatcher
-    ACE_Utils::Auto_Functor<TAO_Asynch_Reply_Dispatcher_Base,
-                            ARDB_Refcount_Functor> safe_rd_;
-
-  private:
-    /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter (void))
-
-    ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &))
-
-  };
-} // End namespace TAO
-
-
-#if defined (__ACE_INLINE__)
-#include "Asynch_Invocation_Adapter.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl b/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl
deleted file mode 100644
index d13c62ae36e..00000000000
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-
-namespace TAO
-{
-  ACE_INLINE void
-  Asynch_Invocation_Adapter::invoke (
-      TAO::Exception_Data *ex,
-      unsigned long ex_count
-      ACE_ENV_ARG_DECL)
-  {
-    Invocation_Adapter::invoke (ex, ex_count  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-} // End namespace TAO
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
deleted file mode 100644
index 3438ebe0b20..00000000000
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// $Id$
-
-#include "Asynch_Reply_Dispatcher.h"
-
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-
-#include "ace/CORBA_macros.h"
-
-ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$")
-
-// Constructor.
-TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
-    const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-    Messaging::ReplyHandler_ptr reply_handler,
-    TAO_ORB_Core *orb_core,
-    ACE_Allocator *allocator
-  )
-  :TAO_Asynch_Reply_Dispatcher_Base (orb_core, allocator)
-  , reply_handler_skel_ (reply_handler_skel)
-  , reply_handler_ (Messaging::ReplyHandler::_duplicate (reply_handler))
-  , timeout_handler_ (0)
-{
-}
-
-// Destructor.
-TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
-{
-}
-
-// Dispatch the reply.
-int
-TAO_Asynch_Reply_Dispatcher::dispatch_reply (
-    TAO_Pluggable_Reply_Params &params
-  )
-{
-  if (params.input_cdr_ == 0)
-    return -1;
-
-  if (!this->try_dispatch_reply ())
-    return 0;
-
-  if (this->timeout_handler_)
-    {
-      // If we had registered timeout handlers just cancel them and
-      // loose ownership of the handlers
-      this->timeout_handler_->cancel ();
-      this->timeout_handler_->remove_reference ();
-      this->timeout_handler_ = 0;
-      // AMI Timeout Handling End
-    }
-
-  this->reply_status_ = params.reply_status_;
-
-  // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
-
-  if (db == 0)
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_ERROR ((
-            LM_ERROR,
-            "TAO (%P|%t) - Asynch_Reply_Dispatcher::dispatch_reply "
-            "clone_from failed \n"));
-        }
-      return -1;
-    }
-
-  // See whether we need to delete the data block by checking the
-  // flags. We cannot be happy that we initally allocated the
-  // datablocks of the stack. If this method is called twice, as is in
-  // some cases where the same invocation object is used to make two
-  // invocations like forwarding, the release becomes essential.
-  if (ACE_BIT_DISABLED (db->flags (),
-                        ACE_Message_Block::DONT_DELETE))
-    db->release ();
-
-  // Steal the buffer, that way we don't do any unnecesary copies of
-  // this data.
-  CORBA::ULong max = params.svc_ctx_.maximum ();
-  CORBA::ULong len = params.svc_ctx_.length ();
-  IOP::ServiceContext *context_list = params.svc_ctx_.get_buffer (1);
-  this->reply_service_info_.replace (max, len, context_list, 1);
-
-  if (TAO_debug_level >= 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Reply_Dispatcher::")
-                  ACE_TEXT ("dispatch_reply\n")));
-    }
-
-  CORBA::ULong reply_error = TAO_AMI_REPLY_NOT_OK;
-  switch (this->reply_status_)
-    {
-    case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
-      reply_error = TAO_AMI_REPLY_OK;
-      break;
-    case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-      reply_error = TAO_AMI_REPLY_USER_EXCEPTION;
-      break;
-    case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-      reply_error = TAO_AMI_REPLY_SYSTEM_EXCEPTION;
-      break;
-    default:
-    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-      // @@ Michael: Not even the spec mentions this case.
-      //             We have to think about this case.
-      // Handle the forwarding and return so the stub restarts the
-      // request!
-      reply_error = TAO_AMI_REPLY_NOT_OK;
-      break;
-    }
-
-  if (!CORBA::is_nil (this->reply_handler_.in ()))
-    {
-      ACE_TRY_NEW_ENV
-        {
-          // Call the Reply Handler's skeleton.
-          reply_handler_skel_ (this->reply_cdr_,
-                               this->reply_handler_.in (),
-                               reply_error
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level >= 4)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Exception during reply handler");
-        }
-      ACE_ENDTRY;
-    }
-
-  this->decr_refcount ();
-
-  return 1;
-}
-
-void
-TAO_Asynch_Reply_Dispatcher::connection_closed (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (!this->try_dispatch_reply ())
-        return;
-
-      if (this->timeout_handler_)
-        {
-          // If we had registered timeout handlers just cancel them and
-          // loose ownership of the handlers
-          this->timeout_handler_->cancel ();
-          this->timeout_handler_->remove_reference ();
-          this->timeout_handler_ = 0;
-        }
-
-      // Generate a fake exception....
-      CORBA::COMM_FAILURE comm_failure (0, CORBA::COMPLETED_MAYBE);
-
-      TAO_OutputCDR out_cdr;
-
-      comm_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-
-      // Turn into an output CDR
-      TAO_InputCDR cdr (out_cdr);
-
-      if (!CORBA::is_nil (this->reply_handler_.in ()))
-        {
-          this->reply_handler_skel_ (cdr,
-                                     this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Asynch_Reply_Dispacher::connection_closed");
-        }
-
-    }
-  ACE_ENDTRY;
-
-  (void) this->decr_refcount ();
-}
-
-// AMI Timeout Handling Begin
-
-void
-TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Generate a fake exception....
-      CORBA::TIMEOUT timeout_failure (
-        CORBA::SystemException::_tao_minor_code (
-            TAO_TIMEOUT_RECV_MINOR_CODE,
-            errno),
-         CORBA::COMPLETED_MAYBE);
-
-      TAO_OutputCDR out_cdr;
-
-      timeout_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // This is okay here... Everything relies on our refcount being
-      // held by the timeout handler, whose refcount in turn is held
-      // by the reactor.
-      if (!this->try_dispatch_reply ())
-        return;
-
-      // @@ This check probably is unnecessary..
-      if (this->timeout_handler_)
-        {
-          // If we had registered timeout handlers just cancel them and
-          // loose ownership of the handlers
-          this->timeout_handler_->remove_reference ();
-          this->timeout_handler_ = 0;
-        }
-
-      // Turn into an output CDR
-      TAO_InputCDR cdr (out_cdr);
-
-      if (!CORBA::is_nil (this->reply_handler_.in ()))
-        {
-          this->reply_handler_skel_ (cdr,
-                                     this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Asynch_Reply_Dispacher::reply_timed_out");
-        }
-
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  (void) this->decr_refcount ();
-}
-
-long
-TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id,
-                                             const ACE_Time_Value &max_wait_time
-                                             ACE_ENV_ARG_DECL)
-{
-  if (this->timeout_handler_ == 0)
-    {
-      // @@ Need to use the pool for this..
-      ACE_NEW_THROW_EX (this->timeout_handler_,
-                        TAO_Asynch_Timeout_Handler (
-                          this,
-                          this->transport_->orb_core ()->reactor ()),
-                        CORBA::NO_MEMORY ());
-    }
-
-  return this->timeout_handler_->schedule_timer (
-      this->transport_->tms (),
-      request_id,
-      max_wait_time);
-}
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
deleted file mode 100644
index 03a35ced0a3..00000000000
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Asynch_Reply_Dispatcher.h
- *
- *  $Id$
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_ASYNCH_REPLY_DISPATCHER_H
-#define TAO_ASYNCH_REPLY_DISPATCHER_H
-#include /**/ "ace/pre.h"
-
-#include "Messaging.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Asynch_Timeout_Handler.h"
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
-
-class ACE_Allocator;
-
-/// Reply dispatcher for Asynchoronous Method Invocation (AMI)s.
-class TAO_Messaging_Export TAO_Asynch_Reply_Dispatcher
-  : public TAO_Asynch_Reply_Dispatcher_Base
-{
-public:
-  /// Constructor.
-  TAO_Asynch_Reply_Dispatcher (
-      const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-      Messaging::ReplyHandler_ptr reply_handler_ptr,
-      TAO_ORB_Core *orb_core,
-      ACE_Allocator *allocator
-    );
-
-  /// Destructor.
-  virtual ~TAO_Asynch_Reply_Dispatcher (void);
-
-  /// @name The Reply Dispatcher methods
-  //@{
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
-
-  virtual void connection_closed (void);
-  //@}
-
-  /// Inform that the reply timed out
-  virtual void reply_timed_out (void);
-
-  /// Install the timeout handler
-  long schedule_timer (CORBA::ULong request_id,
-                       const ACE_Time_Value &max_wait_time
-                       ACE_ENV_ARG_DECL);
-
-private:
-  /// Skeleton for the call back method in the Reply Handler.
-  const TAO_Reply_Handler_Skeleton reply_handler_skel_;
-
-  /// Reply Handler passed in the Asynchronous Invocation.
-  Messaging::ReplyHandler_var reply_handler_;
-
-  /// Timeout Handler in case of AMI timeouts
-  TAO_Asynch_Timeout_Handler *timeout_handler_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ASYNCH_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
deleted file mode 100644
index b3fecff6a83..00000000000
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-
-#include "Asynch_Timeout_Handler.h"
-
-#include "Asynch_Reply_Dispatcher.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "ace/Reactor.h"
-
-ACE_RCSID (Messaging,
-           Asynch_Timeout_Handler,
-           "$Id$")
-
-
-TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
-  TAO_Asynch_Reply_Dispatcher_Base *rd,
-  ACE_Reactor *reactor)
-  : rd_ (rd),
-    tms_ (0),
-    request_id_ (0),
-    reactor_ (reactor)
-{
-  // Enable reference counting on the event handler.
-  this->reference_counting_policy ().value (
-    ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-
-  // We own a reference
-  (void) this->rd_->incr_refcount ();
-}
-
-TAO_Asynch_Timeout_Handler::~TAO_Asynch_Timeout_Handler ()
-{
-  // Forget rd's reference
-  (void) this->rd_->decr_refcount ();
-}
-
-
-long
-TAO_Asynch_Timeout_Handler::schedule_timer (TAO_Transport_Mux_Strategy *tms,
-                                            CORBA::ULong request_id,
-                                            const ACE_Time_Value &max_wait_time)
-{
-  // Remember them for later.
-  this->tms_ = tms;
-  this->request_id_ = request_id;
-
-  return this->reactor_->schedule_timer (this,          // handler
-                                         0,             // arg
-                                         max_wait_time);
-}
-
-int
-TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &,
-                                            const void *)
-{
-  this->tms_->unbind_dispatcher (request_id_);
-
-  this->rd_->reply_timed_out ();
-
-  // reset any possible timeout errno
-  errno = 0;
-
-  // we are unregistered anyway
-  return 0;
-}
-
-void
-TAO_Asynch_Timeout_Handler::cancel ()
-{
-  // The tms_ is only set if we got scheduled.
-  if (this->tms_)
-    {
-      this->reactor_->cancel_timer (this);
-    }
-}
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
deleted file mode 100644
index be230bb6374..00000000000
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Asynch_Timeout_Handler.h
- *
- *  $Id$
- *
- *  Timeout Handler for AMI timeouts
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
-
-#ifndef TAO_ASYNCH_TIMEOUT_HANDLER_H
-#define TAO_ASYNCH_TIMEOUT_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#  pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-#include "tao/Basic_Types.h"
-
-#include "ace/Event_Handler.h"
-
-class TAO_Asynch_Reply_Dispatcher_Base;
-class TAO_Transport_Mux_Strategy;
-
-/**
- * @class TAO_Asynch_Timeout_Handler
- *
- * @brief Handler registered with the reactor in case of AMI timeouts.
- */
-class TAO_Messaging_Export TAO_Asynch_Timeout_Handler
-  : public ACE_Event_Handler
-{
-public:
-  TAO_Asynch_Timeout_Handler (TAO_Asynch_Reply_Dispatcher_Base *rd,
-                              ACE_Reactor *reactor);
-
-  ~TAO_Asynch_Timeout_Handler ();
-
-  /// Schedule a timer
-  long schedule_timer (TAO_Transport_Mux_Strategy *tms,
-                       CORBA::ULong request_id,
-                       const ACE_Time_Value &max_wait_time);
-
-  /// Invoked by the reactor on timeout
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
-
-  /// Cancel this timer, remove it from the reactor
-  virtual void cancel ();
-
-public:
-  /// The reply dispatcher expecting the reply
-  TAO_Asynch_Reply_Dispatcher_Base *rd_;
-
-  /// The transport mux strategy dispatching the reply
-  TAO_Transport_Mux_Strategy *tms_;
-
-  /// Remember the ID of the request.
-  CORBA::ULong request_id_;
-
-  /// Our reactor
-  ACE_Reactor *reactor_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
deleted file mode 100644
index 56a75c6984d..00000000000
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-//$Id$
-#include "Connection_Timeout_Policy_i.h"
-#include "tao/ORB_Core.h"
-#include "tao/Stub.h"
-#include "tao/debug.h"
-
-
-ACE_RCSID (Messaging,
-           Connection_Timeout_Policy_i,
-           "$Id$")
-
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-
-TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
-  const TimeBase::TimeT& relative_expiry)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO::ConnectionTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , relative_expiry_ (relative_expiry)
-{
-}
-
-TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
-  const TAO_ConnectionTimeoutPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO::ConnectionTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , relative_expiry_ (rhs.relative_expiry_)
-{
-}
-
-TimeBase::TimeT
-TAO_ConnectionTimeoutPolicy::relative_expiry (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->relative_expiry_;
-}
-
-CORBA::PolicyType
-TAO_ConnectionTimeoutPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return TAO::CONNECTION_TIMEOUT_POLICY_TYPE;
-}
-
-void
-TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
-                                   TAO_Stub *stub,
-                                   bool &has_timeout,
-                                   ACE_Time_Value &time_value)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Policy_var policy = 0;
-
-      if (stub == 0)
-        {
-          policy =
-            orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          policy =
-            stub->get_cached_policy (
-              TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (CORBA::is_nil (policy.in ()))
-        {
-          has_timeout = 0;
-          return;
-        }
-
-      TAO::ConnectionTimeoutPolicy_var p =
-        TAO::ConnectionTimeoutPolicy::_narrow (
-          policy.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      TimeBase::TimeT seconds = t / 10000000u;
-      TimeBase::TimeT microseconds = (t % 10000000u) / 10;
-      time_value.set (ACE_U64_TO_U32 (seconds),
-                      ACE_U64_TO_U32 (microseconds));
-
-      // Set the flag once all operations complete successfully
-      has_timeout = 1;
-
-      if (TAO_debug_level > 0)
-        {
-          CORBA::ULong msecs =
-            static_cast<CORBA::ULong> (microseconds / 1000);
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
-                      msecs));
-        }
-    }
-  ACE_CATCHANY
-    {
-      // Ignore all exceptions...
-    }
-  ACE_ENDTRY;
-}
-
-CORBA::Policy_ptr
-TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val
-                                            ACE_ENV_ARG_DECL)
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TimeBase::TimeT value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_ConnectionTimeoutPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ConnectionTimeoutPolicy (value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-TAO_ConnectionTimeoutPolicy *
-TAO_ConnectionTimeoutPolicy::clone (void) const
-{
-  TAO_ConnectionTimeoutPolicy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_ConnectionTimeoutPolicy (*this),
-                  0);
-  return copy;
-}
-
-CORBA::Policy_ptr
-TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-  TAO_ConnectionTimeoutPolicy* tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ConnectionTimeoutPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_ConnectionTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_ConnectionTimeoutPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_CONNECTION_TIMEOUT;
-}
-
-void
-TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
-{
-  TimeBase::TimeT t = this->relative_expiry_;
-  TimeBase::TimeT seconds = t / 10000000u;
-  TimeBase::TimeT microseconds = (t % 10000000u) / 10;
-  time_value.set (ACE_U64_TO_U32 (seconds),
-                  ACE_U64_TO_U32 (microseconds));
-
-  if (TAO_debug_level > 0)
-    {
-      CORBA::ULong msecs = time_value.msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
-                  msecs));
-    }
-}
-
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
deleted file mode 100644
index 73f041dca16..00000000000
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   Connection_Timeout_Policy_i.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan (bala@cs.wustl.edu)
- */
-//=============================================================================
-
-#ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H
-#define TAO_CONNECTION_TIMEOUT_POLICY_I_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TAO_ExtC.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-
-/*
- * @class TAO_ConnectionTimeoutPolicy
- *
- * @brief TAO::ConnectionTimeoutPolicy implementation
- *
- *  This policy controls the connection timeout time while
- *  establishing connections. This policy is proprietary to TAO.
- */
-class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy
-  : public TAO::ConnectionTimeoutPolicy,
-    public TAO_Local_RefCounted_Object
-{
-
-public:
-  /// Constructor.
-  TAO_ConnectionTimeoutPolicy (const TimeBase::TimeT& relative_expiry);
-
-  /// Copy constructor.
-  TAO_ConnectionTimeoutPolicy (const TAO_ConnectionTimeoutPolicy &rhs);
-
-  /// Implement the timeout hook, this is set in the ORB_Core at
-  /// initialization time.
-  static void hook (TAO_ORB_Core *orb_core,
-                    TAO_Stub *stub,
-                    bool &has_timeout,
-                    ACE_Time_Value &time_value);
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Returns a copy of <this>.
-  virtual TAO_ConnectionTimeoutPolicy *clone (void) const;
-
-  // = The TAO::ConnectionTinoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Change the CORBA representation to the ACE representation.
-  void set_time_value (ACE_Time_Value &time_value);
-
-  /// Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-private:
-  /// The attribute
-  TimeBase::TimeT relative_expiry_;
-};
-
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_CONNECTION_TIMEOUT_POLICY_I_H*/
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
deleted file mode 100644
index d01dee14bf9..00000000000
--- a/TAO/tao/Messaging/Messaging.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Messaging.h"
-#include "Messaging_ORBInitializer.h"
-
-#include "tao/Exception_Data.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/CDR.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (Messaging,
-           Messaging,
-           "$Id$")
-
-int
-TAO_Messaging_Initializer::init (void)
-{
-
-  static int called_once = 0;
-
-  if (called_once != 0)
-    return 0;
-  called_once = 1;
-
-  PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-    PortableInterceptor::ORBInitializer::_nil ();
-  PortableInterceptor::ORBInitializer_var orb_initializer;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the Messaging ORBInitializer.
-
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_Messaging_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      orb_initializer = temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "(%P | %t) Caught exception:");
-        }
-      return -1;
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
-
-
-void TAO_Messaging_Helper::
-exception_holder_raise (TAO::Exception_Data *exception_data,
-                        CORBA::ULong exception_count,
-                        CORBA::Octet *marshaled_data,
-                        CORBA::ULong marshaled_data_length,
-                        CORBA::Boolean byte_order,
-                        CORBA::Boolean is_system_exception
-                        ACE_ENV_ARG_DECL)
-{
-  TAO_InputCDR _tao_in ((const char*) marshaled_data,
-                        marshaled_data_length,
-                        byte_order);
-
-  CORBA::String_var type_id;
-
-  if ((_tao_in >> type_id.inout ()) == 0)
-    {
-      // Could not demarshal the exception id, raise a local
-      // CORBA::MARSHAL
-      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                 CORBA::COMPLETED_YES));
-    }
-
-  if (is_system_exception)
-    {
-      CORBA::ULong minor = 0;
-      CORBA::ULong completion = 0;
-      if ((_tao_in >> minor) == 0 ||
-          (_tao_in >> completion) == 0)
-        ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                   CORBA::COMPLETED_MAYBE));
-      CORBA::SystemException* exception =
-        TAO_Exceptions::create_system_exception (type_id.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (exception == 0)
-        {
-          // @@ We should raise a CORBA::NO_MEMORY, but we ran out
-          //    of memory already. We need a pre-allocated, TSS,
-          //    CORBA::NO_MEMORY instance
-          ACE_NEW (exception, CORBA::UNKNOWN);
-        }
-      exception->minor (minor);
-      exception->completed (CORBA::CompletionStatus (completion));
-
-      // Raise the exception.
-#if defined (TAO_HAS_EXCEPTIONS)
-      ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exception);
-#endif
-      ACE_ENV_RAISE (exception);
-
-      return;
-    }
-
-  // Match the exception interface repository id with the
-  // exception in the exception list.
-  // This is important to decode the exception.
-  for (CORBA::ULong i = 0; i != exception_count; ++i)
-    {
-      if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0)
-        continue;
-
-      CORBA::Exception *exception = exception_data[i].alloc ();
-
-      if (exception == 0)
-        ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                     CORBA::COMPLETED_YES));
-      exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Raise the exception.
-#if defined (TAO_HAS_EXCEPTIONS)
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(exception);
-#endif
-      ACE_ENV_RAISE (exception);
-
-      return;
-    }
-
-  // If we couldn't find the right exception, report it as
-  // CORBA::UNKNOWN.
-
-  // @@ It would seem like if the remote exception is a
-  //    UserException we can assume that the request was
-  //    completed.
-  ACE_THROW (CORBA::UNKNOWN (TAO::VMCID,
-                             CORBA::COMPLETED_YES));
-}
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
deleted file mode 100644
index e0d6322830f..00000000000
--- a/TAO/tao/Messaging/Messaging.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-
-// ================================================================
-/**
- *  @file Messaging.h
- *
- *  $Id$
- *
- *  Include all the required headers to use CORBA Messaging easily.
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-// ================================================================
-
-#ifndef TAO_MESSAGING_H
-#define TAO_MESSAGING_H
-#include /**/ "ace/pre.h"
-
-
-#include "messaging_export.h"
-
-class TAO_Messaging_Export TAO_Messaging_Initializer
-{
-public:
-  /// Used to force the initialisation of the ORB code.
-  static int init (void);
-};
-
-# if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Messaging_Initializer = &TAO_Messaging_Initializer::init ();
-
-#else
-
-static int
-TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_MESSAGING_SAFE_INCLUDE
-#include "MessagingC.h"
-#undef TAO_MESSAGING_SAFE_INCLUDE
-
-#include "TAO_ExtC.h"
-#include "tao/TAOC.h"
-
-
-// Typedef for the Reply Handler Skeleton.
-// This is handcrafted not generated by the IDL compiler.
-
-class TAO_InputCDR;
-
-enum TAO_AMI_Reply_Status
-{
-  /// Reply is normal.
-  TAO_AMI_REPLY_OK,
-
-  /// Reply is not normal and no exceptions
-  TAO_AMI_REPLY_NOT_OK,
-
-  /// An user exception was raised.
-  TAO_AMI_REPLY_USER_EXCEPTION,
-
-  /// An system exception was raised.
-  TAO_AMI_REPLY_SYSTEM_EXCEPTION
-};
-
-
-typedef void (*TAO_Reply_Handler_Skeleton)(
-    TAO_InputCDR &,
-    Messaging::ReplyHandler_ptr,
-    CORBA::ULong reply_status
-    ACE_ENV_ARG_DECL_NOT_USED
-    );
-
-namespace TAO
-{
-  struct Exception_Data;
-}
-
-/**
- * @namespace TAO_Messaging_Helper
- *
- * @brief Define helper functions for the CORBA Messaging
- * implementation in TAO.
- */
-namespace TAO_Messaging_Helper
-{
-  /// Implement the code shared by all the ExceptionHolder::raise_*()
-  /// operations
-  void TAO_Messaging_Export exception_holder_raise (
-           TAO::Exception_Data *exception_data,
-           CORBA::ULong exception_count,
-           CORBA::Octet *marshaled_data,
-           CORBA::ULong marshaled_data_length,
-           CORBA::Boolean byte_order,
-           CORBA::Boolean is_system_exception
-           ACE_ENV_ARG_DECL);
-}
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MESSAGING_H */
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
deleted file mode 100644
index 874604b6bbe..00000000000
--- a/TAO/tao/Messaging/Messaging.pidl
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   Messaging.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in Messaging{C,S,S_T}.{h,i,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -GA -Ssi
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging.pidl
- *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging{A,C,S,S_T}.{h,inl,cpp} .
- *   patch < diffs/Messaging.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging{A,C,S,S_T}.{h,inl,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging.diff
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_PIDL
-#define TAO_MESSAGING_PIDL
-
-#include "tao/Pollable.pidl"
-#include "tao/Messaging/Messaging_SyncScope_Policy.pidl"
-#include "tao/Messaging/Messaging_RT_Policy.pidl"
-#include "tao/Messaging/Messaging_No_Impl.pidl"
-#include "tao/OctetSeq.pidl"
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  //
-  // Exception Delivery in the Callback Model
-  //
-  valuetype ExceptionHolder {
-    public boolean         is_system_exception;
-    public boolean         byte_order;
-    public CORBA::OctetSeq marshaled_exception;
-  };
-
-  //
-  // Base interface for the Callback model
-  //
-
-  interface ReplyHandler { };
-};
-
-#endif /* TAO_MESSAGING_PIDL */
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
deleted file mode 100644
index 1c098ecd8e1..00000000000
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:50
-
-static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] =
-  {
-    { "is_system_exception", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
-    { "byte_order", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
-    { "marshaled_exception", &CORBA::_tc_OctetSeq, CORBA::PUBLIC_MEMBER }
-    
-  };
-
-static TAO::TypeCode::Value<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Value_Field<char const *,
-                                                       CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ExceptionHolder (
-    CORBA::tk_value,
-    "IDL:omg.org/Messaging/ExceptionHolder:1.0",
-    "ExceptionHolder",
-    CORBA::VM_NONE,
-    &CORBA::_tc_null,
-    _tao_fields_Messaging_ExceptionHolder,
-    3);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
-    &_tao_tc_Messaging_ExceptionHolder;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ReplyHandler (
-    CORBA::tk_objref,
-    "IDL:omg.org/Messaging/ReplyHandler:1.0",
-    "ReplyHandler");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
-    &_tao_tc_Messaging_ReplyHandler;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ExceptionHolder>::to_value (
-      CORBA::ValueBase *&_tao_elem
-    ) const
-  {
-    CORBA::add_ref (this->value_);
-    _tao_elem = this->value_;
-    return 1;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
-      _tao_any,
-      Messaging::ExceptionHolder::_tao_any_destructor,
-      Messaging::_tc_ExceptionHolder,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
-        _tao_any,
-        Messaging::ExceptionHolder::_tao_any_destructor,
-        Messaging::_tc_ExceptionHolder,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyHandler>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr _tao_elem
-  )
-{
-  Messaging::ReplyHandler_ptr _tao_objptr =
-    Messaging::ReplyHandler::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyHandler>::insert (
-      _tao_any,
-      Messaging::ReplyHandler::_tao_any_destructor,
-      Messaging::_tc_ReplyHandler,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyHandler_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyHandler>::extract (
-        _tao_any,
-        Messaging::ReplyHandler::_tao_any_destructor,
-        Messaging::_tc_ReplyHandler,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
deleted file mode 100644
index c9c8c77e7bf..00000000000
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging.h"
-#include "tao/CDR.h"
-#include "tao/Object_T.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
-    Messaging::ExceptionHolder * p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
-    Messaging::ExceptionHolder * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::release (
-    Messaging::ExceptionHolder * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
-{
-  return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
-}
-
-const char *
-Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void
-Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionHolder *_tao_tmp_pointer =
-    static_cast<ExceptionHolder *> (_tao_void_pointer);
-  CORBA::remove_ref (_tao_tmp_pointer);
-}
-
-Messaging::ExceptionHolder::~ExceptionHolder (void)
-{}
-
-CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
-{
-  return this->_tao_marshal__Messaging_ExceptionHolder (strm);
-}
-
-CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
-{
-  return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
-}
-
-CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
-    TAO_InputCDR &strm,
-    ExceptionHolder *&new_object
-  )
-{
-  CORBA::ValueBase *base = 0;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (
-        strm,
-        factory.out (),
-        base,
-        ExceptionHolder::_tao_obv_static_repository_id ()
-      );
-  
-  if (retval == 0)
-    {
-      return 0;
-    }
-  
-  if (factory.in () != 0)
-    {
-      base = factory->create_for_unmarshal ();
-      
-      if (base == 0)
-        {
-          return 0;  // %! except.?
-        }
-      
-      retval = base->_tao_unmarshal_v (strm);
-      
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-  
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ExceptionHolder::_downcast (base);
-  return retval;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_init_cs.cpp:85
-
-Messaging::ExceptionHolder_init::ExceptionHolder_init (void)
-{
-}
-
-Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
-{
-}
-
-Messaging::ExceptionHolder_init *
-Messaging::ExceptionHolder_init::_downcast (CORBA::ValueFactoryBase *v)
-{
-  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
-}
-
-const char* 
-Messaging::ExceptionHolder_init::tao_repository_id (void)
-{
-  return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
-}
-
-CORBA::ValueBase *
-Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ValueBase *ret_val = 0;
-  ACE_NEW_THROW_EX (
-      ret_val,
-      OBV_Messaging::ExceptionHolder,
-      CORBA::NO_MEMORY ()
-    );
-  return ret_val;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::ReplyHandler.
-
-Messaging::ReplyHandler_ptr
-TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate (
-    Messaging::ReplyHandler_ptr p
-  )
-{
-  return Messaging::ReplyHandler::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::ReplyHandler>::release (
-    Messaging::ReplyHandler_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::ReplyHandler_ptr
-TAO::Objref_Traits<Messaging::ReplyHandler>::nil (void)
-{
-  return Messaging::ReplyHandler::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
-    Messaging::ReplyHandler_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-Messaging::ReplyHandler::ReplyHandler (void)
- : the_TAO_ReplyHandler_Proxy_Broker_ (0)
-{
-  this->Messaging_ReplyHandler_setup_collocation ();
-}
-
-void
-Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
-{
-  if (::Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ReplyHandler_Proxy_Broker_ =
-        ::Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-Messaging::ReplyHandler::~ReplyHandler (void)
-{}
-
-void 
-Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ReplyHandler *_tao_tmp_pointer =
-    static_cast<ReplyHandler *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ReplyHandler>::narrow (
-        _tao_objref,
-        "IDL:omg.org/Messaging/ReplyHandler:1.0",
-        Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ReplyHandler>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/Messaging/ReplyHandler:1.0",
-        Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::ReplyHandler::_tao_release (ReplyHandler_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::ReplyHandler::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/ReplyHandler:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/ReplyHandler:1.0";
-}
-
-CORBA::Boolean
-Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
-
-OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
-{}
-
-OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
-{}
-
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const
-{
-  return _tao_marshal_state (strm);
-}
-
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm)
-{
-  return _tao_unmarshal_state (strm);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:580
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val)
-{
-  // Set the value.
-  this->_pd_is_system_exception = val;
-}
-
-// Retrieve the member
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::is_system_exception (void) const
-{
-  return this->_pd_is_system_exception;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:580
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val)
-{
-  // Set the value.
-  this->_pd_byte_order = val;
-}
-
-// Retrieve the member
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::byte_order (void) const
-{
-  return this->_pd_byte_order;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:755
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val)
-{
-  this->_pd_marshaled_exception = val;
-}
-
-// Readonly get method.
-const CORBA::OctetSeq &
-OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
-{
-  return this->_pd_marshaled_exception;
-}
-
-// Read/write get method.
-CORBA::OctetSeq &
-OBV_Messaging::ExceptionHolder::marshaled_exception (void)
-{
-  return this->_pd_marshaled_exception;
-}
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:487
-
-void
-CORBA::add_ref (Messaging::ExceptionHolder * vt)
-{
-  if (vt != 0)
-    {
-      vt->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (Messaging::ExceptionHolder * vt)
-{
-  if (vt != 0)
-    {
-      vt->_remove_ref ();
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ExceptionHolder *_tao_valuetype
-  )
-{
-  return
-    CORBA::ValueBase::_tao_marshal (
-        strm,
-        _tao_valuetype,
-        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
-      );
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ExceptionHolder *&_tao_valuetype
-  )
-{
-  return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/marshal_cs.cpp:44
-
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
-{
-  return (
-      (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) &&
-      (strm << CORBA::Any::from_boolean (_pd_byte_order)) &&
-      (strm << _pd_marshaled_exception)
-    );
-}
-
-CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
-{
-  return (
-    (strm >> CORBA::Any::to_boolean (_pd_is_system_exception)) &&
-    (strm >> CORBA::Any::to_boolean (_pd_byte_order)) &&
-    (strm >> _pd_marshaled_exception)
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ReplyHandler_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ReplyHandler_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
deleted file mode 100644
index ad0634b44b4..00000000000
--- a/TAO/tao/Messaging/MessagingC.h
+++ /dev/null
@@ -1,500 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
-#define _TAO_IDL_ORIG_MESSAGINGC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#ifndef TAO_MESSAGING_SAFE_INCLUDE
-#error "You should not include MessagingC.h directly, use Messaging.h"
-#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
-
-#include "messaging_export.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/Valuetype/ValueFactory.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PollableC.h"
-#include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
-#include "tao/Messaging/Messaging_RT_PolicyC.h"
-#include "tao/Messaging/Messaging_No_ImplC.h"
-#include "tao/OctetSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Messaging_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:524
-  
-  
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_
-  
-  class ExceptionHolder;
-  typedef
-    TAO_Value_Var_T<
-        ExceptionHolder
-      >
-    ExceptionHolder_var;
-  
-  typedef
-    TAO_Value_Out_T<
-        ExceptionHolder
-      >
-    ExceptionHolder_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER_CH_
-  
-  class TAO_Messaging_Export ExceptionHolder
-    : public virtual CORBA::ValueBase
-  {
-  public:
-    typedef ExceptionHolder_var _var_type;
-    
-    static ExceptionHolder* _downcast (CORBA::ValueBase *);
-    
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ExceptionHolder *&
-      );
-    
-    virtual const char* _tao_obv_repository_id (void) const;
-    
-    static const char* _tao_obv_static_repository_id (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:424
-    
-    virtual void is_system_exception (CORBA::Boolean) = 0;
-    virtual CORBA::Boolean is_system_exception (void) const = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:424
-    
-    virtual void byte_order (CORBA::Boolean) = 0;
-    virtual CORBA::Boolean byte_order (void) const = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:497
-    
-    virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
-    virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0;
-    virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
-  protected:
-    ExceptionHolder (void);
-    
-    virtual ~ExceptionHolder (void);
-    
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    
-  private:
-    ExceptionHolder (const ExceptionHolder &);
-    void operator= (const ExceptionHolder &);
-    
-  protected:
-    virtual CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0;
-    
-    virtual CORBA::Boolean
-    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_init_ch.cpp:72
-  
-  class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA::ValueFactoryBase
-  {
-  public:
-    ExceptionHolder_init (void);
-    
-    static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase *);
-    
-    virtual CORBA::ValueBase *
-    create_for_unmarshal (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO-specific extensions
-  public:
-    virtual const char* tao_repository_id (void);
-  
-  protected:
-    virtual ~ExceptionHolder_init (void);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ExceptionHolder;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REPLYHANDLER__VAR_OUT_CH_)
-#define _MESSAGING_REPLYHANDLER__VAR_OUT_CH_
-  
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ReplyHandler
-      >
-    ReplyHandler_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ReplyHandler
-      >
-    ReplyHandler_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REPLYHANDLER_CH_)
-#define _MESSAGING_REPLYHANDLER_CH_
-  
-  class TAO_Messaging_Export ReplyHandler
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<ReplyHandler>;
-    typedef ReplyHandler_ptr _ptr_type;
-    typedef ReplyHandler_var _var_type;
-    
-    // The static operations.
-    static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
-    
-    static void _tao_release (ReplyHandler_ptr obj);
-    
-    static ReplyHandler_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyHandler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyHandler_ptr _nil (void)
-    {
-      return static_cast<ReplyHandler_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ReplyHandler (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void Messaging_ReplyHandler_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ReplyHandler (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ReplyHandler (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ReplyHandler (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ReplyHandler (const ReplyHandler &);
-    
-    void operator= (const ReplyHandler &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyHandler;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_Messaging_Export
-TAO::Collocation_Proxy_Broker *
-(*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
-
-namespace OBV_Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
-  
-  // OBV_ class
-  class TAO_Messaging_Export ExceptionHolder
-    : public virtual Messaging::ExceptionHolder,
-      public virtual CORBA::DefaultValueRefCountBase
-  {
-  public:
-    ExceptionHolder (void);
-    virtual ~ExceptionHolder (void);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:424
-    
-    virtual void is_system_exception (CORBA::Boolean);
-    virtual CORBA::Boolean is_system_exception (void) const;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:424
-    
-    virtual void byte_order (CORBA::Boolean);
-    virtual CORBA::Boolean byte_order (void) const;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:497
-    
-    virtual void marshaled_exception (const CORBA::OctetSeq &);
-    virtual const CORBA::OctetSeq &marshaled_exception (void) const;
-    virtual CORBA::OctetSeq &marshaled_exception (void);
-    
-  protected:
-    virtual CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const;
-    
-    virtual CORBA::Boolean
-    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &);
-    
-    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
-    CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-  
-  private:
-    CORBA::Boolean _pd_is_system_exception;
-    CORBA::Boolean _pd_byte_order;
-    CORBA::OctetSeq _pd_marshaled_exception;
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
-  {
-    static void add_ref (Messaging::ExceptionHolder *);
-    static void remove_ref (Messaging::ExceptionHolder *);
-    static void release (Messaging::ExceptionHolder *);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYHANDLER__TRAITS_CH_)
-#define _MESSAGING_REPLYHANDLER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyHandler>
-  {
-    static ::Messaging::ReplyHandler_ptr duplicate (
-        ::Messaging::ReplyHandler_ptr
-      );
-    static void release (
-        ::Messaging::ReplyHandler_ptr
-      );
-    static ::Messaging::ReplyHandler_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::ReplyHandler_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder *); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:431
-
-namespace CORBA
-{
-  extern TAO_Messaging_Export void add_ref (Messaging::ExceptionHolder *);
-  extern TAO_Messaging_Export void remove_ref (Messaging::ExceptionHolder *);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
-
-TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
-TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr );
-TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "MessagingC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl
deleted file mode 100644
index 3c35462076a..00000000000
--- a/TAO/tao/Messaging/MessagingC.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-Messaging::ExceptionHolder::ExceptionHolder (void)
-{}
-
-ACE_INLINE const char* 
-Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
-{
-  return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_MESSAGING_REPLYHANDLER___CI_)
-#define _MESSAGING_REPLYHANDLER___CI_
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (
-    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_ReplyHandler_Proxy_Broker_ (0)
-{
-  this->Messaging_ReplyHandler_setup_collocation ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ReplyHandler_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
deleted file mode 100644
index 4da94e861da..00000000000
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ /dev/null
@@ -1,715 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
-#define _TAO_IDL_ORIG_MESSAGINGS_CPP_
-
-
-#include "MessagingS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
-#include "tao/PortableServer/Upcall_Command.h"
-#include "tao/PortableServer/Upcall_Wrapper.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/TypeCode_SArg_Traits.h"
-#include "tao/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.h"
-#include "tao/PortableInterceptor.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1455
-
-class TAO_Messaging_ReplyHandler_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: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-     14, 14, 14,  1, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14,  0, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,
-#else
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14,  0, 14,  0, 14, 14,
-     14,  1, 14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,  0, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 4,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 13,
-      HASH_VALUE_RANGE = 9,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 9
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_is_a", &POA_Messaging::ReplyHandler::_is_a_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_component", &POA_Messaging::ReplyHandler::_component_skel, 0},
-      {"_interface", &POA_Messaging::ReplyHandler::_interface_skel, 0},
-      {"",0,0},
-      {"_non_existent", &POA_Messaging::ReplyHandler::_non_existent_skel, 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];
-        }
-    }
-  return 0;
-}
-
-static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker *
-POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
-{
-  static POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker
-  strategized_proxy_broker;
-  
-  return &strategized_proxy_broker;
-}
-
-POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_Messaging::_TAO_ReplyHandler_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;
-}
-
-void
-POA_Messaging::_TAO_ReplyHandler_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
-
-TAO::Collocation_Proxy_Broker *
-Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_Strategized_Proxy_Broker ();
-}
-
-int
-Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
-{
-  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer = 
-    Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function;
-  
-  return 0;
-}
-
-static int
-Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::_TAO_ReplyHandler_Direct_Proxy_Impl (void)
-{}
-
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
-
-POA_Messaging::ReplyHandler::ReplyHandler (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_Messaging_ReplyHandler_optable;
-}
-
-POA_Messaging::ReplyHandler::ReplyHandler (const ReplyHandler& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_Messaging::ReplyHandler::~ReplyHandler (void)
-{
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_Messaging
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _is_a_ReplyHandler_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_ReplyHandler_Upcall_Command (
-      POA_Messaging::ReplyHandler * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_Messaging::ReplyHandler * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_Messaging::ReplyHandler::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_Messaging::ReplyHandler * const impl =
-    static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
-  _is_a_ReplyHandler_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-namespace POA_Messaging
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _non_existent_ReplyHandler_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_ReplyHandler_Upcall_Command (
-      POA_Messaging::ReplyHandler * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_Messaging::ReplyHandler * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_Messaging::ReplyHandler::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_Messaging::ReplyHandler * const impl =
-    static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
-  _non_existent_ReplyHandler_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_Messaging::ReplyHandler::_interface_skel (
-    TAO_ServerRequest & server_request, 
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
-  
-  POA_Messaging::ReplyHandler * const impl =
-    static_cast<POA_Messaging::ReplyHandler *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_Messaging
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_component_ReplyHandler_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_ReplyHandler_Upcall_Command (
-      POA_Messaging::ReplyHandler * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_Messaging::ReplyHandler * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_Messaging::ReplyHandler::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_Messaging::ReplyHandler * const impl =
-    static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
-  _get_component_ReplyHandler_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/ReplyHandler:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/ReplyHandler:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_Messaging::ReplyHandler::_dispatch (
-    TAO_ServerRequest & req,
-    void * 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:891
-
-Messaging::ReplyHandler *
-POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
-  
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
-  
-  typedef ::Messaging::ReplyHandler STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
deleted file mode 100644
index 83c5aadc098..00000000000
--- a/TAO/tao/Messaging/MessagingS.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_H_
-#define _TAO_IDL_ORIG_MESSAGINGS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Messaging.h"
-#include "tao/PollableS.h"
-#include "tao/OctetSeqS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_Messaging
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-  
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-  
-  class _TAO_ReplyHandler_Direct_Proxy_Impl;
-  class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-  
-  class TAO_Messaging_Export ReplyHandler
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    ReplyHandler (void);
-  
-  public:
-    // Useful for template programming.
-    typedef ::Messaging::ReplyHandler _stub_type;
-    typedef ::Messaging::ReplyHandler_ptr _stub_ptr_type;
-    typedef ::Messaging::ReplyHandler_var _stub_var_type;
-    
-    ReplyHandler (const ReplyHandler& rhs);
-    virtual ~ReplyHandler (void);
-    
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    ::Messaging::ReplyHandler *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public: 
-    _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_ReplyHandler_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_ReplyHandler_Strategized_Proxy_Broker *
-    the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-  };
-  
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_Messaging_Export _TAO_ReplyHandler_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_ReplyHandler_Direct_Proxy_Impl (void);
-    
-    virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void) {}
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
-
-} // module Messaging
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:995
-
-#include "MessagingS_T.h"
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
deleted file mode 100644
index b048d9ff092..00000000000
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:677
-
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
-#define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
-
-#include "MessagingS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingS_T.inl"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
deleted file mode 100644
index 86d55268154..00000000000
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:536
-
-#ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
-#define _TAO_IDL_ORIG_MESSAGINGS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/tie_sh.cpp:87
-  
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class  ReplyHandler_tie : public ReplyHandler
-  {
-  public:
-    ReplyHandler_tie (T &t);
-    // the T& ctor
-    ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyHandler_tie (T *tp, CORBA::Boolean release = 1);
-    // ctor taking pointer and an ownership flag
-    ReplyHandler_tie (
-        T *tp,
-        PortableServer::POA_ptr poa,
-        CORBA::Boolean release = 1
-      );
-    // ctor with T*, ownership flag and a POA
-    ~ReplyHandler_tie (void);
-    // dtor
-    
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release = 1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-    
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-  
-  private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-    
-    // copy and assignment are not allowed
-    ReplyHandler_tie (const ReplyHandler_tie &);
-    void operator= (const ReplyHandler_tie &);
-  };
-} // module Messaging
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1096
-
-#if defined (__ACE_INLINE__)
-#include "MessagingS_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "MessagingS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("MessagingS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/Messaging/MessagingS_T.inl b/TAO/tao/Messaging/MessagingS_T.inl
deleted file mode 100644
index 0a3b3cfd130..00000000000
--- a/TAO/tao/Messaging/MessagingS_T.inl
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::~ReplyHandler_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
deleted file mode 100644
index 5e3a4f001f5..00000000000
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   Messaging_No_Impl.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in
- * Messaging_No_Impl{C}.{h,cpp} and as the name implies is not
- * implemented in TAO, yet.
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging_No_Impl.pidl
- *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_No_Impl{C}.{h,cpp} .
- *   patch < diffs/Messaging_No_Impl.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_No_Impl{C}.{h,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_No_Impl.diff
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_NO_IMPL_PIDL
-#define TAO_MESSAGING_NO_IMPL_PIDL
-
-#include "tao/TimeBase.pidl"
-#include "tao/Policy.pidl"
-#include "tao/Pollable.pidl"
-
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  //
-  // Messaging Quality of Service
-  //
-
-  typedef short Priority;
-
-  typedef short RebindMode;
-  const RebindMode TRANSPARENT  = 0;
-  const RebindMode NO_REBIND    = 1;
-  const RebindMode NO_RECONNECT = 2;
-
-  typedef short RoutingType;
-  const RoutingType ROUTE_NONE              = 0;
-  const RoutingType ROUTE_FORWARD           = 1;
-  const RoutingType ROUTE_STORE_AND_FORWARD = 2;
-
-  typedef unsigned short Ordering;
-  const Ordering ORDER_ANY      = 0x01;
-  const Ordering ORDER_TEMPORAL = 0x02;
-  const Ordering ORDER_PRIORITY = 0x04;
-  const Ordering ORDER_DEADLINE = 0x08;
-
-  //
-  // Locally-Constrained Policy Objects
-  //
-
-  // Rebind Policy (default = TRANSPARENT)
-  const CORBA::PolicyType REBIND_POLICY_TYPE = 23;
-  local interface RebindPolicy : CORBA::Policy {
-    readonly attribute RebindMode rebind_mode;
-  };
-
-    // Priority Policies
-  const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
-  struct PriorityRange {
-    Priority min;
-    Priority max;
-  };
-  local interface RequestPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-  const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
-  local interface ReplyPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-
-  // Timeout Policies
-  const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
-  local interface RequestStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
-  local interface RequestEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
-  local interface ReplyStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
-  local interface ReplyEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31;
-  local interface RelativeRequestTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-
-    const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
-  struct RoutingTypeRange {
-    RoutingType min;
-    RoutingType max;
-  };
-  local interface RoutingPolicy : CORBA::Policy {
-    readonly attribute RoutingTypeRange routing_range;
-  };
-
-  const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
-  local interface MaxHopsPolicy : CORBA::Policy {
-    readonly attribute unsigned short max_hops;
-  };
-
-  // Router Delivery-ordering Policy (default = ORDER_TEMPORAL)
-  const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35;
-  local interface QueueOrderPolicy : CORBA::Policy {
-    readonly attribute Ordering allowed_orders;
-  };
-};
-
-#endif /*TAO_MESSAGING_NO_IMPL_PIDL*/
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
deleted file mode 100644
index ae9b087d682..00000000000
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ /dev/null
@@ -1,1315 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_No_ImplC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_Priority (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/Priority:1.0",
-    "Priority",
-    &CORBA::_tc_short);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_Priority =
-    &_tao_tc_Messaging_Priority;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RebindMode (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/RebindMode:1.0",
-    "RebindMode",
-    &CORBA::_tc_short);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RebindMode =
-    &_tao_tc_Messaging_RebindMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RoutingType (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/RoutingType:1.0",
-    "RoutingType",
-    &CORBA::_tc_short);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RoutingType =
-    &_tao_tc_Messaging_RoutingType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_Ordering (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/Ordering:1.0",
-    "Ordering",
-    &CORBA::_tc_ushort);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_Ordering =
-    &_tao_tc_Messaging_Ordering;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RebindPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RebindPolicy:1.0",
-    "RebindPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RebindPolicy =
-    &_tao_tc_Messaging_RebindPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PriorityRange[] =
-  {
-    { "min", &Messaging::_tc_Priority },
-    { "max", &Messaging::_tc_Priority }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PriorityRange (
-    CORBA::tk_struct,
-    "IDL:omg.org/Messaging/PriorityRange:1.0",
-    "PriorityRange",
-    _tao_fields_Messaging_PriorityRange,
-    2);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityRange =
-    &_tao_tc_Messaging_PriorityRange;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RequestPriorityPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0",
-    "RequestPriorityPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy =
-    &_tao_tc_Messaging_RequestPriorityPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ReplyPriorityPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0",
-    "ReplyPriorityPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy =
-    &_tao_tc_Messaging_ReplyPriorityPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RequestStartTimePolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0",
-    "RequestStartTimePolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy =
-    &_tao_tc_Messaging_RequestStartTimePolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RequestEndTimePolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0",
-    "RequestEndTimePolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy =
-    &_tao_tc_Messaging_RequestEndTimePolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ReplyStartTimePolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0",
-    "ReplyStartTimePolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy =
-    &_tao_tc_Messaging_ReplyStartTimePolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ReplyEndTimePolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0",
-    "ReplyEndTimePolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy =
-    &_tao_tc_Messaging_ReplyEndTimePolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RelativeRequestTimeoutPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0",
-    "RelativeRequestTimeoutPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy =
-    &_tao_tc_Messaging_RelativeRequestTimeoutPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_RoutingTypeRange[] =
-  {
-    { "min", &Messaging::_tc_RoutingType },
-    { "max", &Messaging::_tc_RoutingType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RoutingTypeRange (
-    CORBA::tk_struct,
-    "IDL:omg.org/Messaging/RoutingTypeRange:1.0",
-    "RoutingTypeRange",
-    _tao_fields_Messaging_RoutingTypeRange,
-    2);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange =
-    &_tao_tc_Messaging_RoutingTypeRange;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RoutingPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RoutingPolicy:1.0",
-    "RoutingPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RoutingPolicy =
-    &_tao_tc_Messaging_RoutingPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_MaxHopsPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/MaxHopsPolicy:1.0",
-    "MaxHopsPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy =
-    &_tao_tc_Messaging_MaxHopsPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_QueueOrderPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/QueueOrderPolicy:1.0",
-    "QueueOrderPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy =
-    &_tao_tc_Messaging_QueueOrderPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RebindPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RebindPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RebindPolicy_ptr _tao_objptr =
-    Messaging::RebindPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RebindPolicy>::insert (
-      _tao_any,
-      Messaging::RebindPolicy::_tao_any_destructor,
-      Messaging::_tc_RebindPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RebindPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RebindPolicy>::extract (
-        _tao_any,
-        Messaging::RebindPolicy::_tao_any_destructor,
-        Messaging::_tc_RebindPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PriorityRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert_copy (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PriorityRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::insert (
-      _tao_any,
-      Messaging::PriorityRange::_tao_any_destructor,
-      Messaging::_tc_PriorityRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PriorityRange *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PriorityRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PriorityRange>::extract (
-        _tao_any,
-        Messaging::PriorityRange::_tao_any_destructor,
-        Messaging::_tc_PriorityRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestPriorityPolicy_ptr _tao_objptr =
-    Messaging::RequestPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::RequestPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_RequestPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::RequestPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_RequestPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyPriorityPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyPriorityPolicy_ptr _tao_objptr =
-    Messaging::ReplyPriorityPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::insert (
-      _tao_any,
-      Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyPriorityPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyPriorityPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::extract (
-        _tao_any,
-        Messaging::ReplyPriorityPolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyPriorityPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestStartTimePolicy_ptr _tao_objptr =
-    Messaging::RequestStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::RequestEndTimePolicy_ptr _tao_objptr =
-    Messaging::RequestEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::RequestEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_RequestEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RequestEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::RequestEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_RequestEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyStartTimePolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyStartTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyStartTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyStartTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyStartTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyStartTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyStartTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyEndTimePolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr _tao_elem
-  )
-{
-  Messaging::ReplyEndTimePolicy_ptr _tao_objptr =
-    Messaging::ReplyEndTimePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::insert (
-      _tao_any,
-      Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-      Messaging::_tc_ReplyEndTimePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::ReplyEndTimePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::extract (
-        _tao_any,
-        Messaging::ReplyEndTimePolicy::_tao_any_destructor,
-        Messaging::_tc_ReplyEndTimePolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRequestTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRequestTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRequestTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRequestTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRequestTimeoutPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert_copy (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::insert (
-      _tao_any,
-      Messaging::RoutingTypeRange::_tao_any_destructor,
-      Messaging::_tc_RoutingTypeRange,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::RoutingTypeRange *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::RoutingTypeRange *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::RoutingTypeRange>::extract (
-        _tao_any,
-        Messaging::RoutingTypeRange::_tao_any_destructor,
-        Messaging::_tc_RoutingTypeRange,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RoutingPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RoutingPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RoutingPolicy_ptr _tao_objptr =
-    Messaging::RoutingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RoutingPolicy>::insert (
-      _tao_any,
-      Messaging::RoutingPolicy::_tao_any_destructor,
-      Messaging::_tc_RoutingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RoutingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RoutingPolicy>::extract (
-        _tao_any,
-        Messaging::RoutingPolicy::_tao_any_destructor,
-        Messaging::_tc_RoutingPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::MaxHopsPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::MaxHopsPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr _tao_elem
-  )
-{
-  Messaging::MaxHopsPolicy_ptr _tao_objptr =
-    Messaging::MaxHopsPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::insert (
-      _tao_any,
-      Messaging::MaxHopsPolicy::_tao_any_destructor,
-      Messaging::_tc_MaxHopsPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::MaxHopsPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::extract (
-        _tao_any,
-        Messaging::MaxHopsPolicy::_tao_any_destructor,
-        Messaging::_tc_MaxHopsPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::QueueOrderPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::QueueOrderPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr _tao_elem
-  )
-{
-  Messaging::QueueOrderPolicy_ptr _tao_objptr =
-    Messaging::QueueOrderPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::insert (
-      _tao_any,
-      Messaging::QueueOrderPolicy::_tao_any_destructor,
-      Messaging::_tc_QueueOrderPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::QueueOrderPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::extract (
-        _tao_any,
-        Messaging::QueueOrderPolicy::_tao_any_destructor,
-        Messaging::_tc_QueueOrderPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
deleted file mode 100644
index 8f2d286c195..00000000000
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ /dev/null
@@ -1,1714 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging_No_ImplC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RebindPolicy.
-
-Messaging::RebindPolicy_ptr
-TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate (
-    Messaging::RebindPolicy_ptr p
-  )
-{
-  return Messaging::RebindPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RebindPolicy>::release (
-    Messaging::RebindPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RebindPolicy_ptr
-TAO::Objref_Traits<Messaging::RebindPolicy>::nil (void)
-{
-  return Messaging::RebindPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RebindPolicy>::marshal (
-    Messaging::RebindPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RebindPolicy::RebindPolicy (void)
-{}
-
-Messaging::RebindPolicy::~RebindPolicy (void)
-{}
-
-void 
-Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RebindPolicy *_tao_tmp_pointer =
-    static_cast<RebindPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RebindPolicy::_nil ();
-    }
-  
-  RebindPolicy_ptr proxy =
-    dynamic_cast<RebindPolicy_ptr> (_tao_objref);
-  
-  return RebindPolicy::_duplicate (proxy);
-}
-
-Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RebindPolicy::_nil ();
-    }
-  
-  RebindPolicy_ptr proxy =
-    dynamic_cast<RebindPolicy_ptr> (_tao_objref);
-  
-  return RebindPolicy::_duplicate (proxy);
-}
-
-Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RebindPolicy::_tao_release (RebindPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RebindPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RebindPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RebindPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RebindPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Messaging::PriorityRange::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  PriorityRange *_tao_tmp_pointer =
-    static_cast<PriorityRange *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RequestPriorityPolicy.
-
-Messaging::RequestPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate (
-    Messaging::RequestPriorityPolicy_ptr p
-  )
-{
-  return Messaging::RequestPriorityPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release (
-    Messaging::RequestPriorityPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RequestPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::nil (void)
-{
-  return Messaging::RequestPriorityPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal (
-    Messaging::RequestPriorityPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
-{}
-
-Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
-{}
-
-void 
-Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestPriorityPolicy *_tao_tmp_pointer =
-    static_cast<RequestPriorityPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestPriorityPolicy::_nil ();
-    }
-  
-  RequestPriorityPolicy_ptr proxy =
-    dynamic_cast<RequestPriorityPolicy_ptr> (_tao_objref);
-  
-  return RequestPriorityPolicy::_duplicate (proxy);
-}
-
-Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestPriorityPolicy::_nil ();
-    }
-  
-  RequestPriorityPolicy_ptr proxy =
-    dynamic_cast<RequestPriorityPolicy_ptr> (_tao_objref);
-  
-  return RequestPriorityPolicy::_duplicate (proxy);
-}
-
-Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RequestPriorityPolicy::_tao_release (RequestPriorityPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RequestPriorityPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::ReplyPriorityPolicy.
-
-Messaging::ReplyPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate (
-    Messaging::ReplyPriorityPolicy_ptr p
-  )
-{
-  return Messaging::ReplyPriorityPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release (
-    Messaging::ReplyPriorityPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::ReplyPriorityPolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::nil (void)
-{
-  return Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal (
-    Messaging::ReplyPriorityPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
-{}
-
-Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
-{}
-
-void 
-Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ReplyPriorityPolicy *_tao_tmp_pointer =
-    static_cast<ReplyPriorityPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyPriorityPolicy::_nil ();
-    }
-  
-  ReplyPriorityPolicy_ptr proxy =
-    dynamic_cast<ReplyPriorityPolicy_ptr> (_tao_objref);
-  
-  return ReplyPriorityPolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyPriorityPolicy::_nil ();
-    }
-  
-  ReplyPriorityPolicy_ptr proxy =
-    dynamic_cast<ReplyPriorityPolicy_ptr> (_tao_objref);
-  
-  return ReplyPriorityPolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::ReplyPriorityPolicy::_tao_release (ReplyPriorityPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::ReplyPriorityPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RequestStartTimePolicy.
-
-Messaging::RequestStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate (
-    Messaging::RequestStartTimePolicy_ptr p
-  )
-{
-  return Messaging::RequestStartTimePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release (
-    Messaging::RequestStartTimePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RequestStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::nil (void)
-{
-  return Messaging::RequestStartTimePolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal (
-    Messaging::RequestStartTimePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
-{}
-
-Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
-{}
-
-void 
-Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestStartTimePolicy *_tao_tmp_pointer =
-    static_cast<RequestStartTimePolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestStartTimePolicy::_nil ();
-    }
-  
-  RequestStartTimePolicy_ptr proxy =
-    dynamic_cast<RequestStartTimePolicy_ptr> (_tao_objref);
-  
-  return RequestStartTimePolicy::_duplicate (proxy);
-}
-
-Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestStartTimePolicy::_nil ();
-    }
-  
-  RequestStartTimePolicy_ptr proxy =
-    dynamic_cast<RequestStartTimePolicy_ptr> (_tao_objref);
-  
-  return RequestStartTimePolicy::_duplicate (proxy);
-}
-
-Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RequestStartTimePolicy::_tao_release (RequestStartTimePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RequestStartTimePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RequestEndTimePolicy.
-
-Messaging::RequestEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate (
-    Messaging::RequestEndTimePolicy_ptr p
-  )
-{
-  return Messaging::RequestEndTimePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release (
-    Messaging::RequestEndTimePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RequestEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::nil (void)
-{
-  return Messaging::RequestEndTimePolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal (
-    Messaging::RequestEndTimePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
-{}
-
-Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
-{}
-
-void 
-Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestEndTimePolicy *_tao_tmp_pointer =
-    static_cast<RequestEndTimePolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestEndTimePolicy::_nil ();
-    }
-  
-  RequestEndTimePolicy_ptr proxy =
-    dynamic_cast<RequestEndTimePolicy_ptr> (_tao_objref);
-  
-  return RequestEndTimePolicy::_duplicate (proxy);
-}
-
-Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestEndTimePolicy::_nil ();
-    }
-  
-  RequestEndTimePolicy_ptr proxy =
-    dynamic_cast<RequestEndTimePolicy_ptr> (_tao_objref);
-  
-  return RequestEndTimePolicy::_duplicate (proxy);
-}
-
-Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RequestEndTimePolicy::_tao_release (RequestEndTimePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RequestEndTimePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::ReplyStartTimePolicy.
-
-Messaging::ReplyStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate (
-    Messaging::ReplyStartTimePolicy_ptr p
-  )
-{
-  return Messaging::ReplyStartTimePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release (
-    Messaging::ReplyStartTimePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::ReplyStartTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::nil (void)
-{
-  return Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal (
-    Messaging::ReplyStartTimePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
-{}
-
-Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
-{}
-
-void 
-Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ReplyStartTimePolicy *_tao_tmp_pointer =
-    static_cast<ReplyStartTimePolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyStartTimePolicy::_nil ();
-    }
-  
-  ReplyStartTimePolicy_ptr proxy =
-    dynamic_cast<ReplyStartTimePolicy_ptr> (_tao_objref);
-  
-  return ReplyStartTimePolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyStartTimePolicy::_nil ();
-    }
-  
-  ReplyStartTimePolicy_ptr proxy =
-    dynamic_cast<ReplyStartTimePolicy_ptr> (_tao_objref);
-  
-  return ReplyStartTimePolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::ReplyStartTimePolicy::_tao_release (ReplyStartTimePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::ReplyStartTimePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::ReplyEndTimePolicy.
-
-Messaging::ReplyEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate (
-    Messaging::ReplyEndTimePolicy_ptr p
-  )
-{
-  return Messaging::ReplyEndTimePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release (
-    Messaging::ReplyEndTimePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::ReplyEndTimePolicy_ptr
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::nil (void)
-{
-  return Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal (
-    Messaging::ReplyEndTimePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
-{}
-
-Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
-{}
-
-void 
-Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ReplyEndTimePolicy *_tao_tmp_pointer =
-    static_cast<ReplyEndTimePolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyEndTimePolicy::_nil ();
-    }
-  
-  ReplyEndTimePolicy_ptr proxy =
-    dynamic_cast<ReplyEndTimePolicy_ptr> (_tao_objref);
-  
-  return ReplyEndTimePolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ReplyEndTimePolicy::_nil ();
-    }
-  
-  ReplyEndTimePolicy_ptr proxy =
-    dynamic_cast<ReplyEndTimePolicy_ptr> (_tao_objref);
-  
-  return ReplyEndTimePolicy::_duplicate (proxy);
-}
-
-Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::ReplyEndTimePolicy::_tao_release (ReplyEndTimePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::ReplyEndTimePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RelativeRequestTimeoutPolicy.
-
-Messaging::RelativeRequestTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate (
-    Messaging::RelativeRequestTimeoutPolicy_ptr p
-  )
-{
-  return Messaging::RelativeRequestTimeoutPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release (
-    Messaging::RelativeRequestTimeoutPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::nil (void)
-{
-  return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal (
-    Messaging::RelativeRequestTimeoutPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
-{}
-
-Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
-{}
-
-void 
-Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RelativeRequestTimeoutPolicy *_tao_tmp_pointer =
-    static_cast<RelativeRequestTimeoutPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RelativeRequestTimeoutPolicy::_nil ();
-    }
-  
-  RelativeRequestTimeoutPolicy_ptr proxy =
-    dynamic_cast<RelativeRequestTimeoutPolicy_ptr> (_tao_objref);
-  
-  return RelativeRequestTimeoutPolicy::_duplicate (proxy);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RelativeRequestTimeoutPolicy::_nil ();
-    }
-  
-  RelativeRequestTimeoutPolicy_ptr proxy =
-    dynamic_cast<RelativeRequestTimeoutPolicy_ptr> (_tao_objref);
-  
-  return RelativeRequestTimeoutPolicy::_duplicate (proxy);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RelativeRequestTimeoutPolicy::_tao_release (RelativeRequestTimeoutPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RelativeRequestTimeoutPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Messaging::RoutingTypeRange::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  RoutingTypeRange *_tao_tmp_pointer =
-    static_cast<RoutingTypeRange *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RoutingPolicy.
-
-Messaging::RoutingPolicy_ptr
-TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate (
-    Messaging::RoutingPolicy_ptr p
-  )
-{
-  return Messaging::RoutingPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RoutingPolicy>::release (
-    Messaging::RoutingPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RoutingPolicy_ptr
-TAO::Objref_Traits<Messaging::RoutingPolicy>::nil (void)
-{
-  return Messaging::RoutingPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal (
-    Messaging::RoutingPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RoutingPolicy::RoutingPolicy (void)
-{}
-
-Messaging::RoutingPolicy::~RoutingPolicy (void)
-{}
-
-void 
-Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RoutingPolicy *_tao_tmp_pointer =
-    static_cast<RoutingPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RoutingPolicy::_nil ();
-    }
-  
-  RoutingPolicy_ptr proxy =
-    dynamic_cast<RoutingPolicy_ptr> (_tao_objref);
-  
-  return RoutingPolicy::_duplicate (proxy);
-}
-
-Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RoutingPolicy::_nil ();
-    }
-  
-  RoutingPolicy_ptr proxy =
-    dynamic_cast<RoutingPolicy_ptr> (_tao_objref);
-  
-  return RoutingPolicy::_duplicate (proxy);
-}
-
-Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RoutingPolicy::_tao_release (RoutingPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RoutingPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RoutingPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RoutingPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::MaxHopsPolicy.
-
-Messaging::MaxHopsPolicy_ptr
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate (
-    Messaging::MaxHopsPolicy_ptr p
-  )
-{
-  return Messaging::MaxHopsPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release (
-    Messaging::MaxHopsPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::MaxHopsPolicy_ptr
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::nil (void)
-{
-  return Messaging::MaxHopsPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal (
-    Messaging::MaxHopsPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
-{}
-
-Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
-{}
-
-void 
-Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  MaxHopsPolicy *_tao_tmp_pointer =
-    static_cast<MaxHopsPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return MaxHopsPolicy::_nil ();
-    }
-  
-  MaxHopsPolicy_ptr proxy =
-    dynamic_cast<MaxHopsPolicy_ptr> (_tao_objref);
-  
-  return MaxHopsPolicy::_duplicate (proxy);
-}
-
-Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return MaxHopsPolicy::_nil ();
-    }
-  
-  MaxHopsPolicy_ptr proxy =
-    dynamic_cast<MaxHopsPolicy_ptr> (_tao_objref);
-  
-  return MaxHopsPolicy::_duplicate (proxy);
-}
-
-Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::MaxHopsPolicy::_tao_release (MaxHopsPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::MaxHopsPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/MaxHopsPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::QueueOrderPolicy.
-
-Messaging::QueueOrderPolicy_ptr
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate (
-    Messaging::QueueOrderPolicy_ptr p
-  )
-{
-  return Messaging::QueueOrderPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release (
-    Messaging::QueueOrderPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::QueueOrderPolicy_ptr
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::nil (void)
-{
-  return Messaging::QueueOrderPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal (
-    Messaging::QueueOrderPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
-{}
-
-Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
-{}
-
-void 
-Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  QueueOrderPolicy *_tao_tmp_pointer =
-    static_cast<QueueOrderPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return QueueOrderPolicy::_nil ();
-    }
-  
-  QueueOrderPolicy_ptr proxy =
-    dynamic_cast<QueueOrderPolicy_ptr> (_tao_objref);
-  
-  return QueueOrderPolicy::_duplicate (proxy);
-}
-
-Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return QueueOrderPolicy::_nil ();
-    }
-  
-  QueueOrderPolicy_ptr proxy =
-    dynamic_cast<QueueOrderPolicy_ptr> (_tao_objref);
-  
-  return QueueOrderPolicy::_duplicate (proxy);
-}
-
-Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::QueueOrderPolicy::_tao_release (QueueOrderPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::QueueOrderPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/QueueOrderPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PriorityRange &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Messaging::PriorityRange &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::RoutingTypeRange &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Messaging::RoutingTypeRange &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max);
-}
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
deleted file mode 100644
index 6fb80b2bff0..00000000000
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ /dev/null
@@ -1,1966 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
-#define _TAO_IDL_ORIG_MESSAGING_NO_IMPLC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "messaging_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/TimeBaseC.h"
-#include "tao/PolicyC.h"
-#include "tao/PollableC.h"
-
-#if defined(TRANSPARENT)
-// Some platforms define this macro for ioctl()
-#undef TRANSPARENT
-#endif
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Messaging_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short Priority;
-  typedef CORBA::Short_out Priority_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Priority;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short RebindMode;
-  typedef CORBA::Short_out RebindMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindMode;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RebindMode TRANSPARENT = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RebindMode NO_REBIND = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RebindMode NO_RECONNECT = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short RoutingType;
-  typedef CORBA::Short_out RoutingType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingType;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RoutingType ROUTE_NONE = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RoutingType ROUTE_FORWARD = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::RoutingType ROUTE_STORE_AND_FORWARD = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::UShort Ordering;
-  typedef CORBA::UShort_out Ordering_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Ordering;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::Ordering ORDER_ANY = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::Ordering ORDER_TEMPORAL = 2U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::Ordering ORDER_PRIORITY = 4U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::Ordering ORDER_DEADLINE = 8U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REBIND_POLICY_TYPE = 23U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REBINDPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REBINDPOLICY__VAR_OUT_CH_
-  
-  class RebindPolicy;
-  typedef RebindPolicy *RebindPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RebindPolicy
-      >
-    RebindPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RebindPolicy
-      >
-    RebindPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REBINDPOLICY_CH_)
-#define _MESSAGING_REBINDPOLICY_CH_
-  
-  class TAO_Messaging_Export RebindPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RebindPolicy_ptr _ptr_type;
-    typedef RebindPolicy_var _var_type;
-    
-    // The static operations.
-    static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
-    
-    static void _tao_release (RebindPolicy_ptr obj);
-    
-    static RebindPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RebindPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RebindPolicy_ptr _nil (void)
-    {
-      return static_cast<RebindPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual Messaging::RebindMode rebind_mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RebindPolicy (void);
-    
-    virtual ~RebindPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RebindPolicy (const RebindPolicy &);
-    
-    void operator= (const RebindPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25U;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct PriorityRange;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        PriorityRange
-      >
-    PriorityRange_var;
-  
-  typedef
-    PriorityRange &
-    PriorityRange_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Messaging_Export PriorityRange
-  {
-    typedef PriorityRange_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    Messaging::Priority min;
-    Messaging::Priority max;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_PriorityRange;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY__VAR_OUT_CH_
-  
-  class RequestPriorityPolicy;
-  typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RequestPriorityPolicy
-      >
-    RequestPriorityPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RequestPriorityPolicy
-      >
-    RequestPriorityPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
-  
-  class TAO_Messaging_Export RequestPriorityPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RequestPriorityPolicy_ptr _ptr_type;
-    typedef RequestPriorityPolicy_var _var_type;
-    
-    // The static operations.
-    static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
-    
-    static void _tao_release (RequestPriorityPolicy_ptr obj);
-    
-    static RequestPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestPriorityPolicy_ptr _nil (void)
-    {
-      return static_cast<RequestPriorityPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Messaging::PriorityRange priority_range (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RequestPriorityPolicy (void);
-    
-    virtual ~RequestPriorityPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestPriorityPolicy (const RequestPriorityPolicy &);
-    
-    void operator= (const RequestPriorityPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY__VAR_OUT_CH_
-  
-  class ReplyPriorityPolicy;
-  typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ReplyPriorityPolicy
-      >
-    ReplyPriorityPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ReplyPriorityPolicy
-      >
-    ReplyPriorityPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY_CH_
-  
-  class TAO_Messaging_Export ReplyPriorityPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ReplyPriorityPolicy_ptr _ptr_type;
-    typedef ReplyPriorityPolicy_var _var_type;
-    
-    // The static operations.
-    static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
-    
-    static void _tao_release (ReplyPriorityPolicy_ptr obj);
-    
-    static ReplyPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyPriorityPolicy_ptr _nil (void)
-    {
-      return static_cast<ReplyPriorityPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Messaging::PriorityRange priority_range (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ReplyPriorityPolicy (void);
-    
-    virtual ~ReplyPriorityPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ReplyPriorityPolicy (const ReplyPriorityPolicy &);
-    
-    void operator= (const ReplyPriorityPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY__VAR_OUT_CH_
-  
-  class RequestStartTimePolicy;
-  typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RequestStartTimePolicy
-      >
-    RequestStartTimePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RequestStartTimePolicy
-      >
-    RequestStartTimePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
-  
-  class TAO_Messaging_Export RequestStartTimePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RequestStartTimePolicy_ptr _ptr_type;
-    typedef RequestStartTimePolicy_var _var_type;
-    
-    // The static operations.
-    static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
-    
-    static void _tao_release (RequestStartTimePolicy_ptr obj);
-    
-    static RequestStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestStartTimePolicy_ptr _nil (void)
-    {
-      return static_cast<RequestStartTimePolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::TimeBase::UtcT start_time (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RequestStartTimePolicy (void);
-    
-    virtual ~RequestStartTimePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestStartTimePolicy (const RequestStartTimePolicy &);
-    
-    void operator= (const RequestStartTimePolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY__VAR_OUT_CH_
-  
-  class RequestEndTimePolicy;
-  typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RequestEndTimePolicy
-      >
-    RequestEndTimePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RequestEndTimePolicy
-      >
-    RequestEndTimePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
-  
-  class TAO_Messaging_Export RequestEndTimePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RequestEndTimePolicy_ptr _ptr_type;
-    typedef RequestEndTimePolicy_var _var_type;
-    
-    // The static operations.
-    static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
-    
-    static void _tao_release (RequestEndTimePolicy_ptr obj);
-    
-    static RequestEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestEndTimePolicy_ptr _nil (void)
-    {
-      return static_cast<RequestEndTimePolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::TimeBase::UtcT end_time (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RequestEndTimePolicy (void);
-    
-    virtual ~RequestEndTimePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestEndTimePolicy (const RequestEndTimePolicy &);
-    
-    void operator= (const RequestEndTimePolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY__VAR_OUT_CH_
-  
-  class ReplyStartTimePolicy;
-  typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ReplyStartTimePolicy
-      >
-    ReplyStartTimePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ReplyStartTimePolicy
-      >
-    ReplyStartTimePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
-  
-  class TAO_Messaging_Export ReplyStartTimePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ReplyStartTimePolicy_ptr _ptr_type;
-    typedef ReplyStartTimePolicy_var _var_type;
-    
-    // The static operations.
-    static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
-    
-    static void _tao_release (ReplyStartTimePolicy_ptr obj);
-    
-    static ReplyStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyStartTimePolicy_ptr _nil (void)
-    {
-      return static_cast<ReplyStartTimePolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::TimeBase::UtcT start_time (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ReplyStartTimePolicy (void);
-    
-    virtual ~ReplyStartTimePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ReplyStartTimePolicy (const ReplyStartTimePolicy &);
-    
-    void operator= (const ReplyStartTimePolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY__VAR_OUT_CH_
-  
-  class ReplyEndTimePolicy;
-  typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ReplyEndTimePolicy
-      >
-    ReplyEndTimePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ReplyEndTimePolicy
-      >
-    ReplyEndTimePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY_CH_
-  
-  class TAO_Messaging_Export ReplyEndTimePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ReplyEndTimePolicy_ptr _ptr_type;
-    typedef ReplyEndTimePolicy_var _var_type;
-    
-    // The static operations.
-    static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
-    
-    static void _tao_release (ReplyEndTimePolicy_ptr obj);
-    
-    static ReplyEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ReplyEndTimePolicy_ptr _nil (void)
-    {
-      return static_cast<ReplyEndTimePolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::TimeBase::UtcT end_time (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ReplyEndTimePolicy (void);
-    
-    virtual ~ReplyEndTimePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ReplyEndTimePolicy (const ReplyEndTimePolicy &);
-    
-    void operator= (const ReplyEndTimePolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__VAR_OUT_CH_
-  
-  class RelativeRequestTimeoutPolicy;
-  typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RelativeRequestTimeoutPolicy
-      >
-    RelativeRequestTimeoutPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RelativeRequestTimeoutPolicy
-      >
-    RelativeRequestTimeoutPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
-  
-  class TAO_Messaging_Export RelativeRequestTimeoutPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRequestTimeoutPolicy_var _var_type;
-    
-    // The static operations.
-    static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
-    
-    static void _tao_release (RelativeRequestTimeoutPolicy_ptr obj);
-    
-    static RelativeRequestTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RelativeRequestTimeoutPolicy_ptr _nil (void)
-    {
-      return static_cast<RelativeRequestTimeoutPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual TimeBase::TimeT relative_expiry (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RelativeRequestTimeoutPolicy (void);
-    
-    virtual ~RelativeRequestTimeoutPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &);
-    
-    void operator= (const RelativeRequestTimeoutPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType ROUTING_POLICY_TYPE = 33U;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct RoutingTypeRange;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        RoutingTypeRange
-      >
-    RoutingTypeRange_var;
-  
-  typedef
-    RoutingTypeRange &
-    RoutingTypeRange_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Messaging_Export RoutingTypeRange
-  {
-    typedef RoutingTypeRange_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    Messaging::RoutingType min;
-    Messaging::RoutingType max;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_ROUTINGPOLICY__VAR_OUT_CH_
-  
-  class RoutingPolicy;
-  typedef RoutingPolicy *RoutingPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RoutingPolicy
-      >
-    RoutingPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RoutingPolicy
-      >
-    RoutingPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_ROUTINGPOLICY_CH_)
-#define _MESSAGING_ROUTINGPOLICY_CH_
-  
-  class TAO_Messaging_Export RoutingPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RoutingPolicy_ptr _ptr_type;
-    typedef RoutingPolicy_var _var_type;
-    
-    // The static operations.
-    static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
-    
-    static void _tao_release (RoutingPolicy_ptr obj);
-    
-    static RoutingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RoutingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RoutingPolicy_ptr _nil (void)
-    {
-      return static_cast<RoutingPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Messaging::RoutingTypeRange routing_range (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RoutingPolicy (void);
-    
-    virtual ~RoutingPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RoutingPolicy (const RoutingPolicy &);
-    
-    void operator= (const RoutingPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_MAXHOPSPOLICY__VAR_OUT_CH_
-  
-  class MaxHopsPolicy;
-  typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        MaxHopsPolicy
-      >
-    MaxHopsPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        MaxHopsPolicy
-      >
-    MaxHopsPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY_CH_)
-#define _MESSAGING_MAXHOPSPOLICY_CH_
-  
-  class TAO_Messaging_Export MaxHopsPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef MaxHopsPolicy_ptr _ptr_type;
-    typedef MaxHopsPolicy_var _var_type;
-    
-    // The static operations.
-    static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
-    
-    static void _tao_release (MaxHopsPolicy_ptr obj);
-    
-    static MaxHopsPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static MaxHopsPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static MaxHopsPolicy_ptr _nil (void)
-    {
-      return static_cast<MaxHopsPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::UShort max_hops (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    MaxHopsPolicy (void);
-    
-    virtual ~MaxHopsPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    MaxHopsPolicy (const MaxHopsPolicy &);
-    
-    void operator= (const MaxHopsPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY__VAR_OUT_CH_
-  
-  class QueueOrderPolicy;
-  typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        QueueOrderPolicy
-      >
-    QueueOrderPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        QueueOrderPolicy
-      >
-    QueueOrderPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY_CH_
-  
-  class TAO_Messaging_Export QueueOrderPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef QueueOrderPolicy_ptr _ptr_type;
-    typedef QueueOrderPolicy_var _var_type;
-    
-    // The static operations.
-    static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
-    
-    static void _tao_release (QueueOrderPolicy_ptr obj);
-    
-    static QueueOrderPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static QueueOrderPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static QueueOrderPolicy_ptr _nil (void)
-    {
-      return static_cast<QueueOrderPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual Messaging::Ordering allowed_orders (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    QueueOrderPolicy (void);
-    
-    virtual ~QueueOrderPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    QueueOrderPolicy (const QueueOrderPolicy &);
-    
-    void operator= (const QueueOrderPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_MESSAGING_REBINDPOLICY__TRAITS_CH_)
-#define _MESSAGING_REBINDPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RebindPolicy>
-  {
-    static ::Messaging::RebindPolicy_ptr duplicate (
-        ::Messaging::RebindPolicy_ptr
-      );
-    static void release (
-        ::Messaging::RebindPolicy_ptr
-      );
-    static ::Messaging::RebindPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RebindPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY__TRAITS_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestPriorityPolicy>
-  {
-    static ::Messaging::RequestPriorityPolicy_ptr duplicate (
-        ::Messaging::RequestPriorityPolicy_ptr
-      );
-    static void release (
-        ::Messaging::RequestPriorityPolicy_ptr
-      );
-    static ::Messaging::RequestPriorityPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RequestPriorityPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY__TRAITS_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyPriorityPolicy>
-  {
-    static ::Messaging::ReplyPriorityPolicy_ptr duplicate (
-        ::Messaging::ReplyPriorityPolicy_ptr
-      );
-    static void release (
-        ::Messaging::ReplyPriorityPolicy_ptr
-      );
-    static ::Messaging::ReplyPriorityPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::ReplyPriorityPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY__TRAITS_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestStartTimePolicy>
-  {
-    static ::Messaging::RequestStartTimePolicy_ptr duplicate (
-        ::Messaging::RequestStartTimePolicy_ptr
-      );
-    static void release (
-        ::Messaging::RequestStartTimePolicy_ptr
-      );
-    static ::Messaging::RequestStartTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RequestStartTimePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY__TRAITS_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RequestEndTimePolicy>
-  {
-    static ::Messaging::RequestEndTimePolicy_ptr duplicate (
-        ::Messaging::RequestEndTimePolicy_ptr
-      );
-    static void release (
-        ::Messaging::RequestEndTimePolicy_ptr
-      );
-    static ::Messaging::RequestEndTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RequestEndTimePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY__TRAITS_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyStartTimePolicy>
-  {
-    static ::Messaging::ReplyStartTimePolicy_ptr duplicate (
-        ::Messaging::ReplyStartTimePolicy_ptr
-      );
-    static void release (
-        ::Messaging::ReplyStartTimePolicy_ptr
-      );
-    static ::Messaging::ReplyStartTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::ReplyStartTimePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY__TRAITS_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyEndTimePolicy>
-  {
-    static ::Messaging::ReplyEndTimePolicy_ptr duplicate (
-        ::Messaging::ReplyEndTimePolicy_ptr
-      );
-    static void release (
-        ::Messaging::ReplyEndTimePolicy_ptr
-      );
-    static ::Messaging::ReplyEndTimePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::ReplyEndTimePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__TRAITS_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRequestTimeoutPolicy>
-  {
-    static ::Messaging::RelativeRequestTimeoutPolicy_ptr duplicate (
-        ::Messaging::RelativeRequestTimeoutPolicy_ptr
-      );
-    static void release (
-        ::Messaging::RelativeRequestTimeoutPolicy_ptr
-      );
-    static ::Messaging::RelativeRequestTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RelativeRequestTimeoutPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_ROUTINGPOLICY__TRAITS_CH_)
-#define _MESSAGING_ROUTINGPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RoutingPolicy>
-  {
-    static ::Messaging::RoutingPolicy_ptr duplicate (
-        ::Messaging::RoutingPolicy_ptr
-      );
-    static void release (
-        ::Messaging::RoutingPolicy_ptr
-      );
-    static ::Messaging::RoutingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RoutingPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY__TRAITS_CH_)
-#define _MESSAGING_MAXHOPSPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::MaxHopsPolicy>
-  {
-    static ::Messaging::MaxHopsPolicy_ptr duplicate (
-        ::Messaging::MaxHopsPolicy_ptr
-      );
-    static void release (
-        ::Messaging::MaxHopsPolicy_ptr
-      );
-    static ::Messaging::MaxHopsPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::MaxHopsPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY__TRAITS_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::QueueOrderPolicy>
-  {
-    static ::Messaging::QueueOrderPolicy_ptr duplicate (
-        ::Messaging::QueueOrderPolicy_ptr
-      );
-    static void release (
-        ::Messaging::QueueOrderPolicy_ptr
-      );
-    static ::Messaging::QueueOrderPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::QueueOrderPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RebindPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RebindPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RebindPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, const Messaging::PriorityRange &); // copying version
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); // deprecated
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PriorityRange *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestPriorityPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestPriorityPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestPriorityPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyPriorityPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestStartTimePolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestStartTimePolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestStartTimePolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestEndTimePolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RequestEndTimePolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RequestEndTimePolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyStartTimePolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyEndTimePolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRequestTimeoutPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::RoutingTypeRange *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::MaxHopsPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::MaxHopsPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::MaxHopsPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::QueueOrderPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &);
-TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PriorityRange &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &);
-TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
deleted file mode 100644
index 035887d4f7a..00000000000
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-
-#include "Messaging_ORBInitializer.h"
-
-#include "Messaging_Policy_i.h"
-#include "Connection_Timeout_Policy_i.h"
-#include "Messaging_PolicyFactory.h"
-#include "tao/ORB_Core.h"
-
-ACE_RCSID (Messaging,
-           Messaging_ORBInitializer,
-           "$Id$")
-
-void
-TAO_Messaging_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-  TAO_ORB_Core::set_timeout_hook
-    (TAO_RelativeRoundtripTimeoutPolicy::hook);
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-  TAO_ORB_Core::set_sync_scope_hook (TAO_Sync_Scope_Policy::hook);
-#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-  TAO_ORB_Core::connection_timeout_hook
-    (TAO_ConnectionTimeoutPolicy::hook);
-#endif  /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-
-}
-
-void
-TAO_Messaging_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Messaging_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  // Register the Messaging policy factories.
-
-  // The Messaging policy factory is stateless and reentrant, so share a
-  // single instance between all ORBs.
-  if (CORBA::is_nil (this->policy_factory_.in ()))
-    {
-      PortableInterceptor::PolicyFactory_ptr policy_factory;
-      ACE_NEW_THROW_EX (policy_factory,
-                        TAO_Messaging_PolicyFactory,
-                          CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              ENOMEM),
-                            CORBA::COMPLETED_NO));
-      ACE_CHECK;
-
-      this->policy_factory_ = policy_factory;
-    }
-
-  // Bind the same policy factory to all Messaging related policy
-  // types since a single policy factory is used to create each of
-  // the different types of Messaging policies.
-
-  CORBA::PolicyType type[] = {
-#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
-    Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-    Messaging::SYNC_SCOPE_POLICY_TYPE,
-#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-    TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-#if (TAO_HAS_REBIND_POLICY == 1)
-    Messaging::REBIND_POLICY_TYPE,
-#endif  /* TAO_HAS_REBIND_POLICY == 1 */
-#if (TAO_HAS_PRIORITY_POLICIES == 1)
-    Messaging::REQUEST_PRIORITY_POLICY_TYPE,
-    Messaging::REPLY_PRIORITY_POLICY_TYPE,
-#endif  /* TAO_HAS_PRIORITY_POLICIES == 1 */
-#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
-    Messaging::REQUEST_START_TIME_POLICY_TYPE,
-#endif  /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
-#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
-    Messaging::REQUEST_END_TIME_POLICY_TYPE,
-#endif  /*TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
-#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
-    Messaging::REPLY_START_TIME_POLICY_TYPE,
-#endif  /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
-#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
-    Messaging::REPLY_END_TIME_POLICY_TYPE,
-#endif  /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
-#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
-    Messaging::RELATIVE_REQ_TIMEOUT_POLICY_TYPE,
-#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
-#if (TAO_HAS_ROUTING_POLICY == 1)
-    Messaging::ROUTING_POLICY_TYPE,
-#endif  /* TAO_HAS_ROUTING_POLICY == 1 */
-#if (TAO_HAS_MAX_HOPS_POLICY == 1)
-    Messaging::MAX_HOPS_POLICY_TYPE,
-#endif  /* TAO_HAS_MAX_HOPS_POLICY == 1 */
-    Messaging::QUEUE_ORDER_POLICY_TYPE,
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-    TAO::CONNECTION_TIMEOUT_POLICY_TYPE
-#endif  /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-  };
-
-  const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]);
-  for (CORBA::PolicyType *i = type; i != end; ++i)
-    {
-      ACE_TRY
-        {
-          info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-        {
-          if (ex.minor () == (CORBA::OMGVMCID | 16))
-            {
-              // The factory is already there, it happens because the
-              // magic initializer in Messaging.cpp registers with the
-              // ORB multiple times.  This is an indication that we
-              // should do no more work in this ORBInitializer.
-              return;
-            }
-          ACE_RE_THROW;
-        }
-      ACE_CATCHANY
-        {
-          // Rethrow any other exceptions...
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
deleted file mode 100644
index 371356c65ec..00000000000
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Messaging_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_MESSAGING_ORB_INITIALIZER_H
-#define TAO_MESSAGING_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/// Forward Declarations
-class TAO_Messaging_PolicyFactory;
-
-
-/// Messaging ORB initializer.
-class TAO_Messaging_Export TAO_Messaging_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /**
-   * @name PortableInterceptor::ORBInitializer Methods
-   *
-   * The following methods are required by the
-   * PortableInterceptor::ORBInitializer interface.
-   */
-  //@{
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  //@}
-
-private:
-
-  /// Register Messaging policy factories.
-  void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL);
-
-private:
-
-  /// Instance of the Messaging policy factory.
-  /**
-   * The Messaging policy factory is stateless and reentrant, so share
-   * a single instance between all ORBs.
-   */
-  PortableInterceptor::PolicyFactory_var policy_factory_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_MESSAGING_ORB_INITIALIZER_H */
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
deleted file mode 100644
index 2897a284bd5..00000000000
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "Messaging_PolicyFactory.h"
-
-ACE_RCSID (Messaging,
-           Messaging_PolicyFactory,
-           "$Id$")
-
-#include "Messaging_Policy_i.h"
-#include "Connection_Timeout_Policy_i.h"
-
-#include "tao/PolicyC.h"
-#include "tao/Buffering_Constraint_Policy.h"
-#include "tao/Any.h"
-
-CORBA::Policy_ptr
-TAO_Messaging_PolicyFactory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-  if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE)
-    return TAO_RelativeRoundtripTimeoutPolicy::create (value
-                                                       ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-  if (type == TAO::CONNECTION_TIMEOUT_POLICY_TYPE)
-    return TAO_ConnectionTimeoutPolicy::create (value
-                                                ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-  if (type == Messaging::SYNC_SCOPE_POLICY_TYPE)
-    return TAO_Sync_Scope_Policy::create (value
-                                          ACE_ENV_ARG_PARAMETER);
-#endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-  if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
-    return TAO_Buffering_Constraint_Policy::create (value
-                                                    ACE_ENV_ARG_PARAMETER);
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  if (
-#if (TAO_HAS_REBIND_POLICY == 1)
-      type == Messaging::REBIND_POLICY_TYPE ||
-#endif  /* TAO_HAS_REBIND_POLICY == 1 */
-#if (TAO_HAS_PRIORITY_POLICIES == 1)
-      type == Messaging::REQUEST_PRIORITY_POLICY_TYPE ||
-      type == Messaging::REPLY_PRIORITY_POLICY_TYPE ||
-#endif  /* TAO_HAS_PRIORITY_POLICIES == 1 */
-#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
-      type == Messaging::REQUEST_START_TIME_POLICY_TYPE ||
-#endif  /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
-#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
-      type == Messaging::REQUEST_END_TIME_POLICY_TYPE ||
-#endif  /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
-#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
-      type == Messaging::REPLY_START_TIME_POLICY_TYPE ||
-#endif  /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
-#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
-      type == Messaging::REPLY_END_TIME_POLICY_TYPE ||
-#endif  /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
-#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
-      type == Messaging::RELATIVE_REQ_TIMEOUT_POLICY_TYPE ||
-#endif  /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
-#if (TAO_HAS_ROUTING_POLICY == 1)
-      type == Messaging::ROUTING_POLICY_TYPE ||
-#endif  /* TAO_HAS_ROUTING_POLICY == 1 */
-#if (TAO_HAS_MAX_HOPS_POLICY == 1)
-      type == Messaging::MAX_HOPS_POLICY_TYPE ||
-#endif  /* TAO_HAS_MAX_HOPS_POLICY == 1 */
-      type == Messaging::QUEUE_ORDER_POLICY_TYPE)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY),
-                      CORBA::Policy::_nil ());
-
-  ACE_UNUSED_ARG (value);
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
deleted file mode 100644
index 174bea8630b..00000000000
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Messaging_PolicyFactory.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_MESSAGING_POLICY_FACTORY_H
-#define TAO_MESSAGING_POLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Policy factory for all Messaging related policies.
-class TAO_Messaging_Export TAO_Messaging_PolicyFactory
-  : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-};
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_MESSAGING_POLICY_FACTORY_H */
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
deleted file mode 100644
index ede4f4ec4bd..00000000000
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-// $Id$
-#include "tao/Messaging/Messaging_Policy_i.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Messaging_Policy_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Messaging,
-           Messaging_Policy_i,
-           "$Id$")
-
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
-  const TimeBase::TimeT& relative_expiry)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , Messaging::RelativeRoundtripTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , relative_expiry_ (relative_expiry)
-{
-}
-
-TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
-  const TAO_RelativeRoundtripTimeoutPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , Messaging::RelativeRoundtripTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , relative_expiry_ (rhs.relative_expiry_)
-{
-}
-
-TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->relative_expiry_;
-}
-
-CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE;
-}
-
-void
-TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
-                                          TAO_Stub *stub,
-                                          bool &has_timeout,
-                                          ACE_Time_Value &time_value)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Policy_var policy = 0;
-
-      if (stub == 0)
-        {
-          policy =
-            orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          policy =
-            stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (CORBA::is_nil (policy.in ()))
-        {
-          has_timeout = false;
-          return;
-        }
-
-      Messaging::RelativeRoundtripTimeoutPolicy_var p =
-        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-          policy.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      TimeBase::TimeT seconds = t / 10000000u;
-      TimeBase::TimeT microseconds = (t % 10000000u) / 10;
-      time_value.set (ACE_U64_TO_U32 (seconds),
-                      ACE_U64_TO_U32 (microseconds));
-
-      // Set the flag once all operations complete successfully
-      has_timeout = true;
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
-                      time_value.msec ()));
-        }
-    }
-  ACE_CATCHANY
-    {
-      // Ignore all exceptions...
-    }
-  ACE_ENDTRY;
-}
-
-CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
-                                            ACE_ENV_ARG_DECL)
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TimeBase::TimeT value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_RelativeRoundtripTimeoutPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_RelativeRoundtripTimeoutPolicy (value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-TAO_RelativeRoundtripTimeoutPolicy *
-TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
-{
-  TAO_RelativeRoundtripTimeoutPolicy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_RelativeRoundtripTimeoutPolicy (*this),
-                  0);
-  return copy;
-}
-
-CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Future policy implementors: notice how the following code is
-  // exception safe!
-
-  TAO_RelativeRoundtripTimeoutPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT;
-}
-
-void
-TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
-{
-  TimeBase::TimeT t = this->relative_expiry_;
-  TimeBase::TimeT seconds = t / 10000000u;
-  TimeBase::TimeT microseconds = (t % 10000000u) / 10;
-  time_value.set (ACE_U64_TO_U32 (seconds),
-                  ACE_U64_TO_U32 (microseconds));
-
-  if (TAO_debug_level > 0)
-    {
-      CORBA::ULong msecs = time_value.msec ();
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
-                  msecs));
-    }
-}
-
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-// ****************************************************************
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , Messaging::SyncScopePolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , synchronization_ (synchronization)
-{
-}
-
-TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , Messaging::SyncScopePolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , synchronization_ (rhs.synchronization_)
-{
-}
-
-CORBA::PolicyType
-TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return Messaging::SYNC_SCOPE_POLICY_TYPE;
-}
-
-void
-TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
-                             TAO_Stub *stub,
-                             bool &has_synchronization,
-                             Messaging::SyncScope &scope)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Policy_var policy = 0;
-
-      if (stub == 0)
-        {
-          policy =
-            orb_core->get_cached_policy_including_current (
-              TAO_CACHED_POLICY_SYNC_SCOPE
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          policy =
-            stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (CORBA::is_nil (policy.in ()))
-        {
-          has_synchronization = 0;
-          return;
-        }
-      Messaging::SyncScopePolicy_var p =
-        Messaging::SyncScopePolicy::_narrow (policy.in ());
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (p.in ()))
-        ACE_THROW (CORBA::INTERNAL (
-                CORBA::SystemException::_tao_minor_code (
-                  TAO_POLICY_NARROW_CODE,
-                  0),
-                CORBA::COMPLETED_NO));
-
-      has_synchronization = true;
-      scope = p->synchronization (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore all exceptions...
-    }
-  ACE_ENDTRY;
-}
-
-CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::create (const CORBA::Any& val
-                               ACE_ENV_ARG_DECL)
-{
-  Messaging::SyncScope synchronization;
-  if ((val >>= synchronization) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Sync_Scope_Policy *servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Sync_Scope_Policy (synchronization),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
-TAO_Sync_Scope_Policy *
-TAO_Sync_Scope_Policy::clone (void) const
-{
-  TAO_Sync_Scope_Policy *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_Sync_Scope_Policy (*this),
-                  0);
-  return copy;
-}
-
-Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->synchronization_;
-}
-
-CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Sync_Scope_Policy *servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Sync_Scope_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
-void
-TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-TAO_Cached_Policy_Type
-TAO_Sync_Scope_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_SYNC_SCOPE;
-}
-
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
deleted file mode 100644
index 25ee477009e..00000000000
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   Messaging_Policy_i.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_POLICY_I_H
-#define TAO_MESSAGING_POLICY_I_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-
-/*
- * @class TAO_RelativeRoundtripTimeoutPolicy
- *
- * @brief Messaging::RelativeRoundtripTimeoutPolicy implementation
- *
- *  This policy controls the total (round-trip) timeout time for a
- *  request.
- */
-class TAO_Messaging_Export TAO_RelativeRoundtripTimeoutPolicy
-  : public Messaging::RelativeRoundtripTimeoutPolicy,
-    public TAO_Local_RefCounted_Object
-{
-
-public:
-  /// Constructor.
-  TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry);
-
-  /// Copy constructor.
-  TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs);
-
-  /// Implement the timeout hook, this is set in the ORB_Core at
-  /// initialization time.
-  static void hook (TAO_ORB_Core *orb_core,
-                    TAO_Stub *stub,
-                    bool &has_timeout,
-                    ACE_Time_Value &time_value);
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Returns a copy of <this>.
-  virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
-
-  // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Change the CORBA representation to the ACE representation.
-  void set_time_value (ACE_Time_Value &time_value);
-
-  // Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-private:
-  /// The attribute
-  TimeBase::TimeT relative_expiry_;
-};
-
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-/*
- * @class TAO_Sync_Scope_Policy
- *
- * @brief Messaging::SyncScopePolicy implementation.
- *
- *  This policy controls the sync strategy used by the ORB to transport
- *  requests.
- */
-class TAO_Messaging_Export TAO_Sync_Scope_Policy
-  : public Messaging::SyncScopePolicy,
-    public TAO_Local_RefCounted_Object
-{
-
-public:
-  /// Constructor.
-  TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization);
-
-  /// Copy constructor.
-  TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs);
-
-  /// Implement the Sync_Scope hook, this is set in the ORB_Core at
-  /// initialization time.
-  static void hook (TAO_ORB_Core *orb_core,
-                    TAO_Stub *stub,
-                    bool &has_synchronization,
-                    Messaging::SyncScope &scope);
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Returns a copy of <this>.
-  virtual TAO_Sync_Scope_Policy *clone (void) const;
-
-  // = The Messaging::SyncScopePolicy methods.
-
-  virtual Messaging::SyncScope synchronization (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void get_synchronization (Messaging::SyncScope &synchronization) const;
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-private:
-
-  /// The attribute
-  Messaging::SyncScope synchronization_;
-};
-
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-#if defined (__ACE_INLINE__)
-#include "Messaging_Policy_i.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MESSAGING_POLICY_I_H */
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.i b/TAO/tao/Messaging/Messaging_Policy_i.i
deleted file mode 100644
index 2915eaae01e..00000000000
--- a/TAO/tao/Messaging/Messaging_Policy_i.i
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-
-ACE_INLINE void
-TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const
-{
-  s = this->synchronization_;
-}
-
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
deleted file mode 100644
index b5ef012ccf9..00000000000
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   Messaging_RT_Policy.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in
- * Messaging_RT_Policy{C}.{h,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Messaging_RT_Policy.pidl
- *
- *   The generated files are ready to use
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_RT_POLICY_PIDL
-#define TAO_MESSAGING_RT_POLICY_PIDL
-
-#include "tao/TimeBase.pidl"
-#include "tao/Policy.pidl"
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  // Synchronization Policy (default = WITH_TRANSPORT)
-  typedef TimeBase::TimeT Timeout;
-
-  //
-  // Locally-Constrained Policy Objects
-  //
-  const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
-  local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-};
-
-#endif /*TAO_MESSAGING_RT_POLICY_PIDL*/
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
deleted file mode 100644
index db29080e7b6..00000000000
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_RT_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_Timeout (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/Timeout:1.0",
-    "Timeout",
-    &TimeBase::_tc_TimeT);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_Timeout =
-    &_tao_tc_Messaging_Timeout;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_RelativeRoundtripTimeoutPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0",
-    "RelativeRoundtripTimeoutPolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy =
-    &_tao_tc_Messaging_RelativeRoundtripTimeoutPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_elem
-  )
-{
-  Messaging::RelativeRoundtripTimeoutPolicy_ptr _tao_objptr =
-    Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::insert (
-      _tao_any,
-      Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-      Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::extract (
-        _tao_any,
-        Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor,
-        Messaging::_tc_RelativeRoundtripTimeoutPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
deleted file mode 100644
index 71704bdf03e..00000000000
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging_RT_PolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::RelativeRoundtripTimeoutPolicy.
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate (
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr p
-  )
-{
-  return Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release (
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::nil (void)
-{
-  return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal (
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
-{}
-
-Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void)
-{}
-
-void 
-Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RelativeRoundtripTimeoutPolicy *_tao_tmp_pointer =
-    static_cast<RelativeRoundtripTimeoutPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RelativeRoundtripTimeoutPolicy::_nil ();
-    }
-  
-  RelativeRoundtripTimeoutPolicy_ptr proxy =
-    dynamic_cast<RelativeRoundtripTimeoutPolicy_ptr> (_tao_objref);
-  
-  return RelativeRoundtripTimeoutPolicy::_duplicate (proxy);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RelativeRoundtripTimeoutPolicy::_nil ();
-    }
-  
-  RelativeRoundtripTimeoutPolicy_ptr proxy =
-    dynamic_cast<RelativeRoundtripTimeoutPolicy_ptr> (_tao_objref);
-  
-  return RelativeRoundtripTimeoutPolicy::_duplicate (proxy);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::RelativeRoundtripTimeoutPolicy::_tao_release (RelativeRoundtripTimeoutPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::RelativeRoundtripTimeoutPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
deleted file mode 100644
index 57b4150f983..00000000000
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ /dev/null
@@ -1,264 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
-#define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "messaging_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/TimeBaseC.h"
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Messaging_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef TimeBase::TimeT Timeout;
-  typedef TimeBase::TimeT_out Timeout_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Timeout;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_
-  
-  class RelativeRoundtripTimeoutPolicy;
-  typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RelativeRoundtripTimeoutPolicy
-      >
-    RelativeRoundtripTimeoutPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RelativeRoundtripTimeoutPolicy
-      >
-    RelativeRoundtripTimeoutPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
-  
-  class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRoundtripTimeoutPolicy_var _var_type;
-    
-    // The static operations.
-    static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
-    
-    static void _tao_release (RelativeRoundtripTimeoutPolicy_ptr obj);
-    
-    static RelativeRoundtripTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
-    {
-      return static_cast<RelativeRoundtripTimeoutPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual TimeBase::TimeT relative_expiry (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RelativeRoundtripTimeoutPolicy (void);
-    
-    virtual ~RelativeRoundtripTimeoutPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &);
-    
-    void operator= (const RelativeRoundtripTimeoutPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__TRAITS_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRoundtripTimeoutPolicy>
-  {
-    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate (
-        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-      );
-    static void release (
-        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-      );
-    static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
deleted file mode 100644
index ba99b43ab8b..00000000000
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   Messaging_SyncScope_Policy.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in
- * Messaging_SyncScope_Policy{C}.{h,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging_SyncScope_Policy.pidl
- *
- *   The generated files are ready to use
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL
-#define TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL
-
-#include "tao/Policy.pidl"
-#include "tao/Messaging_SyncScope.pidl"
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  // Synchronization Policy (default = WITH_TRANSPORT)
-
-  //
-  // Locally-Constrained Policy Objects
-  //
-  const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
-  local interface SyncScopePolicy : CORBA::Policy {
-    readonly attribute SyncScope synchronization;
-  };
-};
-
-#endif /*TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL*/
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
deleted file mode 100644
index 7d0b92eae46..00000000000
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_SyncScope_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_SyncScopePolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/Messaging/SyncScopePolicy:1.0",
-    "SyncScopePolicy");
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy =
-    &_tao_tc_Messaging_SyncScopePolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::SyncScopePolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::SyncScopePolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr _tao_elem
-  )
-{
-  Messaging::SyncScopePolicy_ptr _tao_objptr =
-    Messaging::SyncScopePolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::SyncScopePolicy>::insert (
-      _tao_any,
-      Messaging::SyncScopePolicy::_tao_any_destructor,
-      Messaging::_tc_SyncScopePolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::SyncScopePolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::SyncScopePolicy>::extract (
-        _tao_any,
-        Messaging::SyncScopePolicy::_tao_any_destructor,
-        Messaging::_tc_SyncScopePolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
deleted file mode 100644
index b7c5388c09e..00000000000
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging_SyncScope_PolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for Messaging::SyncScopePolicy.
-
-Messaging::SyncScopePolicy_ptr
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate (
-    Messaging::SyncScopePolicy_ptr p
-  )
-{
-  return Messaging::SyncScopePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::release (
-    Messaging::SyncScopePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-Messaging::SyncScopePolicy_ptr
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::nil (void)
-{
-  return Messaging::SyncScopePolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal (
-    Messaging::SyncScopePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-Messaging::SyncScopePolicy::SyncScopePolicy (void)
-{}
-
-Messaging::SyncScopePolicy::~SyncScopePolicy (void)
-{}
-
-void 
-Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  SyncScopePolicy *_tao_tmp_pointer =
-    static_cast<SyncScopePolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return SyncScopePolicy::_nil ();
-    }
-  
-  SyncScopePolicy_ptr proxy =
-    dynamic_cast<SyncScopePolicy_ptr> (_tao_objref);
-  
-  return SyncScopePolicy::_duplicate (proxy);
-}
-
-Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return SyncScopePolicy::_nil ();
-    }
-  
-  SyncScopePolicy_ptr proxy =
-    dynamic_cast<SyncScopePolicy_ptr> (_tao_objref);
-  
-  return SyncScopePolicy::_duplicate (proxy);
-}
-
-Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-Messaging::SyncScopePolicy::_tao_release (SyncScopePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-Messaging::SyncScopePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/Messaging/SyncScopePolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/Messaging/SyncScopePolicy:1.0";
-}
-
-CORBA::Boolean
-Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
deleted file mode 100644
index 717e6c49b00..00000000000
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
-#define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "messaging_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-#include "tao/Messaging_SyncScopeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Messaging_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY__VAR_OUT_CH_
-  
-  class SyncScopePolicy;
-  typedef SyncScopePolicy *SyncScopePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        SyncScopePolicy
-      >
-    SyncScopePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        SyncScopePolicy
-      >
-    SyncScopePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY_CH_
-  
-  class TAO_Messaging_Export SyncScopePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef SyncScopePolicy_ptr _ptr_type;
-    typedef SyncScopePolicy_var _var_type;
-    
-    // The static operations.
-    static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
-    
-    static void _tao_release (SyncScopePolicy_ptr obj);
-    
-    static SyncScopePolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SyncScopePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SyncScopePolicy_ptr _nil (void)
-    {
-      return static_cast<SyncScopePolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual Messaging::SyncScope synchronization (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    SyncScopePolicy (void);
-    
-    virtual ~SyncScopePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    SyncScopePolicy (const SyncScopePolicy &);
-    
-    void operator= (const SyncScopePolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY__TRAITS_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::Messaging::SyncScopePolicy>
-  {
-    static ::Messaging::SyncScopePolicy_ptr duplicate (
-        ::Messaging::SyncScopePolicy_ptr
-      );
-    static void release (
-        ::Messaging::SyncScopePolicy_ptr
-      );
-    static ::Messaging::SyncScopePolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::Messaging::SyncScopePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
deleted file mode 100644
index 674c9f499af..00000000000
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file TAO_Ext.pidl
- *
- *  $Id$
- *
- *  This file contains extensions to the TAO-specific idl interfaces
- *  (not part of CORBA  2.6) defined in $TAO_ROOT/tao
- *
- *  The steps to regenerate the code are as follows:
- *
- * 1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci
- *       -Wb,export_macro=TAO_Messaging_Export
- *       -Wb,export_include=messaging_export.h
- *       -Wb,pre_include="ace/pre.h"
- *       -Wb,post_include="ace/post.h"
- *       -I$(TAO_ROOT) TAO_Ext.pidl
- *
- *   The generated files are ready to use
- */
-// ================================================================
-
-#ifndef TAO_TAO_EXT_IDL
-#define TAO_TAO_EXT_IDL
-
-#include "tao/Policy.pidl"
-#include "tao/TimeBase.pidl"
-
-#pragma prefix "tao"
-
-module TAO
-{
-  const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 0x54410008;
-
-  local interface ConnectionTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-};
-
-#endif /* TAO_TAO_EXT_IDL */
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
deleted file mode 100644
index 891d511f1f7..00000000000
--- a/TAO/tao/Messaging/TAO_ExtA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TAO_ExtC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_ConnectionTimeoutPolicy (
-    CORBA::tk_local_interface,
-    "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0",
-    "ConnectionTimeoutPolicy");
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy =
-    &_tao_tc_TAO_ConnectionTimeoutPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr _tao_elem
-  )
-{
-  TAO::ConnectionTimeoutPolicy_ptr _tao_objptr =
-    TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::insert (
-      _tao_any,
-      TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-      TAO::_tc_ConnectionTimeoutPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::extract (
-        _tao_any,
-        TAO::ConnectionTimeoutPolicy::_tao_any_destructor,
-        TAO::_tc_ConnectionTimeoutPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
deleted file mode 100644
index b292ecb81d6..00000000000
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "TAO_ExtC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for TAO::ConnectionTimeoutPolicy.
-
-TAO::ConnectionTimeoutPolicy_ptr
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate (
-    TAO::ConnectionTimeoutPolicy_ptr p
-  )
-{
-  return TAO::ConnectionTimeoutPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release (
-    TAO::ConnectionTimeoutPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-TAO::ConnectionTimeoutPolicy_ptr
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::nil (void)
-{
-  return TAO::ConnectionTimeoutPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal (
-    TAO::ConnectionTimeoutPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
-{}
-
-TAO::ConnectionTimeoutPolicy::~ConnectionTimeoutPolicy (void)
-{}
-
-void 
-TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ConnectionTimeoutPolicy *_tao_tmp_pointer =
-    static_cast<ConnectionTimeoutPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ConnectionTimeoutPolicy::_nil ();
-    }
-  
-  ConnectionTimeoutPolicy_ptr proxy =
-    dynamic_cast<ConnectionTimeoutPolicy_ptr> (_tao_objref);
-  
-  return ConnectionTimeoutPolicy::_duplicate (proxy);
-}
-
-TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ConnectionTimeoutPolicy::_nil ();
-    }
-  
-  ConnectionTimeoutPolicy_ptr proxy =
-    dynamic_cast<ConnectionTimeoutPolicy_ptr> (_tao_objref);
-  
-  return ConnectionTimeoutPolicy::_duplicate (proxy);
-}
-
-TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-TAO::ConnectionTimeoutPolicy::_tao_release (ConnectionTimeoutPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-TAO::ConnectionTimeoutPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* TAO::ConnectionTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0";
-}
-
-CORBA::Boolean
-TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
deleted file mode 100644
index a2548a90499..00000000000
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
-#define _TAO_IDL_ORIG_TAO_EXTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "messaging_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-#include "tao/TimeBaseC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Messaging_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY__VAR_OUT_CH_
-  
-  class ConnectionTimeoutPolicy;
-  typedef ConnectionTimeoutPolicy *ConnectionTimeoutPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ConnectionTimeoutPolicy
-      >
-    ConnectionTimeoutPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ConnectionTimeoutPolicy
-      >
-    ConnectionTimeoutPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
-  
-  class TAO_Messaging_Export ConnectionTimeoutPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ConnectionTimeoutPolicy_ptr _ptr_type;
-    typedef ConnectionTimeoutPolicy_var _var_type;
-    
-    // The static operations.
-    static ConnectionTimeoutPolicy_ptr _duplicate (ConnectionTimeoutPolicy_ptr obj);
-    
-    static void _tao_release (ConnectionTimeoutPolicy_ptr obj);
-    
-    static ConnectionTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConnectionTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ConnectionTimeoutPolicy_ptr _nil (void)
-    {
-      return static_cast<ConnectionTimeoutPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual TimeBase::TimeT relative_expiry (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ConnectionTimeoutPolicy (void);
-    
-    virtual ~ConnectionTimeoutPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ConnectionTimeoutPolicy (const ConnectionTimeoutPolicy &);
-    
-    void operator= (const ConnectionTimeoutPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY__TRAITS_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Messaging_Export Objref_Traits< ::TAO::ConnectionTimeoutPolicy>
-  {
-    static ::TAO::ConnectionTimeoutPolicy_ptr duplicate (
-        ::TAO::ConnectionTimeoutPolicy_ptr
-      );
-    static void release (
-        ::TAO::ConnectionTimeoutPolicy_ptr
-      );
-    static ::TAO::ConnectionTimeoutPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::TAO::ConnectionTimeoutPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr); // copying
-TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr *); // non-copying
-TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging/TAO_Messaging.pc.in b/TAO/tao/Messaging/TAO_Messaging.pc.in
deleted file mode 100644
index e8eb63c6120..00000000000
--- a/TAO/tao/Messaging/TAO_Messaging.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Messaging
-Description: TAO Messaging Library
-Requires: TAO_PortableServer, TAO_Valuetype, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Messaging
-Cflags: -I${includedir}
diff --git a/TAO/tao/Messaging/TAO_Messaging.rc b/TAO/tao/Messaging/TAO_Messaging.rc
deleted file mode 100644
index 033271a4631..00000000000
--- a/TAO/tao/Messaging/TAO_Messaging.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "Messaging\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_MessagingDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_Messaging.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
deleted file mode 100644
index 04073bd36f8..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- orig/MessagingC.h	2005-03-29 14:10:15.848518400 +0200
-+++ MessagingC.h	2005-03-29 14:10:19.884321600 +0200
-@@ -40,6 +40,10 @@
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
-+#ifndef TAO_MESSAGING_SAFE_INCLUDE
-+#error "You should not include MessagingC.h directly, use Messaging.h"
-+#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
-+
- #include "messaging_export.h"
- #include "tao/Valuetype/ValueBase.h"
- #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
---- orig/MessagingC.cpp	2005-03-29 14:10:15.848518400 +0200
-+++ MessagingC.cpp	2005-03-29 14:10:19.884321600 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "MessagingC.h"
-+#include "Messaging.h"
- #include "tao/CDR.h"
- #include "tao/Object_T.h"
- #include "tao/ORB_Core.h"
---- orig/MessagingA.cpp	2005-03-29 14:10:15.848518400 +0200
-+++ MessagingA.cpp	2005-03-29 14:11:22.284048000 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "MessagingC.h"
-+#include "Messaging.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
---- orig/MessagingS.h	2005-03-29 14:10:15.848518400 +0200
-+++ MessagingS.h	2005-03-29 14:10:19.954422400 +0200
-@@ -33,11 +33,8 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "MessagingC.h"
-+#include "Messaging.h"
- #include "tao/PollableS.h"
--#include "tao/Messaging/Messaging_SyncScope_PolicyS.h"
--#include "tao/Messaging/Messaging_RT_PolicyS.h"
--#include "tao/Messaging/Messaging_No_ImplS.h"
- #include "tao/OctetSeqS.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
deleted file mode 100644
index 4aa06ad3ffe..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- orig/Messaging_No_ImplC.h	2005-03-29 14:10:14.786992000 +0200
-+++ Messaging_No_ImplC.h	2005-03-29 14:10:20.014508800 +0200
-@@ -52,6 +52,11 @@
- #include "tao/PolicyC.h"
- #include "tao/PollableC.h"
- 
-+#if defined(TRANSPARENT)
-+// Some platforms define this macro for ioctl()
-+#undef TRANSPARENT
-+#endif
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
diff --git a/TAO/tao/Messaging/messaging_export.h b/TAO/tao/Messaging/messaging_export.h
deleted file mode 100644
index c71eb5c5eed..00000000000
--- a/TAO/tao/Messaging/messaging_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_MESSAGING_EXPORT_H
-#define TAO_MESSAGING_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-# if !defined (TAO_MESSAGING_HAS_DLL)
-#   define TAO_MESSAGING_HAS_DLL 0
-# endif /* ! TAO_MESSAGING_HAS_DLL */
-#else
-# if !defined (TAO_MESSAGING_HAS_DLL)
-#   define TAO_MESSAGING_HAS_DLL 1
-# endif /* ! TAO_MESSAGING_HAS_DLL */
-#endif
-
-#if defined (TAO_MESSAGING_HAS_DLL) && (TAO_MESSAGING_HAS_DLL == 1)
-#  if defined (TAO_MESSAGING_BUILD_DLL)
-#    define TAO_Messaging_Export ACE_Proper_Export_Flag
-#    define TAO_MESSAGING_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_MESSAGING_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_MESSAGING_BUILD_DLL */
-#    define TAO_Messaging_Export ACE_Proper_Import_Flag
-#    define TAO_MESSAGING_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_MESSAGING_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_MESSAGING_BUILD_DLL */
-#else /* TAO_MESSAGING_HAS_DLL == 1 */
-#  define TAO_Messaging_Export
-#  define TAO_MESSAGING_SINGLETON_DECLARATION(T)
-#  define TAO_MESSAGING_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_MESSAGING_HAS_DLL == 1 */
-
-#endif /* TAO_MESSAGING_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
deleted file mode 100644
index 722d37519d8..00000000000
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- IDL -*-
-/**
- *  @file Messaging_PolicyValue.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in Messaging_PolicyValueC.{h,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl.exe
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Messaging_PolicyValue.pidl
- *
- */
-#ifndef TAO_MESSAGING_POLICYVALUE_PIDL
-#define TAO_MESSAGING_POLICYVALUE_PIDL
-
-#include <IOP_IOR.pidl>
-#include <Policy_Forward.pidl>
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  struct PolicyValue
-  {
-    CORBA::PolicyType ptype;
-    CORBA::OctetSeq   pvalue;
-  };
-
-  typedef sequence<PolicyValue> PolicyValueSeq;
-
-  const IOP::ComponentId TAG_POLICIES      = 2;
-  const IOP::ServiceId INVOCATION_POLICIES = 2;
-};
-
-#endif /* TAO_MESSAGING_POLICYVALUE_PIDL */
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
deleted file mode 100644
index 5b53663f3c1..00000000000
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_PolicyValueC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PolicyValue[] =
-  {
-    { "ptype", &CORBA::_tc_PolicyType },
-    { "pvalue", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValue (
-    CORBA::tk_struct,
-    "IDL:omg.org/Messaging/PolicyValue:1.0",
-    "PolicyValue",
-    _tao_fields_Messaging_PolicyValue,
-    2);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValue =
-    &_tao_tc_Messaging_PolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-#define _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Messaging_PolicyValueSeq_0 (
-        CORBA::tk_sequence,
-        &Messaging::_tc_PolicyValue,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Messaging_PolicyValueSeq_0 =
-      &Messaging_PolicyValueSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValueSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/PolicyValueSeq:1.0",
-    "PolicyValueSeq",
-    &TAO::TypeCode::tc_Messaging_PolicyValueSeq_0);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq =
-    &_tao_tc_Messaging_PolicyValueSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValue &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValue::_tao_any_destructor,
-      Messaging::_tc_PolicyValue,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValue *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
-      _tao_any,
-      Messaging::PolicyValue::_tao_any_destructor,
-      Messaging::_tc_PolicyValue,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValue *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
-        _tao_any,
-        Messaging::PolicyValue::_tao_any_destructor,
-        Messaging::_tc_PolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValueSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
-        _tao_any,
-        Messaging::PolicyValueSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
deleted file mode 100644
index ffa5d682e1d..00000000000
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging_PolicyValueC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Messaging::PolicyValue::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  PolicyValue *_tao_tmp_pointer =
-    static_cast<PolicyValue *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
-#define _MESSAGING_POLICYVALUESEQ_CS_
-
-Messaging::PolicyValueSeq::PolicyValueSeq (void)
-{}
-
-Messaging::PolicyValueSeq::PolicyValueSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        Messaging::PolicyValue
-      >
-    (max)
-{}
-
-Messaging::PolicyValueSeq::PolicyValueSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Messaging::PolicyValue * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        Messaging::PolicyValue
-      >
-    (max, length, buffer, release)
-{}
-
-Messaging::PolicyValueSeq::PolicyValueSeq (
-    const PolicyValueSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        Messaging::PolicyValue
-      >
-    (seq)
-{}
-
-Messaging::PolicyValueSeq::~PolicyValueSeq (void)
-{}
-
-void Messaging::PolicyValueSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  PolicyValueSeq * _tao_tmp_pointer =
-    static_cast<PolicyValueSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValue &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.ptype) &&
-    (strm << _tao_aggregate.pvalue);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Messaging::PolicyValue &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.ptype) &&
-    (strm >> _tao_aggregate.pvalue);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_
-#define _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValueSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Messaging::PolicyValueSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
deleted file mode 100644
index 9ce2bf2c371..00000000000
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IOP_IORC.h"
-#include "tao/Policy_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct PolicyValue;
-  
-  typedef
-    TAO_Var_Var_T<
-        PolicyValue
-      >
-    PolicyValue_var;
-  
-  typedef
-    TAO_Out_T<
-        PolicyValue,
-        PolicyValue_var
-      >
-    PolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export PolicyValue
-  {
-    typedef PolicyValue_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::PolicyType ptype;
-    CORBA::OctetSeq pvalue;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValue;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
-#define _MESSAGING_POLICYVALUESEQ_CH_
-  
-  class PolicyValueSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        PolicyValueSeq,
-        PolicyValue
-      >
-    PolicyValueSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        PolicyValueSeq,
-        PolicyValueSeq_var,
-        PolicyValue
-      >
-    PolicyValueSeq_out;
-  
-  class TAO_Export PolicyValueSeq
-    : public
-        TAO_Unbounded_Sequence<
-            PolicyValue
-          >
-  {
-  public:
-    PolicyValueSeq (void);
-    PolicyValueSeq (CORBA::ULong max);
-    PolicyValueSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PolicyValue* buffer, 
-        CORBA::Boolean release = 0
-      );
-    PolicyValueSeq (const PolicyValueSeq &);
-    ~PolicyValueSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef PolicyValueSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ComponentId TAG_POLICIES = 2U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const IOP::ServiceId INVOCATION_POLICIES = 2U;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
-#define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Messaging::PolicyValueSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Messaging::PolicyValueSeq &
-  );
-
-#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl
deleted file mode 100644
index cbc536b4c42..00000000000
--- a/TAO/tao/Messaging_SyncScope.pidl
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- IDL -*-
-/**
- *  @file Messaging_SyncScope.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in Messaging_SyncScopeC.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl.exe
- *        -o orig -St -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Messaging_SyncScope.pidl
- *
- */
-#ifndef TAO_MESSAGING_SYNCSCOPE_PIDL
-#define TAO_MESSAGING_SYNCSCOPE_PIDL
-
-#pragma prefix "omg.org"
-
-module Messaging
-{
-  typedef short SyncScope;
-  const SyncScope SYNC_NONE           = 0;
-  const SyncScope SYNC_WITH_TRANSPORT = 1;
-  const SyncScope SYNC_WITH_SERVER    = 2;
-  const SyncScope SYNC_WITH_TARGET    = 3;
-};
-
-#endif /* TAO_MESSAGING_SYNCSCOPE_PIDL */
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
deleted file mode 100644
index 78f81d090d7..00000000000
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Messaging_SyncScopeC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
deleted file mode 100644
index 61b17540188..00000000000
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
-#define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short SyncScope;
-  typedef CORBA::Short_out SyncScope_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_NONE = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_WITH_TRANSPORT = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_WITH_SERVER = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_WITH_TARGET = 3;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Messaging
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
deleted file mode 100644
index 229c9991076..00000000000
--- a/TAO/tao/Muxed_TMS.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// $Id$
-
-
-#include "tao/Muxed_TMS.h"
-#include "tao/Reply_Dispatcher.h"
-#include "tao/debug.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "Client_Strategy_Factory.h"
-
-ACE_RCSID (tao,
-           Muxed_TMS,
-           "$Id$")
-
-TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport)
-  : TAO_Transport_Mux_Strategy (transport)
-    , request_id_generator_ (0)
-    , orb_core_ (transport->orb_core ())
-    , dispatcher_table_ (this->orb_core_->client_factory ()->reply_dispatcher_table_size ())
-{
-  this->lock_ =
-    this->orb_core_->client_factory ()->create_transport_mux_strategy_lock ();
-}
-
-TAO_Muxed_TMS::~TAO_Muxed_TMS (void)
-{
-  delete this->lock_;
-}
-
-// Generate and return an unique request id for the current
-// invocation.
-CORBA::ULong
-TAO_Muxed_TMS::request_id (void)
-{
-  // @@ What is a good error return value?
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->lock_,
-                    0);
-
-  ++this->request_id_generator_;
-
-  // if TAO_Transport::bidirectional_flag_
-  //  ==  1 --> originating side
-  //  ==  0 --> other side
-  //  == -1 --> no bi-directional connection was negotiated
-  // The originating side must have an even request ID, and the other
-  // side must have an odd request ID.  Make sure that is the case.
-  int bidir_flag =
-    this->transport_->bidirectional_flag ();
-
-  if ((bidir_flag == 1 && ACE_ODD (this->request_id_generator_))
-       || (bidir_flag == 0 && ACE_EVEN (this->request_id_generator_)))
-    ++this->request_id_generator_;
-
-  if (TAO_debug_level > 4)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Muxed_TMS[%d]::request_id, <%d>\n",
-                this->transport_->id (),
-                this->request_id_generator_));
-
-  return this->request_id_generator_;
-}
-
-// Bind the dispatcher with the request id.
-int
-TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id,
-                                TAO_Reply_Dispatcher *rd)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->lock_,
-                    -1);
-
-  if (TAO_debug_level > 0 && rd == 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::bind_dispatcher, ")
-                ACE_TEXT ("null reply dispatcher\n")));
-
-  if (rd == 0)
-    return 0;
-
-  int result =
-    this->dispatcher_table_.bind (request_id, rd);
-
-
-  if (result != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::bind_dispatcher, ")
-                    ACE_TEXT ("bind dispatcher failed: result = %d, request id = %d \n"),
-                    result, request_id));
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->lock_,
-                    -1);
-  TAO_Reply_Dispatcher *rd = 0;
-
-  // @@TODO: WTH are we sending the rd in? We can just unbind using
-  // the request_id
-  return this->dispatcher_table_.unbind (request_id, rd);
-}
-
-int
-TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
-{
-  int result = 0;
-  TAO_Reply_Dispatcher *rd = 0;
-
-  // Grab the reply dispatcher for this id.
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      -1);
-
-    result =
-      this->dispatcher_table_.unbind (params.request_id_, rd);
-
-    if (TAO_debug_level > 8)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ")
-                  ACE_TEXT ("id = %d\n"),
-                  params.request_id_));
-
-    if (result != 0)
-      {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ")
-                      ACE_TEXT ("unbind dispatcher failed: result = %d\n"),
-                      result));
-
-        // This return value means that the mux strategy was not able
-        // to find a registered reply handler, either because the reply
-        // was not our reply - just forget about it - or it was ours, but
-        // the reply timed out - just forget about the reply.
-        return 0;
-      }
-
-    // Do not move it outside the scope of the lock. A follower thread
-    // could have timedout unwinding the stack and the reply
-    // dispatcher, and that would mean the present thread could be left
-    // with a dangling pointer and may crash. To safeguard againt such
-    // cases we dispatch with the lock held.
-    // Dispatch the reply.
-    // They return 1 on success, and -1 on failure.
-    result =  rd->dispatch_reply (params);
-  }
-
-  return result;
-}
-
-bool
-TAO_Muxed_TMS::idle_after_send (void)
-{
-  // Irrespective of whether we are successful or not we need to
-  // return true. If *this* class is not successfull in idling the
-  // transport no one can.
-  if (this->transport_ != 0)
-    (void) this->transport_->make_idle ();
-
-  return true;
-}
-
-bool
-TAO_Muxed_TMS::idle_after_reply (void)
-{
-  return false;
-}
-
-void
-TAO_Muxed_TMS::connection_closed (void)
-{
-  ACE_GUARD (ACE_Lock,
-             ace_mon,
-             *this->lock_);
-
-  int retval = 0;
-  do
-    {
-      retval = this->clear_cache ();
-    }
-  while (retval != -1);
-
-}
-
-int
-TAO_Muxed_TMS::clear_cache (void)
-{
-  if (this->dispatcher_table_.current_size () == 0)
-    return -1;
-
-  REQUEST_DISPATCHER_TABLE::ITERATOR end =
-    this->dispatcher_table_.end ();
-
-  ACE_Unbounded_Stack <TAO_Reply_Dispatcher *> ubs;
-
-  for (REQUEST_DISPATCHER_TABLE::ITERATOR i =
-         this->dispatcher_table_.begin ();
-       i != end;
-       ++i)
-      ubs.push ((*i).int_id_);
-
-  this->dispatcher_table_.unbind_all ();
-  size_t sz =  ubs.size ();
-
-  for (size_t k = 0 ; k != sz ; ++k)
-    {
-      TAO_Reply_Dispatcher *rd = 0;
-
-      ubs.pop (rd);
-
-      rd->connection_closed ();
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager_Ex <CORBA::ULong,
-                                        TAO_Reply_Dispatcher *,
-                                        ACE_Hash <CORBA::ULong>,
-                                        ACE_Equal_To <CORBA::ULong>,
-                                        ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Entry<CORBA::ULong,
-                                  TAO_Reply_Dispatcher *>;
-
-template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong,
-                                             TAO_Reply_Dispatcher *,
-                                             ACE_Hash<unsigned int>,
-                                             ACE_Equal_To<unsigned int>,
-                                             ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,
-                                        TAO_Reply_Dispatcher*,
-                                        ACE_Hash<CORBA::ULong>,
-                                        ACE_Equal_To<CORBA::ULong>,
-                                        ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,
-                                                TAO_Reply_Dispatcher*,
-                                                ACE_Hash<CORBA::ULong>,
-                                                ACE_Equal_To<CORBA::ULong>,
-                                                ACE_Null_Mutex>;
-
-template class ACE_Unbounded_Stack<TAO_Reply_Dispatcher*>;
-template class ACE_Node<TAO_Reply_Dispatcher*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong, TAO_Reply_Dispatcher *, ACE_Hash <CORBA::ULong>, ACE_Equal_To <CORBA::ULong>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, TAO_Reply_Dispatcher *>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_Reply_Dispatcher *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
-
-
-#pragma instantiate ACE_Unbounded_Stack<TAO_Reply_Dispatcher*>
-
-#pragma instantiate ACE_Node<TAO_Reply_Dispatcher*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h
deleted file mode 100644
index 30b055963b3..00000000000
--- a/TAO/tao/Muxed_TMS.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Muxed_TMS.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_MUXED_TMS_H
-#define TAO_MUXED_TMS_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Null_Mutex.h"
-
-#include "tao/Transport_Mux_Strategy.h"
-
-class TAO_ORB_Core;
-class TAO_Pluggable_Reply_Params;
-
-/**
- * @class TAO_Muxed_TMS
- *
- * Using this strategy a single connection can have multiple
- * outstanding requests.
- * @@ Can the performance of the demuxer be made more predictable,
- * for example, using the request id as an active demux key?
- * @note Check the OMG resolutions about bidirectional
- * connections, it is possible that the request ids can only
- * assume even or odd values.
- */
-class TAO_Export TAO_Muxed_TMS : public TAO_Transport_Mux_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Muxed_TMS (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Muxed_TMS (void);
-
-  /// Generate and return an unique request id for the current
-  /// invocation.
-  virtual CORBA::ULong request_id (void);
-
-  // = Please read the documentation in the TAO_Transport_Mux_Strategy
-  //   class.
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rh);
-  virtual int unbind_dispatcher (CORBA::ULong request_id);
-
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
-
-  virtual bool idle_after_send (void);
-  virtual bool idle_after_reply (void);
-  virtual void connection_closed (void);
-
-protected:
-  /// Used to generate a different request_id on each call to
-  /// request_id().
-  CORBA::ULong request_id_generator_;
-
-  /// Keep track of the orb core pointer. We need to this to create the
-  /// Reply Dispatchers.
-  TAO_ORB_Core *orb_core_;
-
-  typedef ACE_Hash_Map_Manager_Ex <CORBA::ULong,
-                                   TAO_Reply_Dispatcher *,
-                                   ACE_Hash <CORBA::ULong>,
-                                   ACE_Equal_To <CORBA::ULong>,
-                                   ACE_Null_Mutex>
-    REQUEST_DISPATCHER_TABLE;
-
-  /// Table of <Request ID, Reply Dispatcher> pairs.
-  REQUEST_DISPATCHER_TABLE dispatcher_table_;
-
-protected:
-  int clear_cache (void);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* MUXED_TMS_H */
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
deleted file mode 100644
index c53583e5194..00000000000
--- a/TAO/tao/NVList.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-// $Id$
-
-
-// Implementation of Named Value List and NamedValue classes
-
-#include "NVList.h"
-
-#include "tao/SystemException.h"
-#include "tao/BoundsC.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-#include "tao/debug.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           NVList,
-           "$Id$")
-
-// Reference counting for DII Request object
-
-CORBA::ULong
-CORBA::NamedValue::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA::NamedValue::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA::NamedValue::~NamedValue (void)
-{
-  if (this->name_)
-    {
-      CORBA::string_free (this->name_);
-      this->name_ = 0;
-    }
-  // the any will be destroyed by itself
-}
-
-// ****************************************************************
-
-CORBA::ULong
-CORBA::NVList::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-CORBA::NVList::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-CORBA::NVList::~NVList (void)
-{
-  // initialize an iterator and delete each NamedValue
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_);
-
-  for (iter.first (); !iter.done (); iter.advance ())
-    {
-      CORBA::NamedValue_ptr *nv;
-      (void) iter.next (nv);
-      delete *nv;
-    }
-
-  this->max_ = 0;
-
-  // Remove the CDR stream if it is present.
-  delete this->incoming_;
-}
-
-// add an element and just initialize its flags
-CORBA::NamedValue_ptr
-CORBA::NVList::add (CORBA::Flags flags
-                    ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item (const char *name,
-                         CORBA::Flags flags
-                         ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-      nv->name_ = CORBA::string_dup (name);
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value (const char *name,
-                          const CORBA::Any &value,
-                          CORBA::Flags flags
-                          ACE_ENV_ARG_DECL)
-{
-  // Call the helper to allocate a NamedValue element.
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      nv->name_ = CORBA::string_dup (name);
-
-      // With the original Any implementation, we had alternate
-      // paths for the assignment based on the IN_COPY_VALUE flag.
-      // Now that the Any's contained Any_Impl is refcounted, the
-      // distinction between the ORB "copying" or "borrowing" the
-      // memory is irrelevant. The IN_COPY_VALUE flag was not
-      // checked anywhere else in the ORB anyway.
-      nv->any_ = value;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item_consume (char *name,
-                                 CORBA::Flags flags
-                                 ACE_ENV_ARG_DECL)
-{
-
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-
-      // consume the name
-      nv->name_ = name;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value_consume (char * name,
-                                  CORBA::Any * value,
-                                  CORBA::Flags flags
-                                  ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-
-      // consume name
-      nv->name_ = name;
-
-      // consume the value @@ (ASG) have we? we may need to destroy
-      // the in parameter
-      nv->any_ = *value;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-//CORBA::Status
-void
-CORBA::NVList::remove (CORBA::ULong /* n */
-                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // not implemented
-  // @@ (ASG) - TODO
-}
-
-// Helper method
-CORBA::NamedValue_ptr
-CORBA::NVList::add_element (CORBA::Flags flags
-                            ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (ACE_BIT_DISABLED (flags,
-                        CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr nv;
-
-  // allocate a new NamedValue
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  // set the flags and enqueue in the queue
-  nv->flags_ = flags;
-
-  if (this->values_.enqueue_tail (nv) == -1)
-    {
-      delete nv;
-      return 0;
-    }
-
-  this->max_++;
-  return nv; // success
-}
-
-// return the item at location n
-CORBA::NamedValue_ptr
-CORBA::NVList::item (CORBA::ULong n
-                     ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (n >= this->max_)
-    {
-      ACE_THROW_RETURN (CORBA::Bounds (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr *nv = 0;
-
-  this->values_.get (nv, n);
-  return *nv;
-}
-
-void
-CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
-                                  int flag,
-                                  bool &lazy_evaluation
-                                  ACE_ENV_ARG_DECL)
-{
-  // If the list is empty then using lazy evaluation is the only
-  // choice.
-  // @@ There are other cases where we can use lazy evaluation, for
-  //    example if the list is not empty but the anys own all their
-  //    objects.
-  if (lazy_evaluation == false && this->max_ == 0)
-    {
-      lazy_evaluation = true;
-    }
-
-  if (lazy_evaluation == false)
-    {
-      this->_tao_decode (cdr,
-                         flag
-                         ACE_ENV_ARG_PARAMETER);
-      return;
-    }
-
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
-
-  if (this->incoming_ != 0)
-    {
-      delete this->incoming_;
-      this->incoming_ = 0;
-    }
-
-  ACE_NEW (this->incoming_, TAO_InputCDR (cdr));
-  this->incoming_flag_ = flag;
-}
-
-void
-CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             ace_mon,
-             this->refcount_lock_);
-
-  if (this->incoming_ != 0)
-    {
-      if (this->max_ == 0)
-        {
-          // The list is empty aggresively reduce copies and just send
-          // the CDR stream, we assume that
-          // TAO_Server_Request::init_reply
-          // has inserted appropiated padding already to make this
-          // operation correct
-          cdr.write_octet_array_mb (this->incoming_->start ());
-          return;
-        }
-
-      // Then unmarshal each "in" and "inout" parameter.
-      ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-      for (i.first (); !i.done (); i.advance ())
-        {
-          CORBA::NamedValue_ptr *item;
-          (void) i.next (item);
-
-          CORBA::NamedValue_ptr nv = *item;
-
-          if (ACE_BIT_DISABLED (nv->flags (), flag))
-            {
-              continue;
-            }
-
-          if (TAO_debug_level > 3)
-            {
-              const char* arg = nv->name ();
-
-              if (arg == 0)
-                {
-                  arg = "(nil)";
-                }
-
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (arg)));
-            }
-          CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
-          (void) TAO_Marshal_Object::perform_append (tc,
-                                                     this->incoming_,
-                                                     &cdr
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      delete this->incoming_;
-      this->incoming_ = 0;
-      return;
-    }
-
-  // The list is already evaluated, we cannot optimize the copies, go
-  // ahead with the slow way to do things.
-
-  // Then marshal each "in" and "inout" parameter.
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      if (ACE_BIT_DISABLED (nv->flags (), flag))
-        {
-          continue;
-        }
-
-      nv->value ()->impl ()->marshal_value (cdr);
-    }
-}
-
-void
-CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
-    }
-
-  // Then unmarshal each "in" and "inout" parameter.
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      // check if it is an in or inout parameter
-      // @@ this is where we assume that the NVList is coming from
-      //    a Server-side request, we could probably handle both
-      //    cases with a flag, but there is no clear need for that.
-      if (ACE_BIT_DISABLED (nv->flags (), flag))
-        {
-          continue;
-        }
-
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" )));
-        }
-
-      CORBA::Any_ptr any = nv->value ();
-      any->impl ()->_tao_decode (incoming
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-ptrdiff_t
-CORBA::NVList::_tao_target_alignment (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->refcount_lock_,
-                    ACE_CDR::MAX_ALIGNMENT);
-
-  if (this->incoming_ == 0)
-    {
-      return ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  const char* rd = this->incoming_->start ()->rd_ptr ();
-  ptrdiff_t t = ptrdiff_t (rd) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (t < 0)
-    {
-      t += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  return t;
-}
-
-void
-CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
-
-  if (this->incoming_ == 0)
-    {
-      return;
-    }
-
-  auto_ptr<TAO_InputCDR> incoming (this->incoming_);
-  this->incoming_ = 0;
-
-  this->_tao_decode (*(incoming.get ()),
-                     this->incoming_flag_
-                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::NVList::_lazy_has_arguments (void) const
-{
-  if (this->incoming_ != 0)
-    {
-      return this->incoming_->length () == 0 ? 0 : 1;
-    }
-  else
-    {
-      return this->count () == 0 ? 0 : 1;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<CORBA::NamedValue_ptr>;
-template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
-template class TAO_Pseudo_Var_T<CORBA::NamedValue>;
-template class TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var>;
-template class TAO_Pseudo_Var_T<CORBA::NVList>;
-template class TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_InputCDR>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-template class auto_ptr<TAO_InputCDR>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
-#pragma instantiate TAO_Pseudo_Var_T<CORBA::NamedValue>
-#pragma instantiate TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var>
-#pragma instantiate TAO_Pseudo_Var_T<CORBA::NVList>
-#pragma instantiate TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-#pragma instantiate auto_ptr<TAO_InputCDR>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
deleted file mode 100644
index a4b0db3f1cc..00000000000
--- a/TAO/tao/NVList.h
+++ /dev/null
@@ -1,312 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    NVList.h
- *
- *  $Id$
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Aniruddha Gokhale <gokhale@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_NVLIST_H
-#define TAO_NVLIST_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Queue.h"
-#include "ace/Thread_Mutex.h"
-
-#include "tao/CORBA_methods.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-
-class TAO_ORB_Core;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  enum
-  {
-    // = Flags for NVList add methods
-    ARG_IN                  = 0x01,
-    ARG_OUT                 = 0x02,
-    ARG_INOUT               = 0x04,
-    IN_COPY_VALUE           = 0x08,
-    OUT_LIST_MEMORY         = 0x10,
-    DEPENDENT_LIST          = 0x20,
-
-    // = (Unused) flags for Context methods
-    CTX_RESTRICT_SCOPE      = 0x40,
-    CTX_DELETE_DESCENDENTS  = 0x80,
-
-    // = Flags for deferred synchronous methods
-    INV_NO_RESPONSE         = 0x100,
-    INV_TERM_ON_ERR         = 0x200,
-    RESP_NO_WAIT            = 0x400
-  };
-
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-  typedef TAO_Pseudo_Var_T<NamedValue> NamedValue_var;
-  typedef TAO_Pseudo_Out_T<NamedValue, NamedValue_var> NamedValue_out;
-
-  typedef ULong Flags;
-
-  /**
-   * @class NamedValue
-   *
-   * @brief CORBA Name/value pair implementation.
-   *
-   * These occur only in "NVList" (named value list) data structures.
-   * The binary form of the data structure is frozen and visible to
-   * programs using it (e.g. from C).  The C++ class supports some
-   * programming discipline, e.g. to avoid memory leaks.  They just
-   * represent parameters to calls.  The name is optional, and the
-   * value is packaged as an Any.  The flags indicate parameter mode,
-   * and some ownership rules for "top level" memory.
-   */
-  class TAO_Export NamedValue
-  {
-    friend class ORB;
-    friend class NVList;
-    friend class Request;
-
-  public:
-    /// optional name
-    const char * name (void) const;
-
-    /// return the value
-    Any_ptr value (void) const;
-
-    /// return the parameter mode flag
-    Flags flags (void) const;
-
-    // The pseudo object static methods..
-    static NamedValue * _duplicate (NamedValue *);
-    static NamedValue * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // Useful for template programming.
-    typedef NamedValue_ptr _ptr_type;
-    typedef NamedValue_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NamedValue (void);
-
-  private:
-
-    /// private constructor. Cannot be directly instantiated other than
-    /// by its friends.
-    NamedValue (void);
-
-  private:
-
-    /// maintains how many references exist to this object
-    ULong refcount_;
-
-    /// Protects the reference count.
-    TAO_SYNCH_MUTEX refcount_lock_;
-
-    /// holds the value
-    Any any_;
-
-    /// parameter mode flags
-    Flags flags_;
-
-    /// optional IDL name of the parameter
-    char * name_;
-  };
-
-  // ****************************************************************
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-  typedef TAO_Pseudo_Var_T<NVList> NVList_var;
-  typedef TAO_Pseudo_Out_T<NVList, NVList_var> NVList_out;
-
-  /**
-   * @class NVList
-   *
-   * @brief CORBA::NVList implementation.
-
-   * This is used in the (client side) DII (Dynamic Invocation
-   * Interface) to hold parameters, except for the return
-   * parameter. It's used in the same role in the (server side) DSI
-   * (Dynamic Skeleton Interface).
-   *
-   * Each user (client, server) provides the typecode and memory for
-   * each parameter using an NVList, then talks to the ORB using a
-   * Request or ServerRequest pseudo-object.  The ORB copies data
-   * to/from the IPC messages (e.g. IIOP::Request, IIOP::Response)
-   * as appropriate.
-   */
-  class TAO_Export NVList
-  {
-    friend class ORB;
-    friend class Request;
-
-  public:
-
-    /// return the current number of elements in the list
-    ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
-
-    /// add an element and just initialize the flags
-    NamedValue_ptr add (Flags
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// add an element and initialize its name and flags
-    NamedValue_ptr add_item (const char *,
-                             Flags
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// initializes a value, name, and flags
-    NamedValue_ptr add_value (const char *,
-                              const Any &,
-                              Flags
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_item. In addition, memory management of char *
-    /// name is taken over by the NVList
-    NamedValue_ptr add_item_consume (char *,
-                                     Flags
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_value. In addition, the NVList controls the
-    /// memory management of the char *name and Any *value parameter
-    NamedValue_ptr add_value_consume (char *,
-                                      Any_ptr,
-                                      Flags
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// retrieve the item at the nth location. Raises Bounds
-    NamedValue_ptr item (ULong n
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    //  CORBA::Status
-    /// remove element at index n. Raises Bounds
-    void remove (ULong n
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // The pseudo object static methods..
-    static NVList * _duplicate (NVList *);
-    static NVList * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // = TAO Extensions:
-
-    /**
-     * Set the incoming CDR stream, this is used by TAO to perform lazy
-     * evaluation of the NVList in an incoming ServerRequest.
-     * The <flag> is used to check which parameters (IN, OUT and/or
-     * INOUT) are to be extracted
-     */
-    void _tao_incoming_cdr (TAO_InputCDR & cdr,
-                            int flag,
-                            bool &lazy_evaluation
-                            ACE_ENV_ARG_DECL);
-
-    /// Encode the NVList into the CDR stream. <flag> masks the type of
-    /// arguments (IN, OUT or INOUT) that are to be marshaled.
-    void _tao_encode (TAO_OutputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Decode the NVList arguments from the <cdr> stream.
-    void _tao_decode (TAO_InputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL);
-
-    /**
-     * Return the required alignment to marshal the NVList without any
-     * re-alignment.
-     * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
-     */
-    ptrdiff_t _tao_target_alignment (void);
-
-    /**
-     * If this list is used by a DII request, this will tell us if
-     * our CDR stream contains any marshaled arguments (needed for
-     * GIOP 1.2).
-     */
-    Boolean _lazy_has_arguments (void) const;
-
-    // Useful for template programming.
-    typedef NVList_ptr _ptr_type;
-    typedef NVList_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NVList (void);
-
-  private:
-    /// constructor - cannot be instantiated directly other than
-    /// through the CORBA::ORB::create_list method
-    NVList (void);
-
-    /// helper to increase the list size. This is used by all the add_
-    /// methods of the NVList class
-    NamedValue_ptr add_element (Flags
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Lazy evaluation routine to fill up the Anys in the NVList from
-    /// the CDR stream.
-    void evaluate (ACE_ENV_SINGLE_ARG_DECL);
-
-  private:
-    /// internal list of parameters stored as NamedValues
-    ACE_Unbounded_Queue<NamedValue_ptr> values_;
-
-    /// maximum length of list
-    ULong max_;
-
-    /// maintains how many references exist to this object
-    ULong refcount_;
-
-    /// Protects the reference count.
-    TAO_SYNCH_MUTEX refcount_lock_;
-
-    /**
-     * When the NVList is used as part of a Server Request we can simply
-     * store the CDR buffer and perform lazy evaluation to compute the
-     * Anys.
-     */
-    TAO_InputCDR * incoming_;
-
-    /// The flags used to check which parameters are actually extracted
-    /// from the <incoming_> buffer
-    int incoming_flag_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
deleted file mode 100644
index 035279feaf6..00000000000
--- a/TAO/tao/NVList.i
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return nv == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->_decr_refcnt ();
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::NamedValue::NamedValue (void)
-  : refcount_ (1),
-    flags_ (0),
-    name_ (0)
-{
-}
-
-ACE_INLINE
-const char *
-CORBA::NamedValue::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE
-CORBA::Any_ptr
-CORBA::NamedValue::value (void) const
-{
-  return const_cast<CORBA::Any_ptr> (&this->any_);
-}
-
-ACE_INLINE
-CORBA::Flags
-CORBA::NamedValue::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_INLINE
-CORBA::NamedValue *
-CORBA::NamedValue::_duplicate (CORBA::NamedValue * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NamedValue*
-CORBA::NamedValue::_nil (void)
-{
-  return 0;
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) (nvl == 0);
-}
-
-ACE_INLINE
-void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    {
-      nvl->_decr_refcnt ();
-    }
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA::NVList::NVList (void)
-  : max_ (0),
-    refcount_ (1),
-    incoming_ (0),
-    incoming_flag_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  (const_cast<CORBA::NVList *> (this))->evaluate (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->max_;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_duplicate (CORBA::NVList * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_nil (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h
deleted file mode 100644
index 6c1f292d6f1..00000000000
--- a/TAO/tao/New_Leader_Generator.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    New_Leader_Generator.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_NEW_LEADER_GENERATOR_H
-#define TAO_NEW_LEADER_GENERATOR_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_RT_New_Leader_Generator
- *
- * @brief Class for creating dynamic threads.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_New_Leader_Generator
-{
-public:
-
-  /// Destructor.
-  virtual ~TAO_New_Leader_Generator (void) {}
-
-  /// Leader/Follower class uses this method to notify the system that
-  /// we are out of leaders.
-  virtual void no_leaders_available (void) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_NEW_LEADER_GENERATOR_H */
diff --git a/TAO/tao/Null_RefCount_Policy.h b/TAO/tao/Null_RefCount_Policy.h
deleted file mode 100644
index 8f8a25307cd..00000000000
--- a/TAO/tao/Null_RefCount_Policy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Null_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_NULL_REFCOUNT_POLICY_H
-#define TAO_NULL_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class Null_RefCount_Policy
-   *
-   * @brief No-op reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that implements no-op reference counting.
-   * That class would then inherit privately from it like so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::Null_RefCount_Policy> MyNonRefCountedClass;
-   *   MyNonRefCountedClass m;
-   *   ...
-   * @endcode
-   *
-   * @note In order to incur no size overhead on the host class due to
-   *       virtual tables, no base class defining an interface is
-   *       defined.  This allows C++ compilers to apply the Empty Base
-   *       Class Optimization.
-   */
-  class TAO_Export Null_RefCount_Policy
-  {
-  public:
-
-    /// No-op reference increment.
-    void add_ref (void)  { }
-
-    /// No-op reference decrement.
-    void remove_ref (void) { }
-
-  };
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_NULL_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
deleted file mode 100644
index 9f8f4f4bc17..00000000000
--- a/TAO/tao/ORB.cpp
+++ /dev/null
@@ -1,2129 +0,0 @@
-// "$Id$"
-
-#include "ORB.h"
-
-ACE_RCSID (tao,
-           ORB,
-           "$Id$")
-
-#include "ORB_Table.h"
-#include "Connector_Registry.h"
-#include "IOR_Parser.h"
-#include "Stub.h"
-#include "ORB_Core.h"
-#include "TAO_Internal.h"
-#include "NVList.h"
-#include "Dynamic_Adapter.h"
-#include "Profile.h"
-#include "default_ports.h"
-#include "ORBInitInfo.h"
-#include "ORBInitializer_Registry.h"
-#include "TAO_Singleton_Manager.h"
-#include "Policy_Manager.h"
-#include "Valuetype_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "CodecFactory_ORBInitializer.h"
-#include "TypeCodeFactory_Adapter.h"
-#include "debug.h"
-#include "CDR.h"
-#include "SystemException.h"
-#include "default_environment.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_ORBInitializer.h"  /* @@ This should go away! */
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if !defined (__ACE_INLINE__)
-# include "ORB.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Reactor.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/ACE.h"
-#include "ace/Static_Object_Lock.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
-
-#if defined (ACE_HAS_EXCEPTIONS)
-void TAO_unexpected_exception_handler (void)
-{
-  throw CORBA::UNKNOWN ();
-}
-#endif  /* ACE_HAS_EXCEPTIONS */
-
-
-static const char ior_prefix[] = "IOR:";
-
-// = Static initialization.
-
-namespace
-{
-  // Count of the number of ORBs.
-  int orb_init_count = 0;
-}
-
-// ****************************************************************
-
-CORBA::ORB::InvalidName::InvalidName (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
-                          "InvalidName")
-{
-}
-
-// Destructor - all members are of self managing types.
-CORBA::ORB::InvalidName::~InvalidName (void)
-{
-}
-
-// Copy constructor.
-CORBA::ORB::InvalidName::InvalidName (const CORBA::ORB::InvalidName &exc)
-  : CORBA::UserException (exc._rep_id (),
-                          exc._name ())
-{
-}
-
-// Assignment operator.
-CORBA::ORB::InvalidName&
-CORBA::ORB::InvalidName::operator= (const ::CORBA::ORB::InvalidName &_tao_excp)
-{
-  this->UserException::operator= (_tao_excp);
-  return *this;
-}
-
-CORBA::ORB::InvalidName *
-CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
-                       exc->_rep_id ()))
-    {
-      return dynamic_cast<InvalidName *> (exc);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::ORB::InvalidName, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::ORB::InvalidName::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::ORB::InvalidName (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::ORB::InvalidName::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::ORB::InvalidName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::ORB::InvalidName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// ****************************************************************
-
-CORBA::ORB::ORB (TAO_ORB_Core *orb_core)
-  : lock_ ()
-  , refcount_ (1)
-  , orb_core_ (orb_core)
-  , use_omg_ior_format_ (1)
-  , timeout_ (0)
-{
-}
-
-CORBA::ORB::~ORB (void)
-{
-  // This destructor is only invoked when the last ORB reference (not
-  // instance) is being destroyed.
-}
-
-void
-CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
-{
-  // We cannot lock the exceptions here. We need to propogate
-  // BAD_INV_ORDER  exceptions if needed to the caller. Locking
-  // exceptions down would render us non-compliant with the spec.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core ()->shutdown (wait_for_completion
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->orb_core () == 0)
-    {
-      // If the ORB_Core pointer is zero, assume that the ORB_Core has
-      // been destroyed.
-
-      // As defined by the CORBA 2.3 specification, throw a
-      // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
-      // destroyed by the time an ORB function is called.
-
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
-    }
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ())));
-    }
-
-  this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Now invalidate the pointer to the ORB_Core that created this
-  // ORB.
-  this->orb_core_ = 0;
-}
-
-void
-CORBA::ORB::run (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->run (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::run (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
-{
-  this->run (&tv ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::run (ACE_Time_Value *tv
-                 ACE_ENV_ARG_DECL)
-{
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core ()->run (tv, 0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::perform_work (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->perform_work (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::perform_work (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
-{
-  this->perform_work (&tv ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::perform_work (ACE_Time_Value *tv
-                         ACE_ENV_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core ()->run (tv, 1 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  const int result = this->orb_core_->reactor ()->work_pending (tv);
-  if (result == 0 || (result == -1 && errno == ETIME))
-    return 0;
-
-  if (result == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  return 1;
-}
-
-CORBA::Boolean
-CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  const int result = this->orb_core_->reactor ()->work_pending ();
-  if (result == 0)
-    return 0;
-
-  if (result == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  return 1;
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-void
-CORBA::ORB::create_list (CORBA::Long count,
-                         CORBA::NVList_ptr &new_list
-                         ACE_ENV_ARG_DECL)
-{
-  ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
-
-  // Create an empty list
-  ACE_NEW_THROW_EX (new_list,
-                    CORBA::NVList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  // If count is greater than 0, create a list of NamedValues.
-  if (count != 0)
-    {
-      new_list->max_ = (CORBA::ULong) count;
-
-      for (CORBA::Long i = 0; i < count; ++i)
-        {
-          CORBA::NamedValue_ptr nv = 0;
-          ACE_NEW_THROW_EX (nv,
-                            CORBA::NamedValue,
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK;
-
-          new_list->values_.enqueue_tail (nv);
-        }
-    }
-}
-
-void
-CORBA::ORB::create_exception_list (CORBA::ExceptionList_ptr &list
-                                   ACE_ENV_ARG_DECL)
-{
-  TAO_Dynamic_Adapter *dynamic_adapter =
-    ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-        TAO_ORB_Core::dynamic_adapter_name ()
-      );
-
-  dynamic_adapter->create_exception_list (list
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef,
-                                   CORBA::NVList_ptr &result
-                                   ACE_ENV_ARG_DECL)
-{
-  TAO_IFR_Client_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW (CORBA::INTF_REPOS ());
-    }
-
-  adapter->create_operation_list (this,
-                                  opDef,
-                                  result
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-
-void
-CORBA::ORB::create_environment (CORBA::Environment_ptr &environment
-                                ACE_ENV_ARG_DECL)
-{
-  ACE_NEW_THROW_EX (environment,
-                    CORBA::Environment (),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
-                               ACE_ENV_ARG_DECL)
-{
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-}
-
-// The following functions are not implemented - they just throw
-// CORBA::NO_IMPLEMENT.
-
-CORBA::Boolean
-CORBA::ORB::get_service_information (
-  CORBA::ServiceType /* service_type */,
-  CORBA::ServiceInformation_out /* service_information */
-  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
-}
-
-void
-CORBA::ORB::create_context_list (CORBA::ContextList_ptr &
-                                ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::ORB::get_default_context (CORBA::Context_ptr &
-                                ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &
-                                          ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &
-                                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
-void
-CORBA::ORB::get_next_response (CORBA::Request_ptr &
-                              ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
-}
-
-// ****************************************************************
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_struct_tc (
-    const char *id,
-    const char *name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_struct_tc (id,
-                                    name,
-                                    members
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_union_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_union_tc (id,
-                                   name,
-                                   discriminator_type,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_enum_tc (
-    const char *id,
-    const char *name,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_enum_tc (id,
-                                  name,
-                                  members
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_alias_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_alias_tc (id,
-                                   name,
-                                   original_type
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_exception_tc (
-    const char *id,
-    const char *name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_exception_tc (id,
-                                       name,
-                                       members
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_interface_tc (id,
-                                       name
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_string_tc (bound
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_wstring_tc (bound
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_fixed_tc (
-    CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_fixed_tc (digits,
-                                   scale
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_sequence_tc (
-    CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_sequence_tc (bound,
-                                      element_type
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_array_tc (
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_array_tc (length,
-                                   element_type
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_value_tc (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_value_tc (id,
-                                   name,
-                                   type_modifier,
-                                   concrete_base,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_value_box_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_value_box_tc (id,
-                                       name,
-                                       boxed_type
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_native_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_native_tc (id,
-                                    name
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_recursive_tc (
-    const char *id
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_recursive_tc (id
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_abstract_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_abstract_interface_tc (id,
-                                                name
-                                                ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_local_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_local_interface_tc (id,
-                                             name
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_component_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_component_tc (id,
-                                       name
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_home_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_home_tc (id,
-                                  name
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-CORBA::ORB::create_event_tc (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_TypeCodeFactory_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        0);
-    }
-
-  return adapter->create_event_tc (id,
-                                   name,
-                                   type_modifier,
-                                   concrete_base,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-// ****************************************************************
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL)
-{
-  return this->orb_core_->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->orb_core_->poa_current ();
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_policy_manager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  TAO_Policy_Manager *policy_manager =
-    this->orb_core_->policy_manager ();
-
-  if (policy_manager == 0)
-    {
-      return CORBA::Object::_nil ();
-    }
-
-  return CORBA::Object::_duplicate (policy_manager);
-
-#else
-
-  return CORBA::Object::_nil ();
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
-  return CORBA::Object::_duplicate (&policy_current);
-
-#else
-
-  return CORBA::Object::_nil ();
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id
-                             ACE_ENV_ARG_DECL_NOT_USED)
-{
-  static const char * env_service_port[] =
-  {
-    "NameServicePort",
-    "TradingServicePort",
-    "ImplRepoServicePort",
-    "InterfaceRepoServicePort"
-  };
-
-  static const unsigned short default_service_port[] =
-  {
-    TAO_DEFAULT_NAME_SERVER_REQUEST_PORT,
-    TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT,
-    TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT,
-    TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT
-  };
-
-  CORBA::Object_var return_value;
-
-  // By now, the table filled in with -ORBInitRef arguments has been
-  // checked.  We only get here if the table didn't contain an initial
-  // reference for the requested Service.
-
-  // First, determine if the port was supplied on the command line
-  unsigned short port =
-  this->orb_core_->orb_params ()->service_port (mcast_service_id);
-
-  if (port == 0)
-  {
-    // Look for the port among our environment variables.
-    const char *port_number =
-      ACE_OS::getenv (env_service_port[mcast_service_id]);
-
-    if (port_number != 0)
-      port = static_cast<unsigned short> (ACE_OS::atoi (port_number));
-    else
-      port = default_service_port[mcast_service_id];
-  }
-
-  // Set the port value in ORB_Params: modify the default mcast
-  // value.
-  static const char prefix[] = "mcast://:";
-
-  char port_char[256];
-
-  ACE_OS::itoa (port,
-                port_char,
-                10);
-
-  CORBA::String_var port_ptr =
-    CORBA::string_alloc (static_cast<CORBA::ULong> (
-                           ACE_OS::strlen ((const char *) port_char)));
-
-  port_ptr = (const char *) port_char;
-
-  CORBA::String_var def_init_ref =
-    CORBA::string_alloc (sizeof (prefix) +
-                         static_cast<CORBA::ULong> (
-                           ACE_OS::strlen (port_ptr.in ())) + 2);
-
-  ACE_OS::strcpy (def_init_ref.inout (), prefix);
-  ACE_OS::strcat (def_init_ref.inout (), port_ptr.in ());
-  ACE_OS::strcat (def_init_ref.inout (), "::");
-
-  CORBA::String_var default_init_ref =
-        this->orb_core_->orb_params ()->default_init_ref ();
-
-  static const char mcast_prefix[] = "mcast://:::";
-
-  if ((ACE_OS::strncmp (default_init_ref.in (),
-                       mcast_prefix,
-                       sizeof mcast_prefix - 1) == 0))
-  {
-    this->orb_core_->orb_params ()->default_init_ref (def_init_ref.in ());
-  }
-
-  return CORBA::Object::_nil ();
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_initial_references (const char *name
-                                        ACE_ENV_ARG_DECL)
-{
-  return this->resolve_initial_references (name,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-CORBA::ORB::resolve_initial_references (const char *name,
-                                        ACE_Time_Value *timeout
-                                        ACE_ENV_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
-    return this->resolve_policy_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
-    return this->resolve_policy_current (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
-    return this->orb_core ()->resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0)
-    return this->orb_core ()->resolve_ior_table (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0)
-    return this->orb_core ()->resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
-    return this->orb_core ()->resolve_typecodefactory (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-
-  // -----------------------------------------------------------------
-
-  // Search the object reference table.  This search must occur before
-  // the InitRef table search, since it may contain local objects.
-  CORBA::Object_var result =
-    this->orb_core ()->object_ref_table ().resolve_initial_references (
-      name
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (!CORBA::is_nil (result.in ()))
-    return result._retn ();
-
-  // -----------------------------------------------------------------
-
-  // Check ORBInitRef options.
-  ACE_CString ior;
-  ACE_CString object_id (name);
-
-  // Is the service name in the IOR Table.
-  if (this->orb_core_->init_ref_map ()->find (object_id, ior) == 0)
-    return this->string_to_object (ior.c_str ()
-                                   ACE_ENV_ARG_PARAMETER);
-
-  // Look for an environment variable called "<name>IOR".
-  //
-  CORBA::String_var ior_env_var_name =
-    CORBA::string_alloc (ACE_OS::strlen (name) + 3);
-
-  ACE_OS::strcpy (ior_env_var_name.inout (),
-                  name);
-
-  ACE_OS::strcat (ior_env_var_name.inout (),
-                  "IOR");
-
-  ACE_CString service_ior = ACE_OS::getenv (ior_env_var_name.in ());
-
-  if (ACE_OS::strcmp (service_ior.c_str (), "") != 0 )
-    {
-      result =
-        this->string_to_object (service_ior.c_str()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      return result._retn ();
-    }
-
-  // May be trying the explicitly specified services and the well
-  // known services should be tried first before falling on to default
-  // services.
-
-  // Set the timeout value.
-  this->set_timeout (timeout);
-
-  if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
-    {
-      result = this->resolve_service (NAMESERVICE
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (!CORBA::is_nil (result.in ()))
-        return result._retn ();
-    }
-  else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
-    {
-      result = this->resolve_service (TRADINGSERVICE
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (!CORBA::is_nil (result.in ()))
-        return result._retn ();
-    }
-  else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0)
-    {
-      result = this->resolve_service (IMPLREPOSERVICE
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (!CORBA::is_nil (result.in ()))
-        return result._retn ();
-    }
-  else if (ACE_OS::strcmp (name, TAO_OBJID_INTERFACEREP) == 0)
-    {
-      result = this->resolve_service (INTERFACEREPOSERVICE
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (!CORBA::is_nil (result.in ()))
-        return result._retn ();
-    }
-
-  // Is not one of the well known services, try to find it in the
-  // InitRef table....check the defaultinitref values also.
-
-  result = this->orb_core ()->resolve_rir (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (!CORBA::is_nil (result.in ()))
-    return result._retn ();
-  // -----------------------------------------------------------------
-
-  ACE_THROW_RETURN (CORBA::ORB::InvalidName (), CORBA::Object::_nil ());
-}
-
-void
-CORBA::ORB::register_initial_reference (const char * id,
-                                        CORBA::Object_ptr obj
-                                        ACE_ENV_ARG_DECL)
-{
-  TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
-
-  table.register_initial_reference (id,
-                                    obj
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-CORBA::ORB::ObjectIdList_ptr
-CORBA::ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    this->orb_core ()->list_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->orb_core () != 0)
-    {
-      this->orb_core ()->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      // If the ORB_Core pointer is zero, assume that the ORB_Core has
-      // been destroyed.
-
-      // As defined by the CORBA 2.3 specification, throw a
-      // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
-      // destroyed by the time an ORB function is called.
-
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
-    }
-}
-
-// ****************************************************************
-
-void
-TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // This method should be invoked atomically.  It is the caller's
-  // responsibility to ensure that this condition is satisfied.
-
-  // Prevent multiple initializations.
-  if (orb_init_count != 0)
-    {
-      return;
-    }
-  else
-    {
-      ++orb_init_count;
-    }
-
-#if defined (ACE_HAS_EXCEPTIONS)
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-  /**
-   * @note The new TypeCode implementation obviates the above
-   *       comment.  Standard CORBA exception TypeCodes are now
-   *       available before CORBA::ORB_init() is ever called.
-   */
-  TAO_Singleton_Manager::instance ()->_set_unexpected (
-    ::TAO_unexpected_exception_handler);
-#endif /* ACE_HAS_EXCEPTIONS */
-
-  // Verify some of the basic implementation requirements.  This test
-  // gets optimized away by a decent compiler (or else the rest of the
-  // routine does).
-  //
-  // NOTE:  we still "just" assume that native floating point is IEEE.
-  if (   sizeof (CORBA::Boolean)    != 1
-      || sizeof (CORBA::Short)      != 2
-      || sizeof (CORBA::Long)       != 4
-      || sizeof (CORBA::LongLong)   != 8
-      || sizeof (CORBA::Float)      != 4
-      || sizeof (CORBA::Double)     != 8
-      || sizeof (CORBA::LongDouble) != 16
-      || sizeof (CORBA::WChar)      < 2
-      || sizeof (void *)            != ACE_SIZEOF_VOID_P)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "%N; ERROR: unexpected basic type size; "
-                  "b:%d s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n"
-                  "please reconfigure TAO\n",
-                  sizeof (CORBA::Boolean),
-                  sizeof (CORBA::Short),
-                  sizeof (CORBA::Long),
-                  sizeof (CORBA::LongLong),
-                  sizeof (CORBA::Float),
-                  sizeof (CORBA::Double),
-                  sizeof (CORBA::LongDouble),
-                  sizeof (CORBA::WChar),
-                  sizeof (void *)));
-
-      ACE_THROW (CORBA::INITIALIZE ());
-    }
-
-  // Register the CodecFactory ORBInitializer.
-  PortableInterceptor::ORBInitializer_ptr tmp_cf_initializer;
-  ACE_NEW_THROW_EX (tmp_cf_initializer,
-                    TAO_CodecFactory_ORBInitializer,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::ORBInitializer_var cf_initializer =
-    tmp_cf_initializer;
-
-  PortableInterceptor::register_orb_initializer (cf_initializer.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // -------------------------------------------------------------
-  // @@ These ORB initializer instantiations should go away.  They
-  //    should be registered via the service configurator, for
-  //    example.
-
-#if TAO_HAS_INTERCEPTORS == 1
-  PortableInterceptor::ORBInitializer_ptr temp_pi_initializer =
-    PortableInterceptor::ORBInitializer::_nil ();
-  PortableInterceptor::ORBInitializer_var pi_initializer;
-
-  // Register the PICurrent ORBInitializer.
-  ACE_NEW_THROW_EX (temp_pi_initializer,
-                    TAO_PICurrent_ORBInitializer,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  pi_initializer = temp_pi_initializer;
-
-  PortableInterceptor::register_orb_initializer (pi_initializer.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-const ACE_CString &
-CORBA::ORB::_tao_ft_client_id (void)
-{
-  return this->orb_core ()->fault_tolerance_service ().client_id ();
-}
-
-void
-CORBA::ORB::_tao_ft_client_id (const char *id)
-{
-  this->orb_core ()->fault_tolerance_service ().client_id (id);
-}
-
-CORBA::ORB_ptr
-CORBA::ORB::_tao_make_ORB (TAO_ORB_Core * orb_core)
-{
-  CORBA::ORB_ptr orb = CORBA::ORB::_nil ();
-
-  ACE_NEW_RETURN (orb,
-                  CORBA::ORB (orb_core),
-                  CORBA::ORB::_nil ());
-
-  return orb;
-}
-
-// ****************************************************************
-
-// ORB initialization, per OMG document 98-12-01.
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char *orb_name)
-{
-  // Make sure TAO's singleton manager is initialized.
-  //
-  // We need to initialize before TAO_default_environment() is called
-  // since that call instantiates a TAO_TSS_Singleton.
-  if (TAO_Singleton_Manager::instance ()->init () == -1)
-    {
-      return CORBA::ORB::_nil ();
-    }
-
-  return CORBA::ORB_init (argc,
-                          argv,
-                          orb_name,
-                          TAO_default_environment ());
-}
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-                 char *argv[],
-                 const char *orbid,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // This ugly macro will go away once we've merged the two ORB_init's.
-  ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
-
-  // Use this string variable to hold the orbid
-  ACE_CString orbid_string (orbid);
-
-  // Copy command line parameter not to use original.
-  ACE_Argv_Type_Converter command_line(argc, argv);
-
-  {
-    // Using ACE_Static_Object_Lock::instance() precludes ORB_init()
-    // from being called within a static object CTOR.
-    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                              guard,
-                              *ACE_Static_Object_Lock::instance (),
-                              CORBA::ORB::_nil ()));
-
-    // Make sure TAO's singleton manager is initialized.
-    if (TAO_Singleton_Manager::instance ()->init () == -1)
-      {
-        return CORBA::ORB::_nil ();
-      }
-
-    TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-  }
-
-  // Make sure the following is done after the global ORB
-  // initialization since we need to have exceptions initialized.
-
-  // It doesn't make sense for argc to be zero and argv to be
-  // non-empty/zero, or for argc to be greater than zero and argv be
-  // zero.
-  const size_t argv0_len =
-    (command_line.get_TCHAR_argv ()
-     ? (*command_line.get_TCHAR_argv ()
-        ? ACE_OS::strlen (*command_line.get_TCHAR_argv ())
-        : 0)
-     : 0);
-
-  if ((command_line.get_argc () == 0 && argv0_len != 0)
-      || (command_line.get_argc () != 0
-          && (command_line.get_TCHAR_argv () == 0
-              || command_line.get_TCHAR_argv ()[0] == 0)))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        CORBA::ORB::_nil ());
-    }
-
-  if (orbid_string.length () == 0)
-    {
-      ACE_Arg_Shifter arg_shifter (command_line.get_argc (),
-                                   command_line.get_TCHAR_argv ());
-
-      while (arg_shifter.is_anything_left ())
-        {
-          const ACE_TCHAR *current_arg = arg_shifter.get_current ();
-
-          static const ACE_TCHAR orbid_opt[] = ACE_TEXT ("-ORBid");
-          size_t orbid_len = ACE_OS::strlen (orbid_opt);
-          if (ACE_OS::strcasecmp (current_arg,
-                                  orbid_opt) == 0)
-            {
-              arg_shifter.consume_arg ();
-              if (arg_shifter.is_parameter_next ())
-                {
-                  orbid_string =
-                    ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ());
-                  arg_shifter.consume_arg ();
-                }
-            }
-          else if (ACE_OS::strncasecmp (current_arg, orbid_opt,
-                                        orbid_len) == 0)
-            {
-              arg_shifter.consume_arg ();
-              // The rest of the argument is the ORB id...
-              // but we should skip an optional space...
-              if (current_arg[orbid_len] == ' ')
-                orbid_string =
-                  ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len + 1);
-              else
-                orbid_string = ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len);
-            }
-          else
-            arg_shifter.ignore_arg ();
-        }
-    }
-
-  // Get ORB Core
-  TAO_ORB_Core_Auto_Ptr oc (
-    TAO::ORB_Table::instance ()->find (orbid_string.c_str ()));
-
-  // The ORB was already initialized.  Just return that one.
-  if (oc.get () != 0)
-    {
-      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                                guard,
-                                *ACE_Static_Object_Lock::instance (),
-                                CORBA::ORB::_nil ()));
-
-      if (oc->has_shutdown ())
-        {
-          // As defined by the CORBA 2.3 specification, throw a
-          // CORBA::BAD_INV_ORDER exception with minor code 4 if the
-          // ORB has shutdown by the time an ORB function is
-          // called.
-
-          // @@ Does the BAD_INV_ORDER exception apply here?
-          //       -Ossama
-
-          ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4,
-                                                  CORBA::COMPLETED_NO),
-                            CORBA::ORB::_nil ());
-        }
-
-      return CORBA::ORB::_duplicate (oc->orb ());
-    }
-  else
-    {
-      // An ORB corresponding to the desired ORBid doesn't exist so create
-      // a new one.
-      TAO_ORB_Core * tmp = 0;
-      ACE_NEW_THROW_EX (tmp,
-                        TAO_ORB_Core (orbid_string.c_str ()),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (0,
-                                                                   ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-      // The ORB table increases the reference count on the ORB Core
-      // so do not release it here.  Allow the TAO_ORB_Core_Auto_Ptr
-      // do decrease the reference on the ORB Core when it goes out of
-      // scope.
-      oc.reset (tmp);
-    }
-
-  // Initialize the Service Configurator.  This must occur before the
-  // ORBInitializer::pre_init() method is invoked on each registered
-  // ORB initializer.
-  int result = TAO::ORB::open_services (command_line.get_argc (),
-                                        command_line.get_TCHAR_argv ());
-
-  // Check for errors returned from <TAO_Internal::open_services>.
-  if (result != 0 && errno != ENOENT)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("Unable to initialize the ")
-                  ACE_TEXT ("Service Configurator")));
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        CORBA::ORB::_nil ());
-    }
-
-  // Run the registered ORB initializers, and initialize the ORB_Core.
-  TAO_ORBInitInfo * orb_init_info_temp = 0;
-  ACE_NEW_THROW_EX (orb_init_info_temp,
-                    TAO_ORBInitInfo (oc.get (),
-                                     command_line.get_argc(),
-                                     command_line.get_ASCII_argv()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-  // This ORBInitInfo instance is only valid for the duration of this
-  // ORB's initialization.
-  PortableInterceptor::ORBInitInfo_var orb_init_info =
-    orb_init_info_temp;
-
-  // Call the ORBInitializer::pre_init() on each registered ORB
-  // initializer.
-  TAO::ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-  // Initialize the ORB Core instance.
-  result = oc->init (command_line.get_argc(),
-                     command_line.get_ASCII_argv()
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-  // Check for errors and return nil pseudo-reference on error.
-  if (result == -1)
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        CORBA::ORB::_nil ());
-
-  // Call the ORBInitializer::post_init() on each registered ORB
-  // initializer.
-  TAO::ORBInitializer_Registry::instance ()->post_init (orb_init_info.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-#if TAO_HAS_INTERCEPTORS == 1
-  oc->pi_current ()->initialize (orb_init_info_temp->slot_count ());
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-  // Invalidate the ORBInitInfo instance to prevent future
-  // modifications to the ORB.  This behavior complies with the
-  // PortableInterceptor specification.
-  orb_init_info_temp->invalidate ();
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("TAO (%P|%t) created new ORB <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (orbid_string.c_str ())));
-    }
-
-  // Before returning remember to store the ORB into the table...
-  if (TAO::ORB_Table::instance ()->bind (orbid_string.c_str (),
-                                         oc.get ()) != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (0,
-                                       CORBA::COMPLETED_NO),
-                      CORBA::ORB::_nil ());
-
-  // Return a duplicate since the ORB_Core should release the last
-  // reference to the ORB.
-  return CORBA::ORB::_duplicate (oc->orb ());
-}
-
-// ****************************************************************
-
-// Object reference stringification.
-char *
-CORBA::ORB::object_to_string (CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!CORBA::is_nil (obj) && obj->_is_local ())
-    // @@ The CCM spec says one minor code, and the CORBA spec says
-    //    another.  Which is the correct one?
-    ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 4,
-                                      CORBA::COMPLETED_NO),
-                      0);
-
-
-  // Application writer controls what kind of objref strings they get,
-  // maybe along with other things, by how they initialize the ORB.
-
-  if (use_omg_ior_format_)
-    {
-      // By default, orbs use IOR strings; these are ugly (and error
-      // prone) but specified by CORBA.
-      //
-      // XXX there should be a simple way to reuse this code in other
-      // ORB implementations ...
-
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-      char buf [ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
-#else
-      // Avoid the initialization overhead if not compiling with
-      // support for a memory profiler.  There is no need to actually perform
-      // initialization otherwise.
-      char buf [ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-      TAO_OutputCDR cdr (buf,  sizeof buf,
-                         TAO_ENCAP_BYTE_ORDER,
-                         this->orb_core_->output_cdr_buffer_allocator (),
-                         this->orb_core_->output_cdr_dblock_allocator (),
-                         this->orb_core_->output_cdr_msgblock_allocator (),
-                         this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                         TAO_DEF_GIOP_MAJOR,
-                         TAO_DEF_GIOP_MINOR);
-
-      // There is no translator currently available for stringifying an object
-      // reference, since there is no transport with which to choose an NCS/TCS
-      // pair.
-
-      // support limited oref ACE_OS::strcmp.
-      (void) ACE_OS::memset (buf, 0, sizeof (buf));
-
-      // Marshal the objref into an encapsulation bytestream.
-      (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if ((cdr << obj) == 0)
-        ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
-      // Now hexify the encapsulated CDR data into a string, and
-      // return that string.
-
-      const size_t total_len = cdr.total_length ();
-
-      char *cp;
-      ACE_ALLOCATOR_RETURN (cp,
-                            CORBA::string_alloc (
-                              sizeof ior_prefix
-                              + 2
-                              * static_cast<CORBA::ULong> (total_len)),
-                            0);
-
-      CORBA::String_var string = cp;
-
-      ACE_OS::strcpy (cp, ior_prefix);
-      cp += sizeof (ior_prefix) - 1;
-
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
-        {
-          const char *bytes = i->rd_ptr ();
-          size_t len = i->length ();
-
-          while (len--)
-            {
-              *cp++ = ACE::nibble2hex ((*bytes) >> 4);
-              *cp++ = ACE::nibble2hex (*bytes);
-              ++bytes;
-            }
-        }
-      // Null terminate the string..
-      *cp = 0;
-
-      return string._retn ();
-    }
-  else
-    {
-      // It is perfectly valid to marshal a nil object reference.
-      // However, it is not possible to convert a nil object reference
-      // to a URL IOR, so throw an exception.
-      if (CORBA::is_nil (obj) || obj->_stubobj () == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("Nil object reference or TAO_Stub ")
-                        ACE_TEXT ("pointer is zero when converting\n")
-                        ACE_TEXT ("object reference to URL IOR.\n")));
-
-          ACE_THROW_RETURN (CORBA::MARSHAL (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            0);
-        }
-
-      TAO_MProfile &mp = obj->_stubobj ()->base_profiles ();
-
-      if (mp.profile_count () == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) Cannot stringify given ")
-                        ACE_TEXT ("object.  No profiles.\n")));
-
-
-          ACE_THROW_RETURN (CORBA::MARSHAL (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            0);
-        }
-
-      // For now we just use the first profile.
-      TAO_Profile *profile = mp.get_profile (0);
-
-      return profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-}
-
-// Destringify arbitrary objrefs.  This method is called from
-// <resolve_name_service> with an IOR <multicast_to_service>.
-
-CORBA::Object_ptr
-CORBA::ORB::string_to_object (const char *str
-                              ACE_ENV_ARG_DECL)
-{
-  // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Check for NULL pointer
-  if (str == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                        CORBA::SystemException::_tao_minor_code (
-                          0,
-                          EINVAL),
-                        CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
-
-  TAO_IOR_Parser *ior_parser =
-    this->orb_core_->parser_registry ()->match_parser (str);
-
-  if (ior_parser != 0)
-    {
-      return ior_parser->parse_string (str,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-
-
-  if (ACE_OS::strncmp (str,
-                       ior_prefix,
-                       sizeof ior_prefix - 1) == 0)
-    return this->ior_string_to_object (str + sizeof ior_prefix - 1
-                                       ACE_ENV_ARG_PARAMETER);
-  else
-    return this->url_ior_string_to_object (str
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-// ****************************************************************
-
-char *
-CORBA::ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return CORBA::string_dup (this->orb_core_->orbid ());
-}
-
-// ****************************************************************
-
-CORBA::Policy_ptr
-CORBA::ORB::create_policy (CORBA::PolicyType type,
-                           const CORBA::Any& val
-                           ACE_ENV_ARG_DECL)
-{
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Attempt to obtain the policy from the policy factory registry.
-  return
-    this->orb_core_->policy_factory_registry ()->create_policy (
-      type,
-      val
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-CORBA::ORB::_create_policy (CORBA::PolicyType type
-                            ACE_ENV_ARG_DECL)
-{
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Attempt to obtain the policy from the policy factory registry.
-  return
-    this->orb_core_->policy_factory_registry ()->_create_policy (
-      type
-      ACE_ENV_ARG_PARAMETER);
-}
-
-// Destringify OMG-specified "IOR" string.
-//
-// XXX there should be a simple way to reuse this code in other ORB
-// implementations ...
-
-CORBA::Object_ptr
-CORBA::ORB::ior_string_to_object (const char *str
-                                  ACE_ENV_ARG_DECL)
-{
-  // Unhex the bytes, and make a CDR deencapsulation stream from the
-  // resulting data.
-  ACE_Message_Block mb (ACE_OS::strlen (str) / 2 + 1
-                        + ACE_CDR::MAX_ALIGNMENT + 1);
-
-  ACE_CDR::mb_align (&mb);
-
-  char *buffer = mb.rd_ptr ();
-  const char *tmp = str;
-  size_t len = 0;
-
-  while (tmp [0] && tmp [1])
-    {
-      // Some platforms define 'byte' as a macro, solve the problem
-      // here.
-#undef byte
-      unsigned char byte;
-
-      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
-        break;
-
-      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
-      byte |= ACE::hex2byte (tmp [1]);
-
-      buffer [len++] = byte;
-      tmp += 2;
-    }
-
-  if (tmp [0] && !isspace (tmp [0]))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create deencapsulation stream ... then unmarshal objref from that
-  // stream.
-
-  int byte_order = *(mb.rd_ptr ());
-  mb.rd_ptr (1);
-  mb.wr_ptr (len);
-  TAO_InputCDR stream (&mb,
-                       byte_order,
-                       TAO_DEF_GIOP_MAJOR,
-                       TAO_DEF_GIOP_MINOR,
-                       this->orb_core_);
-
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  stream >> objref;
-  return objref;
-}
-
-// ****************************************************************
-
-// Convert an URL style IOR in an object
-
-CORBA::Object_ptr
-CORBA::ORB::url_ior_string_to_object (const char* str
-                                      ACE_ENV_ARG_DECL)
-{
-  TAO_MProfile mprofile;
-  // It is safe to declare this on the stack since the contents of
-  // mprofile get copied.  No memory is allocated for profile storage
-  // here.  The Connector Registry will determine the exact number
-  // of profiles and tell the MProfile object to allocate enough memory
-  // to hold them all.
-
-  TAO_Connector_Registry *conn_reg =
-    this->orb_core_->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  int retv =
-    conn_reg->make_mprofile (str,
-                             mprofile
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
-
-  if (retv != 0)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
-    }
-
-  // Now make the TAO_Stub.
-  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
-                                                 mprofile
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  TAO_Stub_Auto_Ptr safe_objdata (data);
-
-  // Figure out if the servant is collocated.
-  CORBA::Object_ptr obj =
-    this->orb_core_->create_object (safe_objdata.get ());
-  if (CORBA::is_nil (obj))
-    return CORBA::Object::_nil ();
-
-  // Transfer ownership to the CORBA::Object
-  (void) safe_objdata.release ();
-
-  return obj;
-}
-
-// ****************************************************************
-
-ACE_Time_Value *
-CORBA::ORB::get_timeout (void)
-{
-  return this->timeout_;
-}
-
-void
-CORBA::ORB::set_timeout (ACE_Time_Value *timeout)
-{
-  this->timeout_ = timeout;
-}
-
-// *************************************************************
-// Valuetype factory operations
-// *************************************************************
-
-CORBA::ValueFactory
-CORBA::ORB::register_value_factory (const char *repository_id,
-                                    CORBA::ValueFactory factory
-                                    ACE_ENV_ARG_DECL)
-{
-  // %! guard, and ACE_Null_Mutex in the map
-  // do _add_ref here not in map->rebind
-
-  if (this->orb_core ()->valuetype_adapter () == 0)
-    {
-
-     this->orb_core ()->valuetype_adapter () =
-       ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-         );
-
-      if (this->orb_core ()->valuetype_adapter () == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-    }
-
-  int result =
-    this->orb_core ()->valuetype_adapter ()->vf_map_rebind (repository_id,
-                                                            factory);
-
-  if (result == 0)              // No previous factory found
-    {
-      return 0;
-    }
-
-  if (result == -1)
-    {
-      // Error on bind.
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-    }
-
-  return factory;    // previous factory was found
-}
-
-void
-CORBA::ORB::unregister_value_factory (const char *repository_id
-                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (this->orb_core ()->valuetype_adapter ())
-    {
-      // Dont care whther it was successful or not!
-      (void) this->orb_core ()->valuetype_adapter ()->vf_map_unbind (repository_id);
-    }
-}
-
-CORBA::ValueFactory
-CORBA::ORB::lookup_value_factory (const char *repository_id
-                                  ACE_ENV_ARG_DECL)
-{
-  if (this->orb_core ()->valuetype_adapter () == 0)
-    {
-      this->orb_core ()->valuetype_adapter () =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (this->orb_core ()->valuetype_adapter () == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-    }
-
-  return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Pseudo_Var_T<CORBA::ORB>;
-template class TAO_Pseudo_Out_T<CORBA::ORB, CORBA::ORB_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Pseudo_Var_T<CORBA::ORB>
-#pragma instantiate TAO_Pseudo_Out_T<CORBA::ORB, CORBA::ORB_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
deleted file mode 100644
index 4fa0fa78a7d..00000000000
--- a/TAO/tao/ORB.h
+++ /dev/null
@@ -1,672 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ORB.h
- *
- *  $Id$
- *
- *  Header file for CORBA's ORB type.
- *
- *  @author DOC Center - Washington University at St. Louis
- *  @author DOC Group - Vanderbilt University
- *  @author DOC Laboratory - University of California at Irvine
- */
-//=============================================================================
-
-#ifndef TAO_ORB_H
-#define TAO_ORB_H
-
-#include /**/ "ace/pre.h"
-
-#include "UserException.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orb_typesC.h"
-#include "objectid.h"
-#include "Policy_ForwardC.h"
-#include "CORBA_methods.h"
-#include "VarOut_T.h"
-
-#include "ace/Thread_Mutex.h"
-#include "ace/Guard_T.h"
-
-typedef enum
-{
-  TAO_SERVICEID_NAMESERVICE,
-  TAO_SERVICEID_TRADINGSERVICE,
-  TAO_SERVICEID_IMPLREPOSERVICE,
-  TAO_SERVICEID_INTERFACEREPOSERVICE,
-  TAO_SERVICEID_MCASTSERVER
-} TAO_Service_ID;
-
-/// Forward declarations.
-class TAO_MProfile;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-class TAO_InputCDR;
-class TAO_OutputCDR;
-class TAO_Stub;
-class TAO_Valuetype_Adapter;
-class TAO_Acceptor_Filter;
-class TAO_SeqElem_String_Manager;
-
-// ****************************************************************
-
-namespace CORBA
-{
-  class EnumMemberSeq;
-  class StructMemberSeq;
-  class UnionMemberSeq;
-  class ValueMemberSeq;
-  class ORB_ObjectIdList;
-
-  class ExceptionList;
-  typedef ExceptionList * ExceptionList_ptr;
-
-  class ContextList;
-  typedef ContextList * ContextList_ptr;
-
-  class Context;
-  typedef Context * Context_ptr;
-
-  // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
-
-  typedef
-    TAO_MngSeq_Var_T<
-        ORB_ObjectIdList,
-        TAO_SeqElem_String_Manager
-      >
-    ORB_ObjectIdList_var;
-
-  typedef
-    TAO_MngSeq_Out_T<
-        ORB_ObjectIdList,
-        ORB_ObjectIdList_var,
-        TAO_SeqElem_String_Manager
-      >
-    ORB_ObjectIdList_out;
-
-  struct ServiceInformation;
-
-  typedef
-    TAO_Var_Var_T<
-        ServiceInformation
-      >
-    ServiceInformation_var;
-
-  typedef
-    TAO_Out_T<
-        ServiceInformation,
-        ServiceInformation_var
-      >
-    ServiceInformation_out;
-
-  class ValueFactoryBase;
-  typedef ValueFactoryBase *ValueFactory;
-
-  typedef UShort ServiceType;
-
-  class Request;
-  typedef Request * Request_ptr;
-  typedef TAO_Pseudo_Var_T<Request> Request_var;
-  typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out;
-
-  class ORB;
-  typedef ORB * ORB_ptr;
-  typedef TAO_Pseudo_Var_T<ORB> ORB_var;
-  typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
-
-  typedef CORBA::Short ValueModifier;
-
-  /**
-   * @class ORB
-   *
-   * @brief ORB pseudo-object.
-   *
-   * The "ORB" pseudo-object is used in bootstrapping, such as to
-   * create object references from strings.  This class is intended
-   * to be inherited by others, which will provide some more of the
-   * CORBA support.  Implementations of this "CORBA::ORB" class must
-   * know how to create stringify/destringify their objrefs, as well
-   * as how to marshal and unmarshal them.
-   */
-  class TAO_Export ORB
-  {
-  public:
-
-    class TAO_Export InvalidName : public CORBA::UserException
-    {
-    public:
-      InvalidName (void);
-      InvalidName (const InvalidName &);
-      ~InvalidName (void);
-
-      InvalidName &operator= (const InvalidName &);
-
-      static InvalidName *_downcast (CORBA::Exception *);
-      static CORBA::Exception *_alloc (void);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR &
-                                ACE_ENV_ARG_DECL) const;
-
-      virtual void _tao_decode (TAO_InputCDR &
-                                ACE_ENV_ARG_DECL);
-    };
-
-    typedef char *ObjectId;
-    typedef CORBA::String_var ObjectId_var;
-    typedef CORBA::String_out ObjectId_out;
-    static CORBA::TypeCode_ptr const _tc_ObjectId;
-
-    typedef CORBA::ORB_ObjectIdList ObjectIdList;
-    typedef CORBA::ORB_ObjectIdList_var ObjectIdList_var;
-    typedef CORBA::ORB_ObjectIdList_out ObjectIdList_out;
-    typedef CORBA::ORB_ObjectIdList *ObjectIdList_ptr;
-    static CORBA::TypeCode_ptr const _tc_ObjectIdList;
-
-    /// Return a duplicate of @c orb.
-    /**
-     * When work with this duplicate is complete, it should be freed
-     * up using CORBA::release().
-     */
-    static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
-
-    /// Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
-    /// can be used for initialization or in comparisons.
-    static CORBA::ORB_ptr _nil (void);
-
-    /// Return this ORB's ORBid.
-    char * id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Turn a string-ified object reference back into an object
-     * pointer.  Typically these strings are created using
-     * object_to_string(), but not necessarily locally.
-     */
-    CORBA::Object_ptr string_to_object (const char *str
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Turn an object reference into a string.  Each type of ORB,
-     * e.g. an IIOP ORB, must implement this.  This can be used by
-     * servers to publish their whereabouts to clients.  The output of
-     * this is typically eventually given to @c string_to_object() as
-     * an argument.
-     */
-    char * object_to_string (CORBA::Object_ptr obj
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
-    CORBA::ValueFactory register_value_factory (
-        const char *repository_id,
-        CORBA::ValueFactory factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void unregister_value_factory (const char * repository_id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    CORBA::ValueFactory lookup_value_factory (
-        const char *repository_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-    // Typedefs for CORBA::ORB::RequestSeq, which is an argument of
-    // send_multiple_requests_*().
-
-    typedef
-      TAO_Unbounded_Pseudo_Sequence<
-          CORBA::Request
-        >
-      RequestSeq;
-
-    typedef
-      TAO_VarSeq_Var_T<
-          RequestSeq,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Request
-            >
-        >
-      RequestSeq_var;
-
-    typedef
-      TAO_Seq_Out_T<
-          RequestSeq,
-          RequestSeq_var,
-          TAO_Pseudo_Object_Manager<
-              CORBA::Request
-            >
-        >
-      RequestSeq_out;
-
-    void create_list (CORBA::Long count,
-                      CORBA::NVList_ptr &new_list
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void create_operation_list(CORBA::OperationDef_ptr,
-                             CORBA::NVList_ptr&
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void create_named_value (CORBA::NamedValue_ptr &nmval
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void create_exception_list (CORBA::ExceptionList_ptr &exclist
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void create_environment (CORBA::Environment_ptr &new_env
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // The following are not implemented and just throw
-    // CORBA::NO_IMPLEMENT.
-
-    void create_context_list (CORBA::ContextList_ptr &ctxtlist
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void get_default_context (CORBA::Context_ptr &ctx
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Boolean get_service_information (
-      CORBA::ServiceType service_type,
-      CORBA::ServiceInformation_out service_information
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &req
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &req
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    void get_next_response (CORBA::Request_ptr &req
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Boolean poll_next_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /// The ORB TypeCode creation functions.
-
-    CORBA::TypeCode_ptr create_struct_tc (
-        const char *id,
-        const char *name,
-        const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_union_tc (
-        const char *id,
-        const char *name,
-        CORBA::TypeCode_ptr discriminator_type,
-        const CORBA::UnionMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_enum_tc (
-        const char *id,
-        const char *name,
-        const CORBA::EnumMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_alias_tc (
-        const char *id,
-        const char *name,
-        CORBA::TypeCode_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_exception_tc (
-        const char *id,
-        const char *name,
-        const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_interface_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_string_tc (
-        CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_wstring_tc (
-        CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_fixed_tc (
-        CORBA::UShort digits,
-        CORBA::UShort scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_sequence_tc (
-        CORBA::ULong bound,
-        CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_array_tc (
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_value_tc (
-        const char *id,
-        const char *name,
-        CORBA::ValueModifier type_modifier,
-        CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_value_box_tc (
-        const char *id,
-        const char *name,
-        CORBA::TypeCode_ptr boxed_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_native_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_recursive_tc (
-        const char *id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_abstract_interface_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_local_interface_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_component_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::TypeCode_ptr create_home_tc (
-        const char *id,
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-
-    CORBA::TypeCode_ptr create_event_tc (
-        const char *id,
-        const char *name,
-        CORBA::ValueModifier type_modifier,
-        CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    // = ORB event loop methods.
-
-    /**
-     * Instructs the ORB to initialize itself and run its event loop in
-     * the current thread, not returning until the ORB has shut down.
-     * If an error occurs during initialization or at runtime, a CORBA
-     * system exception will be thrown.
-     */
-    void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Instructs the ORB to initialize itself and run its event loop in
-     * the current thread, not returning until the ORB has shut down or
-     * the time value specified through @a tv has expired.  If an
-     * error occurs during initialization or at runtime, a CORBA
-     * system exception will be thrown.  @a tv is reduced by the
-     * amount of time spent in this call.
-     *
-     * If this function is called with a @ tv value, client threads
-     * making invocations will continue their operations. When the
-     * operation timesout and returns, any invocations showing up on
-     * the server will be buffered by TCP.
-     **/
-    void run (ACE_Time_Value &tv
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Instructs the ORB to initialize itself and run its event loop in
-     * the current thread, not returning until the ORB has shut down or
-     * the time value specified through @a tv has expired.  If an error
-     * occurs during initialization or at runtime, a CORBA system
-     * exception will be thrown.  @a tv is reduced by the amount of time
-     * spent in this call.  If @a tv is 0, it means that the timeout
-     * is infinite.  If @a tv is @c ACE_Time_Value::zero, it specifies
-     * to poll and does not block.
-     *
-     * If this function is called with @a tv value, client threads
-     * making invocations will continue their operations. When the
-     * operation timesout and returns, any invocations showing up on
-     * the server will be buffered by TCP.
-     **/
-    void run (ACE_Time_Value *tv
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Returns an indication of whether the ORB needs to perform some
-    /// work.
-    CORBA::Boolean work_pending (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    /// Returns an indication of whether the ORB needs to perform some
-    /// work but will look for work pending for no more than the
-    /// specified time.
-    /**
-     * @note This is useful for implementing an event loop with an
-     *       idle timeout.
-     */
-    CORBA::Boolean work_pending (ACE_Time_Value &tv
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * This operation performs an implementation-defined unit of work.
-     * Note that the default behavior is to block if the unit of work
-     * is not present; this behavior can be modified by passing an
-     * appropriate @c ACE_Time_Value as described in run().
-     **/
-    void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void perform_work (ACE_Time_Value &
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void perform_work (ACE_Time_Value *
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * This operation instructs the ORB to shut down. Shutting down the
-     * ORB causes all Object Adapters to be shut down. If
-     * @c wait_for_completion parameter is TRUE, this operation blocks
-     * until all ORB processing (including request processing and object
-     * deactivation or other operations associated with object adapters)
-     * has completed.
-     */
-    void shutdown (CORBA::Boolean wait_for_completion = 0
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Explicitly destroy the ORB, releasing any resources.  Note that
-     * TAO *cannot* implicitly release the resources even if you have
-     * destroyed all the references to a particular ORB since
-     * CORBA::ORB_init() is required to return the same pointer if
-     * called with the same ORBid, only after ORB::destroy() is called
-     * it may return a new one.
-     *
-     * The results of multi-threaded applications, trying to destroy ()
-     * the ORB in one thread and trying to service a request in another
-     * thread are not well defined. TAO does not support such cases.
-     */
-    void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Object_ptr resolve_initial_references (
-        const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /**
-     * This method acts as a mini-bootstrapping Naming Service, which is
-     * provided by the ORB for certain well-known object references.  TAO
-     * supports the "NameService", "TradingService", "RootPOA",
-     * "ImplRepo", and "POACurrent" via this method.  The @c timeout
-     * value bounds the amount of time the ORB blocks waiting to
-     * resolve the service.  This is most useful for bootstrapping
-     * remote services, such as the "NameService" or "TradingService",
-     * that are commonly resolved via multicast.  By default, the
-     * value is 0, which means "use the @c
-     * TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT timeout period".
-     *
-     * @note By using a default value for the @c timeout parameter,
-     *       TAO will remains compliant with the CORBA
-     *       resolve_initial_references() specification.
-     */
-    CORBA::Object_ptr resolve_initial_references (
-      const char *name,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Register an object reference with the ORB.
-    void register_initial_reference (const char * id,
-                                     CORBA::Object_ptr obj
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Returns a sequence of ObjectIds that lists which objects have
-    /// references available via the initial references mechanism.
-    CORBA::ORB::ObjectIdList_ptr list_initial_services (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                     const CORBA::Any& val
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // ----------------------------------------------------------------
-    // = TAO-specific extensions to the CORBA specification.
-    // ----------------------------------------------------------------
-
-    /// Create an empty policy, usually to be filled in later by
-    /// demarshaling.
-    CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                      ACE_ENV_ARG_DECL);
-
-    /// Resolve the POA.
-    CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL);
-
-    // Reference counting...
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
-
-    /// Set the IOR flag.
-    void _use_omg_ior_format (CORBA::Boolean ior);
-
-    /// Get the IOR flag.
-    CORBA::Boolean _use_omg_ior_format (void);
-
-    /// Get the ORB core.
-    TAO_ORB_Core *orb_core (void) const;
-
-    /**
-     * TAO specific extension to get and set the client ID. The client
-     * id can be set by the application which would be used by the FT
-     * service. As there are no specific interfaces defined in the
-     * spec, we have this proprietary extension.
-     */
-    const ACE_CString &_tao_ft_client_id (void);
-    void _tao_ft_client_id (const char *id);
-
-    /// Factory method that creates an ORB.
-    static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core);
-
-    // Useful for template programming.
-    typedef ORB_ptr _ptr_type;
-    typedef ORB_var _var_type;
-
-    /// Get the Timeout value
-    ACE_Time_Value *get_timeout (void);
-
-  protected:
-
-    // We must be created via the @c CORBA::ORB_init() function.
-    ORB (TAO_ORB_Core *orb_core);
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~ORB (void);
-
-    /// Resolve the POA current.
-    CORBA::Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Resolve the Policy Manager for this ORB.
-    CORBA::Object_ptr resolve_policy_manager (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
-    /// Resolve the Policy Current for this thread.
-    CORBA::Object_ptr resolve_policy_current (
-        ACE_ENV_SINGLE_ARG_DECL
-      );
-
-  private:
-
-    /// Resolve the given service based on the service ID.
-    CORBA::Object_ptr resolve_service (TAO_MCAST_SERVICEID service_id
-                                       ACE_ENV_ARG_DECL);
-
-    /// Convert an OMG IOR into an object reference.
-    CORBA::Object_ptr ior_string_to_object (const char* ior
-                                            ACE_ENV_ARG_DECL);
-
-    /// Convert an URL style IOR into an object reference.
-    CORBA::Object_ptr url_ior_string_to_object (const char* ior
-                                                ACE_ENV_ARG_DECL);
-
-    /// Check if ORB has shutdown.  If it has, throw the appropriate
-    /// exception.
-    void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Set the timeout value
-    void set_timeout (ACE_Time_Value * timeout);
-
-  private:
-
-    /// lock required for mutual exclusion between multiple threads.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Maintains a reference count of number of instantiations of the
-    /// ORB.
-    CORBA::ULong refcount_;
-
-    /// The ORB_Core that created us....
-    TAO_ORB_Core *orb_core_;
-
-    /// Decides whether to use the URL notation or to use IOR notation.
-    CORBA::Boolean use_omg_ior_format_;
-
-    // Prevent copying and assignment.
-    ORB (const ORB &);
-    ORB &operator= (const ORB &);
-
-    /// Timeout value
-    ACE_Time_Value * timeout_;
-
-  };
-}  // End namespace CORBA
-
-namespace TAO
-{
-  namespace ORB
-  {
-    /// Initialize the ORB globals correctly, i.e., only when they
-    /// haven't been initialized yet.
-    void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
-  }
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORB_H */
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
deleted file mode 100644
index 16a9d6be7e6..00000000000
--- a/TAO/tao/ORB.i
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-// ---------------------------------------------------------------------------
-//  ORB specific
-// ---------------------------------------------------------------------------
-
-ACE_INLINE CORBA::ULong
-CORBA::ORB::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
-                    guard, 
-                    lock_, 
-                    0);
-  return ++this->refcount_;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::ORB::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB::_duplicate (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    {
-      obj->_incr_refcnt ();
-    }
-
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE void
-CORBA::ORB::_use_omg_ior_format (CORBA::Boolean ior)
-{
-  this->use_omg_ior_format_ = ior;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::ORB::_use_omg_ior_format (void)
-{
-  return this->use_omg_ior_format_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-CORBA::ORB::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-// ************************************************************
-// These are in CORBA namespace
-// ************************************************************
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::ORB_ptr obj)
-{
-  return obj == CORBA::ORB::_nil ();
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::ORB_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_decr_refcnt ();
-}
-
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
deleted file mode 100644
index a288a2f72ac..00000000000
--- a/TAO/tao/ORBInitInfo.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-// $Id$
-
-#include "ORBInitInfo.h"
-#include "ORB_Core.h"
-#include "ORB.h"
-#include "CodecFactory.h"
-#include "SystemException.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-ACE_RCSID (TAO,
-           ORBInitInfo,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "ORBInitInfo.inl"
-#endif /* defined INLINE */
-
-#include "ace/OS_NS_string.h"
-
-// Traits specializations for TAO_ORBInitInfo.
-
-TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate (
-    TAO_ORBInitInfo_ptr p
-  )
-{
-  return TAO_ORBInitInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<TAO_ORBInitInfo>::release (
-    TAO_ORBInitInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void)
-{
-  return TAO_ORBInitInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<TAO_ORBInitInfo>::marshal (
-    TAO_ORBInitInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
-                                  int  argc ,
-                                  char *argv[])
-  : orb_core_ (orb_core),
-    argc_ (argc),
-    argv_ (argv),
-    codec_factory_ (),
-    slot_count_ (0)
-{
-}
-
-TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
-{
-}
-
-CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // In accordance with the C++ mapping for sequences, it is up to the
-  // caller to deallocate storage for returned sequences.
-
-  CORBA::StringSeq *args = 0;
-  ACE_NEW_THROW_EX (args,
-                    CORBA::StringSeq,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::StringSeq_var safe_args (args);
-
-  // Copy the argument vector to the string sequence.
-
-  args->length (this->argc_);   // Not a problem if argc is zero.
-  for (int i = 0; i < this->argc_; ++i)
-    (*args)[i] = CORBA::string_dup (this->argv_[i]);
-
-  return safe_args._retn ();
-}
-
-char *
-TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // In accordance with the C++ mapping for strings, return a copy.
-
-  return CORBA::string_dup (this->orb_core_->orbid ());
-}
-
-IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (CORBA::is_nil (this->codec_factory_.in ()))
-    {
-      // A new instance must be allocated since the application code
-      // may have registered an ORBInitializer that requires a
-      // CodecFactory before the CodecFactory is itself registered
-      // with the ORB.
-      IOP::CodecFactory_ptr codec_factory;
-      ACE_NEW_THROW_EX (codec_factory,
-                        TAO_CodecFactory (this->orb_core_),
-                          CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                              0,
-                              ENOMEM),
-                            CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
-
-      this->codec_factory_ = codec_factory;
-    }
-
-  return IOP::CodecFactory::_duplicate (this->codec_factory_.in ());
-}
-
-void
-TAO_ORBInitInfo::register_initial_reference (
-    const char * id,
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::InvalidName))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ());
-
-  TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
-
-  table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object_ptr
-TAO_ORBInitInfo::resolve_initial_references (
-    const char * id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::InvalidName))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (),
-                      CORBA::Object::_nil ());
-
-  // The ORB is practically fully initialized by the time this point
-  // is reached so just use the ORB's resolve_initial_references()
-  // mechanism.
-  return
-    this->orb_core_->orb ()->resolve_initial_references (id
-                                                          ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_ORBInitInfo::add_client_request_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
-{
-# if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core_->add_interceptor (interceptor
-                                     ACE_ENV_ARG_PARAMETER);
-#else
-  ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-void
-TAO_ORBInitInfo::add_server_request_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
-{
-# if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core_->add_interceptor (interceptor
-                                     ACE_ENV_ARG_PARAMETER);
-
-#else
-  ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA::SystemException::_tao_minor_code (
-                 0,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-void
-TAO_ORBInitInfo::add_ior_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ORBInitInfo::DuplicateName))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_core_->add_interceptor (interceptor
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-#if TAO_HAS_INTERCEPTORS == 1
-  // No need to acquire a lock.  This only gets called during ORB
-  // initialization.  ORB initialization is already atomic.
-  return this->slot_count_++;
-#else
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-void
-TAO_ORBInitInfo::register_policy_factory (
-    CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_PolicyFactory_Registry *registry =
-    this->orb_core_->policy_factory_registry ();
-
-  registry->register_policy_factory (type,
-                                     policy_factory
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-size_t
-TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  size_t slot_id = 0;
-
-  const int result = this->orb_core_->add_tss_cleanup_func (cleanup,
-                                                            slot_id);
-
-  if (result != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          0,
-                          errno),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  return slot_id;
-}
-
-void
-TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->orb_core_ == 0)
-    {
-      // As defined by the Portable Interceptor specification, throw a
-      // CORBA::OBJECT_NOT_EXIST exception after CORBA::ORB_init() has
-      // completed.  CORBA::ORB_init() sets the ORB core pointer in
-      // this instance to zero when it is done initializing the ORB,
-      // which is why we base "existence" on the validity of the ORB
-      // core pointer.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
-    }
-}
-
-TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TAO_ORBInitInfo::_nil ();
-    }
-
-  TAO_ORBInitInfo_ptr proxy =
-    dynamic_cast<TAO_ORBInitInfo_ptr> (_tao_objref);
-
-  return TAO_ORBInitInfo::_duplicate (proxy);
-}
-
-TAO_ORBInitInfo_ptr
-TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-const char* TAO_ORBInitInfo::_interface_repository_id (void) const
-{
-  return "IDL:TAO_ORBInitInfo:1.0";
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Objref_Var_T<TAO_ORBInitInfo>;
-template class TAO_Objref_Out_T<TAO_ORBInitInfo>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Objref_Var_T<TAO_ORBInitInfo>
-# pragma instantiate TAO_Objref_Out_T<TAO_ORBInitInfo>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
deleted file mode 100644
index 01a7385f4e0..00000000000
--- a/TAO/tao/ORBInitInfo.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ORBInitInfo.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_ORB_INIT_INFO_H
-#define TAO_ORB_INIT_INFO_H
-
-#include /**/ "ace/pre.h"
-
-#include "ORBInitInfoC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-class TAO_ORB_Core;
-class TAO_ORBInitInfo;
-typedef TAO_ORBInitInfo *TAO_ORBInitInfo_ptr;
-
-typedef TAO_Objref_Var_T<TAO_ORBInitInfo>
-                         TAO_ORBInitInfo_var;
-
-typedef TAO_Objref_Out_T<TAO_ORBInitInfo>
-                         TAO_ORBInitInfo_out;
-
-/**
- * @class TAO_ORBInitInfo
- *
- * @brief An implementation of the PortableInterceptor::ORBInitInfo
- *        interface.
- *
- * This class encapsulates the data passed to ORBInitializers during
- * ORB initialization.
- */
-class TAO_Export TAO_ORBInitInfo
-  : public virtual PortableInterceptor::ORBInitInfo,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
-                   int argc,
-                   char *argv[]);
-
-  /**
-   * @name PortableInterceptor::ORBInitInfo Methods
-   *
-   * These methods are exported by the
-   * PortableInterceptor::ORBInitInfo interface.
-   */
-  //@{
-  /// Return the argument vector for the ORB currently being
-  /// initialized as a string sequence.
-  virtual CORBA::StringSeq * arguments (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the ORBid for the ORB currently being initialized.
-  virtual char * orb_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the CodecFactory for the ORB currently being
-  /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Register a mapping between a string and a corresponding object
-  /// reference with the ORB being initialized.
-  /**
-   * This method is particularly useful for registering references to
-   * local (locality constrained) objects.  Note that this method
-   * should be called in ORBInitializer::pre_init() so that the
-   * registered reference will be available to the
-   * resolve_initial_references() that may be called in the
-   * ORBInitializer::post_init() call.
-   */
-  virtual void register_initial_reference (
-      const char * id,
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
-
-  /// Obtain a reference to an object that may not yet be available
-  /// via the usual CORBA::ORB::resolve_initial_references() mechanism
-  /// since the ORB may not be fully initialized yet.
-  virtual CORBA::Object_ptr resolve_initial_references (
-      const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
-
-  /// Register a client request interceptor with the ORB currently
-  /// being initialized.
-  virtual void add_client_request_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
-
-  /// Register a server request interceptor with the ORB currently
-  /// being initialized.
-  virtual void add_server_request_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
-
-  /// Register an IOR interceptor with the ORB currently being
-  /// initialized.
-  virtual void add_ior_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
-
-  /// Reserve a slot in table found within the
-  /// PortableInterceptor::Current object.
-  virtual PortableInterceptor::SlotId allocate_slot_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Register a policy factory of the given policy type with the ORB
-  /// currently being initialized.
-  virtual void register_policy_factory (
-      CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  //@}
-
-  /**
-   * @name TAO Extensions
-   *
-   * These methods are not part of the PortableInterceptor
-   * specification, and are TAO-specific extensions.
-   */
-  //@{
-  /// Allocate a slot in the ORB's TSS resources.
-  /**
-   * TAO uses a single TSS key for these resources, so it is useful to
-   * place TSS objects in TAO's TSS resources on platforms where the
-   * number of TSS keys is low.  The returned SlotId can be used to
-   * index into the array stored in ORB's TSS resources structure.
-   * @par
-   * An accompanying cleanup function (e.g. a TSS destructor) can also
-   * be registered.
-   */
-  size_t allocate_tss_slot_id (
-      ACE_CLEANUP_FUNC cleanup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return a pointer to the ORB Core associated with the ORB being
-  /// initialized.
-  /**
-   * The ORB Core is essentialy fully initialized by the time
-   * ORBInitializer::post_init() is invoked.  As such, it is generally
-   * best if this method is used in that method.
-   *
-   * @note Only use this method if you know what you are doing.
-   */
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Invalidate this ORBInitInfo instance.
-  /**
-   * @note This method is only meant to be called by the
-   *       CORBA::ORB_init() function.
-   */
-  void invalidate (void);
-
-  /// Return the number of allocated slots in for the PICurrent
-  /// object.
-  PortableInterceptor::SlotId slot_count (void) const;
-  //@}
-
-  /**
-   * @name Reference Related Methods
-   *
-   * TAO_ORBInitInfo-specific methods and types.
-   */
-  //@{
-  typedef TAO_ORBInitInfo_ptr _ptr_type;
-  typedef TAO_ORBInitInfo_var _var_type;
-
-  static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
-
-  static TAO_ORBInitInfo_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-  static TAO_ORBInitInfo_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-  static TAO_ORBInitInfo_ptr _nil (void)
-    {
-      return (TAO_ORBInitInfo_ptr)0;
-    }
-  //@}
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-
-  /// Destructor is protected to enforce proper memory management
-  /// through the reference counting mechanism.
-  ~TAO_ORBInitInfo (void);
-
-  /// Check if this ORBInitInfo instance is valid.  Once post_init()
-  /// has been called on each of the ORBInitializers, this ORBInitInfo
-  /// is no longer valid.  Throw an exception in that case.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  TAO_ORBInitInfo (const TAO_ORBInitInfo &);
-  void operator= (const TAO_ORBInitInfo &);
-
-private:
-
-  /// Reference to the ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// The number of arguments in the argument vector passed to
-  /// CORBA::ORB_init().
-  int argc_;
-
-  /// The argument vector passed to CORBA::ORB_init().
-  char **argv_;
-
-  /// Reference to the CodecFactory returned by
-  /// ORBInitInfo::codec_factory().
-  IOP::CodecFactory_var codec_factory_;
-
-  /// The number of allocated slots.
-  PortableInterceptor::SlotId slot_count_;
-
-};
-
-// Traits specializations.
-namespace TAO
-{
-  // Hand crafted. Not forward declared, but used by PortableServer.
-  template<>
-  struct TAO_Export Objref_Traits<TAO_ORBInitInfo>
-  {
-    static TAO_ORBInitInfo_ptr duplicate (
-        TAO_ORBInitInfo_ptr
-      );
-    static void release (
-        TAO_ORBInitInfo_ptr
-      );
-    static TAO_ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        TAO_ORBInitInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "ORBInitInfo.inl"
-#endif  /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORB_INIT_INFO_H */
diff --git a/TAO/tao/ORBInitInfo.inl b/TAO/tao/ORBInitInfo.inl
deleted file mode 100644
index bb8d32ed135..00000000000
--- a/TAO/tao/ORBInitInfo.inl
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORBInitInfo::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE void
-TAO_ORBInitInfo::invalidate (void)
-{
-  this->orb_core_ = 0;
-}
-
-ACE_INLINE PortableInterceptor::SlotId
-TAO_ORBInitInfo::slot_count (void) const
-{
-  return this->slot_count_;
-}
diff --git a/TAO/tao/ORBInitInfo.pidl b/TAO/tao/ORBInitInfo.pidl
deleted file mode 100644
index 58281e6fa0d..00000000000
--- a/TAO/tao/ORBInitInfo.pidl
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ORBInitInfo.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the ORBInitInfo
- *
- * This file was used to generate the code in ORBInitInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ORBInitInfo.pidl
- */
-
-#ifndef _ORBINITINFO_PIDL_
-#define _ORBINITINFO_PIDL_
-
-#include <StringSeq.pidl>
-#include <IOP_Codec.pidl>
-#include <PI_Forward.pidl>
-#include <Policy.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ClientRequestInterceptor;
-  local interface ServerRequestInterceptor;
-  local interface IORInterceptor;
-  local interface PolicyFactory;
-
-  local interface ORBInitInfo
-  {
-    typedef string ObjectId;
-
-    exception DuplicateName
-    {
-      string name;
-    };
-
-    exception InvalidName {};
-
-    readonly attribute CORBA::StringSeq arguments;
-    readonly attribute string orb_id;
-    readonly attribute IOP::CodecFactory codec_factory;
-
-    void register_initial_reference (in ObjectId id, in Object obj)
-      raises (InvalidName);
-    Object resolve_initial_references (in ObjectId id)
-      raises (InvalidName);
-    void add_client_request_interceptor (
-      in ClientRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_server_request_interceptor (
-      in ServerRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_ior_interceptor (in IORInterceptor interceptor)
-      raises (DuplicateName);
-    SlotId allocate_slot_id ();
-    void register_policy_factory (
-      in CORBA::PolicyType type,
-      in PolicyFactory policy_factory);
-  };
-};
-
-#endif  /* _ORBINITINFO_PIDL_ */
diff --git a/TAO/tao/ORBInitInfoA.cpp b/TAO/tao/ORBInitInfoA.cpp
deleted file mode 100644
index 76a41ed6f19..00000000000
--- a/TAO/tao/ORBInitInfoA.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ORBInitInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_string);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
-  {
-    { "name", &CORBA::_tc_string }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-    "DuplicateName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
-    1);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
-    "InvalidName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
-    "ORBInitInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
-    &_tao_tc_PortableInterceptor_ORBInitInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
-    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::DuplicateName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::InvalidName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ORBInitInfoC.cpp b/TAO/tao/ORBInitInfoC.cpp
deleted file mode 100644
index c110e5d0220..00000000000
--- a/TAO/tao/ORBInitInfoC.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ORBInitInfoC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ORBInitInfo.
-
-PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate (
-    PortableInterceptor::ORBInitInfo_ptr p
-  )
-{
-  return PortableInterceptor::ORBInitInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
-    PortableInterceptor::ORBInitInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
-{
-  return PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
-    PortableInterceptor::ORBInitInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-        "DuplicateName"
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
-{
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName&
-PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
-  return *this;
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DuplicateName *_tao_tmp_pointer =
-    static_cast<DuplicateName *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<DuplicateName *> (_tao_excp);
-}
-
-const PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const DuplicateName *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
-    const char * _tao_name
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-        "DuplicateName"
-      )
-{
-  this->name = CORBA::string_dup (_tao_name);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
-        "InvalidName"
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName&
-PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidName *_tao_tmp_pointer =
-    static_cast<InvalidName *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidName *> (_tao_excp);
-}
-
-const PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidName *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
-}
-
-PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
-{}
-
-PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
-{}
-
-void 
-PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitInfo *_tao_tmp_pointer =
-    static_cast<ORBInitInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitInfo::_nil ();
-    }
-  
-  ORBInitInfo_ptr proxy =
-    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-  
-  return ORBInitInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitInfo::_nil ();
-    }
-  
-  ORBInitInfo_ptr proxy =
-    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-  
-  return ORBInitInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ORBInitInfoC.h b/TAO/tao/ORBInitInfoC.h
deleted file mode 100644
index 1ebabfa85d2..00000000000
--- a/TAO/tao/ORBInitInfoC.h
+++ /dev/null
@@ -1,561 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ORBINITINFOC_H_
-#define _TAO_IDL_ORIG_ORBINITINFOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/StringSeqC.h"
-#include "tao/IOP_CodecC.h"
-#include "tao/PI_ForwardC.h"
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
-  class ClientRequestInterceptor;
-  typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ClientRequestInterceptor
-      >
-    ClientRequestInterceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ClientRequestInterceptor
-      >
-    ClientRequestInterceptor_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
-  class ServerRequestInterceptor;
-  typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServerRequestInterceptor
-      >
-    ServerRequestInterceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServerRequestInterceptor
-      >
-    ServerRequestInterceptor_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-  
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IORInterceptor
-      >
-    IORInterceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IORInterceptor
-      >
-    IORInterceptor_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-  
-  class PolicyFactory;
-  typedef PolicyFactory *PolicyFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PolicyFactory
-      >
-    PolicyFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PolicyFactory
-      >
-    PolicyFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
-  
-  class ORBInitInfo;
-  typedef ORBInitInfo *ORBInitInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-  
-  class TAO_Export ORBInitInfo
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef ORBInitInfo_ptr _ptr_type;
-    typedef ORBInitInfo_var _var_type;
-    
-    // The static operations.
-    static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-    
-    static void _tao_release (ORBInitInfo_ptr obj);
-    
-    static ORBInitInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ORBInitInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ORBInitInfo_ptr _nil (void)
-    {
-      return static_cast<ORBInitInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
-    
-    typedef char * ObjectId;
-    typedef CORBA::String_var ObjectId_var;
-    typedef CORBA::String_out ObjectId_out;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ObjectId;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-    
-    class TAO_Export DuplicateName : public CORBA::UserException
-    {
-    public:
-      
-      TAO_String_Manager name;
-      DuplicateName (void);
-      DuplicateName (const DuplicateName &);
-      ~DuplicateName (void);
-
-      DuplicateName &operator= (const DuplicateName &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static DuplicateName *_downcast (CORBA::Exception *);
-      static const DuplicateName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-      
-      DuplicateName (
-          const char * _tao_name
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_DuplicateName;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-    
-    class TAO_Export InvalidName : public CORBA::UserException
-    {
-    public:
-      
-      InvalidName (void);
-      InvalidName (const InvalidName &);
-      ~InvalidName (void);
-
-      InvalidName &operator= (const InvalidName &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static InvalidName *_downcast (CORBA::Exception *);
-      static const InvalidName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_InvalidName;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::StringSeq * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * orb_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::CodecFactory_ptr codec_factory (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void register_initial_reference (
-        const char * id,
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::InvalidName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr resolve_initial_references (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::InvalidName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_client_request_interceptor (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_server_request_interceptor (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_interceptor (
-        ::PortableInterceptor::IORInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::SlotId allocate_slot_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void register_policy_factory (
-        ::CORBA::PolicyType type,
-        ::PortableInterceptor::PolicyFactory_ptr policy_factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ORBInitInfo (void);
-    
-    virtual ~ORBInitInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ORBInitInfo (const ORBInitInfo &);
-    
-    void operator= (const ORBInitInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
-  {
-    static ::PortableInterceptor::ORBInitInfo_ptr duplicate (
-        ::PortableInterceptor::ORBInitInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ORBInitInfo_ptr
-      );
-    static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ORBInitInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ORBInitInfoS.h b/TAO/tao/ORBInitInfoS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ORBInitInfoS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ORBInitializer.pidl b/TAO/tao/ORBInitializer.pidl
deleted file mode 100644
index 7a79e766eb9..00000000000
--- a/TAO/tao/ORBInitializer.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ORBInitializer.pidl
- *
- * $Id$
- *
- * @brief ORBInitializer part of the PortableInterceptor part of the CORBA
- * spec
- *
- * This file was used to generate the code in ORBInitializerC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ORBInitializer.pidl
- *
- */
-
-#ifndef _ORB_INITIALIZER_PIDL
-#define _ORB_INITIALIZER_PIDL
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ORBInitInfo;
-
-  local interface ORBInitializer
-  {
-    void pre_init (in ORBInitInfo info);
-    void post_init (in ORBInitInfo info);
-  };
-
-};
-
-#endif  /* _ORB_INITIALIZER_PIDL */
diff --git a/TAO/tao/ORBInitializerA.cpp b/TAO/tao/ORBInitializerA.cpp
deleted file mode 100644
index e2349bb574e..00000000000
--- a/TAO/tao/ORBInitializerA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ORBInitializerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitializer (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
-    "ORBInitializer");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
-    &_tao_tc_PortableInterceptor_ORBInitializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
-    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitializer::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitializer,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitializer::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitializer,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ORBInitializerC.cpp b/TAO/tao/ORBInitializerC.cpp
deleted file mode 100644
index 852187e9957..00000000000
--- a/TAO/tao/ORBInitializerC.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ORBInitializerC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ORBInitializer.
-
-PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate (
-    PortableInterceptor::ORBInitializer_ptr p
-  )
-{
-  return PortableInterceptor::ORBInitializer::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
-    PortableInterceptor::ORBInitializer_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void)
-{
-  return PortableInterceptor::ORBInitializer::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
-    PortableInterceptor::ORBInitializer_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ORBInitializer::ORBInitializer (void)
-{}
-
-PortableInterceptor::ORBInitializer::~ORBInitializer (void)
-{}
-
-void 
-PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitializer *_tao_tmp_pointer =
-    static_cast<ORBInitializer *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitializer::_nil ();
-    }
-  
-  ORBInitializer_ptr proxy =
-    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-  
-  return ORBInitializer::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitializer::_nil ();
-    }
-  
-  ORBInitializer_ptr proxy =
-    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-  
-  return ORBInitializer::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitializer::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ORBInitializerC.h b/TAO/tao/ORBInitializerC.h
deleted file mode 100644
index b50ee32c7d2..00000000000
--- a/TAO/tao/ORBInitializerC.h
+++ /dev/null
@@ -1,260 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ORBINITIALIZERC_H_
-#define _TAO_IDL_ORIG_ORBINITIALIZERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
-  
-  class ORBInitInfo;
-  typedef ORBInitInfo *ORBInitInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
-  
-  class ORBInitializer;
-  typedef ORBInitializer *ORBInitializer_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitializer
-      >
-    ORBInitializer_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ORBInitializer
-      >
-    ORBInitializer_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
-  
-  class TAO_Export ORBInitializer
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef ORBInitializer_ptr _ptr_type;
-    typedef ORBInitializer_var _var_type;
-    
-    // The static operations.
-    static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-    
-    static void _tao_release (ORBInitializer_ptr obj);
-    
-    static ORBInitializer_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ORBInitializer_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ORBInitializer_ptr _nil (void)
-    {
-      return static_cast<ORBInitializer_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void pre_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void post_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ORBInitializer (void);
-    
-    virtual ~ORBInitializer (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ORBInitializer (const ORBInitializer &);
-    
-    void operator= (const ORBInitializer &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
-  {
-    static ::PortableInterceptor::ORBInitializer_ptr duplicate (
-        ::PortableInterceptor::ORBInitializer_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ORBInitializer_ptr
-      );
-    static ::PortableInterceptor::ORBInitializer_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ORBInitializer_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ORBInitializerS.h b/TAO/tao/ORBInitializerS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ORBInitializerS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
deleted file mode 100644
index 7a9bb00e595..00000000000
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "ORBInitializer_Registry.h"
-#include "PortableInterceptorC.h"
-#include "ORB.h"
-#include "TAO_Singleton.h"
-#include "ORB_Constants.h"
-#include "TAO_Singleton_Manager.h"
-#include "SystemException.h"
-
-#include "ace/Static_Object_Lock.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           ORBInitializer_Registry,
-           "$Id$")
-
-
-// ****************************************************************
-
-void
-PortableInterceptor::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init
-  ACE_ENV_ARG_DECL)
-{
-  {
-    // Using ACE_Static_Object_Lock::instance() precludes
-    // register_orb_initializer() from being called within a static
-    // object CTOR.
-    ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX,
-                       guard,
-                       *ACE_Static_Object_Lock::instance ()));
-
-    // Make sure TAO's singleton manager is initialized.
-    if (TAO_Singleton_Manager::instance ()->init () == -1)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) register_orb_initializer: ")
-                    ACE_TEXT ("Unable to pre-initialize TAO\n")));
-      }
-
-    TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  // Make sure the following is done after the global ORB
-  // initialization since we need to have exceptions initialized.
-
-  TAO::ORBInitializer_Registry::instance ()->register_orb_initializer (
-    init
-    ACE_ENV_ARG_PARAMETER);
-}
-
-// ------------------------------------------------------------------
-
-TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
-  : lock_ (),
-    initializers_ ()
-{
-}
-
-void
-TAO::ORBInitializer_Registry::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init
-  ACE_ENV_ARG_DECL)
-{
-  if (!CORBA::is_nil (init))
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX,
-                 guard,
-                 this->lock_);
-
-      // Increase the length of the ORBInitializer array by one.
-      size_t const cur_len = this->initializers_.size ();
-      size_t const new_len = cur_len + 1;
-      if (this->initializers_.size (new_len) != 0)
-        ACE_THROW (CORBA::INTERNAL ());
-
-      // Add the given ORBInitializer to the sequence.
-      this->initializers_[cur_len] =
-        PortableInterceptor::ORBInitializer::_duplicate (init);
-    }
-  else
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   0,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
-}
-
-void
-TAO::ORBInitializer_Registry::pre_init (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->lock_);
-
-  size_t const initializer_count (this->initializers_.size ());
-  for (size_t i = 0; i < initializer_count; ++i)
-    {
-      this->initializers_[i]->pre_init (info
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO::ORBInitializer_Registry::post_init (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->lock_);
-
-  size_t const initializer_count (this->initializers_.size ());
-  for (size_t i = 0; i < initializer_count; ++i)
-    {
-      this->initializers_[i]->post_init (info
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-TAO::ORBInitializer_Registry *
-TAO::ORBInitializer_Registry::instance (void)
-{
-  return
-    TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>::instance ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
-template class ACE_Array_Base<PortableInterceptor::ORBInitializer_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_var>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-
-template TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORBInitializer_Registry, TAO_SYNCH_MUTEX>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
deleted file mode 100644
index 58b4c1f8376..00000000000
--- a/TAO/tao/ORBInitializer_Registry.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ORBInitializer_Registry.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_ORB_INITIALIZER_REGISTRY_H
-#define TAO_ORB_INITIALIZER_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Array_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "CORBA_methods.h"
-#include "Objref_VarOut_T.h"
-#include "Environment.h"
-#include "default_environment.h"
-
-#include "ace/Thread_Mutex.h"
-
-namespace PortableInterceptor
-{
-  class ORBInitializer;
-  typedef ORBInitializer *ORBInitializer_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitializer
-      >
-    ORBInitializer_var;
-
-  class ORBInitInfo;
-  typedef ORBInitInfo *ORBInitInfo_ptr;
-
-  /// Register an ORBInitializer with the global ORBInitializer
-  /// table.
-  TAO_Export void register_orb_initializer (
-      ORBInitializer_ptr init
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-}
-
-namespace TAO
-{
-  /**
-   * @class ORBInitializer_Registry
-   *
-   * @brief Global list that contains all portable interceptor ORB
-   *        initializers.
-   *
-   * @note This class should be instantiated via its instance()
-   *       method.  Normally this would be enforced by making the
-   *       constructor protected but that forces a friend declaration
-   *       containing a template type (TAO_Singleton) with a static
-   *       member to be introduced.  In turn, this potentially
-   *       introduces problems in MS Windows DLL environments due to
-   *       the occurance of multiple singleton instances.  There
-   *       should only be one!
-   */
-  class ORBInitializer_Registry
-  {
-#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4)
-    // Workaround for g++ (version 2.9-gnupro-98r2) on LynxOS 3.x which has
-    // problems with friend declarations in namespaces 
-    friend void register_orb_initializer (
-        PortableInterceptor::ORBInitializer_ptr init
-        ACE_ENV_ARG_DECL);
-
-    friend CORBA::ORB_ptr ORB_init (int &,
-                                    char *argv[],
-                                    const char *,
-                                    CORBA::Environment &);
-#else
-    friend void PortableInterceptor::register_orb_initializer (
-                  PortableInterceptor::ORBInitializer_ptr init
-                  ACE_ENV_ARG_DECL);
-
-    friend CORBA::ORB_ptr CORBA::ORB_init (int &,
-                                           char *argv[],
-                                           const char *,
-                                           CORBA::Environment &);
-#endif /* (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) */
-
-  public:
-
-    /// Only allow this class to be instantiated as a singleton
-    /// instance, so declare the constructor as protected.
-    /**
-     * @note See the note in the class description for an explanation of
-     *       why this constructor is not protected.
-     */
-    ORBInitializer_Registry (void);
-
-  protected:
-
-    /// Register an ORBInitializer with the underlying ORBInitializer
-    /// array.
-    void register_orb_initializer (PortableInterceptor::ORBInitializer_ptr init
-                                   ACE_ENV_ARG_DECL);
-
-    /// Begin initialization of all registered ORBInitializers before
-    /// the ORB itself is initialized.
-    void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                   ACE_ENV_ARG_DECL);
-
-    /// Complete initialization of all registered ORBInitializers after
-    /// the ORB has been initialized.
-    void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                    ACE_ENV_ARG_DECL);
-
-    /// Return a unique singleton instance.
-    static ORBInitializer_Registry * instance (void);
-
-  private:
-    // Prevent copying
-    ORBInitializer_Registry (const ORBInitializer_Registry &);
-    void operator= (const ORBInitializer_Registry &);
-
-  private:
-
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Dynamic array containing registered ORBInitializers.
-    ACE_Array_Base<PortableInterceptor::ORBInitializer_var> initializers_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORB_INITIALIZER_REGISTRY_H */
diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h
deleted file mode 100644
index 6e324f0f908..00000000000
--- a/TAO/tao/ORB_Constants.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file  ORB_Constants.h
- *
- *  $Id$
- *
- *  Constants needed by various files.
- *
- *  @author  Jeff Parsons
- *  @author  Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_ORB_CONSTANTS_H
-#define TAO_ORB_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// A hash define for the regular two way operation.
-#define TAO_TWOWAY_RESPONSE_FLAG 255
-
-namespace CORBA
-{
-  /// The OMG Vendor Minor Codeset ID (VMCID).
-  /**
-   * This number is reserved by the OMG as a prefix to all the
-   * standard system exception minor codes.  Check the CORBA/IIOP
-   * specification for details.
-   *
-   * OMG defined system exception minor codes should be logically
-   * OR-ed with this constant when passing such minor codes to a
-   * @c CORBA::SystemException constructor.  For example, throwing a
-   * @c CORBA::BAD_PARAM exception with an OMG defined minor code of
-   * @c 2 is done as follows:
-   *
-   * @verbatim
-   *   throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
-   * @endverbatim
-   *
-   * *NOT* as:
-   *
-   * @verbatim
-   *   throw (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO);
-   * @endverbatim
-   */
-  const ULong OMGVMCID = 0x4f4d0000U;
-}
-
-namespace TAO
-{
-  /// TAO Vendor Minor Codeset ID (VMCID).
-  /**
-   * TAO Vendor Minor Codeset ID (VMCID) assigned by the OMG.  Do
-   * *NOT* change at random.  The TAO VMCID is an ASCII representation
-   * of @c TA0xxxx (close enough since a VMCID only consists of the
-   * higher order 20 bits of a 32 bit unsigned long integer).  The
-   * first 16 bits are @c TA, and the remaining 4 are @c 0.
-   *
-   * @note Remember that we can only play with the lower order 12
-   *       bits.  @c MAX_MINOR_CODE is there to remind us of that.
-   *
-   * @see @c MAX_MINOR_CODE
-   */
-  const CORBA::ULong VMCID = 0x54410000U;
-
-  /// Maximum allowed TAO system exception minor code.
-  /**
-   * Vendors are only allowed to use the lower order 12 bits of their
-   * when defining vendor-specific exception minor codes.
-   * @c MAX_MINOR_CODE is the maximum minor code value available to
-   * TAO.  Do not exceed it when defining TAO system exception minor
-   * codes.
-   *
-   * @see @c VMCID
-   */
-  const CORBA::ULong MAX_MINOR_CODE = VMCID | 0xfffU;
-
-  /// TAO Vendor @c PolicyType Valueset ID (VPVID)
-  /**
-   * TAO Vendor @c PolicyType Valueset ID (VPVID) assigned by the
-   * OMG.  This value was automatically assigned when TAO's VMCID was
-   * assigned.  Its value is always the same as the VMCID.
-   *
-   * As with TAO-specific system exception minor codes, the
-   * TAO-specific @c PolicyType space occupies the lower order 12 bits
-   * of the TAO VPVID, i.e.
-   *
-   * @verbatim
-   *    TAO::VPVID <= TAO PolicyType <= TAO::VPVID | 0xfffU.
-   * @endverbatim
-   *
-   * For example, TAO-specific @c PolicyTypes should be defined by
-   * logically "OR-ing" a 12 bit or less (i.e. 0x0U <= value <=
-   * 0xfffU) value with @c TAO::VPVID.
-   *
-   * @see VMCID
-   */
-  const CORBA::ULong VPVID = VMCID;
-}
-
-/**
- * @name TAO-Specific System Exception Minor Code Values
- *
- * These system exception minor code values are specific to TAO.
- */
-//@{
-/// TAO VMCID assigned by the OMG.
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  /**
-   * @note This constant has historically been used in the wrong way.
-   *       It was often used as the @a location argument to the @c
-   *       CORBA::SystemException::_tao_minor_code() static method.  A
-   *       more appropriate default @a location argument/value would
-   *       have been zero since the location code resides in portion of
-   *       the lower order 12 bits, not the higher order 20 bits which
-   *       is where the VMCID resides, and what this value happens to
-   *       be.
-   *
-   * @deprecated Please use @c TAO::VMCID instead, or zero if being used
-   *             as default TAO exception location code argument.
-   *
-   * @see @c TAO::VMCID
-   */
-  const CORBA::ULong TAO_DEFAULT_MINOR_CODE = TAO::VMCID;
-#endif /* !ACE_LACKS_DEPRECATED_MACROS */
-
-#if !defined (ACE_LACKS_DEPRECATED_MACROS)
-  /// Maximum allowed system exception minor code.
-  /**
-   * @deprecated Please use @c TAO::MAX_MINOR_CODE instead.
-   *
-   * @see @c TAO::MAX_MINOR_CODE
-   */
-  const CORBA::ULong TAO_MAX_MINOR_CODE = TAO::MAX_MINOR_CODE;
-#endif /* !ACE_LACKS_DEPRECATED_MACROS */
-//@}
-
-/// A dummy service context that is inserted in the service context
-/// list to preserve the alignment in DSI based gateways, so no
-/// marshaling/demarshaling is required.
-/**
- * @note This is *extremely* brittle but works.
- */
-const CORBA::ULong TAO_SVC_CONTEXT_ALIGN = 0x54414f00U;
-
-/**
- * @name TAO-Specific Profile IDs
- *
- * The TAO @c IOP::ProfileId range @c 0x54414f00 - @c 0x54414f0f has
- * been reserved with the OMG.
- *
- * @note It is *NOT* necessary to list your own protocols here.
- *
- * @note The values below are subject to change at any point.
- */
-//@{
-/// Local IPC (Unix Domain)
-const CORBA::ULong TAO_TAG_UIOP_PROFILE = 0x54414f00U;
-
-/// ATM/AAL5
-// const CORBA::ULong TAO_TAG_AIOP_PROFILE = 0x54414f01U;
-
-/// Shared memory
-const CORBA::ULong TAO_TAG_SHMEM_PROFILE = 0x54414f02U;
-
-/// Message Queue
-// const CORBA::ULong TAO_TAG_MSGQ_PROFILE = 0x54414f03U;
-
-/// UDP
-const CORBA::ULong TAO_TAG_DIOP_PROFILE = 0x54414f04U;
-
-/// Unreliable IP Multicast
-const CORBA::ULong TAO_TAG_UIPMC_PROFILE = 0x54414f0CU;
-
-/// SCIOP
-const CORBA::ULong TAO_TAG_SCIOP_PROFILE = 0x54414f0EU;
-
-/// Tandem (HP) File System Protocol
-const CORBA::ULong TAO_TAG_NSKFS_PROFILE = 0x00003039U;
-
-/// Tandem (HP) Pathsend Protocol
-const CORBA::ULong TAO_TAG_NSKPW_PROFILE = 0x0000303AU;
-
-// Default DiffServ CodePoint.
-const int IPDSFIELD_DSCP_DEFAULT = 0x00;
-
-/**
- * @name Minor Code Encoding
- *
- * Encode the location in 5 bits, and the errno in 7 bits:
- *
- * @verbatim
- * 0x   0101 0100   0100 0001   0000   ____ _     ___ ____
- *          T           A        0    location      errno
- * @endverbatim
- **/
-//@{
-/**
- * @name Location Encoding
- *
- * The location encoding is the 5 bits, after the @ errno encoding.
- */
-//@{
-const CORBA::ULong TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE = (0x01U << 7);
-const CORBA::ULong TAO_INVOCATION_SEND_REQUEST_MINOR_CODE     = (0x02U << 7);
-const CORBA::ULong TAO_POA_DISCARDING                         = (0x03U << 7);
-const CORBA::ULong TAO_POA_HOLDING                            = (0x04U << 7);
-const CORBA::ULong TAO_UNHANDLED_SERVER_CXX_EXCEPTION         = (0x05U << 7);
-const CORBA::ULong TAO_INVOCATION_RECV_REQUEST_MINOR_CODE     = (0x06U << 7);
-const CORBA::ULong TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL  = (0x07U << 7);
-const CORBA::ULong TAO_MPROFILE_CREATION_ERROR                = (0x08U << 7);
-const CORBA::ULong TAO_TIMEOUT_CONNECT_MINOR_CODE             = (0x09U << 7);
-const CORBA::ULong TAO_TIMEOUT_SEND_MINOR_CODE                = (0x0AU << 7);
-const CORBA::ULong TAO_TIMEOUT_RECV_MINOR_CODE                = (0x0BU << 7);
-const CORBA::ULong TAO_IMPLREPO_MINOR_CODE                    = (0x0CU << 7);
-const CORBA::ULong TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE   = (0x0DU << 7);
-const CORBA::ULong TAO_ORB_CORE_INIT_LOCATION_CODE            = (0x0EU << 7);
-const CORBA::ULong TAO_POLICY_NARROW_CODE                     = (0x0FU << 7);
-const CORBA::ULong TAO_GUARD_FAILURE                          = (0x10U << 7);
-const CORBA::ULong TAO_POA_BEING_DESTROYED                    = (0x11U << 7);
-const CORBA::ULong TAO_POA_INACTIVE                           = (0x12U << 7);
-const CORBA::ULong TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE  = (0x13U << 7);
-const CORBA::ULong TAO_AMH_REPLY_LOCATION_CODE                = (0x14U << 7);
-const CORBA::ULong TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE  = (0x15U << 7);
-// *Don't* use TAO_<location>_MINOR_CODE greater than 0x1FU!
-//@}
-//@}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_ORB_CONSTANTS_H */
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
deleted file mode 100644
index 15e3f8ff33b..00000000000
--- a/TAO/tao/ORB_Core.cpp
+++ /dev/null
@@ -1,3000 +0,0 @@
-// $Id$
-
-#include "ORB_Core.h"
-#include "ORB_Table.h"
-#include "TAO_Internal.h"
-#include "default_server.h"
-#include "Profile.h"
-#include "Stub.h"
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "LF_Event_Loop_Thread_Helper.h"
-#include "Connector_Registry.h"
-#include "Sync_Strategies.h"
-#include "Object_Loader.h"
-#include "ObjectIdListC.h"
-#include "BiDir_Adapter.h"
-#include "Collocation_Resolver.h"
-#include "Flushing_Strategy.h"
-#include "Request_Dispatcher.h"
-#include "Stub_Factory.h"
-#include "Thread_Lane_Resources.h"
-#include "Thread_Lane_Resources_Manager.h"
-#include "TSS_Resources.h"
-#include "Protocols_Hooks.h"
-#include "IORInterceptor_Adapter.h"
-#include "IORInterceptor_Adapter_Factory.h"
-#include "debug.h"
-#include "TAOC.h"
-#include "Endpoint_Selector_Factory.h"
-#include "Client_Strategy_Factory.h"
-#include "Adapter_Factory.h"
-#include "Adapter.h"
-#include "GUIResource_Factory.h"
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-# include "ClientRequestInfo.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1  */
-
-#include "ace/Reactor.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/Static_Object_Lock.h"
-
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-// Needed to set ACE_LOG_MSG::msg_ostream()
-// FUZZ: disable check_for_streams_include
-#  include "ace/streams.h"
-#endif /* !ACE_LACKS_IOSTREAM_TOTALLY */
-
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "ORB_Core.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           ORB_Core,
-           "$Id$")
-
-// ****************************************************************
-
-CORBA::Environment&
-TAO_default_environment (void)
-{
-  return *TAO_TSS_RESOURCES::instance ()->default_environment_;
-}
-
-// ****************************************************************
-
-// Initialize instance_ to 0, since this is what we test for in the call
-// to instance ().  Note that this does not require a constructor call, so
-// it is always initialized by the time that instance () can be called.
-TAO_ORB_Core_Static_Resources* TAO_ORB_Core_Static_Resources::instance_ = 0;
-
-// Force an instance to be created at module initialization time,
-// since we do not want to worry about double checked locking and
-// the race condition to initialize the lock.
-TAO_ORB_Core_Static_Resources* TAO_ORB_Core_Static_Resources::initialization_reference_ =
-  TAO_ORB_Core_Static_Resources::instance ();
-
-TAO_ORB_Core_Static_Resources*
-TAO_ORB_Core_Static_Resources::instance (void)
-{
-  if (TAO_ORB_Core_Static_Resources::instance_ == 0)
-    {
-      // This new is never freed on purpose.  The data specified by
-      // it needs to be around for the last shared library that references
-      // this class.  This could occur in a destructor in a shared library
-      // that is unloaded after this one.  One solution to avoid this
-      // harmless memory leak would be to use reference counting.
-      ACE_NEW_RETURN (TAO_ORB_Core_Static_Resources::instance_,
-                      TAO_ORB_Core_Static_Resources (),
-                      0);
-    }
-
-  return TAO_ORB_Core_Static_Resources::instance_;
-}
-
-TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
-  : sync_scope_hook_ (0),
-    protocols_hooks_name_ ("Protocols_Hooks"),
-    timeout_hook_ (0),
-    connection_timeout_hook_ (0),
-    endpoint_selector_factory_name_ ("Default_Endpoint_Selector_Factory"),
-    thread_lane_resources_manager_factory_name_ ("Default_Thread_Lane_Resources_Manager_Factory"),
-    collocation_resolver_name_ ("Default_Collocation_Resolver"),
-    stub_factory_name_ ("Default_Stub_Factory"),
-    resource_factory_name_ ("Resource_Factory"),
-    dynamic_adapter_name_ ("Dynamic_Adapter"),
-    ifr_client_adapter_name_ ("IFR_Client_Adapter"),
-    typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
-    iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
-    valuetype_adapter_name_ ("Valuetype_Adapter"),
-    poa_factory_name_ ("TAO_Object_Adapter_Factory"),
-    poa_factory_directive_ ("dynamic TAO_Object_Adapter_Factory Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()")
-{
-}
-
-// ****************************************************************
-
-TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
-  : protocols_hooks_ (0),
-    lock_ (),
-    thread_lane_resources_manager_ (0),
-    collocation_resolver_ (0),
-    stub_factory_ (0),
-    protocol_factories_ (0),
-    implrepo_service_ (CORBA::Object::_nil ()),
-    use_implrepo_ (0),
-    imr_endpoints_in_ior_ (1),
-    typecode_factory_ (CORBA::Object::_nil ()),
-    dynany_factory_ (CORBA::Object::_nil ()),
-    ior_manip_factory_ (CORBA::Object::_nil ()),
-    ior_table_ (CORBA::Object::_nil ()),
-    orb_ (CORBA::ORB::_nil ()),
-    root_poa_ (),
-    orb_params_ (),
-    init_ref_map_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE),
-    object_ref_table_ (),
-    object_key_table_ (),
-    orbid_ (ACE_OS::strdup (orbid ? orbid : "")),
-    resource_factory_ (0),
-    client_factory_ (0),
-    server_factory_ (0),
-    opt_for_collocation_ (1),
-    use_global_collocation_ (1),
-    collocation_strategy_ (THRU_POA),
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-    policy_manager_ (0),
-    default_policies_ (0),
-    policy_current_ (0),
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-    poa_current_ (),
-    adapter_registry_ (this),
-    poa_adapter_ (0),
-    tm_ (),
-    tss_cleanup_funcs_ (),
-    tss_resources_ (),
-    has_shutdown_ (1),  // Start the ORB in a  "shutdown" state.  Only
-                        // after CORBA::ORB_init() is called will the
-                        // ORB no longer be shutdown.  This does not
-                        // mean that the ORB can be reinitialized.  It
-                        // can only be initialized once.
-    thread_per_connection_use_timeout_ (1),
-    open_lock_ (),
-    endpoint_selector_factory_ (0),
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-    eager_buffering_sync_strategy_ (0),
-    delayed_buffering_sync_strategy_ (0),
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-    transport_sync_strategy_ (0),
-    refcount_ (1),
-    policy_factory_registry_ (),
-#if (TAO_HAS_INTERCEPTORS == 1)
-    pi_current_ (0),
-    client_request_interceptors_ (),
-    server_request_interceptors_ (),
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    ior_interceptor_adapter_ (0),
-    valuetype_adapter_ (0),
-    parser_registry_ (),
-    bidir_adapter_ (0),
-    bidir_giop_policy_ (0),
-    flushing_strategy_ (0),
-    codeset_manager_ (0)
-{
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  ACE_NEW (this->eager_buffering_sync_strategy_,
-           TAO_Eager_Buffering_Sync_Strategy);
-
-  ACE_NEW (this->delayed_buffering_sync_strategy_,
-           TAO_Delayed_Buffering_Sync_Strategy);
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  ACE_NEW (this->policy_manager_,
-           TAO_Policy_Manager);
-
-  ACE_NEW (this->default_policies_,
-           TAO_Policy_Set (TAO_POLICY_ORB_SCOPE));
-
-  ACE_NEW (this->policy_current_,
-           TAO_Policy_Current);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  ACE_NEW (this->transport_sync_strategy_,
-           TAO_Transport_Sync_Strategy);
-
-  // Initialize the default request dispatcher.
-  ACE_NEW (this->request_dispatcher_,
-           TAO_Request_Dispatcher);
-}
-
-TAO_ORB_Core::~TAO_ORB_Core (void)
-{
-  delete this->thread_lane_resources_manager_;
-
-  delete this->flushing_strategy_;
-
-  ACE_OS::free (this->orbid_);
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  delete this->eager_buffering_sync_strategy_;
-  delete this->delayed_buffering_sync_strategy_;
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  CORBA::release (this->policy_manager_);
-  delete this->default_policies_;
-  CORBA::release (this->policy_current_);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  delete this->transport_sync_strategy_;
-
-  delete this->request_dispatcher_;
-
-  CORBA::release (this->orb_);
-}
-
-int
-TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
-{
-  // Right now, this code expects to begin parsing in argv[1] rather
-  // than argv[0].  I don't think that's wise.  I think we need to
-  // change that convention to argv[0] and let the initializing code
-  // make any necessary shifts.
-  //
-  // Parse arguments to the ORB.  Typically the ORB is passed
-  // arguments straight from the command line, so we will simply pass
-  // through them and respond to the ones we understand and ignore
-  // those we don't.
-  //
-  // In some instances, we may actually build another vector of
-  // arguments and stash it for use initializing other components such
-  // as the RootPOA.
-
-  // @@ GIOPLite should be an alternative ORB Messaging protocols, fredk
-  // int giop_lite = 0;
-
-  bool use_ior = true;
-  int cdr_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF;
-
-  // The following things should be changed to use the ACE_Env_Value<>
-  // template sometime.
-
-  // Name Service port use for Multicast
-  unsigned short ns_port = 0;
-
-  // Trading Service port used for Multicast
-  unsigned short ts_port = 0;
-
-  // Implementation Repository Service port #.
-  unsigned short ir_port = 0;
-
-  // Buffer sizes for kernel socket buffers
-  // @@ should be a default defined for each protocol implementation?
-  //    since we may have protocols loaded which use shared memory of
-  //    some form, fredk
-  long rcv_sock_size = -1;
-  long snd_sock_size = -1;
-
-  // Use TCP_NODELAY.
-  int nodelay = 1;
-
-  // Use dotted decimal addresses
-  // @@ This option will be treated as a suggestion to each loaded
-  //    protocol to use a character representation for the numeric
-  //    address, otherwise use a logical name. fredk
-#if (TAO_USE_DOTTED_DECIMAL_ADDRESSES == 1)
-  int dotted_decimal_addresses = 1;
-#else
-  int dotted_decimal_addresses = 0;
-#endif /* TAO_USE_DOTTED_DECIMAL_ADDRESSES */
-
-#if defined (TAO_STD_PROFILE_COMPONENTS)
-  int std_profile_components = 1;
-#else
-  int std_profile_components = 0;
-#endif /* TAO_STD_PROFILE_COMPONENTS */
-
-  int linger = -1;
-
-  // Copy command line parameter not to use original.
-  ACE_Argv_Type_Converter command_line (argc, argv);
-
-  ACE_Arg_Shifter arg_shifter (command_line.get_argc (),
-                               command_line.get_TCHAR_argv ());
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    monitor,
-                    this->lock_,
-                    -1);
-
-  // Pick up the value of the use_implrepo_ flag from an environment variable
-  // called "TAO_USE_IMR". Do it here so that it can be overridden by
-  // the "-ORBUseIMR" command line argument.
-  //
-  char* const use_IMR_env_var_value = ACE_OS::getenv  ("TAO_USE_IMR") ;
-  if  (use_IMR_env_var_value != 0)
-    {
-      this->use_implrepo_ = ACE_OS::atoi  (use_IMR_env_var_value) ;
-    }
-
-
-  while (arg_shifter.is_anything_left ())
-    {
-      const ACE_TCHAR *current_arg = 0;
-
-      ////////////////////////////////////////////////////////////////
-      // begin with the 'parameterless' flags                       //
-      ////////////////////////////////////////////////////////////////
-      if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBDottedDecimalAddresses"))))
-        {
-          // Use dotted decimal addresses
-          // @@ this should be renamed.  See above comment. fredk
-          dotted_decimal_addresses =
-            ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBNameServicePort"))))
-        {
-          // Specify the port number for the NameService.
-          // Unrelated to ORB Protocols, this is used for multicast.
-
-          ns_port = (CORBA::UShort) ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBMulticastDiscoveryEndpoint"))))
-        {
-          // Specify mcast address:port@network_interface for the
-          // Naming Service Multicast Discovery Protocol.
-          // If there is no colon, its only the port no.
-          // If there is a '@' also, it means that the network
-          // interface name is specified.
-          this->orb_params ()->mcast_discovery_endpoint (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBNodelay"))))
-        {
-          // Use TCP_NODELAY or not.
-          nodelay =
-            ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBTradingServicePort"))))
-        {
-          // Specify the port number for the NameService.
-
-          ts_port = (CORBA::UShort) ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBImplRepoServicePort"))))
-        {
-          // Specify the multicast port number for the Implementation
-          // Repository.
-          ir_port = (CORBA::UShort) ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBRcvSock"))))
-        {
-          // @@ All protocol implementation may not use sockets, so
-          //    this can either be a generic I/O Buffer size or
-          //    Buffer info can be a per protocol specification, fredk
-
-          // Specify the size of the socket's receive buffer
-
-          rcv_sock_size = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBSndSock"))))
-        {
-          // @@ All protocol implementation may not use sockets, so
-          //    this can either be a generic I/O Buffer size or
-          //    Buffer info can be a per protocol specification, fredk
-
-          // Specify the size of the socket's send buffer
-          snd_sock_size = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBObjRefStyle"))))
-        {
-          // Specifies the style of printed objrefs: URL or IOR
-          //
-          // BEGIN COMMENTS FROM IIOP-1.4 On Win32, we should be
-          // collecting information from the Registry such as what
-          // ORBs are configured, specific configuration details like
-          // whether they generate IOR or URL style stringified
-          // objrefs and which addresses they listen to (e.g. allowing
-          // multihomed hosts to implement firewalls), user-meaningful
-          // orb names (they will normally indicate domains), and
-          // more.
-          //
-          // On UNIX, we should collect that from some private config
-          // file.
-          //
-          // Instead, this just treats the "internet" ORB name
-          // specially and makes it always use URL-style stringified
-          // objrefs, where the hostname and TCP port number are
-          // explicit (and the whole objref is readable by mortals).
-          // BEGIN COMMENTS FROM IIOP-1.4
-          const ACE_TCHAR *opt = current_arg;
-          if (ACE_OS::strcasecmp (opt, ACE_TEXT("URL")) == 0)
-            use_ior = false;
-          else if (ACE_OS::strcasecmp (opt, ACE_TEXT("IOR")) == 0)
-            use_ior = true;
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBCollocationStrategy"))))
-        {
-          // Specify which collocation policy we want to use.
-          const ACE_TCHAR *opt = current_arg;
-          if (ACE_OS::strcasecmp (opt, ACE_TEXT("thru_poa")) == 0)
-            this->collocation_strategy_ = THRU_POA;
-          else if (ACE_OS::strcasecmp (opt, ACE_TEXT("direct")) == 0)
-            this->collocation_strategy_ = DIRECT;
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBCollocation"))))
-        {
-          // Specify whether we want to optimize against collocation
-          // objects.  Valid arguments are: "yes" and "no".
-          // Default is yes.
-
-          int yes_implies_global = 0;
-
-          const ACE_TCHAR *opt = current_arg;
-          if (ACE_OS::strcasecmp (opt, ACE_TEXT("YES")) == 0)
-            {
-              yes_implies_global = 1;
-              ACE_DEBUG ((LM_WARNING,
-                          ACE_TEXT ("WARNING: using '-ORBCollocation YES' is obsolete ")
-                          ACE_TEXT ("and implies '-ORBCollocation global'")
-                          ACE_TEXT ("  Please use '-ORBCollocation global' instead.\n")));
-            }
-
-          if (yes_implies_global ||
-              ACE_OS::strcasecmp (opt, ACE_TEXT("global")) == 0)
-            {
-              this->opt_for_collocation_ = 1;
-              this->use_global_collocation_ = 1;
-            }
-          else if (ACE_OS::strcasecmp (opt, ACE_TEXT("NO")) == 0)
-            {
-              this->opt_for_collocation_ = 0;
-              this->use_global_collocation_ = 0;
-            }
-          else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-orb")) == 0)
-            {
-              this->opt_for_collocation_ = 1;
-              this->use_global_collocation_ = 0;
-            }
-          else
-            {
-              ACE_DEBUG ((LM_WARNING,
-                          ACE_TEXT ("WARNING: Unknown option to ")
-                          ACE_TEXT ("'-ORBCollocation': %s\n"), opt));
-            }
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBGlobalCollocation"))))
-        // Specify whether we want to use collocation across ORBs;
-        // i.e. all the ORBs in the same address space use collocated
-        // calls.
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("WARNING: -ORBGlobalCollocation option is obsolete.")
-                      ACE_TEXT ("  Please use '-ORBCollocation global/per-orb/no'")
-                      ACE_TEXT ("instead.\n")));
-
-          const ACE_TCHAR *opt = current_arg;
-          if (ACE_OS::strcasecmp (opt, ACE_TEXT("YES")) == 0)
-            this->use_global_collocation_ = 1;
-          else if (ACE_OS::strcasecmp (opt, ACE_TEXT("NO")) == 0)
-            this->use_global_collocation_ = 0;
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBPreferredInterfaces"))))
-        {
-          if (this->orb_params ()->preferred_interfaces (
-                ACE_TEXT_ALWAYS_CHAR (current_arg)) == false)
-            ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBEnforcePreferredInterfaces"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("YES")) == 0)
-            this->orb_params ()->enforce_pref_interfaces (true);
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("NO")) == 0)
-            this->orb_params ()->enforce_pref_interfaces (false);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBCDRTradeoff"))))
-        {
-          cdr_tradeoff = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-
-      // A new <ObjectID>:<IOR> mapping has been specified. This will be
-      // used by the resolve_initial_references ().
-
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBInitRef"))))
-        {
-          const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '=');
-          if (pos == 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("Invalid ORBInitRef argument '%s'")
-                          ACE_TEXT ("format is ObjectID=IOR\n"),
-                          current_arg));
-              ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
-            }
-          ACE_CString object_id (ACE_TEXT_ALWAYS_CHAR(current_arg),
-                                 pos - current_arg);
-          ACE_CString IOR (ACE_TEXT_ALWAYS_CHAR(pos + 1));
-          if (this->init_ref_map_.bind (object_id, IOR) != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("Cannot store ORBInitRef ")
-                          ACE_TEXT ("argument '%s'\n"),
-                          current_arg));
-              ACE_THROW_RETURN (CORBA::INTERNAL (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                    0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
-            }
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBDefaultInitRef"))))
-        {
-          // Set the list of prefixes from -ORBDefaultInitRef.
-          this->orb_params ()->default_init_ref (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBStdProfileComponents"))))
-        {
-          std_profile_components =
-            ACE_OS::atoi (current_arg);
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBResources"))))
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("\"-ORBResources\" has been ")
-                      ACE_TEXT ("deprecated.\n")));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLogFile"))))
-        {
-          // redirect all ACE_DEBUG and ACE_ERROR output to a file
-          // USAGE: -ORBLogFile <file>
-          // default: if <file> is present     = append
-          //          if <file> is not present = create
-
-          const ACE_TCHAR *file_name = current_arg;
-          arg_shifter.consume_arg ();
-
-          // would rather use ACE_OSTREAM_TYPE out here..
-          // but need ACE_FSTREAM_TYPE to call ->open(...)
-          // and haven't found such a macro to rep FILE* and/or fstream*
-
-#if defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-          FILE* output_stream = ACE_OS::fopen (file_name, ACE_TEXT ("a"));
-
-          ACE_LOG_MSG->msg_ostream (output_stream, 1);
-
-#else /* ! ACE_LACKS_IOSTREAM_TOTALLY */
-
-          ofstream* output_stream = 0;
-
-          //
-          // note: we are allocating dynamic memory here....but
-          // I assume it will persist for the life of the program
-          //
-
-          ACE_NEW_THROW_EX (output_stream,
-                            ofstream (),
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (-1);
-
-          output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), ios::out | ios::app);
-
-          if (!output_stream->bad ())
-            {
-              ACE_LOG_MSG->msg_ostream (output_stream, 1);
-            }
-
-#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
-          ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
-          ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
-
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBVerboseLogging"))))
-        {
-          unsigned long verbose_logging = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-
-          typedef void (ACE_Log_Msg::*PTMF)(u_long);
-          PTMF flagop = &ACE_Log_Msg::set_flags;
-          u_long value;
-
-          switch (verbose_logging)
-            {
-            case 0:
-              flagop = &ACE_Log_Msg::clr_flags;
-              value = ACE_Log_Msg::VERBOSE | ACE_Log_Msg::VERBOSE_LITE;
-              break;
-            case 1:
-              value = ACE_Log_Msg::VERBOSE_LITE; break;
-            default:
-              value = ACE_Log_Msg::VERBOSE; break;
-            }
-
-          (ACE_LOG_MSG->*flagop)(value);
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBUseIMR"))))
-        {
-          // Use IR or not.
-          this->use_implrepo_ = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_LIB_TEXT("-ORBIMREndpointsInIOR"))))
-        {
-          this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBid"))))
-        {
-          // The ORBid is actually set in ORB_init(), and then passed
-          // to the TAO_ORB_Core() constructor.  However, in the case
-          // where the ORBid third argument to ORB_init() is not zero,
-          // any "-ORBid" arguments in the argv argument list are
-          // supposed to be ignored, according to the CORBA spec.  As
-          // such, "-ORBid" must be removed from the argument list
-          // since ORB_init() must remove all "-ORB" option
-          // arguments.
-
-          // We obtain a lock on the ORB table when setting the
-          // ORBid.  For this reason we should *not* set the ORBid
-          // here.  CORBA::ORB_init() does all of the proper locking
-          // and setting.
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBServerId"))))
-        {
-          // The this->server_id_ is to uniquely identify a server to
-          // an IMR.
-          // Fill in later.
-          this->server_id_.set(ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-               (ACE_LIB_TEXT("-ORBLingerTimeout"))))
-        {
-          linger = ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBEndpoint"))))
-        {
-          // Each "endpoint" is of the form:
-          //
-          //   protocol://V.v@addr1,addr2,...,addrN
-          //
-          // or:
-          //
-          //   protocol://addr1,addr2,...,addrN
-          //
-          // where "V.v" is an optional protocol version for each
-          // addr.  All endpoint strings should be of the above
-          // form(s).
-          //
-          // Multiple sets of endpoint may be seperated by a semi-colon `;'.
-          // For example:
-          //
-          //   corbaloc:space:2001,1.2@odyssey:2010;uiop://foo,bar
-          //
-          // All endpoint strings should be of the above form(s).
-
-          this->set_endpoint_helper (TAO_DEFAULT_LANE,
-                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBListenEndpoints"))))
-        {
-          // This option is similar to the -ORBEndPoint option. May be
-          // ORBEndpoint option will be deprecated in future. But, for
-          // now, I (Priyanka) am leaving so that both options can be
-          // used.
-
-          this->set_endpoint_helper (TAO_DEFAULT_LANE,
-                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneEndpoint"))) ||
-               (current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneListenEndpoints"))))
-        {
-          // This option is similar to the -ORBEndPoint option but
-          // specifies endpoints for each lane.
-
-          if (arg_shifter.is_option_next ())
-            return -1;
-
-          ACE_CString lane (ACE_TEXT_ALWAYS_CHAR (current_arg));
-          arg_shifter.consume_arg ();
-
-          if(arg_shifter.is_option_next ())
-            return -1;
-
-          ACE_CString endpoints (ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()));
-          arg_shifter.consume_arg ();
-
-          this->set_endpoint_helper (lane,
-                                     endpoints
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBNoProprietaryActivation"))))
-        {
-          // This option can be used to set to not use any proprietary
-          // activation framework. The only TAO proprietary activation
-          // framework is IMR. So, by setting this option in TAO, the
-          // IMR shouldnt be used .. even if the ORBUseIMR option is
-          // set.
-          // Fill in later
-          // @@ To do later: Priyanka.
-
-          ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1);
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBSingleReadOptimization"))))
-        {
-          this->orb_params ()->single_read_optimization
-            (ACE_OS::atoi (current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBDisableRTCollocation"))))
-        {
-          const ACE_TCHAR *popt = current_arg;
-          if (ACE_OS::strcasecmp (popt, ACE_TEXT("NO")) == 0)
-            {
-              this->orb_params ()->disable_rt_collocation_resolver (false);
-            }
-          else if (ACE_OS::strcasecmp (popt, ACE_TEXT("YES")) == 0)
-            {
-              this->orb_params ()->disable_rt_collocation_resolver (true);
-            }
-          else
-            {
-              // Should we print an error mesg?? Probably we
-              // should. We will look into this after 1.4 and make all
-              // the options consistent.
-            }
-
-          arg_shifter.consume_arg ();
-        }
-      ////////////////////////////////////////////////////////////////
-      // catch any unknown -ORB args                                //
-      ////////////////////////////////////////////////////////////////
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ORB")) != -1)
-        {
-          if (TAO_debug_level > 0)
-            {
-              current_arg = arg_shifter.get_current ();
-              ACE_DEBUG ((LM_ERROR,
-                          ACE_TEXT ("ERROR: Unknown \"-ORB\" option ")
-                          ACE_TEXT ("<%s>.\n"),
-                          ((current_arg == 0) ? ACE_TEXT("<NULL>") : current_arg)));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            -1);
-        }
-
-      ////////////////////////////////////////////////////////////////
-      // ok, we can't interpret this argument, move to next argument//
-      ////////////////////////////////////////////////////////////////
-      else
-        // Any arguments that don't match are ignored so that the
-        // caller can still use them.
-        arg_shifter.ignore_arg ();
-    }
-
-  const char *env_endpoint =
-    ACE_OS::getenv ("TAO_ORBENDPOINT");
-
-  if (env_endpoint != 0)
-    {
-      int result =
-        this->orb_params ()->add_endpoints (TAO_DEFAULT_LANE,
-                                            env_endpoint);
-
-      if (result != 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("ERROR: Environment variable TAO_ORBENDPOINT set to invalid value ")
-                          ACE_TEXT ("<%s>.\n"),
-                          env_endpoint));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_ORB_CORE_INIT_LOCATION_CODE,
-                                EINVAL),
-                              CORBA::COMPLETED_NO),
-                            -1);
-        }
-    }
-
-#if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
-  // There's really no way to deal with this in a portable manner, so
-  // we just have to suck it up and get preprocessor conditional and
-  // ugly.
-  //
-  // Impractical to have each call to the ORB protect against the
-  // implementation artifact of potential writes to dead connections,
-  // as it'd be way expensive.  Do it here; who cares about SIGPIPE in
-  // these kinds of applications, anyway?
-  (void) ACE_OS::signal (SIGPIPE, (ACE_SignalHandler) SIG_IGN);
-#endif /* SIGPIPE */
-
-  // Calling the open method here so that the svc.conf file is
-  // opened and TAO_default_resource_factory::init () is called by the
-  // time this method is called.
-  this->parser_registry_.open (this);
-
-  // Initialize the pointers to resources in the ORB Core instance,
-  // e.g., reactor, connector, etc.  Must do this after we open
-  // services because we'll load the factory from there.
-  TAO_Resource_Factory *trf = this->resource_factory ();
-
-  if (trf == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("ORB Core unable to find a ")
-                  ACE_TEXT ("Resource Factory instance")));
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  // @@Phil: Could we add a -ORB option to prevent creation of codeset
-  // manager. This adds to our runtime footprint. It would be awesome
-  // if we can do away with this if the user doesnt want to. Does that
-  // sound reasonable? Please let me know if this is not possible.
-
-  this->codeset_manager_ = trf->get_codeset_manager();
-  if (this->codeset_manager_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("ORB Core unable to initialize codeset_manager")));
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  // @@ ????
-  // Make sure the reactor is initialized...
-  ACE_Reactor *reactor = this->reactor ();
-  if (reactor == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("ORB Core unable to initialize reactor")));
-      ACE_THROW_RETURN (CORBA::INITIALIZE (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  TAO_Server_Strategy_Factory *ssf = this->server_factory ();
-
-  if (ssf == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("ORB Core unable to find a ")
-                  ACE_TEXT ("Server Strategy Factory instance")));
-      ACE_THROW_RETURN (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_ORB_CORE_INIT_LOCATION_CODE,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  ssf->open (this);
-
-  // Open the ObjectKey_Table
-  (void) this->object_key_table_.init (this);
-
-  // Obtain the timeout value for the thread-per-connection model
-  this->thread_per_connection_use_timeout_ =
-    ssf->thread_per_connection_timeout (this->thread_per_connection_timeout_);
-
-  if (thread_per_connection_use_timeout_ == -1)
-    {
-      if (ACE_OS::strcasecmp (TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT,
-                              "INFINITE") == 0)
-        {
-          this->thread_per_connection_use_timeout_ = 0;
-        }
-      else
-        {
-          this->thread_per_connection_use_timeout_ = 1;
-          int milliseconds =
-            ACE_OS::atoi (TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT);
-          // Use a temporary to obtain automatic normalization.
-          this->thread_per_connection_timeout_ =
-            ACE_Time_Value (0, 1000 * milliseconds);
-        }
-    }
-  if (this->thread_per_connection_use_timeout_ == 0)
-    {
-      // Do not wait for the server threads because they may block
-      // forever.
-      this->tm_.wait_on_exit (0);
-    }
-
-  // Initialize the "ORB" pseudo-object now.
-  this->orb_ = CORBA::ORB::_tao_make_ORB (this);
-
-  // This should probably move into the ORB Core someday rather then
-  // being done at this level.
-  this->orb_->_use_omg_ior_format (use_ior);
-
-  // Set all kinds of orb parameters whose setting needed to be
-  // deferred until after the service config entries had been
-  // determined.
-
-  this->orb_params ()->service_port (NAMESERVICE, ns_port);
-
-  if (ns_port != 0)
-    {
-      char ns_port_char[256];
-
-      ACE_OS::itoa (ns_port,
-                    ns_port_char,
-                    10);
-
-      CORBA::String_var ns_port_ptr =
-        CORBA::string_alloc (static_cast<CORBA::ULong> (
-                               ACE_OS::strlen ((const char *) ns_port_char)));
-
-      ns_port_ptr = (const char *) ns_port_char;
-
-      const char prefix[] = "mcast://:";
-
-      CORBA::String_var def_init_ref =
-        CORBA::string_alloc (sizeof (prefix) +
-                             static_cast<CORBA::ULong> (
-                                    ACE_OS::strlen (ns_port_ptr.in ())) +
-                             2);
-
-      ACE_OS::strcpy (def_init_ref.inout (), prefix);
-      ACE_OS::strcat (def_init_ref.inout (), ns_port_ptr.in ());
-      ACE_OS::strcat (def_init_ref.inout (), "::");
-
-      this->orb_params ()->default_init_ref (def_init_ref.in ());
-    }
-
-  this->orb_params ()->service_port (TRADINGSERVICE, ts_port);
-  this->orb_params ()->service_port (IMPLREPOSERVICE, ir_port);
-
-  this->orb_params ()->use_dotted_decimal_addresses (dotted_decimal_addresses);
-  this->orb_params ()->linger (linger);
-  this->orb_params ()->nodelay (nodelay);
-  if (rcv_sock_size >= 0)
-    this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
-  if (snd_sock_size >= 0)
-    this->orb_params ()->sock_sndbuf_size (snd_sock_size);
-  if (cdr_tradeoff >= 0)
-    this->orb_params ()->cdr_memcpy_tradeoff (cdr_tradeoff);
-
-  this->orb_params ()->std_profile_components (std_profile_components);
-
-  // Set up the pluggable protocol infrastructure.  First get a
-  // pointer to the protocol factories set, then obtain pointers to
-  // all factories loaded by the service configurator.
-  // Load all protocol factories!
-  if (trf->init_protocol_factories () == -1)
-    ACE_THROW_RETURN (CORBA::INITIALIZE (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_ORB_CORE_INIT_LOCATION_CODE,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      -1);
-
-  // init the ORB core's pointer
-  this->protocol_factories_ = trf->get_protocol_factories ();
-
-  // Initialize the flushing strategy
-  this->flushing_strategy_ = trf->create_flushing_strategy ();
-
-  // Look in the service repository for an instance of the Protocol Hooks.
-  this->protocols_hooks_ =
-    ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_.c_str());
-
-  // Must have valid protocol hooks.
-  if (this->protocols_hooks_ == 0)
-    ACE_THROW_RETURN (CORBA::INITIALIZE (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_ORB_CORE_INIT_LOCATION_CODE,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      -1);
-
-  // Initialize the protocols hooks instance.
-  this->protocols_hooks_->init_hooks (this
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Look for BiDirectional library here. If the user has svc.conf
-  // file, load the library at this point.
-  int ret = this->bidirectional_giop_init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (ret == -1)
-    return -1;
-
-  // As a last step perform initializations of the service callbacks
-  this->services_callbacks_init ();
-
-  // The ORB has been initialized, meaning that the ORB is no longer
-  // in the shutdown state.
-  this->has_shutdown_ = 0;
-
-  return 0;
-}
-
-
-int
-TAO_ORB_Core::fini (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Shutdown the ORB and block until the shutdown is complete.
-      this->shutdown (1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_CString message =
-        "Exception caught in trying to shutdown ";
-      message += this->orbid_;
-      message += "\n";
-
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           message.c_str ());
-    }
-  ACE_ENDTRY;
-
-  // Wait for any server threads, ignoring any failures.
-  (void) this->thr_mgr ()->wait ();
-
-  CORBA::release (this->implrepo_service_);
-
-  CORBA::release (this->typecode_factory_);
-
-  CORBA::release (this->dynany_factory_);
-
-  CORBA::release (this->ior_manip_factory_);
-
-  CORBA::release (this->ior_table_);
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Destroying ORB <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->orbid_)));
-    }
-
-  // Finalize lane resources.
-  //
-  // @@ Do not call this->thread_lane_resources_manager().finalize().
-  // this->thread_lane_manager_resources() can seg fault if the
-  // factory method it invokes returns a zero pointer, which can
-  // easily occur if the ORB is partially initialized due to a Service
-  // Configurator initialization failure.  Instead check if the
-  // cached pointer is non-zero and then finalize.
-  //
-  // @todo Fix potential seg fault in
-  //       TAO_ORB_Core::thread_lane_resources_manager().
-  if (this->thread_lane_resources_manager_ != 0)
-    this->thread_lane_resources_manager_->finalize ();
-
-  (void) TAO::ORB::close_services ();
-
-  // Destroy the object_key table
-  this->object_key_table_.destroy ();
-
-  delete this;
-
-  return 0;
-}
-
-void
-TAO_ORB_Core::set_thread_lane_resources_manager_factory (const char *thread_lane_resources_manager_factory_name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->thread_lane_resources_manager_factory_name_ =
-    thread_lane_resources_manager_factory_name;
-}
-
-void
-TAO_ORB_Core::set_collocation_resolver (const char *collocation_resolver_name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->collocation_resolver_name_ =
-    collocation_resolver_name;
-}
-
-void
-TAO_ORB_Core::set_stub_factory (const char *stub_factory_name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->stub_factory_name_ =
-    stub_factory_name;
-}
-
-void
-TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->resource_factory_name_ =
-    resource_factory_name;
-}
-
-void
-TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
-{
-  if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
-    {
-
-      ACE_DEBUG ((LM_WARNING,
-                  "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
-      delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
-    }
-
-  TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
-}
-
-void
-TAO_ORB_Core::dynamic_adapter_name (const char *name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_ = name;
-}
-
-const char *
-TAO_ORB_Core::dynamic_adapter_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_.c_str();
-}
-
-void
-TAO_ORB_Core::ifr_client_adapter_name (const char *name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->ifr_client_adapter_name_ = name;
-}
-
-const char *
-TAO_ORB_Core::ifr_client_adapter_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->ifr_client_adapter_name_.c_str();
-}
-
-void
-TAO_ORB_Core::typecodefactory_adapter_name (const char *name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->typecodefactory_adapter_name_ = name;
-}
-
-const char *
-TAO_ORB_Core::typecodefactory_adapter_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->typecodefactory_adapter_name_.c_str();
-}
-
-void
-TAO_ORB_Core::iorinterceptor_adapter_factory_name (const char *name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_factory_name_ = name;
-}
-
-const char *
-TAO_ORB_Core::iorinterceptor_adapter_factory_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_factory_name_.c_str();
-}
-
-void
-TAO_ORB_Core::valuetype_adapter_name (const char *name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_ = name;
-}
-
-const char *
-TAO_ORB_Core::valuetype_adapter_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_.c_str();
-}
-
-TAO_Resource_Factory *
-TAO_ORB_Core::resource_factory (void)
-{
-  // Check if there is a cached reference.
-  if (this->resource_factory_ != 0)
-    {
-      return this->resource_factory_;
-    }
-
-  // Look in the service repository for an instance.
-  this->resource_factory_ =
-    ACE_Dynamic_Service<TAO_Resource_Factory>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->resource_factory_name_.c_str());
-
-  return this->resource_factory_;
-}
-
-TAO::GUIResource_Factory *
-TAO_ORB_Core::gui_resource_factory (void)
-{
-  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
-}
-
-
-TAO_Thread_Lane_Resources_Manager &
-TAO_ORB_Core::thread_lane_resources_manager (void)
-{
-  // Check if there is a cached reference.
-  if (this->thread_lane_resources_manager_ != 0)
-    return *this->thread_lane_resources_manager_;
-
-  // If not, lookup the corresponding factory and ask it to make one.
-  TAO_Thread_Lane_Resources_Manager_Factory *factory =
-    ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->thread_lane_resources_manager_factory_name_.c_str());
-
-  this->thread_lane_resources_manager_ =
-    factory->create_thread_lane_resources_manager (*this);
-
-  return *this->thread_lane_resources_manager_;
-}
-
-TAO_Collocation_Resolver &
-TAO_ORB_Core::collocation_resolver (void)
-{
-  // Check if there is a cached reference.
-  if (this->collocation_resolver_ != 0)
-    return *this->collocation_resolver_;
-
-  // If not, lookup it up.
-  this->collocation_resolver_ =
-    ACE_Dynamic_Service<TAO_Collocation_Resolver>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->collocation_resolver_name_.c_str());
-
-  return *this->collocation_resolver_;
-}
-
-TAO_Stub_Factory *
-TAO_ORB_Core::stub_factory (void)
-{
-  // Check if there is a cached reference.
-  if (this->stub_factory_ != 0)
-    return this->stub_factory_;
-
-  // If not, look in the service repository for an instance.
-  this->stub_factory_ =
-    ACE_Dynamic_Service<TAO_Stub_Factory>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->stub_factory_name_.c_str());
-
-  return this->stub_factory_;
-}
-
-void
-TAO_ORB_Core::set_poa_factory (const char *poa_factory_name,
-                               const char *poa_factory_directive)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->poa_factory_name_ =
-    poa_factory_name;
-  TAO_ORB_Core_Static_Resources::instance ()->poa_factory_directive_ =
-    poa_factory_directive;
-}
-
-const ACE_CString &
-TAO_ORB_Core::poa_factory_name (void)
-{
-  return TAO_ORB_Core_Static_Resources::instance ()->poa_factory_name_;
-}
-
-void
-TAO_ORB_Core::set_endpoint_selector_factory (const char *endpoint_selector_factory_name)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->endpoint_selector_factory_name_ =
-    endpoint_selector_factory_name;
-}
-
-TAO_Endpoint_Selector_Factory *
-TAO_ORB_Core::endpoint_selector_factory (void)
-{
-  // Check if there is a cached reference.
-  if (this->endpoint_selector_factory_ != 0)
-    return this->endpoint_selector_factory_;
-
-  // If not, look in the service repository for an instance.
-  this->endpoint_selector_factory_ =
-    ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->endpoint_selector_factory_name_.c_str());
-
-  return this->endpoint_selector_factory_;
-}
-
-void
-TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks_name)
-{
-  // Is synchronization necessary?
-  TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_ =
-    protocols_hooks_name;
-}
-
-TAO_Protocols_Hooks *
-TAO_ORB_Core::get_protocols_hooks (void)
-{
-  return this->protocols_hooks_;
-}
-
-int
-TAO_ORB_Core::bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->bidir_adapter_ == 0)
-    {
-      this->bidir_adapter_ =
-        ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance ("BiDirGIOP_Loader");
-    }
-
-  if (this->bidir_adapter_)
-    return this->bidir_adapter_->activate (this->orb_,
-                                           0,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
-  else
-    return 0;
-}
-
-void
-TAO_ORB_Core::services_callbacks_init (void)
-{
-  // We (should) know what are the services that would need
-  // callbacks. So, what we do is go through the Service Configurator
-  // list for looking at the services that we want to load.
-  this->ft_service_.init (this);
-
-  // @@ Other service callbacks can be added here
-}
-
-TAO::Invocation_Status
-TAO_ORB_Core::service_raise_comm_failure (
-    IOP::ServiceContextList &clist,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
-{
-  if (this->ft_service_.service_callback ())
-    {
-      return this->ft_service_.service_callback ()->
-                 raise_comm_failure (clist,
-                                     profile
-                                     ACE_ENV_ARG_PARAMETER);
-    }
-
-  ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          errno),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_SYSTEM_EXCEPTION);
-}
-
-
-TAO::Invocation_Status
-TAO_ORB_Core::service_raise_transient_failure (
-    IOP::ServiceContextList &clist,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
-{
-  if (this->ft_service_.service_callback ())
-    {
-      return
-        this->ft_service_.service_callback ()->raise_transient_failure (clist,
-                                 profile
-                                 ACE_ENV_ARG_PARAMETER);
-    }
-
-  return TAO::TAO_INVOKE_FAILURE;
-}
-
-void
-TAO_ORB_Core::service_context_list (
-    TAO_Stub *stub,
-    TAO_Service_Context &service_context,
-    CORBA::Boolean restart
-    ACE_ENV_ARG_DECL)
-{
-  // @NOTE: Can use Interceptors instead..
-  this->protocols_hooks_->rt_service_context (stub,
-                                              service_context,
-                                              restart
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_Client_Strategy_Factory *
-TAO_ORB_Core::client_factory (void)
-{
-  if (this->client_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->client_factory_ =
-        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory");
-    }
-
-  return this->client_factory_;
-}
-
-TAO_Server_Strategy_Factory *
-TAO_ORB_Core::server_factory (void)
-{
-  if (this->server_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->server_factory_ =
-        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory");
-    }
-
-  return this->server_factory_;
-}
-
-CORBA::Object_ptr
-TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // DCL ..
-  if (CORBA::is_nil (this->root_poa_.in ()))
-    {
-      TAO_ORB_Core_Static_Resources* static_resources =
-        TAO_ORB_Core_Static_Resources::instance ();
-
-      TAO_Adapter_Factory *factory =
-        ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
-          static_resources->poa_factory_name_.c_str());
-
-      if (factory == 0)
-        {
-          ACE_Service_Config::process_directive (
-           ACE_TEXT_CHAR_TO_TCHAR (
-             static_resources->poa_factory_directive_.c_str()));
-          factory =
-            ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
-              static_resources->poa_factory_name_.c_str());
-        }
-
-      if (factory == 0)
-        {
-          // It really failed, raise an exception!
-          ACE_THROW_RETURN (CORBA::ORB::InvalidName (),
-                            CORBA::Object::_nil ());
-        }
-
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        monitor,
-                        this->open_lock_,
-                        0);
-
-      if (CORBA::is_nil (this->root_poa_.in ()))
-        {
-          // @@ Not exception safe
-          TAO_Adapter *poa_adapter =
-            factory->create (this);
-
-          poa_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-          // @@ Not exception safe
-          this->root_poa_ =
-            poa_adapter->root ();
-
-          this->adapter_registry_.insert (poa_adapter
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
-        }
-    }
-
-  return CORBA::Object::_duplicate (this->root_poa_.in ());
-}
-
-TAO_Adapter *
-TAO_ORB_Core::poa_adapter (void)
-{
-  if (this->poa_adapter_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->poa_adapter_ == 0)
-        {
-          this->poa_adapter_ =
-            this->adapter_registry_.find_adapter ("RootPOA");
-        }
-    }
-  return this->poa_adapter_;
-}
-
-TAO_Stub *
-TAO_ORB_Core::create_stub (const char *repository_id,
-                           const TAO_MProfile &profiles
-                           ACE_ENV_ARG_DECL)
-{
-  TAO_Stub *retval =
-    this->stub_factory ()->create_stub (repository_id,
-                                        profiles,
-                                        this
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
-  return retval;
-}
-
-void
-TAO_ORB_Core::request_dispatcher (TAO_Request_Dispatcher *request_dispatcher)
-{
-  // Assume ownership of the request dispatcher.
-  TAO_Request_Dispatcher *tmp = this->request_dispatcher_;
-  this->request_dispatcher_ = request_dispatcher;
-  delete tmp;
-}
-
-TAO_Stub *
-TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
-                                  const char *type_id,
-                                  CORBA::PolicyList *policy_list
-                                  ACE_ENV_ARG_DECL)
-{
-  // Add the Polices contained in "policy_list" to each profile so
-  // that those policies will be exposed to the client in the IOR.  In
-  // particular each CORBA::Policy has to be converted in to
-  // Messaging::PolicyValue, and then all the Messaging::PolicyValue
-  // should be embedded inside a Messaging::PolicyValueSeq which
-  // became in turns the "body" of the IOP::TaggedComponent. This
-  // conversion is a responsability of the CORBA::Profile class.  (See
-  // orbos\98-05-05.pdf Section 5.4)
-  if (policy_list->length () != 0)
-    {
-      TAO_Profile * profile;
-
-      const CORBA::ULong count = mprofile.profile_count ();
-      for (CORBA::ULong i = 0; i < count; ++i)
-        {
-          // Get the ith profile
-          profile = mprofile.get_profile (i);
-          profile->policies (policy_list ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-        }
-    }
-
-  /// Initialize a TAO_Stub object with the mprofile thats passed.
-  TAO_Stub *stub =
-    this->create_stub (type_id, mprofile ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (stub);
-
-  stub->base_profiles ().policy_list (policy_list);
-
-  return stub;
-}
-
-void
-TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator
-                                      ACE_ENV_ARG_DECL)
-{
-  // Call the BiDir library if it has been loaded
-  if (this->bidir_adapter_)
-    this->bidir_adapter_->load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_ORB_Core::create_object (TAO_Stub *stub)
-{
-  // @@ What about forwarding.  With this approach we are never forwarded
-  //    when we use collocation!
-  const TAO_MProfile &mprofile = stub->base_profiles ();
-
-  // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions,
-  // but we are stuck in platforms without exceptions!
-  CORBA::Object_ptr x;
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->lock_,
-                      CORBA::Object::_nil ());
-
-    TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
-    const TAO::ORB_Table::Iterator end = table->end ();
-    for (TAO::ORB_Table::Iterator i = table->begin (); i != end; ++i)
-      {
-        TAO_ORB_Core *other_core = (*i).int_id_;
-
-        if (this->is_collocation_enabled (other_core,
-                                          mprofile))
-          {
-            TAO_Adapter_Registry *ar =
-              other_core->adapter_registry ();
-
-            return ar->create_collocated_object (stub,
-                                                 mprofile);
-          }
-      }
-  }
-
-  // The constructor sets the proxy broker as the
-  // Remote one.
-  ACE_NEW_RETURN (x,
-                  CORBA::Object (stub, 0),
-                  0);
-  return x;
-}
-
-CORBA::Long
-TAO_ORB_Core::initialize_object (TAO_Stub *stub,
-                                 CORBA::Object_ptr obj)
-{
-  // @@ What about forwarding.  With this approach we are never forwarded
-  //    when we use collocation!
-  const TAO_MProfile &mprofile =
-    stub->base_profiles ();
-  {
-    // @@ Ossama: maybe we need another lock for the table, to
-    //    reduce contention on the Static_Object_Lock below, if so
-    //    then we need to use that lock in the ORB_init() function.
-    ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                              guard,
-                              this->lock_,
-                              0));
-
-    TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
-    TAO::ORB_Table::Iterator const end = table->end ();
-    for (TAO::ORB_Table::Iterator i = table->begin (); i != end; ++i)
-      {
-        TAO_ORB_Core * const other_core = (*i).int_id_;
-
-        if (this->is_collocation_enabled (other_core,
-                                          mprofile))
-          {
-            TAO_Adapter_Registry * const ar =
-              other_core->adapter_registry ();
-
-            return ar->initialize_collocated_object (stub,
-                                                     obj);
-          }
-      }
-  }
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core,
-                                      const TAO_MProfile &mp)
-{
-  if (!orb_core->optimize_collocation_objects ())
-    return 0;
-
-  if (!orb_core->use_global_collocation () && orb_core != this)
-    return 0;
-
-  if (!orb_core->is_collocated (mp))
-    return 0;
-
-  return 1;
-}
-
-int
-TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
-{
-  // @@ Lots of issues arise when dealing with collocation.  What about
-  //    forwarding or what if this is a multi-profile IOR where the order is
-  //    significant and only one of the profiles is collocated.  For example
-  //    when using a multiple servers for fault tolerance.  For now, we just
-  //    look through all profiles and if any are colocated then we assume
-  //    the object is collocated.
-  // @@ Note, if collocated we can not be forwarded!
-  //    Also, acceptor_registry_->is_collocated (...) will check the
-  //    address (ORB Host) but not the object_key.  This should be checked
-  //    also.
-
-  return this->thread_lane_resources_manager ().is_collocated (mprofile);
-}
-
-// ****************************************************************
-
-TAO_Leader_Follower &
-TAO_ORB_Core::leader_follower (void)
-{
-  return this->lane_resources ().leader_follower ();
-}
-
-TAO_LF_Strategy &
-TAO_ORB_Core::lf_strategy (void)
-{
-  return this->thread_lane_resources_manager ().lf_strategy ();
-}
-
-int
-TAO_ORB_Core::run (ACE_Time_Value *tv,
-                   int perform_work
-                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ")
-                  ACE_TEXT ("start [%s]\n"),
-                  perform_work?ACE_TEXT("perform_work"):ACE_TEXT("run")));
-    }
-
-  // Fetch the Reactor
-  ACE_Reactor *r = this->reactor ();
-
-  int result = 1;
-  // 1 to detect that nothing went wrong
-
-  // Loop handling client requests until the ORB is shutdown.
-
-  // We could use the leader-follower lock to check for the state
-  // if this variable or use the lock <create_event_loop_lock> in
-  // the server strategy factory.
-  // We don't need to do this because we use the Reactor
-  // mechanisms to shutdown in a thread-safe way.
-
-  while (this->has_shutdown () == 0)
-    {
-      // Every time we perform an interation we have to become the
-      // leader again, because it is possible that a client has
-      // acquired the leader role...
-      TAO_Leader_Follower &leader_follower =
-        this->leader_follower ();
-
-      TAO_LF_Strategy &lf_strategy =
-        this->lf_strategy ();
-
-      TAO_LF_Event_Loop_Thread_Helper helper (leader_follower,
-                                              lf_strategy,
-                                              tv);
-      result = helper.event_loop_return ();
-      if (result != 0)
-        {
-          if (errno == ETIME)
-            return 0;
-          else
-            return result;
-        }
-
-      // Set the owning thread of the Reactor to the one which we're
-      // currently in.  This is necessary b/c it's possible that the
-      // application is calling us from a thread other than that in which
-      // the Reactor's CTOR (which sets the owner) was called.
-      //
-      // We need to do this on every iteration because the reactor may be
-      // acquired by one of the client threads in the LF waiting
-      // strategy
-      r->owner (ACE_Thread::self ());
-
-      if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ")
-                      ACE_TEXT ( "calling handle_events()\n")));
-        }
-
-      result = r->handle_events (tv);
-
-      if (TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ")
-                      ACE_TEXT ("handle_events() returns %d\n"),
-                      result));
-        }
-
-      if (result == -1)
-        {
-          // An error, terminate the loop
-          break;
-        }
-      if (result == 0
-          && tv != 0
-          && *tv == ACE_Time_Value::zero)
-        {
-          // A timeout, terminate the loop...
-          break;
-        }
-      if (perform_work)
-        {
-          // This is running on behalf of a perform_work() call,
-          // The loop should run only once.
-          break;
-        }
-      // Otherwise just continue..
-    }
-
-  if (this->has_shutdown () == 1 &&
-      this->server_factory_->activate_server_connections ())
-      this->tm_.wait ();
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ")
-                  ACE_TEXT ("ends with result = %d\n"),
-                  result));
-    }
-
-  return result;
-}
-
-
-void
-TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-  ACE_TRY
-    {
-      {
-        ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
-
-        if (this->has_shutdown () != 0)
-          return;
-
-        // Check if we are on the right state, i.e. do not accept
-        // shutdowns with the 'wait_for_completion' flag set in the middle
-        // of an upcall (because those deadlock).
-        this->adapter_registry_.check_close (wait_for_completion
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // Set the 'has_shutdown' flag, so any further attempt to shutdown
-        // becomes a noop.
-        this->has_shutdown_ = 1;
-
-        // need to release the mutex, because some of the shutdown
-        // operations invoke application code, that could (and in practice
-        // does!) callback into ORB Core code.
-      }
-
-      this->adapter_registry_.close (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Shutdown reactor.
-      this->thread_lane_resources_manager ().shutdown_reactor ();
-
-      // Cleanup transports that use the RW strategies
-      this->thread_lane_resources_manager ().cleanup_rw_transports ();
-
-      // Grab the thread manager
-      ACE_Thread_Manager *tm = this->thr_mgr ();
-
-      // Try to cancel all the threads in the ORB.
-      tm->cancel_all ();
-
-      // If <wait_for_completion> is set, wait for all threads to exit.
-      if (wait_for_completion != 0)
-        tm->wait ();
-
-      // Explicitly destroy the object reference table since it
-      // contains references to objects, which themselves may contain
-      // reference to this ORB.
-      this->object_ref_table_.destroy ();
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-      this->pi_current_ = 0;  // For the sake of consistency.
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    }
-  ACE_CATCHALL
-    {
-      // Do not allow exceptions to escape.. So catch all the
-      // exceptions.
-      // @@ Not sure what to print here for the users..
-
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-
-void
-TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
-{
-  //
-  // All destroy() should do is (a) call shutdown() and (b) unbind()
-  // from the ORB table.  Nothing else should really be added to this
-  // method.  Everything else should go to the shutdown() method.
-  // Remember when the ORB Core is finally removed from the ORB table,
-  // the reference count goes to zero and fini() is called.  fini()
-  // calls shutdown() and does not call destroy() since destroy() will
-  // try to unbind from the ORB table again.  Additional code should
-  // not be added to destroy() since there is no guarantee that
-  // orb->destroy() will ever be called by the user.  Since TAO
-  // guarantees that shutdown() will be called, all cleanup code
-  // should go there.
-  //
-
-  // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Invoke Interceptor::destroy() on all registered interceptors.
-  this->destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Now remove it from the ORB table so that it's ORBid may be
-  // reused.
-  TAO::ORB_Table::instance ()->unbind (this->orbid_);
-}
-
-void
-TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->has_shutdown ())
-    {
-      // As defined by the CORBA 2.3 specification, throw a
-      // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB
-      // has shutdown by the time an ORB function is called.
-
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4,
-                                       CORBA::COMPLETED_NO));
-    }
-}
-
-void
-TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC (())
-{
-
-  ACE_TRY
-    {
-#if TAO_HAS_INTERCEPTORS == 1
-      size_t len = 0;   // The length of the interceptor array.
-      size_t ilen = 0;  // The incremental length of the interceptor array.
-
-      TAO::ClientRequestInterceptor_List::TYPE &client_interceptors =
-        this->client_request_interceptors_.interceptors ();
-
-      len = client_interceptors.size ();
-      ilen = len;
-
-      for (size_t i = 0; i < len; ++i)
-        {
-          // Destroy the interceptors in reverse order in case the array
-          // list is only partially destroyed and another invocation
-          // occurs afterwards.
-          --ilen;
-
-          client_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Since Interceptor::destroy() can throw an exception, decrease
-          // the size of the interceptor array incrementally since some
-          // interceptors may not have been destroyed yet.  Note that this
-          // size reduction is fast since no memory is actually
-          // deallocated.
-          client_interceptors.size (ilen);
-        }
-
-      TAO::ServerRequestInterceptor_List::TYPE &server_interceptors =
-        this->server_request_interceptors_.interceptors ();
-
-      len = server_interceptors.size ();
-      ilen = len;
-
-      for (size_t j = 0; j < len; ++j)
-        {
-          // Destroy the interceptors in reverse order in case the array
-          // list is only partially destroyed and another invocation
-          // occurs afterwards.
-          --ilen;
-
-          server_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Since Interceptor::destroy() can throw an exception, decrease
-          // the size of the interceptor array incrementally since some
-          // interceptors may not have been destroyed yet.  Note that this
-          // size reduction is fast since no memory is actually
-          // deallocated.
-          server_interceptors.size (ilen);
-        }
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-      if (this->ior_interceptor_adapter_ != 0)
-        {
-          this->ior_interceptor_adapter_->destroy_interceptors (
-              ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          this->ior_interceptor_adapter_ = 0;
-        }
-
-    }
-  ACE_CATCHALL
-    {
-      // .. catch all the exceptions..
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Exception in TAO_ORB_Core")
-                      ACE_TEXT ("::destroy_interceptors () \n")));
-        }
-    }
-  ACE_ENDTRY;
-
-  return;
-}
-
-TAO_Thread_Lane_Resources &
-TAO_ORB_Core::lane_resources (void)
-{
-  return this->thread_lane_resources_manager ().lane_resources ();
-}
-
-void
-TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Object_Loader *loader =
-    ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TypeCodeFactory_Loader");
-  if (loader == 0)
-    {
-      ACE_Service_Config::process_directive (ACE_TEXT("dynamic TypeCodeFactory Service_Object *")
-                                             ACE_TEXT("TAO_TypeCodeFactory:_make_TAO_TypeCodeFactory_Loader()"));
-      loader =
-        ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TypeCodeFactory_Loader");
-      if (loader == 0)
-        ACE_THROW (CORBA::ORB::InvalidName ());
-    }
-  this->typecode_factory_ =
-    loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Object_Loader *loader =
-    ACE_Dynamic_Service<TAO_Object_Loader>::instance ("DynamicAny_Loader");
-  if (loader == 0)
-    {
-      ACE_Service_Config::process_directive (ACE_TEXT("dynamic DynamicAny_Loader Service_Object *")
-                                             ACE_TEXT("TAO_DynamicAny:_make_TAO_DynamicAny_Loader()"));
-      loader =
-        ACE_Dynamic_Service<TAO_Object_Loader>::instance ("DynamicAny_Loader");
-      if (loader == 0)
-        ACE_THROW (CORBA::ORB::InvalidName ());
-    }
-  this->dynany_factory_ =
-    loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Object_Loader *loader =
-    ACE_Dynamic_Service<TAO_Object_Loader>::instance ("IORManip_Loader");
-
-  if (loader == 0)
-    {
-      ACE_Service_Config::process_directive (ACE_TEXT("dynamic IORManip_Loader Service_Object *")
-                                             ACE_TEXT("TAO_IORManip:_make_TAO_IORManip_Loader()"));
-      loader =
-        ACE_Dynamic_Service<TAO_Object_Loader>::instance ("IORManip_Loader");
-      if (loader == 0)
-        ACE_THROW (CORBA::ORB::InvalidName ());
-    }
-  this->ior_manip_factory_ =
-    loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Adapter_Factory *factory =
-    ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_IORTable");
-  if (factory == 0)
-    {
-      ACE_Service_Config::process_directive (ACE_TEXT("dynamic TAO_IORTable Service_Object *")
-                                             ACE_TEXT("TAO_IORTable:_make_TAO_Table_Adapter_Factory()"));
-      factory =
-        ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_IORTable");
-    }
-  if (factory == 0)
-    ACE_THROW (CORBA::ORB::InvalidName ());
-
-  // @@ Not exception safe
-  TAO_Adapter *iortable_adapter = factory->create (this);
-  this->adapter_registry_.insert (iortable_adapter ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  iortable_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->ior_table_ = iortable_adapter->root ();
-}
-
-int
-TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
-                                   const ACE_CString &endpoints
-                                   ACE_ENV_ARG_DECL)
-{
-  if (this->orb_params ()->add_endpoints (lane,
-                                          endpoints) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t)\n")
-                  ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ())));
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                           CORBA::SystemException::_tao_minor_code (
-                              TAO_ORB_CORE_INIT_LOCATION_CODE,
-                              EINVAL),
-                           CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  return 0;
-}
-
-CORBA::Object_ptr
-TAO_ORB_Core::resolve_rir (const char *name
-                           ACE_ENV_ARG_DECL)
-{
-  // Get the table of initial references specified through
-  // -ORBInitRef.
-  ACE_CString ior;
-  ACE_CString object_id ((const char *) name);
-
-  // Get the list of initial reference prefixes specified through
-  // -ORBDefaultInitRef.
-  CORBA::String_var default_init_ref =
-    this->orb_params ()->default_init_ref ();
-
-  // Check if a DefaultInitRef was specified.
-  if (ACE_OS::strlen (default_init_ref.in ()) != 0)
-    {
-      static const char corbaloc_prefix[] = "corbaloc:";
-      static const char mcast_prefix[] = "mcast:";
-      char object_key_delimiter = 0;
-
-      ACE_CString list_of_profiles (default_init_ref.in ());
-
-      // Check if the protocol is corbaloc: or mcast:.
-      // If it is, set the object_key_delimiter.
-      if ((ACE_OS::strncmp (default_init_ref.in (),
-                            corbaloc_prefix,
-                            sizeof corbaloc_prefix -1) == 0) ||
-          (ACE_OS::strncmp (default_init_ref.in (),
-                            mcast_prefix,
-                            sizeof mcast_prefix -1) == 0))
-        {
-          object_key_delimiter = '/';
-        }
-      else
-        {
-          TAO_Connector_Registry *conn_reg =
-            this->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          // Obtain the appropriate object key delimiter for the
-          // specified protocol.
-          object_key_delimiter =
-            conn_reg->object_key_delimiter (list_of_profiles.c_str ());
-        }
-
-      // Make sure that the default initial reference doesn't end
-      // with the object key delimiter character.
-      if (list_of_profiles[list_of_profiles.length() - 1] !=
-          object_key_delimiter)
-            list_of_profiles += ACE_CString (object_key_delimiter);
-
-      list_of_profiles += object_id;
-
-      return this->orb ()->string_to_object (list_of_profiles.c_str ()
-                                             ACE_ENV_ARG_PARAMETER);
-    }
-
-  return CORBA::Object::_nil ();
-}
-
-CORBA::ORB::ObjectIdList *
-TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Unsupported initial services should NOT be included in the below list!
-  static const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
-  // Make sure the "terminating" zero is the last array element so
-  // that there is a stop condition when iterating through the list.
-
-  static const size_t initial_services_size =
-    sizeof (initial_services) / sizeof (initial_services[0]);
-
-  const size_t total_size =
-    initial_services_size
-    + this->init_ref_map_.current_size ()
-    + this->object_ref_table_.current_size ();
-
-  CORBA::ORB::ObjectIdList *tmp = 0;
-
-  ACE_NEW_THROW_EX (tmp,
-                    CORBA::ORB::ObjectIdList (
-                      static_cast<CORBA::ULong> (total_size)),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ORB::ObjectIdList_var list (tmp);
-  list->length (static_cast<CORBA::ULong> (total_size));
-
-  CORBA::ULong index = 0;
-  // Index for ObjectIdList members.
-
-  // Iterate over the registered initial references.
-  for (index = 0; index < initial_services_size; ++index)
-    list[index] = initial_services[index];
-
-  // Now iterate over the initial references created by the user and
-  // add them to the sequence.
-
-  // References registered via
-  // ORBInitInfo::register_initial_reference().
-  TAO_Object_Ref_Table::Iterator obj_ref_end =
-    this->object_ref_table_.end ();
-
-  for (TAO_Object_Ref_Table::Iterator i = this->object_ref_table_.begin ();
-       i != obj_ref_end;
-       ++i, ++index)
-    list[index] = CORBA::string_dup ((*i).ext_id_);
-
-  // References registered via INS.
-  const InitRefMap::iterator end = this->init_ref_map_.end ();
-
-  for (InitRefMap::iterator j = this-> init_ref_map_.begin ();
-       j != end;
-       ++j, ++index)
-    list[index] = (*j).ext_id_.c_str ();
-
-  return list._retn ();
-}
-
-// ****************************************************************
-ACE_Allocator*
-TAO_ORB_Core::input_cdr_dblock_allocator (void)
-{
-  return this->lane_resources ().input_cdr_dblock_allocator ();
-}
-
-ACE_Allocator*
-TAO_ORB_Core::input_cdr_buffer_allocator (void)
-{
-  return this->lane_resources ().input_cdr_buffer_allocator ();
-}
-
-ACE_Allocator*
-TAO_ORB_Core::input_cdr_msgblock_allocator (void)
-{
-  return this->lane_resources ().input_cdr_msgblock_allocator ();
-}
-
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_dblock_allocator (void)
-{
-
-  return this->lane_resources ().output_cdr_dblock_allocator ();
-}
-
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_buffer_allocator (void)
-{
-  return this->lane_resources ().output_cdr_buffer_allocator ();
-}
-
-
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_msgblock_allocator (void)
-{
-  return this->lane_resources ().output_cdr_msgblock_allocator ();
-}
-
-
-ACE_Allocator *
-TAO_ORB_Core::transport_message_buffer_allocator (void)
-{
-  return this->lane_resources ().transport_message_buffer_allocator ();
-}
-
-
-ACE_Data_Block*
-TAO_ORB_Core::create_input_cdr_data_block (size_t size)
-{
-
-  ACE_Allocator *dblock_allocator;
-  ACE_Allocator *buffer_allocator;
-
-  dblock_allocator =
-    this->input_cdr_dblock_allocator ();
-  buffer_allocator =
-    this->input_cdr_buffer_allocator ();
-
-  ACE_Lock* lock_strategy = 0;
-  if (this->resource_factory ()->use_locked_data_blocks ())
-    {
-      lock_strategy = &this->data_block_lock_;
-    }
-
-  return this->create_data_block_i (size,
-                                    buffer_allocator,
-                                    dblock_allocator,
-                                    lock_strategy);
-}
-
-ACE_Data_Block *
-TAO_ORB_Core::create_data_block_i (size_t size,
-                                   ACE_Allocator *buffer_allocator,
-                                   ACE_Allocator *dblock_allocator,
-                                   ACE_Lock *lock_strategy)
-{
-  ACE_Data_Block *nb = 0;
-
-  ACE_NEW_MALLOC_RETURN (
-                         nb,
-                         static_cast<ACE_Data_Block*> (
-                           dblock_allocator->malloc (sizeof (ACE_Data_Block))),
-                         ACE_Data_Block (size,
-                                         ACE_Message_Block::MB_DATA,
-                                         0,
-                                         buffer_allocator,
-                                         lock_strategy,
-                                         0,
-                                         dblock_allocator),
-                         0);
-
-  return nb;
-}
-
-TAO_Connector_Registry *
-TAO_ORB_Core::connector_registry (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Connector_Registry *conn =
-    this->lane_resources ().connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return conn;
-}
-
-ACE_Reactor *
-TAO_ORB_Core::reactor (void)
-{
-  return this->leader_follower ().reactor ();
-}
-
-CORBA::Object_ptr
-TAO_ORB_Core::implrepo_service (void)
-{
-  if (!this->use_implrepo_)
-    return CORBA::Object::_nil ();
-
-  if (CORBA::is_nil (this->implrepo_service_))
-    {
-
-      ACE_TRY_NEW_ENV
-        {
-          CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ());
-
-          // @@ Worry about assigning a different IOR? (brunsch)
-          this->implrepo_service_ = temp._retn ();
-        }
-      ACE_CATCHANY
-        {
-          // Just make sure that we have a null pointer.  Ignore the exception anyway.
-          this->implrepo_service_ = CORBA::Object::_nil ();
-        }
-      ACE_ENDTRY;
-    }
-
-  return CORBA::Object::_duplicate (this->implrepo_service_);
-}
-
-void
-TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub,
-                                    bool &has_synchronization,
-                                    Messaging::SyncScope &scope)
-{
-  Sync_Scope_Hook sync_scope_hook =
-    TAO_ORB_Core_Static_Resources::instance ()->sync_scope_hook_;
-
-  if (sync_scope_hook == 0)
-    {
-      has_synchronization = false;
-      return;
-    }
-
-  (*sync_scope_hook) (this, stub, has_synchronization, scope);
-}
-
-TAO_Sync_Strategy &
-TAO_ORB_Core::get_sync_strategy (TAO_Stub *,
-                                 Messaging::SyncScope &scope)
-{
-
-  if (scope == Messaging::SYNC_WITH_TRANSPORT
-      || scope == Messaging::SYNC_WITH_SERVER
-      || scope == Messaging::SYNC_WITH_TARGET)
-    {
-      return this->transport_sync_strategy ();
-    }
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  if (scope == Messaging::SYNC_NONE
-      || scope == TAO::SYNC_EAGER_BUFFERING)
-    {
-      return this->eager_buffering_sync_strategy ();
-    }
-
-  if (scope == TAO::SYNC_DELAYED_BUFFERING)
-    {
-      return this->delayed_buffering_sync_strategy ();
-    }
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  return this->transport_sync_strategy ();
-}
-
-void
-TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook)
-{
-  TAO_ORB_Core_Static_Resources::instance ()-> sync_scope_hook_ = hook;
-}
-
-void
-TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub,
-                                 bool &has_timeout,
-                                 ACE_Time_Value &time_value)
-{
-  Timeout_Hook timeout_hook =
-    TAO_ORB_Core_Static_Resources::instance ()->timeout_hook_;
-
-  if (timeout_hook == 0)
-    {
-      has_timeout = false;
-      return;
-    }
-  (*timeout_hook) (this, stub, has_timeout, time_value);
-}
-
-void
-TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook)
-{
-  TAO_ORB_Core_Static_Resources::instance ()->timeout_hook_ = hook;
-  // Saving the hook pointer so that we can use it later when needed.
-
-  return;
-}
-
-void
-TAO_ORB_Core::connection_timeout (TAO_Stub *stub,
-                                  bool &has_timeout,
-                                  ACE_Time_Value &time_value)
-{
-  Timeout_Hook connection_timeout_hook =
-    TAO_ORB_Core_Static_Resources::instance ()->connection_timeout_hook_;
-
-  if (connection_timeout_hook == 0)
-    {
-      has_timeout = false;
-      return;
-    }
-
-  (*connection_timeout_hook) (this, stub, has_timeout, time_value);
-}
-
-void
-TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
-{
-  // Saving the hook pointer so that we can use it later when needed.
-  TAO_ORB_Core_Static_Resources::instance ()->connection_timeout_hook_ = hook;
-}
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-CORBA::Policy_ptr
-TAO_ORB_Core::get_policy (CORBA::PolicyType type
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var result;
-
-  TAO_Policy_Manager *policy_manager =
-    this->policy_manager ();
-  if (policy_manager != 0)
-    {
-      result = policy_manager->get_policy (type
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result =
-        this->get_default_policies ()->get_policy (type
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type
-                                            ACE_ENV_ARG_DECL)
-{
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
-
-  CORBA::Policy_var result =
-    policy_current.get_policy (type
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result = this->get_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
-                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var result;
-
-  TAO_Policy_Manager *policy_manager =
-    this->policy_manager ();
-  if (policy_manager != 0)
-    {
-      result =
-        policy_manager->get_cached_policy (type
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result =
-        this->get_default_policies ()->get_cached_policy (type
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_ORB_Core::get_cached_policy_including_current (
-    TAO_Cached_Policy_Type type
-    ACE_ENV_ARG_DECL)
-{
-  TAO_Policy_Current &policy_current =
-    this->policy_current ();
-
-  CORBA::Policy_var result =
-    policy_current.get_cached_policy (type
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK (CORBA::Policy::_nil ());
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result =
-        this->get_cached_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-#endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
-
-CORBA::Environment *
-TAO_ORB_Core::default_environment (void) const
-{
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
-}
-
-void
-TAO_ORB_Core::default_environment (CORBA::Environment *env)
-{
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
-}
-
-void
-TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::IORInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
-{
-  if (this->ior_interceptor_adapter ())
-    {
-      this->ior_interceptor_adapter_->add_interceptor (interceptor
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("ERROR: ORB Core unable to find the ")
-                  ACE_TEXT ("IORInterceptor Adapter Factory instance")));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-TAO_IORInterceptor_Adapter *
-TAO_ORB_Core::ior_interceptor_adapter (void)
-{
-  if (this->ior_interceptor_adapter_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        this->lock_,
-                        0);
-
-      if (this->ior_interceptor_adapter_ == 0)
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              TAO_IORInterceptor_Adapter_Factory * ior_ap_factory =
-                ACE_Dynamic_Service<TAO_IORInterceptor_Adapter_Factory>::instance (
-                    TAO_ORB_Core::iorinterceptor_adapter_factory_name ()
-                  );
-
-              if (ior_ap_factory)
-                {
-                  this->ior_interceptor_adapter_ =
-                    ior_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                }
-            }
-          ACE_CATCHANY
-            {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "(%P|%t) Cannot initialize the "
-                                   "ior_interceptor_adapter \n");
-            }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN(0);
-        }
-    }
-
-  return this->ior_interceptor_adapter_;
-}
-
-// ****************************************************************
-
-TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
-  : event_loop_thread_ (0)
-  , client_leader_thread_ (0)
-  , lane_ (0)
-  , ts_objects_ ()
-  , upcalls_temporarily_suspended_on_this_thread_ (false)
-  , orb_core_ (0)
-#if TAO_HAS_INTERCEPTORS == 1
-    , pi_current_ ()
-    , client_request_info_ (0)
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-{
-#if TAO_HAS_INTERCEPTORS == 1
-  ACE_NEW (this->client_request_info_,
-           TAO_ClientRequestInfo);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-}
-
-TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
-{
-
-#if TAO_HAS_INTERCEPTORS == 1
-  CORBA::release (this->client_request_info_);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-  //@@ This is broken on platforms that use TSS emulation since this
-  //   destructor is invoked after the ORB.  Since we're under
-  //   pressure to release a beta, we'll have to leak the TSS objects
-  //   stores in the <ts_objects_> array.  However, the only service
-  //   known to currently use this array is the SSLIOP pluggable
-  //   protocol.  Fortunately, it registeres a null cleanup function
-  //   so we're not leaking anything yet.  We *do* need to fix this
-  //   before other services start to use this array.
-  //      -Ossama
-  // if (this->orb_core_ != 0)
-  //   this->orb_core_->tss_cleanup_funcs ()->cleanup (this->ts_objects_);
-}
-
-// ****************************************************************
-
-TAO_Export TAO_ORB_Core *
-TAO_ORB_Core_instance (void)
-{
-  // @@ This is a slight violation of layering, we should use
-  //    TAO_ORB_Core_instance(), but that breaks during startup.
-  TAO::ORB_Table * const orb_table = TAO::ORB_Table::instance ();
-  if (orb_table->first_orb () == 0)
-    {
-      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), 0));
-
-      if (orb_table->first_orb () == 0)
-        {
-          // Calling CORBA::ORB_init() returns a duplicated ORB
-          // reference, so make sure that reference is stored in an
-          // ORB_var so that no leak occurs.  The duplicate ORB
-          // reference isn't needed outside the scope of this function
-          // since the corresponding ORB Core instance will still
-          // exist in the ORB table after the ORB reference is
-          // destroyed.
-
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              int argc = 0;
-              CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // @@ What should we do here?
-            }
-          ACE_ENDTRY;
-        }
-    }
-
-  return orb_table->first_orb ();
-}
-
-
-TAO::Collocation_Strategy
-TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
-                                    ACE_ENV_ARG_DECL)
-{
-  TAO_Stub *stub = object->_stubobj ();
-  if (!CORBA::is_nil (stub->servant_orb_var ().in ()) &&
-      stub->servant_orb_var ()->orb_core () != 0)
-    {
-      TAO_ORB_Core *orb_core =
-        stub->servant_orb_var ()->orb_core ();
-
-      const int collocated =
-        orb_core->collocation_resolver ().is_collocated (object
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
-      if (collocated)
-        {
-          switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
-            {
-            case THRU_POA:
-              return TAO::TAO_CS_THRU_POA_STRATEGY;
-
-            case DIRECT:
-              {
-                /////////////////////////////////////////////////////////////
-                // If the servant is null and you are collocated this means
-                // that the POA policy NON-RETAIN is set, and with that policy
-                // using the DIRECT collocation strategy is just insane.
-                /////////////////////////////////////////////////////////////
-                ACE_ASSERT (object->_servant () != 0);
-                return TAO::TAO_CS_DIRECT_STRATEGY;
-              }
-            }
-        }
-    }
-
-  // In this case the Object is a client.
-  return TAO::TAO_CS_REMOTE_STRATEGY;
-}
-
-TAO_ORB_Core::InitRefMap *
-TAO_ORB_Core::init_ref_map ()
-{
-  return &this->init_ref_map_;
-}
-
-void
-TAO_ORB_Core::set_default (const char * orb_id)
-{
-  TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
-  table->set_default (orb_id);
-}
-
-void
-TAO_ORB_Core::not_default (const char * orb_id)
-{
-  TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
-  table->not_default (orb_id);
-}
-
-/// Return the valuetype adapter
-TAO_Valuetype_Adapter *&
-TAO_ORB_Core::valuetype_adapter (void)
-{
-  return this->valuetype_adapter_;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-#if defined (ACE_HAS_THREADS)
-template class ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Lock_Adapter<TAO_SYNCH_MUTEX>;
-#endif /* ACE_HAS_THREADS */
-
-template class ACE_Reverse_Lock<TAO_SYNCH_MUTEX>;
-template class ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> >;
-
-template class ACE_TSS<TAO_ORB_Core_TSS_Resources>;
-
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, ACE_CString>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-
-template class ACE_Array_Base<void *>;
-
-template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
-template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_MUTEX>
-#endif /* ACE_HAS_THREADS */
-
-#pragma instantiate ACE_Reverse_Lock<TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_CString>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Array_Base<void *>
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
-#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
deleted file mode 100644
index 9286302beec..00000000000
--- a/TAO/tao/ORB_Core.h
+++ /dev/null
@@ -1,1451 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ORB_Core.h
- *
- *  $Id$
- *
- *  @author DOC Center - Washington University at St. Louis
- *  @author DOC Laboratory - University of California at Irvine
- */
-// ===================================================================
-
-#ifndef TAO_ORB_CORE_H
-#define TAO_ORB_CORE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Resource_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Strategy.h"
-#include "tao/params.h"
-#include "tao/ORB_Constants.h"
-#include "tao/PolicyFactory_Registry.h"
-#include "tao/Parser_Registry.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/Service_Callbacks.h"
-#include "tao/Fault_Tolerance_Service.h"
-#include "tao/Cleanup_Func_Registry.h"
-#include "tao/Object_Ref_Table.h"
-#include "tao/ObjectKey_Table.h"
-#include "tao/Messaging_SyncScopeC.h"
-#include "tao/Object.h"
-#include "tao/Invocation_Utils.h"
-#include "tao/Adapter_Registry.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/Interceptor_List.h"
-
-namespace TAO
-{
-  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor>
-    ClientRequestInterceptor_List;
-}
-
-namespace TAO
-{
-  typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor>
-    ServerRequestInterceptor_List;
-}
-
-# include "PICurrent.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1  */
-
-#include "ace/Thread_Manager.h"
-#include "ace/Lock_Adapter_T.h"
-
-// Forward declarations
-class TAO_Adapter;
-class TAO_Acceptor;
-class TAO_Connector;
-class TAO_Connector_Registry;
-
-class TAO_Resource_Factory;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-
-class TAO_TSS_Resources;
-class TAO_Leader_Follower;
-class TAO_LF_Strategy;
-class TAO_RT_ORB;
-class TAO_RT_Current;
-class TAO_MProfile;
-class TAO_Profile;
-
-class TAO_Endpoint_Selector_Factory;
-class TAO_Message_State_Factory;
-class TAO_ServerRequest;
-class TAO_Protocols_Hooks;
-class TAO_BiDir_Adapter;
-
-class TAO_Flushing_Strategy;
-
-class TAO_Thread_Lane_Resources_Manager;
-class TAO_Collocation_Resolver;
-class TAO_Thread_Lane_Resources;
-class TAO_Stub_Factory;
-class TAO_Endpoint_Selector_Factory;
-class TAO_Service_Context;
-class TAO_Request_Dispatcher;
-class TAO_Policy_Set;
-class TAO_Policy_Manager;
-class TAO_Policy_Current;
-
-class TAO_Codeset_Manager;
-class TAO_IORInterceptor_Adapter;
-class TAO_Valuetype_Adapter;
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-class TAO_Buffering_Constraint_Policy;
-class TAO_Eager_Buffering_Sync_Strategy;
-class TAO_Delayed_Buffering_Sync_Strategy;
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#if TAO_HAS_INTERCEPTORS == 1
-class TAO_ClientRequestInfo;
-#endif  /* TAO_HAS_INTERCEPTORS == 1  */
-
-
-class TAO_Transport_Sync_Strategy;
-class TAO_Sync_Strategy;
-class TAO_Policy_Validator;
-namespace TAO
-{
-  class GUIResource_Factory;
-}
-
-namespace CORBA
-{
-  class ORB_ObjectIdList;  // CORBA::ORB::ObjectIdList
-  class ORB;
-  typedef ORB *ORB_ptr;
-
-  class PolicyList;
-}
-
-namespace IOP
-{
-  class ServiceContextList;
-}
-
-namespace PortableInterceptor
-{
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-}
-// ****************************************************************
-
-/**
- * @class TAO_ORB_Core_TSS_Resources
- *
- * @brief The TSS resoures of an ORB core.
- *
- * This class is used by the ORB_Core to store the resources
- * potentially bound to a thread in TSS storage. The members are public
- * because only the ORB Core is expected to access them.
- */
-class TAO_Export TAO_ORB_Core_TSS_Resources
-{
-public:
-
-  /// Constructor
-  TAO_ORB_Core_TSS_Resources (void);
-
-  /// destructor
-  ~TAO_ORB_Core_TSS_Resources (void);
-
-private:
-
-  /// The ORB Core TSS resources should not be copied
-  ACE_UNIMPLEMENTED_FUNC (TAO_ORB_Core_TSS_Resources (const TAO_ORB_Core_TSS_Resources&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_ORB_Core_TSS_Resources&))
-
-public:
-
-  /**
-   * @todo
-   * The rest of the resources are not currently in use, just a plan
-   * for the future...
-   */
-  /// Counter for how (nested) calls this thread has made to run the
-  /// event loop.
-  int event_loop_thread_;
-
-  /// Counter for how many times this thread has become a client
-  /// leader.
-  int client_leader_thread_;
-
-  /// Lane for this thread.
-  void *lane_;
-
-  /// Generic container for thread-specific objects.
-  ACE_Array_Base<void *> ts_objects_;
-
-  // Set to true by the wait_on_lf_no_nested_upcall wait strategy
-  // @CJC@  maybe we should use allocate_tss_slot_id() instead?
-  bool upcalls_temporarily_suspended_on_this_thread_;
-
-  /// Pointer to the ORB core.  Needed to get access to the TSS
-  /// cleanup functions for the TSS objects stored in the TSS object
-  /// array in this class.
-  TAO_ORB_Core *orb_core_;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  /// The thread-specific portion of the PICurrent object.
-  TAO::PICurrent_Impl pi_current_;
-
-  /// The PortableInterceptor::ClientRequestInfo object for the
-  /// current thread.
-  TAO_ClientRequestInfo *client_request_info_;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-};
-
-
-// ****************************************************************
-/**
- * @class TAO_ORB_Core
- *
- * @brief Encapsulates the state of an ORB.
- *
- * This is the implementation class for the CORBA::ORB interface.  The
- * class also encapsulates the access to the ORB resources and its
- * state.
- * @par
- * Some resources can be TSS or global, those resources are always
- * accessed through a TSS interface, but are allocated using the
- * Resource_Factory.  If the resource is really global the
- * Resource_Factory will simply return a pointer to the global
- * instance.
- */
-class TAO_Export TAO_ORB_Core
-{
-  friend class TAO_ORB_Core_Auto_Ptr;
-  friend CORBA::ORB_ptr CORBA::ORB_init (int &,
-                                         char *argv[],
-                                         const char *,
-                                         CORBA::Environment &);
-public:
-
-  /// Constructor.
-  TAO_ORB_Core (const char* id);
-
-  /// Accessor for the ORB parameters.
-  TAO_ORB_Parameters *orb_params (void);
-
-  /**
-   * @todo
-   * In the future this hook should change, instead of hardcoding the
-   * object we should add a "Resolver" to the ORB, so the "POACurrent"
-   * object returns a per-ORB object.
-   * @par
-   * Similarly, each ORB should implement the TSS pattern to put   the
-   * POA_Current_Impl in a void* slot.  The current approach *does*
-   * decouple the POA from the ORB, but it cannot add new adapters or
-   * other components transparently.
-   */
-  /// Accessor to the POA current.
-  //@{
-  CORBA::Object_ptr poa_current(void);
-  void poa_current (CORBA::Object_ptr poa_current);
-  //@}
-
-  ///Get the connector registry
-  TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
-
-  ///Get the IOR parser registry
-  TAO_Parser_Registry *parser_registry (void);
-
-  /// Return pointer to the policy factory registry associated with
-  /// this ORB core.
-  TAO_PolicyFactory_Registry *policy_factory_registry (void);
-
-  /// Get the protocol factories
-  TAO_ProtocolFactorySet *protocol_factories (void);
-
-  /// Get pointer to the ORB.
-  CORBA::ORB_ptr orb (void);
-
-  /// Wrappers that forward the request to the concurrency strategy.
-  ACE_Reactor *reactor (void);
-
-  /// Get the ACE_Thread_Manager
-  ACE_Thread_Manager *thr_mgr (void);
-
-  /// Return the RootPOA, or try to load it if not initialized already.
-  CORBA::Object_ptr root_poa (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Get the adapter registry
-  TAO_Adapter_Registry *adapter_registry (void);
-
-  /// @name Collocation Strategies
-  //@{
-  enum
-  {
-    /// Indicate object should refer to ORB for either one of the
-    /// following strategies.
-    ORB_CONTROL,
-
-    /// Collocated calls will go thru POA.
-    THRU_POA,
-
-    /// Collocated calls invoke operation on Servant directly.
-    DIRECT
-  };
-
-  /**
-   * This method returns the right collocation strategy, if any,
-   * to be used to perform a method invocation on the given object.
-   *
-   * @note
-   * No-Collocation is a special case of collocation.
-   */
-  static
-TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
-                                                  ACE_ENV_ARG_DECL);
-  //@}
-
-  /**
-   * @name Default Code Set Translators
-   *
-   * Get the default codeset translators.
-   *
-   * @par
-   * In most configurations these are just <nil> objects, but they can
-   * be set to something different if the native character sets are
-   * not ISO8869 (aka Latin/1, UTF-8) and UNICODE (aka UTF-16).
-   *
-   * @note
-   * This is just note on how the translator database coule be
-   * implemented: use the Service Configurator to load the translator,
-   * and then use the CodesetId (an unsigned long) to translate the
-   * character set code into the Service Object name.
-   * @par
-   * The default resource factory could parse command line options
-   * like:
-   *   - -ORBcharcodeset 0x00010001=ISO8859
-   *   - -ORBcharcodeset 0x10020417=IBM1047
-   *   - -ORBwcharcodeset 0x00010106=ISOIEC10646
-   * that would let the user experiment with different translators
-   * and plug them in on demand.
-   *@par
-   *
-   * We should also think about how translators will report conversion
-   * failures and how to simplify the implementation of char
-   * translators (it would seem like just a couple of arrays are
-   * needed, maybe the arrays should be dynamically loaded and the
-   * implementation would remain constant?  Just a thought.
-   *
-   */
-  //@{
-  /// Convert from ISO8859 to the native character set
-  ACE_Char_Codeset_Translator *from_iso8859 (void) const;
-
-  /// Convert from the native character set to ISO8859
-  ACE_Char_Codeset_Translator *to_iso8859 (void) const;
-
-  /// Convert from UNICODE to the native wide character set
-  ACE_WChar_Codeset_Translator *from_unicode (void) const;
-
-  /// Convert from the native wide character set to UNICODE
-  ACE_WChar_Codeset_Translator *to_unicode (void) const;
-  //@}
-
-  /// Set/get the collocation flags
-  //@{
-  void optimize_collocation_objects (CORBA::Boolean opt);
-  CORBA::Boolean optimize_collocation_objects (void) const;
-
-  void use_global_collocation (CORBA::Boolean opt);
-  CORBA::Boolean use_global_collocation (void) const;
-
-  CORBA::ULong get_collocation_strategy (void) const;
-  //@}
-
-  /// Get the adapter named "RootPOA" and cache the result, this is an
-  /// optimization for the POA.
-  TAO_Adapter *poa_adapter (void);
-
-  /**
-   * @name Access to Factories
-   *
-   * These factories are not thread-specific, and are presented here
-   * in order to have one place to get useful information.  Often, the
-   * instances to which the return pointers are stored in the Service
-   * Repository.
-   */
-  //@{
-  /// Returns pointer to the resource factory.
-  TAO_Resource_Factory *resource_factory (void);
-
-  /// Returns pointer to the factory for creating gui resources
-  TAO::GUIResource_Factory *gui_resource_factory (void);
-
-  /// Returns pointer to the client factory.
-  TAO_Client_Strategy_Factory *client_factory (void);
-
-  /// Returns pointer to the server factory.
-  TAO_Server_Strategy_Factory *server_factory (void);
-
-  /// Returns pointer to the Protocols_Hooks.
-  TAO_Protocols_Hooks *protocols_hooks (void);
-
-  /// Returns a pointer to the Thread Lane Resources Manager.
-  TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void);
-
-  /// Returns a pointer to the Collocation Resolver.
-  TAO_Collocation_Resolver &collocation_resolver (void);
-
-  /// Returns a pointer to the Stub factory.
-  TAO_Stub_Factory *stub_factory (void);
-
-  /// Returns a pointer to the endpoint selector factory.
-  TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void);
-
-  //@}
-
-  /// Sets the value of
-  /// TAO_ORB_Core::thread_lane_resources_manager_factory_name_
-  static void set_thread_lane_resources_manager_factory (const char *
-    thread_lane_resources_manager_factory_name);
-
-  /// Sets the value of TAO_ORB_Core::collocation_resolver_name_
-  static void set_collocation_resolver (const char *collocation_resolver_name);
-
-  /// Sets the value of TAO_ORB_Core::stub_factory_name_
-  static void set_stub_factory (const char *stub_factory_name);
-
-  /// Sets the value of TAO_ORB_Core::resource_factory_
-  static void set_resource_factory (const char *resource_factory_name);
-
-  /** Sets the value of TAO_ORB_Core::gui_resource_factory_.
-   *
-   *  Sets the value of gui_resource_factory in TSS. ORB_Core is responsible
-   *  for releasing this factory if needed.
-   */
-  static void set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory);
-
-  /// Sets the value of TAO_ORB_Core::protocols_hooks_
-  static void set_protocols_hooks (const char *protocols_hooks_name);
-
-  /// Sets the value of TAO_ORB_Core::endpoint_selector_factory_
-  static void set_endpoint_selector_factory (
-    const char *endpoint_selector_factory_name);
-
-  /// Sets the name of the POA factory and the dynamic service
-  /// configurator directive to load it if needed.
-  static void set_poa_factory (const char *poa_factory_name,
-                               const char *poa_factory_directive);
-
-  /// Access the POA factory name.
-  static const ACE_CString &poa_factory_name (void);
-
-  /// Gets the value of TAO_ORB_Core::protocols_hooks__
-  TAO_Protocols_Hooks * get_protocols_hooks (void);
-
-  /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
-  static void dynamic_adapter_name (const char *name);
-
-  /// Gets the value of TAO_ORB_Core::dynamic_adapter_name_.
-  static const char *dynamic_adapter_name (void);
-
-  /// Sets the value of TAO_ORB_Core::ifr_client_adapter_name_.
-  static void ifr_client_adapter_name (const char *name);
-
-  /// Gets the value of TAO_ORB_Core::ifr_client_adapter_name_.
-  static const char *ifr_client_adapter_name (void);
-
-  /// Sets the value of TAO_ORB_Core::typecodefactory_adapter_name_.
-  static void typecodefactory_adapter_name (const char *name);
-
-  /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_.
-  static const char *typecodefactory_adapter_name (void);
-
-  /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_.
-  static void iorinterceptor_adapter_factory_name (const char *name);
-
-  /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_.
-  static const char *iorinterceptor_adapter_factory_name (void);
-
-  /// Sets the value of TAO_ORB_Core::valuetype_adapter_name.
-  static void valuetype_adapter_name (const char *name);
-
-  /// Gets the value of TAO_ORB_Core::valuetype_adapter_name.
-  static const char *valuetype_adapter_name (void);
-
-
-  /// See if we have a collocated address, if yes, return the POA
-  /// associated with the address.
-  int is_collocated (const TAO_MProfile& mprofile);
-
-  /// This allocator is always TSS and has no locks. It is intended
-  /// for allocating the ACE_Data_Blocks used in *outgoing* CDR
-  /// streams.
-  ACE_Allocator *output_cdr_dblock_allocator (void);
-
-  /// This allocator is always TSS and has no locks. It is intended
-  /// for allocating the buffers used in *outgoing* CDR streams.
-  ACE_Allocator *output_cdr_buffer_allocator (void);
-
-  /// This allocator is always TSS and has no locks. It is intended
-  /// for allocating the ACE_Data_Blocks used in *outgoing* CDR
-  /// streams.
-  ACE_Allocator *output_cdr_msgblock_allocator (void);
-
-  /// This allocator is global, may or may not have locks. It is
-  /// intended for allocating the ACE_Data_Blocks used in *incoming*
-  /// CDR streams.
-  ACE_Allocator *input_cdr_dblock_allocator (void);
-
-  /// This allocator is always global and has no locks. It is intended
-  /// for allocating the buffers used in *incoming* CDR streams.
-  ACE_Allocator *input_cdr_buffer_allocator (void);
-
-  /// This allocator is always global and has no locks. It is intended
-  /// for allocating the buffers used in *incoming* CDR streams.
-  ACE_Allocator *input_cdr_msgblock_allocator (void);
-
-  /// This allocator is always global and has no locks. It is intended
-  /// for allocating the buffers used to queue messages in
-  /// transports.
-  ACE_Allocator *transport_message_buffer_allocator (void);
-
-  /// The Message Blocks used for input CDRs must have appropiate
-  /// locking strategies.
-  ACE_Data_Block *create_input_cdr_data_block (size_t size);
-
-
-  /// Return the locking strategy used for the data blocks.
-  ACE_Lock *locking_strategy (void);
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /// Accessor method for the default_policies_
-  TAO_Policy_Set *get_default_policies (void);
-
-  /// Get a policy.  First, check the ORB-level Policy Manager, then
-  /// check the ORB defaults.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                ACE_ENV_ARG_DECL);
-
-  /// Get a policy.  First, check the thread current, then check the
-  /// ORB-level Policy Manager, then check the ORB defaults.
-  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type
-                                                  ACE_ENV_ARG_DECL);
-
-  /// Get a cached policy.  First, check the ORB-level Policy Manager,
-  /// then check the ORB defaults.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  /// Get a cached policy.  First, check the thread current, then
-  /// check the ORB-level Policy Manager, then check the ORB defaults.
-  CORBA::Policy_ptr get_cached_policy_including_current (
-      TAO_Cached_Policy_Type type
-      ACE_ENV_ARG_DECL);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  /**
-   * The thread has a default environment to simplify porting between
-   * platforms that support native C++ exceptions and those that
-   * don't. This is a TSS resource (always), but with a twist: if the
-   * user creates a new environment the old one is "pushed" (actually
-   * the new one remembers it), eventually the new environment
-   * destructor pops itself from the stack and we recover the old
-   * environment.
-   * @par
-   * This means that if the user create a new environment and somebody
-   * calls a function using the default one the exception will still
-   * be received in the environment created by the user.
-   * The only drawback is that environments life time must nest
-   * properly, this shouldn't be a problem because environments are
-   * usually created on the stack, but, the spec allows their creation
-   * on the heap and/or as class members; we need to investigate the
-   * tradeoffs and take a decision.
-   */
-  //@{
-  CORBA::Environment *default_environment (void) const;
-  void default_environment (CORBA::Environment*);
-  //@}
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /// Return the Policy_Manager for this ORB.
-  TAO_Policy_Manager *policy_manager (void);
-
-  /// Accesors to the policy current, this object should be kept in
-  /// TSS storage.  The POA has to reset the policy current object on
-  /// every upcall.
-  TAO_Policy_Current &policy_current (void);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  /// Invoke the timeout hook if present.
-  /**
-   * The timeout hook is used to determine if the timeout policy is
-   * set and with what value.  If the ORB is compiled without support
-   * for Messaging this feature does not take effect
-   * \param has_timeout returns 0 if there is no timeout policy set.
-   * \param time_value returns the timeout value in effect for the object,
-   * thread and current ORB.
-   */
-  void call_timeout_hook (TAO_Stub *stub,
-                          bool &has_timeout,
-                          ACE_Time_Value &time_value);
-
-  /// Define the Timeout_Hook signature
-  typedef void (*Timeout_Hook) (TAO_ORB_Core *,
-                                TAO_Stub *,
-                                bool&,
-                                ACE_Time_Value&);
-
-  static void set_timeout_hook (Timeout_Hook hook);
-
-  /// Invoke the timeout hook if present.
-  /**
-   * The timeout hook is used to determine if the timeout policy is
-   * set and with what value.  If the ORB is compiled without support
-   * for Messaging this feature does not take effect
-   * \param has_timeout returns 0 if there is no timeout policy set.
-   * \param time_value returns the timeout value in effect for the object,
-   * thread and current ORB.
-   */
-  void connection_timeout (TAO_Stub *stub,
-                           bool &has_timeout,
-                           ACE_Time_Value &time_value);
-
-  /// Define the Timeout_Hook signature
-  static void connection_timeout_hook (Timeout_Hook hook);
-
-  void call_sync_scope_hook (TAO_Stub *stub,
-                             bool &has_synchronization,
-                             Messaging::SyncScope &scope);
-
-  TAO_Sync_Strategy &get_sync_strategy (TAO_Stub *stub,
-                                        Messaging::SyncScope &scope);
-  typedef void (*Sync_Scope_Hook) (TAO_ORB_Core *,
-                                   TAO_Stub *,
-                                   bool &,
-                                   Messaging::SyncScope &);
-
-  static void set_sync_scope_hook (Sync_Scope_Hook hook);
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  /// This strategy will buffer messages.
-  //@{
-  TAO_Eager_Buffering_Sync_Strategy &eager_buffering_sync_strategy (void);
-  TAO_Delayed_Buffering_Sync_Strategy &delayed_buffering_sync_strategy (void);
-  //@}
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  /// This strategy will sync with the transport.
-  TAO_Transport_Sync_Strategy &transport_sync_strategy (void);
-
-  /// Handle to the factory for protocols_hooks_..
-  TAO_Protocols_Hooks *protocols_hooks_;
-
-  /// Obtain the TSS resources of this orb.
-  TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
-
-  /// Obtain the TSS resource in the given slot.
-  void* get_tss_resource (size_t slot_id);
-
-  /// Set the TSS resource at the given slot.
-  /// Returns 0 on success, and -1 on failure.
-  int set_tss_resource (size_t slot_id, void *);
-
-  /// Register a TSS cleanup function.  The slot ID for the
-  /// corresponding ORB core TSS resource is returned by the reference
-  /// argument.  This method return 0 on success, and -1 on failure.
-  int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup,
-                            size_t &slot_id);
-
-  /// Return the underlying TSS cleanup function registry.
-  TAO_Cleanup_Func_Registry *tss_cleanup_funcs (void);
-
-  /// Get access to the leader_follower class.
-  TAO_Leader_Follower &leader_follower (void);
-
-  /// Get access to the leader follower strategy.
-  TAO_LF_Strategy &lf_strategy (void);
-
-  /// Get access to the thread lane resources.
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  /// Run the event loop.
-  int run (ACE_Time_Value *tv,
-           int perform_work
-           ACE_ENV_ARG_DECL);
-
-  /// End the event loop
-  void shutdown (CORBA::Boolean wait_for_completion
-                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /// Get the shutdown flag value
-  int has_shutdown (void);
-
-  /// Shutdown the ORB and free resources
-  void destroy (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Returns the <timeout> value used by the server threads to poll
-  /// the shutdown flag. If the return value is zero then the server
-  /// threads block forever.
-  int thread_per_connection_timeout (ACE_Time_Value &timeout) const;
-
-  /// Makes sure that the ORB is open and then creates a TAO_Stub
-  /// based on the endpoint.
-  TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
-                                const char *type_id,
-                                CORBA::PolicyList *policy_list
-                                ACE_ENV_ARG_DECL);
-
-  /// Factory method that create the "right" Stub depending on
-  /// wheather RTCORBA is loaded or not. The factory used to create
-  /// the stub, is loaded at ORB initialization, and its type depends
-  /// on the fact that RTCORBA is being used or not.
-  TAO_Stub *create_stub (const char *repository_id,
-                         const TAO_MProfile &profiles
-                         ACE_ENV_ARG_DECL);
-
-  /// Create a new object, use the adapter registry to create a
-  /// collocated object, if not possible then create a regular
-  /// object.
-  CORBA::Object_ptr create_object (TAO_Stub *the_stub);
-
-  /// Initialize a new object, use the adapter registry to initialize a
-  /// collocated object, if not possible then initialize a regular
-  /// object.
-  /// NOTE: Why would this method be required? The answer is if the
-  /// user decides to use lazy initialization of CORBA object, then
-  /// this is the route that we have to take to do the
-  /// initialization.
-  CORBA::Long initialize_object (TAO_Stub *the_stub,
-                                 CORBA::Object_ptr obj);
-
-  /// Return ORBid string.
-  const char *orbid (void) const;
-
-  /// Set/Get the IOR of the Implementation Repository service.
-  //@{
-  CORBA::Object_ptr implrepo_service (void);
-  void implrepo_service (const CORBA::Object_ptr ir);
-  //@}
-
-  /// Do we put the ImR's endpoints into persistent object references we create
-  CORBA::Boolean imr_endpoints_in_ior (void);
-
-  /// Resolve the TypeCodeFactory DLL.
-  CORBA::Object_ptr resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Resolve the Dynamic Any Factory
-  CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Resolve the IOR Manipulation reference for this ORB.
-  CORBA::Object_ptr resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Resolve the IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Resolve an initial reference via the -ORBInitRef and
-  // -ORBDefaultInitRef options.
-  CORBA::Object_ptr resolve_rir (const char *name
-                                 ACE_ENV_ARG_DECL);
-
-  /// Resolve the RT ORB reference for this ORB.
-  CORBA::Object_ptr resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Resolve the RT Current flyweight for this ORB.
-  /// Return server_id string.
-  const char *server_id (void) const;
-
-  CORBA::Object_ptr resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// List all the service known by the ORB
-  CORBA::ORB_ObjectIdList *list_initial_references (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    );
-
-  /// Reference counting...
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  /// Register the handle of an open connection with the ORB Core
-  /// handle set.  This handle set will be used to explicitly remove
-  /// corresponding event handlers from the reactor.
-  int register_handle (ACE_HANDLE handle);
-
-  /// Remove <handle> from the ORB Core's handle set so that it
-  /// isn't included in the set that is passed to the reactor upon ORB
-  /// destruction.
-  int remove_handle (ACE_HANDLE handle);
-
-  /**
-   * @name ORB Core Service Hooks
-   *
-   * These methods would represent the hooks in the ORB Core. These
-   * hooks would be used to call back on the services or other
-   * features that are dynamically loaded.
-   */
-  //@{
-  /**
-   * The loaded service in the ORB_Core would determine if the profile
-   * selection is going to be made by the services or not. If the
-   * services do make the selection they would return the selected
-   * profile through <profile>.
-   */
-  CORBA::Boolean service_profile_selection (TAO_MProfile &mprofile,
-                                            TAO_Profile  *&profile);
-
-  /**
-   * The loaded service in the ORB_Core would determine if the profile
-   * reselection is going to be made by the services or not. If the
-   * services do make the reselection they would return the selected
-   * profile through <profile>. The reselction is for the
-   * multi-profile IORS.
-   */
-  CORBA::Boolean service_profile_reselection (TAO_Stub *stub,
-                                              TAO_Profile *&profile);
-
-  /// Reset the flags in the loaded services.
-  void reset_service_profile_flags (void);
-
-  /**
-   * The loaded service would determine if the CORBA::Object_ptr is
-   * actually nil or not. This would be useful to accomodate new
-   * enhanced definitions as defined by the service specification.
-   */
-  CORBA::Boolean object_is_nil (CORBA::Object_ptr object);
-
-  /// Hook for the services to determine whether the profiles are
-  /// equivalent or not.
-  /**
-   * For details on how this is used please see the FT service
-   */
-  CORBA::Boolean is_profile_equivalent (const TAO_Profile *this_p,
-                                        const TAO_Profile *that_p);
-
-  /// Hook for the services to determine the <hash> value of a
-  /// profile.
-  /**
-   * For details on how this is used please see the FT service
-   */
-  CORBA::ULong hash_service (TAO_Profile *this_p,
-                             CORBA::ULong max);
-
-  /// Call the service layers with the Service Context to check
-  /// whether they would like to add something to the list.
-  void service_context_list (TAO_Stub *stub,
-                             TAO_Service_Context &service_context,
-                             CORBA::Boolean retstart
-                             ACE_ENV_ARG_DECL);
-
-  /// Return a reference to the Fault Tolerant service object.
-  TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
-
-  /// Raise a comm failure exception if a service is not loaded, else
-  /// delegate to the service to see what the service has to do for
-  /// this case.
-  TAO::Invocation_Status service_raise_comm_failure (
-      IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
-
-  /// Raise a transient failure exception if a service is not loaded,
-  /// else delegate to the service to see what the service has to do
-  /// for this case.
-  TAO::Invocation_Status service_raise_transient_failure (
-      IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
-
-  //@}
-
-  /**
-   * @name Portable Interceptor Related Methods
-   *
-   * These are support methods for interceptor registration and
-   * interceptor set (an array) access, in addition to PICurrent
-   * access.
-   */
-  //@{
-#if TAO_HAS_INTERCEPTORS == 1
-
-  /// Return a pointer to the cached TAO::PICurrent object.
-  TAO::PICurrent *pi_current (void);
-
-  /// Set the pointer to the cached TAO::PICurrent object.
-  void pi_current (TAO::PICurrent *current);
-
-  /// Register a client request interceptor.
-  void add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
-
-  /// Register a server request interceptor.
-  void add_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
-
-  /// Return the array of client-side interceptors specific to this
-  /// ORB.
-  TAO::ClientRequestInterceptor_List::TYPE &
-    client_request_interceptors (void);
-
-  /// Return the array of server-side interceptors specific to this
-  /// ORB.
-  TAO::ServerRequestInterceptor_List::TYPE &
-    server_request_interceptors (void);
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  /// Register an IOR interceptor.
-  void add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
-  //@}
-
-  /// Return the valuetype adapter
-  TAO_Valuetype_Adapter *& valuetype_adapter (void);
-
-  /// Get the IOR Interceptor adapter. If not created, this method will try
-  /// to create one.
-  TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
-
-  /// Set and Get methods to indicate whether a BiDir IIOP policy has
-  /// been set in the POA.
-  /// @note At present, the value will be true even if one of the POA's
-  ///       is set with the Bi Dir GIOP policy.
-  CORBA::Boolean bidir_giop_policy (void);
-  void bidir_giop_policy (CORBA::Boolean);
-
-  /// Return the table that maps object key/name to de-stringified
-  /// object reference.  It is needed for supporting local objects in
-  /// the resolve_initial_references() mechanism.
-  TAO_Object_Ref_Table &object_ref_table (void);
-
-  /// Acceessor to the table that stores the object_keys.
-  TAO::ObjectKey_Table &object_key_table (void);
-
-  /// Return the current request dispatcher strategy.
-  TAO_Request_Dispatcher *request_dispatcher (void);
-
-  /// Set a new request dispatcher.  The ORB Core retains ownership
-  /// of the request dispatcher once it gets it.  Currently, this only
-  /// gets called at initialization.
-  void request_dispatcher (TAO_Request_Dispatcher *rd);
-
-  /// Call the libraries to handover the validators if they havent
-  /// registered yet with the list of validators.
-  void load_policy_validators (TAO_Policy_Validator &validator
-                               ACE_ENV_ARG_DECL);
-
-  /// Return the flushing strategy
-  /**
-   * The flushing strategy is created by the resource factory, and it
-   * is used by the ORB to control the mechanism used to flush the
-   * outgoing data queues.
-   * The flushing strategies are stateless, therefore, there is only
-   * one per ORB.
-   */
-  TAO_Flushing_Strategy *flushing_strategy (void);
-
-  /// Get Code Set Manager
-  TAO_Codeset_Manager *codeset_manager (void);
-
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                  ACE_CString,
-                                  ACE_Hash<ACE_CString>,
-                                  ACE_Equal_To<ACE_CString>,
-                                  ACE_Null_Mutex>
-    InitRefMap;
-
-  /// Return a pointer to the -ORBInitRef map.
-  InitRefMap * init_ref_map (void);
-
-  /// Set the ORB related to the orb_id as the default ORB and not the
-  /// ORB that is first binded in the ORB Table
-  void set_default (const char *orb_id);
-
-  /// Set to choose to be not a default ORB when there are more than
-  /// one ORB.
-  void not_default (const char *orb_id);
-
-protected:
-
-  /// Destructor is protected since the ORB Core is a reference
-  /// counted object.
-  ~TAO_ORB_Core (void);
-
-  /// Initialize the guts of the ORB Core.  It is intended that this be
-  /// called by <CORBA::ORB_init>.
-  int init (int &argc, char **argv ACE_ENV_ARG_DECL);
-
-  /// Final termination hook, typically called by CORBA::ORB's
-  /// destructor.
-  int fini (void);
-
-  /// Routine that creates a ACE_Data_Block given the lock and allocators.
-  ACE_Data_Block *create_data_block_i (size_t size,
-                                       ACE_Allocator *buffer_allocator,
-                                       ACE_Allocator *dblock_allocator,
-                                       ACE_Lock *lock);
-
-  /// Obtain and cache the dynamic any factory object reference.
-  void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Obtain and cache the dynamic any factory object reference.
-  void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Obtain and cache the IORManipulation factory object reference.
-  void resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Search the Dynamic service list for BiDirectional options that
-  /// can be dynamically loaded.
-  int bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Search the Dynamic service list for well known services that has
-  /// callbacks  which can be dynamically loaded.
-  void services_callbacks_init (void);
-
-  /// Helper method that invokes Interceptor::destroy() on all
-  /// registered interceptors when ORB::destroy() is called. Prevents
-  /// exceptions from propagating up the call chain.
-  void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC (());
-
-  /// Pointer to the list of protocol loaded into this ORB instance.
-  /// Helper method to hold the common code part for -ORBEndpoint and
-  /// -ORBListenEndpoint options.
-  int set_endpoint_helper (const ACE_CString &lane,
-                           const ACE_CString &endpoints
-                           ACE_ENV_ARG_DECL);
-
-private:
-
-  /// The ORB Core should not be copied.
-  //@{
-  ACE_UNIMPLEMENTED_FUNC (TAO_ORB_Core(const TAO_ORB_Core&))
-  ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_ORB_Core&))
-  //@}
-
-  /// Obtain and cache the dynamic any factory object reference.
-  void resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Checks to see whether collocation optimizations have to be
-  /// applied on objects in the <other_orb>
-  CORBA::Boolean is_collocation_enabled (TAO_ORB_Core *other_orb,
-                                         const TAO_MProfile &mp);
-
-protected:
-
-  /// Synchronize internal state...
-  TAO_SYNCH_MUTEX lock_;
-
-  TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager_;
-
-  TAO_Collocation_Resolver *collocation_resolver_;
-
-  TAO_Stub_Factory *stub_factory_;
-
-  TAO_ProtocolFactorySet *protocol_factories_;
-
-  /// The cached IOR for the Implementation Repository.
-  // @@ If this is a _var, where should it get deleted? (brunsch)
-  CORBA::Object_ptr implrepo_service_;
-
-  /// Flag for whether the implrepo support is enabled or not.
-  int use_implrepo_;
-
-  /// Flag for whether to put the ImR endpoints into our object refs.
-  int imr_endpoints_in_ior_;
-
-  /// The cached IOR for the TypeCodeFactory DLL.
-  CORBA::Object_ptr typecode_factory_;
-
-  /// The cached object reference for the DynAnyFactory.
-  CORBA::Object_ptr dynany_factory_;
-
-  /// The cached object reference for the IORManipulataion.
-  CORBA::Object_ptr ior_manip_factory_;
-
-  /// The cached object reference for the IORTable.
-  CORBA::Object_ptr ior_table_;
-
-  /// The cached object reference for the RTCORBA::RTORB.
-  CORBA::Object_var rt_orb_;
-
-  /// The cached object reference for the RTCORBA::Current interface.
-  CORBA::Object_var rt_current_;
-
-  /**
-   * @note
-   * Should we keep a single ORB pointer? This is good because
-   * multiple calls to ORB_init() with the same ORBid can use the same
-   * object, but maybe don't want so much coupling.
-   *
-   * Pointer to the ORB.
-   */
-  CORBA::ORB_ptr orb_;
-
-  /// Object reference to the root POA.  It will eventually be the
-  /// object reference returned by calls to
-  ///   CORBA::ORB::resolve_initial_references ("RootPOA").
-  CORBA::Object_var root_poa_;
-
-  /// Parameters used by the ORB.
-  TAO_ORB_Parameters orb_params_;
-
-  /// Return InitRefMap to find if a particular object id is present.
-  InitRefMap init_ref_map_;
-
-  /// Table that maps object key/name to (de-stringified) object
-  /// reference.  It is needed for supporting local objects in the
-  /// resolve_initial_references() mechanism.
-  TAO_Object_Ref_Table object_ref_table_;
-
-  /// Table that stores the object key instead of caching one per-profile.
-  TAO::ObjectKey_Table object_key_table_;
-
-  /// The ORBid for this ORB.
-  char *orbid_;
-
-  /// Handle to the factory for resource information..
-  TAO_Resource_Factory *resource_factory_;
-
-  /// The server_id_ that was passed via -ORBServerId option
-  ACE_CString server_id_;
-
-  /// Handle to the factory for Client-side strategies.
-  TAO_Client_Strategy_Factory *client_factory_;
-
-  /// Handle to the factory for Server-side strategies.
-  TAO_Server_Strategy_Factory *server_factory_;
-
-  /**
-   * @name Service Level Hooks
-   */
-  //@{
-
-  /// Fault Tolerant service hook.
-  TAO_Fault_Tolerance_Service ft_service_;
-
-  //@}
-
-  /// TRUE if we want to take advantage of collocation optimization in
-  /// this ORB.
-  CORBA::Boolean opt_for_collocation_;
-
-  /// TRUE if we want to consider all ORBs in this address space
-  /// collocated.
-  CORBA::Boolean use_global_collocation_;
-
-  /// Default collocation policy.  This should never be ORB_CONTROL.
-  CORBA::ULong collocation_strategy_;
-
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /// The Policy_Manager for this ORB.
-  TAO_Policy_Manager *policy_manager_;
-
-  /// The default policies.
-  TAO_Policy_Set *default_policies_;
-
-  /// Policy current.
-  TAO_Policy_Current *policy_current_;
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-    /// The request dispatching strategy.
-  TAO_Request_Dispatcher *request_dispatcher_;
-
-  /**
-   * POA current.
-   *
-   * @note
-   * This is a pointer in order to reduce the include file
-   * dependencies.
-   */
-  CORBA::Object_var poa_current_;
-
-  /// The list of Adapters used in this ORB.
-  TAO_Adapter_Registry adapter_registry_;
-
-  /// An optimization for the POA.
-  TAO_Adapter *poa_adapter_;
-
-  /// The Thread Manager
-  ACE_Thread_Manager tm_;
-
-  /// The data block reference counts are locked using this mutex
-  ACE_Lock_Adapter<TAO_SYNCH_MUTEX> data_block_lock_;
-
-  /// TSS Object cleanup functions.  These correspond to the TSS
-  /// objects stored in TAO's TSS resources.
-  TAO_Cleanup_Func_Registry tss_cleanup_funcs_;
-
-  /// This is where the tss resources for this ORB are stored.
-  ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_;
-
-  /// Flag which denotes that the ORB has been shutdown.
-  int has_shutdown_;
-
-  /// The value of the timeout if the flag above is not zero.
-  //@{
-  int thread_per_connection_use_timeout_;
-  ACE_Time_Value thread_per_connection_timeout_;
-  //@}
-
-  /// Mutual exclusion for calling open.
-  TAO_SYNCH_MUTEX open_lock_;
-
-  /// Flag which denotes that the open method was called.
-  int open_called_;
-
-  TAO_Endpoint_Selector_Factory *endpoint_selector_factory_;
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  /// This strategy will buffer messages.
-  TAO_Eager_Buffering_Sync_Strategy *eager_buffering_sync_strategy_;
-
-  /// This strategy will buffer messages.
-  TAO_Delayed_Buffering_Sync_Strategy *delayed_buffering_sync_strategy_;
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  /// This strategy will sync with the transport.
-  TAO_Transport_Sync_Strategy *transport_sync_strategy_;
-
-  /// Number of outstanding references to this object.
-  CORBA::ULong refcount_;
-
-  /// Registry containing all registered policy factories.
-  TAO_PolicyFactory_Registry policy_factory_registry_;
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  /// Cached pointer/reference to the PICurrent object.
-  /**
-   * A pointer/reference to the PICurrent object is cached in the ORB
-   * Core since it is accessed in the critical path (i.e. the request
-   * invocation path).  Caching it prevents additional overhead to due
-   * object resolution from occurring.
-   */
-  TAO::PICurrent *pi_current_;
-
-  /// Client request interceptor registry.
-  TAO::ClientRequestInterceptor_List client_request_interceptors_;
-
-  /// Server request interceptor registry.
-  TAO::ServerRequestInterceptor_List server_request_interceptors_;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  /// IORInterceptor adapter.
-  TAO_IORInterceptor_Adapter *ior_interceptor_adapter_;
-
-  /// Pointer to the valuetype adapter.
-  TAO_Valuetype_Adapter *valuetype_adapter_;
-
-  /// The IOR parser registry.
-  TAO_Parser_Registry parser_registry_;
-
-  /// BiDirectional GIOP factory
-  TAO_BiDir_Adapter *bidir_adapter_;
-
-  /// Bir Dir GIOP policy value
-  CORBA::Boolean bidir_giop_policy_;
-
-  /// Hold the flushing strategy
-  TAO_Flushing_Strategy *flushing_strategy_;
-
-  /// Code Set Manager
-  TAO_Codeset_Manager *codeset_manager_;
-
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_ORB_Core_Static_Resources
- *
- * @brief The static (global) resoures of all ORB cores.
- *
- * This class is used by the ORB_Core to store the resources global to
- * all ORB_Cores.  All instance variables that would have been
- * declared "static" in TAO_ORB_Core, should be declared in this class
- * to avoid the "static initialization order fiasco" as described in
- * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11.
- * Briefly, this is the problem that occurs if any static initializers
- * in any other code call into set static members of TAO_ORB_Core.
- * Since the order in which these initializers execute is unspecified,
- * uninitialized members can be accessed.
- */
-class TAO_Export TAO_ORB_Core_Static_Resources
-{
-public:
-
-  /// Return the singleton instance.
-  static TAO_ORB_Core_Static_Resources* instance (void);
-
-public:
-  // The hook to be set for the SyncScopePolicy
-  TAO_ORB_Core::Sync_Scope_Hook sync_scope_hook_;
-
-  /**
-   * Name of the protocols_hooks that needs to be instantiated.
-   * The default value is "Protocols_Hooks". If RTCORBA option is
-   * set, its value will be set to be "RT_Protocols_Hooks".
-   */
-  ACE_CString protocols_hooks_name_;
-
-  /// The hook to be set for the RelativeRoundtripTimeoutPolicy.
-  TAO_ORB_Core::Timeout_Hook timeout_hook_;
-
-  /// The hook to be set for the ConnectionTimeoutPolicy
-  TAO_ORB_Core::Timeout_Hook connection_timeout_hook_;
-
-  /**
-   * Name of the endpoint selector factory that needs to be instantiated.
-   * The default value is "Default_Endpoint_Selector_Factory". If
-   * TAO_RTCORBA is linked, the set_endpoint_selector_factory will be
-   * called to set the value to be "RT_Endpoint_Selector_Factory".
-   */
-  ACE_CString endpoint_selector_factory_name_;
-
-  /**
-   * Name of the thread lane resources manager that needs to be
-   * instantiated.  The default value is
-   * "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
-   * is linked, the set_thread_lane_resources_manager will be called
-   * to set the value to be
-   * "RT_Thread_Lane_Resources_Manager_Factory".
-   */
-  ACE_CString thread_lane_resources_manager_factory_name_;
-
-  /**
-   * Name of the collocation resolver that needs to be instantiated.
-   * The default value is "Default_Collocation_Resolver". If
-   * TAO_RTCORBA is linked, the set_collocation_resolver will be
-   * called to set the value to be "RT_Collocation_Resolver".
-   */
-  ACE_CString collocation_resolver_name_;
-
-  /**
-   * Name of the stub factory that needs to be instantiated.
-   * The default value is "Default_Stub_Factory". If TAO_RTCORBA is
-   * linked, the set_stub_factory will be called to set the value
-   * to be "RT_Stub_Factory".
-   */
-  ACE_CString stub_factory_name_;
-
-  /**
-   * Name of the resource factory that needs to be instantiated.
-   * The default value is "Resource_Factory". If TAO_Strategies is
-   * linked, the set_resource_factory will be called to set the value
-   * to be "Advanced_Resource_Factory".
-   */
-  ACE_CString resource_factory_name_;
-
-  /**
-   * Name of the service object for DII request creation that needs
-   * to be instantiated. The default value is "Dynamic_Adaper". If
-   * TAO_DynamicInterface is linked, dynamic_adapter_name() will be
-   * called to set the value to "Concrete_Dynamic_Adapter".
-   */
-  ACE_CString dynamic_adapter_name_;
-
-  /**
-   * Name of the service object for functions that make calls on
-   * the Interface Repository. The default value is "IFR_Client_Adaper".
-   * If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be
-   * called to set the value to "Concrete_IFR_Client_Adapter".
-   */
-  ACE_CString ifr_client_adapter_name_;
-
-  /**
-   * Name of the service object used by the ORB create_*_tc functions.
-   * The default value is "TypeCodeFactory_Adapter". If the
-   * TypeCodeFactory library is linked, the corresponding accessor
-   * function typecodefactory_adapter_name() will be called to set
-   * the value to "Concrete_TypeCodeFactory_Adapter".
-   */
-  ACE_CString typecodefactory_adapter_name_;
-
-  /**
-   * Name of the factory object used to adapt function calls on
-   * the PortableInterceptor interfaces IORInfo and IORInterceptor.
-   * The default value is "IORInterceptor_Adapter_Factory". If the
-   * IORInterceptor library is linked, the corresponding accessor
-   * function iorinterceptor_adapter_factory_name() will be called to set
-   * the value to "Concrete_IORInterceptor_Adapter_Factory".
-   */
-  ACE_CString iorinterceptor_adapter_factory_name_;
-
-  /**
-   * Name of the service object used to adapt function calls on
-   * the valuetype-related interfaces.
-   * The default value is "Valuetype_Adapter". If the
-   * Valuetype library is linked, the corresponding accessor
-   * function valuetype_adapter_name() will be called to set
-   * the value to "Concrete_Valuetype_Adapter".
-   */
-  ACE_CString valuetype_adapter_name_;
-
-  /**
-   * Name of the service object used to create the RootPOA.  The
-   * default value is "TAO_POA".  If TAO_RTCORBA is loaded, this
-   * will be changed to TAO_RT_POA so that a POA equipped with
-   * realtime extensions will be returned.
-   */
-  ACE_CString poa_factory_name_;
-
-  /**
-   * The service configurator directive used to load
-   * poa_factory_name_ dynamically.
-   */
-  ACE_CString poa_factory_directive_;
-
-private:
-
-  /// Constructor.
-  TAO_ORB_Core_Static_Resources (void);
-
-private:
-
-  /// The singleton instance.
-  static TAO_ORB_Core_Static_Resources* instance_;
-
-  /// Mostly unused variable whose sole purpose is to enforce
-  /// the instantiation of a TAO_ORB_Core_Static_Resources instance
-  /// at initialization time.
-  static TAO_ORB_Core_Static_Resources* initialization_reference_;
-};
-
-// ****************************************************************
-
-/// Obtain an instance of the first ORB core registered in the ORB
-/// table.
-TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void);
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-# include "ORB_Core.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ORB_CORE_H */
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
deleted file mode 100644
index 8071b21a4b0..00000000000
--- a/TAO/tao/ORB_Core.i
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
-  return this->refcount_++;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
-    --this->refcount_;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  this->fini ();
-  return 0;
-}
-
-ACE_INLINE ACE_Lock *
-TAO_ORB_Core::locking_strategy (void)
-{
-  if (this->resource_factory ()->use_locked_data_blocks ())
-    return &this->data_block_lock_;
-
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::bidir_giop_policy (void)
-{
-  return this->bidir_giop_policy_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val)
-{
-  this->bidir_giop_policy_ = val;
-}
-
-ACE_INLINE TAO_Object_Ref_Table &
-TAO_ORB_Core::object_ref_table (void)
-{
-  return this->object_ref_table_;
-}
-
-ACE_INLINE TAO::ObjectKey_Table &
-TAO_ORB_Core::object_key_table (void)
-{
-  return this->object_key_table_;
-}
-
-ACE_INLINE TAO_Flushing_Strategy *
-TAO_ORB_Core::flushing_strategy (void)
-{
-  return this->flushing_strategy_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile,
-                                         TAO_Profile  *&profile)
-{
-  CORBA::Boolean retval = 0;
-  // @@ If different services have the same feature we may want to
-  // prioritise them here. We need to decide here whose selection of
-  // profile is more important.
-  if (this->ft_service_.service_callback ())
-    {
-      retval =
-        this->ft_service_.service_callback ()->select_profile (&mprofile,
-                                                                profile);
-    }
-  return retval;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::service_profile_reselection (TAO_Stub *stub,
-                                           TAO_Profile *&profile)
-{
-  CORBA::Boolean retval = 0;
-  // @@ If different services have the same feature we may want to
-  // prioritise them here. We need to decide here whose selection of
-  // profile is more important.
-  if (this->ft_service_.service_callback ())
-    {
-      retval =
-        this->ft_service_.service_callback ()->reselect_profile (stub,
-                                                                 profile);
-    }
-  return retval;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::reset_service_profile_flags (void)
-{
-  // @@ If different services have the same feature we may want to
-  // prioritise them here. We need to decide here whose selection of
-  // profile is more important.
-
-  if (this->ft_service_.service_callback ())
-    {
-      this->ft_service_.service_callback ()->reset_profile_flags ();
-    }
-  return;
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj)
-{
-  CORBA::Boolean retval = 0;
-  if (this->ft_service_.service_callback ())
-    {
-      retval =
-        this->ft_service_.service_callback ()->object_is_nil (obj);
-    }
-  return retval;
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::is_profile_equivalent (const TAO_Profile *this_p,
-                                     const TAO_Profile *that_p)
-{
-  CORBA::Boolean retval = 1;
-
-  if (this->ft_service_.service_callback ())
-    {
-      retval =
-        this->ft_service_.service_callback ()->is_profile_equivalent (this_p,
-                                                                      that_p);
-    }
-
-  return retval;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::hash_service (TAO_Profile *p,
-                            CORBA::ULong m)
-{
-  if (this->ft_service_.service_callback ())
-    {
-      return this->ft_service_.service_callback ()->hash_ft (p, m);
-    }
-
-  return 0;
-}
-
-ACE_INLINE TAO_Fault_Tolerance_Service &
-TAO_ORB_Core::fault_tolerance_service (void)
-{
-  return this->ft_service_;
-}
-
-ACE_INLINE ACE_Thread_Manager *
-TAO_ORB_Core::thr_mgr (void)
-{
-  return &this->tm_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_ORB_Core::orb (void)
-{
-  return this->orb_;
-}
-
-ACE_INLINE TAO_Adapter_Registry *
-TAO_ORB_Core::adapter_registry (void)
-{
-  return &this->adapter_registry_;
-}
-
-ACE_INLINE TAO_Request_Dispatcher *
-TAO_ORB_Core::request_dispatcher (void)
-{
-  return this->request_dispatcher_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt)
-{
-  this->opt_for_collocation_ = opt;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::optimize_collocation_objects (void) const
-{
-  return this->opt_for_collocation_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::use_global_collocation (CORBA::Boolean opt)
-{
-  this->use_global_collocation_ = opt;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::use_global_collocation (void) const
-{
-  return this->use_global_collocation_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::get_collocation_strategy (void) const
-{
-  return this->collocation_strategy_;
-}
-
-ACE_INLINE TAO_ORB_Parameters *
-TAO_ORB_Core::orb_params(void)
-{
-  return &(this->orb_params_);
-}
-
-#define TAO_OC_RETRIEVE(member) \
-((this->member##_ == 0) \
-  ? (this->member##_ = this->resource_factory ()->get_##member ()) \
-  : (this->member##_))
-
-ACE_INLINE TAO_ProtocolFactorySet *
-TAO_ORB_Core::protocol_factories (void)
-{
-  return TAO_OC_RETRIEVE (protocol_factories);
-}
-
-ACE_INLINE TAO_Parser_Registry *
-TAO_ORB_Core::parser_registry (void)
-{
-  return &this->parser_registry_;
-}
-
-ACE_INLINE TAO_PolicyFactory_Registry *
-TAO_ORB_Core::policy_factory_registry (void)
-{
-  return &this->policy_factory_registry_;
-}
-
-
-ACE_INLINE TAO_Codeset_Manager *
-TAO_ORB_Core::codeset_manager()
-{
-  return this->codeset_manager_;
-}
-
-#undef TAO_OC_RETRIEVE
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-ACE_INLINE TAO_Policy_Manager *
-TAO_ORB_Core::policy_manager (void)
-{
-  return this->policy_manager_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-ACE_INLINE TAO_ORB_Core_TSS_Resources*
-TAO_ORB_Core::get_tss_resources (void)
-{
-  return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources);
-}
-
-ACE_INLINE void *
-TAO_ORB_Core::get_tss_resource (size_t slot_id)
-{
-  TAO_ORB_Core_TSS_Resources *tss_resources =
-    this->get_tss_resources ();
-
-  if (slot_id >= tss_resources->ts_objects_.size ())
-    return 0;
-
-  return tss_resources->ts_objects_[slot_id];
-}
-
-ACE_INLINE int
-TAO_ORB_Core::set_tss_resource (size_t slot_id, void *ts_object)
-{
-  TAO_ORB_Core_TSS_Resources *tss_resources =
-    this->get_tss_resources ();
-
-  // The number of allocated slots is equal to the number of
-  // registered TSS cleanup functions, *not* the size of the array in
-  // the ORB core TSS resources.
-  if (slot_id >= this->tss_cleanup_funcs_.size ())
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  // If the TSS array isn't large enough, then increase its size.
-  // We're guaranteed not to exceed the number of allocated slots by
-  // the above check.
-  const size_t old_size = tss_resources->ts_objects_.size ();
-  const size_t new_size = slot_id + 1;
-  if (slot_id >= old_size
-      && tss_resources->ts_objects_.size (new_size) != 0)
-    return -1;
-
-  // Initialize intermediate array elements to zero, since they
-  // haven't been initialized yet.  This ensures that garbage is not
-  // returned when accessing any of those elements at a later point in
-  // time.
-  for (size_t i = old_size; i < slot_id; ++i)
-    tss_resources->ts_objects_[i] = 0;
-
-  tss_resources->ts_objects_[slot_id] = ts_object;
-
-  // Make sure the ORB core pointer is set in the ORB core's TSS
-  // resources so that the TSS cleanup functions stored in the ORB
-  // core can be invoked.
-  tss_resources->orb_core_ = this;
-
-  return 0;
-}
-
-ACE_INLINE int
-TAO_ORB_Core::add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup,
-                                    size_t &slot_id)
-{
-  return this->tss_cleanup_funcs_.register_cleanup_function (cleanup,
-                                                             slot_id);
-}
-
-ACE_INLINE TAO_Cleanup_Func_Registry *
-TAO_ORB_Core::tss_cleanup_funcs (void)
-{
-  return &(this->tss_cleanup_funcs_);
-}
-
-ACE_INLINE int
-TAO_ORB_Core::has_shutdown (void)
-{
-  return this->has_shutdown_;
-}
-
-ACE_INLINE int
-TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const
-{
-  timeout = this->thread_per_connection_timeout_;
-  return this->thread_per_connection_use_timeout_;
-}
-
-ACE_INLINE const char *
-TAO_ORB_Core::orbid (void) const
-{
-  return this->orbid_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
-{
-  this->implrepo_service_ = ir;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ORB_Core::imr_endpoints_in_ior (void)
-{
-  return imr_endpoints_in_ior_;
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                    CORBA::Object::_nil ());
-  if (CORBA::is_nil (this->typecode_factory_))
-    {
-      this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  return CORBA::Object::_duplicate (this->typecode_factory_);
-}
-
-ACE_INLINE const char *
-TAO_ORB_Core::server_id (void) const
-{
-  return this->server_id_.c_str();
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                    CORBA::Object::_nil ());
-  if (CORBA::is_nil (this->dynany_factory_))
-    {
-      this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  return CORBA::Object::_duplicate (this->dynany_factory_);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                    CORBA::Object::_nil ());
-  if (CORBA::is_nil (this->ior_manip_factory_))
-    {
-      this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  return CORBA::Object::_duplicate (this->ior_manip_factory_);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                    CORBA::Object::_nil ());
-  if (CORBA::is_nil (this->ior_table_))
-    {
-      this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  return CORBA::Object::_duplicate (this->ior_table_);
-}
-
-// ****************************************************************
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-ACE_INLINE TAO_Eager_Buffering_Sync_Strategy &
-TAO_ORB_Core::eager_buffering_sync_strategy (void)
-{
-  return *this->eager_buffering_sync_strategy_;
-}
-
-ACE_INLINE TAO_Delayed_Buffering_Sync_Strategy &
-TAO_ORB_Core::delayed_buffering_sync_strategy (void)
-{
-  return *this->delayed_buffering_sync_strategy_;
-}
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-ACE_INLINE TAO_Transport_Sync_Strategy &
-TAO_ORB_Core::transport_sync_strategy (void)
-{
-  return *this->transport_sync_strategy_;
-}
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-ACE_INLINE TAO_Policy_Current &
-TAO_ORB_Core::policy_current (void)
-{
-  return *this->policy_current_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::poa_current (void)
-{
-  return CORBA::Object::_duplicate (this->poa_current_.in ());
-}
-
-ACE_INLINE void
-TAO_ORB_Core::poa_current (CORBA::Object_ptr current)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
-  this->poa_current_ =
-    CORBA::Object::_duplicate (current);
-}
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-ACE_INLINE  TAO_Policy_Set *
-TAO_ORB_Core::get_default_policies (void)
-{
-  return this->default_policies_;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (CORBA::is_nil (this->rt_orb_.in ()))
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                        CORBA::Object::_nil ());
-      if (CORBA::is_nil (this->rt_orb_.in ()))
-        {
-          // Save a reference to the priority mapping manager.
-          this->rt_orb_ =
-              this->object_ref_table ().resolve_initial_references (
-              TAO_OBJID_RTORB
-               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
-        }
-    }
-
-  return CORBA::Object::_duplicate (this->rt_orb_.in ());
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (CORBA::is_nil (this->rt_current_.in ()))
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
-                        CORBA::Object::_nil ());
-      if (CORBA::is_nil (this->rt_current_.in ()))
-        {
-          // Save a reference to the priority mapping manager.
-          this->rt_current_ =
-              this->object_ref_table ().resolve_initial_references (
-              TAO_OBJID_RTCURRENT
-               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
-        }
-    }
-  return CORBA::Object::_duplicate (this->rt_current_.in ());
-}
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-ACE_INLINE TAO::PICurrent *
-TAO_ORB_Core::pi_current (void)
-{
-  // A pointer/reference to PICurrent is cached in the ORB Core since
-  // it is accessed in the critical path (i.e. the request invocation
-  // path).  Caching it prevents additional overhead to due object
-  // resolution from occurring.
-  return this->pi_current_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::pi_current (TAO::PICurrent *current)
-{
-  // Not duplicated since the ORB Core's "object_ref_table" already
-  // contains a duplicate of the PICurrent object.
-  this->pi_current_ = current;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
-{
-  this->client_request_interceptors_.add_interceptor (interceptor
-                                                       ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
-{
-  this->server_request_interceptors_.add_interceptor (interceptor
-                                                       ACE_ENV_ARG_PARAMETER);
-}
-
-// ------
-
-ACE_INLINE TAO::ClientRequestInterceptor_List::TYPE &
-TAO_ORB_Core::client_request_interceptors (void)
-{
-  return this->client_request_interceptors_.interceptors ();
-}
-
-// @@ It would be nice to move these to the PortableServer library,
-//    perhaps to the RootPOA.  However, there is no "RootPOA" class so
-//    there doesn't appear to be a way that only the RootPOA
-//    implementation has these server-side interceptor methods and
-//    attributes.  Leave them in the ORB Core for now.
-ACE_INLINE TAO::ServerRequestInterceptor_List::TYPE &
-TAO_ORB_Core::server_request_interceptors (void)
-{
-  return this->server_request_interceptors_.interceptors ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp
deleted file mode 100644
index a0b908a54dd..00000000000
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "ORB_Core_Auto_Ptr.h"
-#include "ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "ORB_Core_Auto_Ptr.inl"
-#endif  /* !__ACE_INLINE */
-
-ACE_RCSID (tao,
-           ORB_Core_Auto_Ptr,
-           "$Id$")
-
-TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void)
-{
-  if (this->get () != 0)
-    {
-      this->get ()->_decr_refcnt ();
-    }
-}
-
-void
-TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p)
-{
-  if (this->get () != p && this->get () != 0)
-    {
-      this->get ()->_decr_refcnt ();
-    }
-
-  this->p_ = p;
-}
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
deleted file mode 100644
index 458f8152af5..00000000000
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   ORB_Core_Auto_Ptr.h
- *
- *  $Id$
- *
- *  @author DOC Center - Washington University at St. Louis
- *  @author DOC Laboratory - University of California at Irvine
- */
-// ===================================================================
-
-#ifndef TAO_ORB_CORE_AUTO_PTR_H
-#define TAO_ORB_CORE_AUTO_PTR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_ORB_Core_Auto_Ptr
- *
- * @brief Define a TAO_ORB_Core auto_ptr class.
- *
- * This class is used as an aid to make ORB initialization exception
- * safe.  It ensures that the ORB core is deallocated if an exception
- * is thrown.
- *
- * @todo
- * TAO_ORB_Core_Auto_Ptr should be renamed to TAO_ORB_Core_var
- * since the ORB Core is reference counted.
- */
-class TAO_Export TAO_ORB_Core_Auto_Ptr
-{
-public:
-
-  /// Initialization and termination methods
-  //@{
-  /* explicit */ TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0);
-  TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap);
-  TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs);
-  ~TAO_ORB_Core_Auto_Ptr (void);
-  //@}
-
-  /// Accessor methods.
-  //@{
-  TAO_ORB_Core &operator *() const;
-  TAO_ORB_Core *get (void) const;
-  TAO_ORB_Core *release (void);
-  void reset (TAO_ORB_Core *p = 0);
-  TAO_ORB_Core *operator-> () const;
-  //@}
-
-protected:
-
-  TAO_ORB_Core *p_;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "ORB_Core_Auto_Ptr.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_ORB_CORE_AUTO_PTR_H */
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl
deleted file mode 100644
index 50cc45b0bb5..00000000000
--- a/TAO/tao/ORB_Core_Auto_Ptr.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p)
-  : p_ (p)
-{
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Core_Auto_Ptr::get (void) const
-{
-  return this->p_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Core_Auto_Ptr::release (void)
-{
-  TAO_ORB_Core *old = this->p_;
-  this->p_ = 0;
-  return old;
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ORB_Core_Auto_Ptr::operator-> () const
-{
-  return this->get ();
-}
-
-ACE_INLINE
-TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &rhs)
-  : p_ (rhs.release ())
-{
-}
-
-ACE_INLINE TAO_ORB_Core_Auto_Ptr &
-TAO_ORB_Core_Auto_Ptr::operator= (TAO_ORB_Core_Auto_Ptr &rhs)
-{
-  if (this != &rhs)
-    {
-      this->reset (rhs.release ());
-    }
-  return *this;
-}
-
-// Accessor methods to the underlying ORB_Core Object
-
-ACE_INLINE TAO_ORB_Core &
-TAO_ORB_Core_Auto_Ptr::operator *() const
-{
-  // @@ Potential problem if this->p_ is zero!
-  return *this->get ();
-}
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
deleted file mode 100644
index a678a26da19..00000000000
--- a/TAO/tao/ORB_Table.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-#include "ORB_Table.h"
-#include "ORB_Core.h"
-#include "TAO_Singleton.h"
-
-#if !defined (__ACE_INLINE__)
-# include "ORB_Table.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           ORB_Table,
-           "$Id$")
-
-
-// ****************************************************************
-
-TAO::ORB_Table::ORB_Table (void)
-  : lock_ (),
-    first_orb_not_default_ (false),
-    table_ (TAO_DEFAULT_ORB_TABLE_SIZE),
-    first_orb_ (0),
-    orbs_ (0),
-    num_orbs_ (0)
-{
-}
-
-TAO::ORB_Table::~ORB_Table (void)
-{
-  Iterator const end (this->end ());
-  for (Iterator i (this->begin ()); i != end; ++i)
-    {
-      // Deallocate the ORBid.
-      CORBA::string_free (const_cast<char *> ((*i).ext_id_));
-
-      // Destroy the ORB_Core
-      (void) (*i).int_id_->_decr_refcnt ();
-    }
-
-  this->table_.close ();
-}
-
-TAO::ORB_Table::Iterator
-TAO::ORB_Table::begin (void)
-{
-  return this->table_.begin ();
-}
-
-TAO::ORB_Table::Iterator
-TAO::ORB_Table::end (void)
-{
-  return this->table_.end ();
-}
-
-TAO_ORB_Core* const *
-TAO::ORB_Table::get_orbs (size_t& num_orbs)
-{
-  num_orbs = this->num_orbs_;
-  return this->orbs_;
-}
-
-int
-TAO::ORB_Table::bind (char const * orb_id,
-                      TAO_ORB_Core * orb_core)
-{
-  // Make sure that the supplied ORB core pointer is valid,
-  // i.e. non-zero.
-  if (orb_id == 0 || orb_core == 0)
-    {
-      errno = EINVAL;
-      return -1;
-    };
-
-  CORBA::String_var id (CORBA::string_dup (orb_id));
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->lock_,
-                    -1);
-
-  int const result = this->table_.bind (id.in (), orb_core);
-
-  if (result == 0)
-    {
-      // Make sure the ORB table owns the ORB Core by increasing the
-      // reference count on it.
-      (void) orb_core->_incr_refcnt ();
-
-      // This is not the first ORB .. but if the current default
-      // ORB decided not to be the default and there is more than
-      // one orb then set this orb to be the default ORB.
-      if ((this->first_orb_ != 0)
-          && (this->first_orb_not_default_))
-        {
-          this->first_orb_ = orb_core;
-          this->first_orb_not_default_ = 0;
-        }
-
-      // Set the "first_orb_" member for the first given ORB Core
-      // that was successfully added to the ORB table.
-      if (this->first_orb_ == 0)
-        {
-          this->first_orb_ = orb_core;
-        }
-
-      (void) id._retn ();  // ORB Table now owns the id.
-    }
-
-  return result;
-}
-
-TAO_ORB_Core *
-TAO::ORB_Table::find (char const * orb_id)
-{
-  TAO_ORB_Core * found = 0;
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->lock_,
-                    0);
-
-  this->table_.find (orb_id, found);
-
-  // Maintain ownership of the ORB_Core.
-  if (found != 0)
-    (void) found->_incr_refcnt ();
-
-  return found;
-}
-
-int
-TAO::ORB_Table::unbind (const char *orb_id)
-{
-  Table::ENTRY * entry = 0;
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->lock_,
-                    -1);
-
-  int result = this->table_.find (orb_id, entry);
-
-  if (result == 0)
-    {
-      // Deallocate the external ID and obtain the ORB core pointer
-      // before unbinding the entry since the entry is deallocated
-      // during the call to unbind().
-      CORBA::string_free (const_cast<char *> (entry->ext_id_));
-      TAO_ORB_Core * const orb_core = entry->int_id_;
-
-      result = this->table_.unbind (entry);
-
-      if (result != 0)
-        {
-          return result;
-        }
-
-      if (orb_core == this->first_orb_)
-        {
-          Iterator const begin (this->begin ());
-          Iterator const end (this->end ());
-
-          if (begin != end)
-            {
-              this->first_orb_ = (*begin).int_id_;
-            }
-          else
-            {
-              this->first_orb_ = 0;
-            }
-        }
-
-      orb_core->_decr_refcnt ();
-    }
-
-  return result;
-}
-
-void
-TAO::ORB_Table::set_default (char const  * orb_id)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->lock_);
-
-  this->table_.find (orb_id, this->first_orb_);
-}
-
-void
-TAO::ORB_Table::not_default (char const * orb_id)
-{
-  // @@  This method now works for restricted cases. Should work on
-  //     generalizing it. It works if the first ORB that is registered
-  //     decides to not want be the default ORB. Should generalize it
-  //     to handle all cases.
-
-
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->lock_);
-
-  // Check if there is a default ORB already and if it is *not* the
-  // same as the orb_id thats passed in.  We don't have to do
-  // anything.
-  if (this->first_orb_ != 0)
-    {
-      if (ACE_OS::strcmp (this->first_orb_->orbid (), orb_id) != 0)
-        {
-          // There is another default ORB. No need to change anything
-          return;
-        }
-      else
-        {
-          // The ORB with orbid 'orb_id' is the default now. We need
-          // to change it.
-          this->first_orb_not_default_ = true;
-        }
-    }
-}
-
-/// Accessor to the underlying table_
-TAO::ORB_Table::Table *
-TAO::ORB_Table::table (void)
-{
-  return &this->table_;
-}
-
-TAO::ORB_Table *
-TAO::ORB_Table::instance (void)
-{
-  return TAO_Singleton<TAO::ORB_Table, TAO_SYNCH_MUTEX>::instance ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>;
-
-template class ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *>;
-template class ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>
-
-#pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-
-template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
deleted file mode 100644
index 30eca509c82..00000000000
--- a/TAO/tao/ORB_Table.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ORB_Table.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_ORB_TABLE_H
-#define TAO_ORB_TABLE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-
-// Forward declarations.
-class TAO_ORB_Core;
-
-namespace TAO
-{
-  /**
-   * @class ORB_Table
-   *
-   * @brief Keep a table with all the ORBs in the system.
-   *
-   * CORBA::ORB_init() is supposed to return the same ORB if the
-   * user specifies the same ORBid, either in the ORB_init()
-   * parameter or in the -ORBid option.
-   * This class is used to implement that feature.
-   * It is also useful when trying to determine if an object
-   * reference is collocated or not.
-   *
-   * @note This class should be instantiated via its instance()
-   *       method.  Normally this would be enforced by making the
-   *       constructor protected but that forces a friend declaration
-   *       containing a template type (TAO_Singleton) with a static
-   *       member to be introduced.  In turn, this potentially
-   *       introduces problems in MS Windows DLL environments due to
-   *       the occurance of multiple singleton instances.  There
-   *       should only be one!
-   */
-  class TAO_Export ORB_Table
-  {
-  public:
-
-    /// Constructor
-    /**
-     * @note See the note in the class description for an explanation
-     *       of why this constructor is not protected.
-     */
-    ORB_Table (void);
-
-    /// destructor
-    ~ORB_Table (void);
-
-    typedef ACE_Hash_Map_Manager_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> Table;
-    typedef Table::iterator Iterator;
-
-    /// The canonical ACE_Map methods.
-    //@{
-    Iterator begin (void);
-    Iterator end (void);
-    int bind (const char *orb_id, TAO_ORB_Core *orb_core);
-
-    /**
-     * @note The caller must decrease the reference count on the
-     *       returned ORB_Core, i.e. the callers "owns" it.
-     */
-    TAO_ORB_Core* find (const char *orb_id);
-
-    int unbind (const char *orb_id);
-    //@}
-
-    TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
-
-    /// Obtain the first ORB for the @c ORB_Core_instance()
-    /// implementation.
-    TAO_ORB_Core * first_orb (void);
-
-    /// Return a unique instance
-    static ORB_Table * instance (void);
-
-    /// Set the ORB related to the orb_id as the default ORB and not the
-    /// ORB that is first binded.
-    void set_default (char const * orb_id);
-
-    /// Method the ORB invokes to specify that it doesnt want to be the
-    /// default ORB if there are more than one ORB registered.
-    void not_default (char const * orb_id);
-
-    /// Accessor to the underlying table_
-    Table * table (void);
-
-  private:
-
-    // Prevent copying
-    ORB_Table (const ORB_Table &);
-    void operator= (const ORB_Table &);
-
-    /// Update our list of orbs
-    void update_orbs (void);
-
-  private:
-
-    /// Lock used to synchronize access to the internal state.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Variable to check if the first ORB decides not to be the
-    /// default.
-    bool first_orb_not_default_;
-
-    /// The underlying table.
-    Table table_;
-
-    /// The first ORB created by the user
-    TAO_ORB_Core * first_orb_;
-
-    /// List of orbs for get_orbs call
-    TAO_ORB_Core ** orbs_;
-
-    /// Number of ORBs in the table.
-    size_t num_orbs_;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/ORB_Table.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_ORB_TABLE_H */
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
deleted file mode 100644
index f8f1f2d9937..00000000000
--- a/TAO/tao/ORB_Table.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO_ORB_Core *
-TAO::ORB_Table::first_orb (void)
-{
-  return this->first_orb_;
-}
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
deleted file mode 100644
index 77150719a80..00000000000
--- a/TAO/tao/ObjRefTemplate.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : valuetype, portableserver, core {
-  sharedname   = TAO_ObjRefTemplate
-  dynamicflags = TAO_ORT_BUILD_DLL
-
-  Source_Files {
-    ObjRefTemplate
-  }
-
-  Header_Files {
-    ObjRefTemplate
-  }
-
-  Inline_Files {
-    ObjRefTemplate
-  }
-
-  Template_Files {
-    ObjRefTemplate
-  }
-
-  Resource_Files {
-    ObjRefTemplate
-  }
-
-  PIDL_Files {
-    ObjRefTemplate
-  }
-
-  Pkgconfig_Files {
-    ObjRefTemplate/TAO_ObjRefTemplate.pc.in
-  }
-}
diff --git a/TAO/tao/ObjRefTemplate/Default_ORT.pidl b/TAO/tao/ObjRefTemplate/Default_ORT.pidl
deleted file mode 100644
index 9ef0be12442..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORT.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-/**
- * @file Default_ORT.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the TAO_Default_ORT module.
- *
- * This file is used to generate Default_ORTC.{h,i,cpp}, using the following
- * command:
- *
- *   tao_idl.exe
- *        -o orig -Ge 1 -Sc -GA
- *        -I../..
- *        -Wb,export_macro=TAO_ORT_Export \
- *        -Wb,export_include="ort_export.h" \
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Default_ORT.pidl
- *
- */
-
-#ifndef TAO_DEFAULT_ORT_PIDL
-#define TAO_DEFAULT_ORT_PIDL
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
-
-module TAO_Default_ORT
-{
-  valuetype ObjectReferenceTemplate
-    : PortableInterceptor::ObjectReferenceTemplate
-  {
-  };
-};
-
-#endif /* TAO_DEFAULT_ORT_PIDL */
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
deleted file mode 100644
index 9be9852ca99..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Default_ORTC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:50
-
-static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate = 0;
-
-static TAO::TypeCode::Value<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Value_Field<char const *,
-                                                       CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_Default_ORT_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0",
-    "ObjectReferenceTemplate",
-    CORBA::VM_NONE,
-    &CORBA::_tc_null,
-    _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate,
-    0);
-  
-namespace TAO_Default_ORT
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
-    &_tao_tc_TAO_Default_ORT_ObjectReferenceTemplate;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
-      CORBA::ValueBase *&_tao_elem
-    ) const
-  {
-    CORBA::add_ref (this->value_);
-    _tao_elem = this->value_;
-    return 1;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
-      _tao_any,
-      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
-      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
-        _tao_any,
-        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
-        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
-        _tao_elem
-      );
-}
-
-
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
deleted file mode 100644
index f44925afb77..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Default_ORTC.h"
-#include "tao/CDR.h"
-#include "tao/Valuetype/ValueFactory.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "Default_ORTC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref (
-    TAO_Default_ORT::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref (
-    TAO_Default_ORT::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-void
-TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release (
-    TAO_Default_ORT::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
-{
-  return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v);
-}
-
-const char *
-TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void
-TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectReferenceTemplate *_tao_tmp_pointer =
-    static_cast<ObjectReferenceTemplate *> (_tao_void_pointer);
-  CORBA::remove_ref (_tao_tmp_pointer);
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm) const
-{
-  return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
-}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR & strm)
-{
-  return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
-}
-
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
-    TAO_InputCDR &strm,
-    ObjectReferenceTemplate *&new_object
-  )
-{
-  CORBA::ValueBase *base = 0;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (
-        strm,
-        factory.out (),
-        base,
-        ObjectReferenceTemplate::_tao_obv_static_repository_id ()
-      );
-  
-  if (retval == 0)
-    {
-      return 0;
-    }
-  
-  if (factory.in () != 0)
-    {
-      base = factory->create_for_unmarshal ();
-      
-      if (base == 0)
-        {
-          return 0;  // %! except.?
-        }
-      
-      retval = base->_tao_unmarshal_v (strm);
-      
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-  
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ObjectReferenceTemplate::_downcast (base);
-  return retval;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
-
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
-{}
-
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm) const
-{
-  return _tao_marshal_state (strm);
-}
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm)
-{
-  return _tao_unmarshal_state (strm);
-}
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:487
-
-void
-CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
-{
-  if (vt != 0)
-    {
-      vt->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
-{
-  if (vt != 0)
-    {
-      vt->_remove_ref ();
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype
-  )
-{
-  return
-    CORBA::ValueBase::_tao_marshal (
-        strm,
-        _tao_valuetype,
-        reinterpret_cast<ptrdiff_t> (&TAO_Default_ORT::ObjectReferenceTemplate::_downcast)
-      );
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype
-  )
-{
-  return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/marshal_cs.cpp:44
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &) const
-{
-  return (
-      true
-    );
-}
-
-CORBA::Boolean
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &)
-{
-  return (
-    true
-  );
-}
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
deleted file mode 100644
index f7f225bf63b..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
-#define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ort_export.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_ORT_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO_Default_ORT
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:524
-  
-  
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-  
-  class ObjectReferenceTemplate;
-  typedef
-    TAO_Value_Var_T<
-        ObjectReferenceTemplate
-      >
-    ObjectReferenceTemplate_var;
-  
-  typedef
-    TAO_Value_Out_T<
-        ObjectReferenceTemplate
-      >
-    ObjectReferenceTemplate_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-  
-  class TAO_ORT_Export ObjectReferenceTemplate
-    : public virtual PortableInterceptor::ObjectReferenceTemplate
-  {
-  public:
-    typedef ObjectReferenceTemplate_var _var_type;
-    
-    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-    
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ObjectReferenceTemplate *&
-      );
-    
-    virtual const char* _tao_obv_repository_id (void) const;
-    
-    static const char* _tao_obv_static_repository_id (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
-  protected:
-    ObjectReferenceTemplate (void);
-    
-    virtual ~ObjectReferenceTemplate (void);
-    
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    
-  private:
-    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-    void operator= (const ObjectReferenceTemplate &);
-    
-  protected:
-    virtual CORBA::Boolean
-    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const = 0;
-    
-    virtual CORBA::Boolean
-    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO_Default_ORT
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
-
-namespace OBV_TAO_Default_ORT
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-  
-  // OBV_ class
-  class TAO_ORT_Export ObjectReferenceTemplate
-    : public virtual TAO_Default_ORT::ObjectReferenceTemplate
-  {
-  public:
-    
-  protected:
-    ObjectReferenceTemplate (void);
-    virtual ~ObjectReferenceTemplate (void);
-    
-  protected:
-    virtual CORBA::Boolean
-    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const;
-    
-    virtual CORBA::Boolean
-    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
-    
-    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
-    CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-  
-  private:
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-  
-  template<>
-  struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
-  {
-    static void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-    static void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-    static void release (TAO_Default_ORT::ObjectReferenceTemplate *);
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
-
-TAO_ORT_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
-TAO_ORT_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
-TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:431
-
-namespace CORBA
-{
-  extern TAO_ORT_Export void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-  extern TAO_ORT_Export void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
-
-TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
-TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "Default_ORTC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.inl b/TAO/tao/ObjRefTemplate/Default_ORTC.inl
deleted file mode 100644
index 990533dd1e9..00000000000
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.inl
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
-{}
-
-ACE_INLINE const char* 
-TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
-{
-  return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
-}
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
deleted file mode 100644
index 5ca97d9d64b..00000000000
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-#include "ORT_Adapter_Factory_Impl.h"
-#include "ORT_Adapter_Impl.h"
-#include "tao/PortableServer/Root_POA.h"
-
-ACE_RCSID (ORT,
-           ORT_Adapter_Factory_Impl,
-           "$Id$")
-
-namespace TAO
-{
-  ORT_Adapter *
-  ORT_Adapter_Factory_Impl::create ()
-  {
-    ORT_Adapter_Impl * new_ort_adapter = 0;
-
-    ACE_NEW_RETURN (new_ort_adapter,
-                    TAO::ORT_Adapter_Impl,
-                    0);
-
-    return new_ort_adapter;
-  }
-
-  void
-  ORT_Adapter_Factory_Impl::destroy (ORT_Adapter * adapter)
-  {
-    delete adapter;
-  }
-
-  int
-  ORT_Adapter_Factory_Impl::Initializer (void)
-  {
-    TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory"
-      );
-
-    return ACE_Service_Config::process_directive (
-          ace_svc_desc_ORT_Adapter_Factory_Impl
-        );
-  }
-
-  ACE_STATIC_SVC_DEFINE (
-    ORT_Adapter_Factory_Impl,
-    ACE_TEXT ("Concrete_ORT_Adapter_Factory"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (ORT_Adapter_Factory_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0)
-
-  ACE_FACTORY_DEFINE (TAO_ORT, ORT_Adapter_Factory_Impl)
-}
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
deleted file mode 100644
index 765ff32d331..00000000000
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ORT_Adapter_Factory_Impl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ORT_ADAPTER_FACTORY_IMPL_H
-#define TAO_ORT_ADAPTER_FACTORY_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ort_export.h"
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
-
-namespace TAO
-{
-  /**
-   * @class ORT_Adapter_Factory_Impl
-   *
-   * @brief ORT_Adapter_Factory_Impl
-   *
-   * Class that creates instances of TAO::ORT_Adapter
-   * (one per POA). This is the derived class that contains the actual
-   * implementation.
-   */
-  class TAO_ORT_Export ORT_Adapter_Factory_Impl
-    : public ORT_Adapter_Factory
-  {
-  public:
-    /// Create an adapter
-    virtual TAO::ORT_Adapter * create ();
-
-    /// Destroy an adapter that is created by this factory
-    virtual void destroy (TAO::ORT_Adapter * adapter);
-
-    // Used to force the initialization of the code.
-    static int Initializer (void);
-  };
-
-  ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl)
-  ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl)
-}
-
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-  TAO_Requires_ORTFactory_Initializer =
-    &TAO::ORT_Adapter_Factory_Impl::Initializer;
-
-#else
-
-static int TAO_Requires_ORTFactory_Initializer =
-  TAO::ORT_Adapter_Factory_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
-#undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORT_ADAPTER_FACTORY_IMPL_H */
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
deleted file mode 100644
index 050be03e0dc..00000000000
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-#include "ORT_Adapter_Impl.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/CORBA_String.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CORBA_methods.h"
-
-
-ACE_RCSID (ObjRefTemplate,
-           ORT_Adapter_Impl,
-           "$Id$")
-
-char *
-TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-char *
-TAO::ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableInterceptor::AdapterName *
-TAO::ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
-                                    const PortableInterceptor::ObjectId &id
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->ort_factory_->make_object (repo_id,
-                                          id
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-TAO::ORT_Adapter_Impl::get_adapter_template (void)
-{
-  CORBA::add_ref (this->ort_template_.in ());
-
-  return this->ort_template_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
-{
-  CORBA::add_ref (this->ort_factory_.in ());
-
-  return this->ort_factory_;
-}
-
-int
-TAO::ORT_Adapter_Impl::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *cf
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  this->ort_factory_ = cf;
-
-  CORBA::add_ref (this->ort_factory_.in ());
-
-  return 0;
-}
-
-void
-TAO::ORT_Adapter_Impl::release (
-  PortableInterceptor::ObjectReferenceTemplate * t)
-{
-  CORBA::remove_ref (t);
-}
-
-int
-TAO::ORT_Adapter_Impl::activate (
-  const char *server_id,
-  const char *orb_id,
-  PortableInterceptor::AdapterName *adapter_name,
-  PortableServer::POA_ptr poa
-  ACE_ENV_ARG_DECL)
-{
-  // No need to lock here, there is one instance for each POA and
-  // when the POA creates and actives an ORT_Adapter it will lock
-  // itself. Create an ObjectReferenceTemplate for this POA.
-
-  ObjectReferenceTemplate * t = 0;
-  ACE_NEW_THROW_EX (t,
-                    ObjectReferenceTemplate (server_id,
-                                             orb_id,
-                                             adapter_name,
-                                             poa),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
-
-  this->ort_template_ = t;
-
-  // Must increase ref count since this->ort_factory_ will
-  // decrease it upon destruction.
-  CORBA::add_ref (t);
-  this->ort_factory_ = t;
-
-  return 0;
-}
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
deleted file mode 100644
index ad2f8ecdf17..00000000000
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ORT_Adapter_Impl.h
- *
- * $Id$
- *
- * This is the implementation of the TAO::ORT_Adapter
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ORT_ADAPTER_IMPL_H
-#define TAO_ORT_ADAPTER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ort_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/ORT_Adapter.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  /**
-   * @class ObjectReferenceTemplate_Adapter_Impl
-   *
-   * @brief Implementation of the TAO::ORT_Adapter
-   */
-  class TAO_ORT_Export ORT_Adapter_Impl
-    : public ORT_Adapter
-  {
-  public:
-    /// Activate this adapter
-    virtual int activate (const char *server_id,
-                          const char *orb_id,
-                          PortableInterceptor::AdapterName *adapter_name,
-                          PortableServer::POA_ptr poa
-                          ACE_ENV_ARG_DECL);
-
-    /// Accessor methods to ObjectReferenceTemplate template
-    virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
-
-    /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-    virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
-
-    /// Set a different ort_factory to be used.
-    virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory * current_factory
-      ACE_ENV_ARG_DECL);
-
-    /**
-     * @see @c TAO::ORT_Adapter for details.
-     */
-    virtual void release (PortableInterceptor::ObjectReferenceTemplate * ort);
-
-    /**
-     * @name Adapter methods for PortableInterceptor::ObjectReferenceTemplate
-     * Methods
-     */
-    //@{
-    virtual char * tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual char * tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    //@}
-
-    /**
-     * @name PortableInterceptor::ObjectReferenceFactory Methods
-     *
-     * Methods required by the
-     * PortableInterceptor::ObjectReferenceFactory ValueType.
-     */
-    //@{
-    virtual CORBA::Object_ptr make_object (
-        const char * repository_id,
-        const PortableInterceptor::ObjectId & id
-        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-    //@}
-
-  private:
-
-    /// The ORT Template, this is the factory and its identity.
-    PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
-
-    /// The ORT Factory.
-    PortableInterceptor::ObjectReferenceFactory_var ort_factory_;
-
-  };
-
-}
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.h
deleted file mode 100644
index f1a112b9d3f..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ObjectReferenceTemplate.h
- *
- * $Id$
- *
- * This is the implementation of the TAO::ORT_Adapter
- *
- * @author Bala Natarajan  <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_REFERENCE_TEMPLATE_H
-#define TAO_OBJECT_REFERENCE_TEMPLATE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_OBJECT_REFERENCE_TEMPLATE_H*/
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
deleted file mode 100644
index 335fd5ad8d9..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ObjectReferenceTemplate.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the ObjectReferenceTemplate module.
- *
- * This file is used to generate ObjectReferenceTemplateC.{h,i,cpp},
- * using the following command:
- *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Sc -GA
- *        -I$(TAO_ROOT)
- *        -Wb,export_macro=TAO_ORT_Export
- *        -Wb,export_include=ort_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        ObjectReferenceTemplate.pidl
- *
- * and then:
- *
- * cp orig/ObjectReferenceTemplateC.{h,i,cpp} .
- * patch < diffs/ObjectReferenceTemplate.diff
- *
- * The code left in ObjectReferenceTemplateC.{h,i,cpp} is ready for use.
- *
- */
-
-// File: ObjectReferenceTemplate.idl
-
-#ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
-#define _OBJECT_REFERENCE_TEMPLATE_IDL_
-
-#include <PI_Forward.pidl>
-
-module PortableInterceptor
-{
-  typeprefix PortableInterceptor "omg.org";
-
-  abstract valuetype ObjectReferenceFactory {
-    // boolean equals (in ObjectReferenceFactory other);
-    Object make_object (in string repository_id,
-			in ObjectId id);
-    // IOP::TaggedProfileSeq make_profiles (in string repository_id,
-    //                                      in ObjectId id);
-  };
-
-  abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory {
-    readonly attribute ServerId server_id;
-    readonly attribute ORBId orb_id;
-    readonly attribute AdapterName adapter_name;
-  };
-
-  typedef sequence<ObjectReferenceTemplate> ObjectReferenceTemplateSeq;
-};
-
-#endif  /* _OBJECT_REFERENCE_TEMPLATE_IDL_ */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
deleted file mode 100644
index 1c230c1fa55..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ObjectReferenceTemplate.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:50
-
-static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ObjectReferenceFactory = 0;
-
-static TAO::TypeCode::Value<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Value_Field<char const *,
-                                                       CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectReferenceFactory (
-    CORBA::tk_value,
-    "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0",
-    "ObjectReferenceFactory",
-    CORBA::VM_ABSTRACT,
-    &CORBA::_tc_null,
-    _tao_fields_PortableInterceptor_ObjectReferenceFactory,
-    0);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory =
-    &_tao_tc_PortableInterceptor_ObjectReferenceFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/value_typecode.cpp:50
-
-static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ObjectReferenceTemplate = 0;
-
-static TAO::TypeCode::Value<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Value_Field<char const *,
-                                                       CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectReferenceTemplate (
-    CORBA::tk_value,
-    "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0",
-    "ObjectReferenceTemplate",
-    CORBA::VM_ABSTRACT,
-    &CORBA::_tc_null,
-    _tao_fields_PortableInterceptor_ObjectReferenceTemplate,
-    0);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
-    &_tao_tc_PortableInterceptor_ObjectReferenceTemplate;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_PortableInterceptor_ObjectReferenceTemplateSeq_GUARD
-#define _TAO_TYPECODE_PortableInterceptor_ObjectReferenceTemplateSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      PortableInterceptor_ObjectReferenceTemplateSeq_0 (
-        CORBA::tk_sequence,
-        &PortableInterceptor::_tc_ObjectReferenceTemplate,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_PortableInterceptor_ObjectReferenceTemplateSeq_0 =
-      &PortableInterceptor_ObjectReferenceTemplateSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_PortableInterceptor_ObjectReferenceTemplateSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectReferenceTemplateSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0",
-    "ObjectReferenceTemplateSeq",
-    &TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq =
-    &_tao_tc_PortableInterceptor_ObjectReferenceTemplateSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
-      CORBA::ValueBase *&_tao_elem
-    ) const
-  {
-    CORBA::add_ref (this->value_);
-    _tao_elem = this->value_;
-    return 1;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceFactory *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceFactory,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
-      CORBA::ValueBase *&_tao_elem
-    ) const
-  {
-    CORBA::add_ref (this->value_);
-    _tao_elem = this->value_;
-    return 1;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate *_tao_elem
-  )
-{
-  CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
-      PortableInterceptor::_tc_ObjectReferenceTemplate,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor,
-        PortableInterceptor::_tc_ObjectReferenceTemplate,
-        _tao_elem
-      );
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplateSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::insert (
-      _tao_any,
-      PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ObjectReferenceTemplateSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ObjectReferenceTemplateSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>::extract (
-        _tao_any,
-        PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
deleted file mode 100644
index 3c6be414aa1..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ObjectReferenceTemplate.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Valuetype/ValueFactory.h"
-#include "tao/ORB_Core.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/Var_Size_Argument_T.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::StringSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StringSeq,
-            CORBA::StringSeq_var,
-            CORBA::StringSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref (
-    PortableInterceptor::ObjectReferenceFactory * p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref (
-    PortableInterceptor::ObjectReferenceFactory * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release (
-    PortableInterceptor::ObjectReferenceFactory * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
-{
-  return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v);
-}
-
-const char *
-PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void
-PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectReferenceFactory *_tao_tmp_pointer =
-    static_cast<ObjectReferenceFactory *> (_tao_void_pointer);
-  CORBA::remove_ref (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
-{}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
-    TAO_InputCDR &strm,
-    ObjectReferenceFactory *&new_object
-  )
-{
-  CORBA::ValueBase *base = 0;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (
-        strm,
-        factory.out (),
-        base,
-        ObjectReferenceFactory::_tao_obv_static_repository_id ()
-      );
-  
-  if (retval == 0)
-    {
-      return 0;
-    }
-  
-  if (factory.in () != 0)
-    {
-      base = factory->create_for_unmarshal ();
-      
-      if (base == 0)
-        {
-          return 0;  // %! except.?
-        }
-      
-      retval = base->_tao_unmarshal_v (strm);
-      
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-  
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ObjectReferenceFactory::_downcast (base);
-  return retval;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref (
-    PortableInterceptor::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref (
-    PortableInterceptor::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-void
-TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release (
-    PortableInterceptor::ObjectReferenceTemplate * p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
-{
-  return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v);
-}
-
-const char *
-PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void
-PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectReferenceTemplate *_tao_tmp_pointer =
-    static_cast<ObjectReferenceTemplate *> (_tao_void_pointer);
-  CORBA::remove_ref (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
-CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
-    TAO_InputCDR &strm,
-    ObjectReferenceTemplate *&new_object
-  )
-{
-  CORBA::ValueBase *base = 0;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (
-        strm,
-        factory.out (),
-        base,
-        ObjectReferenceTemplate::_tao_obv_static_repository_id ()
-      );
-  
-  if (retval == 0)
-    {
-      return 0;
-    }
-  
-  if (factory.in () != 0)
-    {
-      base = factory->create_for_unmarshal ();
-      
-      if (base == 0)
-        {
-          return 0;  // %! except.?
-        }
-      
-      retval = base->_tao_unmarshal_v (strm);
-      
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-  
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ObjectReferenceTemplate::_downcast (base);
-  return retval;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
-
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
-{}
-
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Valuetype_Sequence<
-        PortableInterceptor::ObjectReferenceTemplate,
-        PortableInterceptor::ObjectReferenceTemplate_var
-      >
-    (max)
-{}
-
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    PortableInterceptor::ObjectReferenceTemplate * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Valuetype_Sequence<
-        PortableInterceptor::ObjectReferenceTemplate,
-        PortableInterceptor::ObjectReferenceTemplate_var
-      >
-    (max, length, buffer, release)
-{}
-
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
-    const ObjectReferenceTemplateSeq &seq
-  )
-  : TAO_Unbounded_Valuetype_Sequence<
-        PortableInterceptor::ObjectReferenceTemplate,
-        PortableInterceptor::ObjectReferenceTemplate_var
-      >
-    (seq)
-{}
-
-PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void)
-{}
-
-void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ObjectReferenceTemplateSeq * _tao_tmp_pointer =
-    static_cast<ObjectReferenceTemplateSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:487
-
-void
-CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
-{
-  if (vt != 0)
-    {
-      vt->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
-{
-  if (vt != 0)
-    {
-      vt->_remove_ref ();
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype
-  )
-{
-  return
-    CORBA::ValueBase::_tao_marshal (
-        strm,
-        _tao_valuetype,
-        reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceFactory::_downcast)
-      );
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableInterceptor::ObjectReferenceFactory *&_tao_valuetype
-  )
-{
-  return PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:487
-
-void
-CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
-{
-  if (vt != 0)
-    {
-      vt->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
-{
-  if (vt != 0)
-    {
-      vt->_remove_ref ();
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype
-  )
-{
-  return
-    CORBA::ValueBase::_tao_marshal (
-        strm,
-        _tao_valuetype,
-        reinterpret_cast<ptrdiff_t> (&PortableInterceptor::ObjectReferenceTemplate::_downcast)
-      );
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableInterceptor::ObjectReferenceTemplate *&_tao_valuetype
-  )
-{
-  return PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
-#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
deleted file mode 100644
index 70c007519ce..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ /dev/null
@@ -1,449 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
-
-#include /**/ "ace/pre.h"
-
-#ifndef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
-#error "You should not include ObjectReferenceTemplateC.h directly, use ObjectReferenceTemplate.h"
-#endif /* !TAO_OBJREF_TEMPLATE_SAFE_INCLUDE */
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ort_export.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Valuetype/Sequence_T.h"
-#include "tao/Sequence_T.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/PI_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_ORT_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:524
-  
-  
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-  
-  class ObjectReferenceFactory;
-  typedef
-    TAO_Value_Var_T<
-        ObjectReferenceFactory
-      >
-    ObjectReferenceFactory_var;
-  
-  typedef
-    TAO_Value_Out_T<
-        ObjectReferenceFactory
-      >
-    ObjectReferenceFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-  
-  class TAO_ORT_Export ObjectReferenceFactory
-    : public virtual CORBA::ValueBase
-  {
-  public:
-    typedef ObjectReferenceFactory_var _var_type;
-    
-    static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-    
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ObjectReferenceFactory *&
-      );
-    
-    virtual const char* _tao_obv_repository_id (void) const;
-    
-    static const char* _tao_obv_static_repository_id (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
-  public:
-    virtual CORBA::Object_ptr make_object (
-        const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
-  protected:
-    ObjectReferenceFactory (void);
-    
-    virtual ~ObjectReferenceFactory (void);
-    
-    
-  private:
-    ObjectReferenceFactory (const ObjectReferenceFactory &);
-    void operator= (const ObjectReferenceFactory &);
-    
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory;
-  
-  // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:524
-  
-  
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-  
-  class ObjectReferenceTemplate;
-  typedef
-    TAO_Value_Var_T<
-        ObjectReferenceTemplate
-      >
-    ObjectReferenceTemplate_var;
-  
-  typedef
-    TAO_Value_Out_T<
-        ObjectReferenceTemplate
-      >
-    ObjectReferenceTemplate_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:56
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-  
-  class TAO_ORT_Export ObjectReferenceTemplate
-    : public virtual ObjectReferenceFactory
-  {
-  public:
-    typedef ObjectReferenceTemplate_var _var_type;
-    
-    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-    
-    // (TAO extensions or internals)
-    static CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ObjectReferenceTemplate *&
-      );
-    
-    virtual const char* _tao_obv_repository_id (void) const;
-    
-    static const char* _tao_obv_static_repository_id (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
-  public:
-    virtual char * server_id (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
-  public:
-    virtual char * orb_id (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:404
-    
-  public:
-    virtual ::PortableInterceptor::AdapterName * adapter_name (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:246
-  
-  protected:
-    ObjectReferenceTemplate (void);
-    
-    virtual ~ObjectReferenceTemplate (void);
-    
-    
-  private:
-    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
-    void operator= (const ObjectReferenceTemplate &);
-    
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
-  class ObjectReferenceTemplateSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ObjectReferenceTemplateSeq,
-        TAO_Valuetype_Manager<
-            ObjectReferenceTemplate,
-            ObjectReferenceTemplate_var
-          >
-      >
-    ObjectReferenceTemplateSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ObjectReferenceTemplateSeq,
-        ObjectReferenceTemplateSeq_var,
-        TAO_Valuetype_Manager<
-            ObjectReferenceTemplate,
-            ObjectReferenceTemplate_var
-          >
-      >
-    ObjectReferenceTemplateSeq_out;
-  
-  class TAO_ORT_Export ObjectReferenceTemplateSeq
-    : public
-        TAO_Unbounded_Valuetype_Sequence<
-            ObjectReferenceTemplate,
-            ObjectReferenceTemplate_var
-          >
-  {
-  public:
-    ObjectReferenceTemplateSeq (void);
-    ObjectReferenceTemplateSeq (CORBA::ULong max);
-    ObjectReferenceTemplateSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
-    ~ObjectReferenceTemplateSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ObjectReferenceTemplateSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
-
-namespace OBV_PortableInterceptor
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
-  {
-    static void add_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
-    static void release (PortableInterceptor::ObjectReferenceFactory *);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-  
-  template<>
-  struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
-  {
-    static void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
-    static void release (PortableInterceptor::ObjectReferenceTemplate *);
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
-
-TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
-TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
-TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_ch.cpp:54
-
-TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
-TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
-TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
-TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
-TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated
-TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:431
-
-namespace CORBA
-{
-  extern TAO_ORT_Export void add_ref (PortableInterceptor::ObjectReferenceFactory *);
-  extern TAO_ORT_Export void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
-
-TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
-TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:431
-
-namespace CORBA
-{
-  extern TAO_ORT_Export void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
-  extern TAO_ORT_Export void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
-
-TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
-TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
-#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
-
-TAO_ORT_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const PortableInterceptor::ObjectReferenceTemplateSeq &
-  );
-TAO_ORT_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableInterceptor::ObjectReferenceTemplateSeq &
-  );
-
-#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "ObjectReferenceTemplateC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
deleted file mode 100644
index 18ca86135e7..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
-{}
-
-ACE_INLINE const char* 
-PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
-{
-  return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
-{}
-
-ACE_INLINE const char* 
-PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
-{
-  return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
-}
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
deleted file mode 100644
index 9965d1edb67..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "ObjectReferenceTemplate_i.h"
-#include "tao/PortableServer/Root_POA.h"
-
-#include "tao/CORBA_String.h"
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID (ORT,
-           ObjectReferenceTemplate_i,
-           "$Id$")
-
-namespace TAO
-{
-  ObjectReferenceTemplate::ObjectReferenceTemplate (
-  const char *server_id,
-  const char *orb_id,
-  PortableInterceptor::AdapterName *adapter_name,
-  PortableServer::POA_ptr poa)
-  : server_id_ (server_id),
-    orb_id_ (orb_id),
-    adapter_name_ (adapter_name),
-    poa_ (PortableServer::POA::_duplicate (poa))
-  {
-  }
-
-  ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-  {
-  }
-
-  char *
-  ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return CORBA::string_dup (this->server_id_);
-  }
-
-  char *
-  ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return CORBA::string_dup (this->orb_id_);
-  }
-
-  PortableInterceptor::AdapterName *
-  ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    PortableInterceptor::AdapterName *adapter_name = 0;
-
-    ACE_NEW_THROW_EX (adapter_name,
-                      PortableInterceptor::AdapterName (
-                                                        *(this->adapter_name_)),
-                      CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              ENOMEM),
-                          CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (0);
-
-    return adapter_name;
-  }
-
-  CORBA::Object_ptr
-  ObjectReferenceTemplate::make_object (
-      const char *,
-      const PortableInterceptor::ObjectId &
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    if (CORBA::is_nil(poa_.in()))
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
-
-    TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
-
-    return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-  }
-}
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
deleted file mode 100644
index aca0b876cdf..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ObjectReferenceTemplate_i.h
- *
- * $Id$
- *
- * This is the implementation of the
- * PortableInterceptor::ObjectReferenceTemplate ValueType.
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_REFERENCE_TEMPLATE_I_H
-#define TAO_OBJECT_REFERENCE_TEMPLATE_I_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ObjRefTemplate/ort_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Default_ORTC.h"
-#include "tao/SystemException.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace PortableServer
-{
-  class POA;
-
-  typedef POA *POA_ptr;
-  typedef TAO_Objref_Var_T<POA> POA_var;
-}
-
-namespace TAO
-{
-  /**
-   * @class TAO_ObjectReferenceTemplate
-   *
-   * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate
-   *        interface. This is a default implementation created to be returned
-   *        by the IORInfo when the user requests the ORT or ORF.
-   */
-  class TAO_ORT_Export ObjectReferenceTemplate
-    : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate,
-      public virtual CORBA::DefaultValueRefCountBase
-  {
-  public:
-    /// Constructor
-    ObjectReferenceTemplate (const char *server_id,
-                             const char *orb_id,
-                             PortableInterceptor::AdapterName *adapter_name,
-                             PortableServer::POA_ptr poa);
-
-    /**
-     * @name PortableInterceptor::ObjectReferenceTemplate Methods
-     *
-     * Methods required by the
-     * PortableInterceptor::ObjectReferenceTemplate ValueType.
-     */
-    //@{
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual PortableInterceptor::AdapterName * adapter_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    //@}
-
-    /**
-     * @name PortableInterceptor::ObjectReferenceFactory Methods
-     *
-     * Methods required by the
-     * PortableInterceptor::ObjectReferenceFactory ValueType.
-     */
-    //@{
-    virtual CORBA::Object_ptr make_object (
-      const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-                       CORBA::SystemException
-                       ));
-    //@}
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management via
-     * reference counting.
-     */
-    ~ObjectReferenceTemplate (void);
-
-  private:
-    const char *server_id_;
-    const char *orb_id_;
-    PortableInterceptor::AdapterName_var adapter_name_;
-    PortableServer::POA_var poa_;
-  };
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_REFERENCE_TEMPLATE_I_H */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
deleted file mode 100644
index 5335679ca76..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file ObjectReferenceTemplate_include.pidl
- *
- * $Id$
- *
- * @brief Include file for use in applications that need ObjectReferenceTemplate.pidl.
- *
- * This file just includes ObjectReferenceTemplate.pidl. The *C.h file generated from
- * this is hand-crafted to itself include ObjectReferenceTemplate.h instead of
- * ObjectReferenceTemplateC.h (which will produce a compiler error message if
- * included directly). The ObjectReferenceTemplate_includeC.h file can then be
- * included directly and automatically by the IDL compiler when
- * building the application.
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *     this is:
- *
- *     tao_idl -o orig -St -Sc -Sp
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ObjectReferenceTemplate_include.pidl
- *
- *   2. Then change this line in ObjectReferenceTemplate_includeC.h:
- *
- *          #include "ObjectReferenceTemplateC.h"
- *
- *      to
- *
- *          #include "ObjectReferenceTemplate.h"
- */
-
-#ifndef _OBJECTREFERENCETEMPLATE_INCLUDE_IDL_
-#define _OBJECTREFERENCETEMPLATE_INCLUDE_IDL_
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
-
-#endif /* _OBJECTREFERENCETEMPLATE_INCLUDE_IDL_ */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
deleted file mode 100644
index 1b15e680078..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEC_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ort_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_ORT_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_ORT_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:963
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
deleted file mode 100644
index 0d6946f8b84..00000000000
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
-#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateS.h"
-#include "ObjectReferenceTemplate_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:999
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.pc.in b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
deleted file mode 100644
index 9347bb98b50..00000000000
--- a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_ObjRefTemplate
-Description: TAO ObjRefTemplate Library
-Requires: TAO_PortableServer, TAO_Valuetype, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_ObjRefTemplate
-Cflags: -I${includedir}
diff --git a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc
deleted file mode 100644
index 7a2e46e5c0c..00000000000
--- a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ObjRefTemplate\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_ObjRefTemplateDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_ObjRefTemplate.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff b/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff
deleted file mode 100644
index 2561a42d5fb..00000000000
--- a/TAO/tao/ObjRefTemplate/diffs/ObjectReferenceTemplate.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- orig/ObjectReferenceTemplateC.h	2005-03-25 19:44:50.584169600 +0100
-+++ ObjectReferenceTemplateC.h	2005-03-25 19:44:51.054846400 +0100
-@@ -33,6 +33,9 @@
- 
- #include /**/ "ace/pre.h"
- 
-+#ifndef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
-+#error "You should not include ObjectReferenceTemplateC.h directly, use ObjectReferenceTemplate.h"
-+#endif /* !TAO_OBJREF_TEMPLATE_SAFE_INCLUDE */
- 
- #include "ace/config-all.h"
- 
---- orig/ObjectReferenceTemplateC.cpp	2005-03-25 19:44:50.584169600 +0100
-+++ ObjectReferenceTemplateC.cpp	2005-03-25 19:44:51.114932800 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "ObjectReferenceTemplateC.h"
-+#include "ObjectReferenceTemplate.h"
- #include "tao/CDR.h"
- #include "tao/Exception_Data.h"
- #include "tao/Invocation_Adapter.h"
---- orig/ObjectReferenceTemplateA.cpp	2005-03-25 19:44:50.584169600 +0100
-+++ ObjectReferenceTemplateA.cpp	2005-03-25 19:45:21.758996800 +0100
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "ObjectReferenceTemplateC.h"
-+#include "ObjectReferenceTemplate.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/ObjRefTemplate/ort_export.h b/TAO/tao/ObjRefTemplate/ort_export.h
deleted file mode 100644
index 3da9ca420ee..00000000000
--- a/TAO/tao/ObjRefTemplate/ort_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_ORT_EXPORT_H
-#define TAO_ORT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_ORT_HAS_DLL)
-#    define TAO_ORT_HAS_DLL 0
-#  endif /* ! TAO_ORT_HAS_DLL */
-#else
-#  if !defined (TAO_ORT_HAS_DLL)
-#    define TAO_ORT_HAS_DLL 1
-#  endif /* ! TAO_ORT_HAS_DLL */
-#endif
-
-#if defined (TAO_ORT_HAS_DLL) && (TAO_ORT_HAS_DLL == 1)
-#  if defined (TAO_ORT_BUILD_DLL)
-#    define TAO_ORT_Export ACE_Proper_Export_Flag
-#    define TAO_ORT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_ORT_BUILD_DLL */
-#    define TAO_ORT_Export ACE_Proper_Import_Flag
-#    define TAO_ORT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_ORT_BUILD_DLL */
-#else /* TAO_ORT_HAS_DLL == 1 */
-#  define TAO_ORT_Export
-#  define TAO_ORT_SINGLETON_DECLARATION(T)
-#  define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_ORT_HAS_DLL == 1 */
-
-#endif /* TAO_ORT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
deleted file mode 100644
index f9562ce762d..00000000000
--- a/TAO/tao/Object.cpp
+++ /dev/null
@@ -1,1077 +0,0 @@
-// @(#) $Id$
-//
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// Copyright 1997-2002 by Washington University
-// All Rights Reserved
-//
-// ORB:         CORBA::Object operations
-
-#include "Object.h"
-#include "Stub.h"
-#include "Profile.h"
-#include "ORB_Core.h"
-#include "Connector_Registry.h"
-#include "LocateRequest_Invocation_Adapter.h"
-#include "debug.h"
-#include "Dynamic_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "Remote_Object_Proxy_Broker.h"
-#include "CDR.h"
-#include "SystemException.h"
-#include "PolicyC.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Object,
-           "$Id$")
-
-
-CORBA::Object::~Object (void)
-{
-  if (this->protocol_proxy_)
-    (void) this->protocol_proxy_->_decr_refcnt ();
-
-  delete this->refcount_lock_;
-}
-
-CORBA::Object::Object (TAO_Stub * protocol_proxy,
-                       CORBA::Boolean collocated,
-                       TAO_Abstract_ServantBase * servant,
-                       TAO_ORB_Core *orb_core)
-  : servant_ (servant)
-    , is_collocated_ (collocated)
-    , is_local_ (0)
-    , is_evaluated_ (1)
-    , ior_ (0)
-    , orb_core_ (orb_core)
-    , protocol_proxy_ (protocol_proxy)
-    , refcount_ (1)
-    , refcount_lock_ (0)
-{
-  /// This constructor should not be called when the protocol proxy is
-  /// null ie. when the object is a LocalObject. Assert that
-  /// requirement.
-  ACE_ASSERT (this->protocol_proxy_ != 0);
-
-  if (this->orb_core_ == 0)
-    this->orb_core_ = this->protocol_proxy_->orb_core ();
-
-  this->refcount_lock_ =
-    this->orb_core_->resource_factory ()->create_corba_object_lock ();
-
-  // If the object is collocated then set the broker using the
-  // factory otherwise use the remote proxy broker.
-  if (this->is_collocated_ &&
-      _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
-    this->proxy_broker_ =
-      _TAO_Object_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->proxy_broker_ =
-      the_tao_remote_object_proxy_broker ();
-}
-
-CORBA::Object::Object (IOP::IOR *ior,
-                       TAO_ORB_Core *orb_core)
-  : servant_ (0)
-    , proxy_broker_ (0)
-    , is_collocated_ (0)
-    , is_local_ (0)
-    , is_evaluated_ (0)
-    , ior_ (ior)
-    , orb_core_ (orb_core)
-    , protocol_proxy_ (0)
-    , refcount_ (1)
-    , refcount_lock_ (0)
-{
-  this->refcount_lock_ =
-    this->orb_core_->resource_factory ()->create_corba_object_lock ();
-}
-
-// Too lazy to do this check in every method properly! This is useful
-// only  for lazily evaluated IOR's
-#define TAO_OBJECT_IOR_EVALUATE \
-if (!this->is_evaluated_) \
-  { \
-    ACE_GUARD (ACE_Lock , mon, *this->refcount_lock_); \
-    CORBA::Object::tao_object_initialize (this); \
-  }
-
-#define TAO_OBJECT_IOR_EVALUATE_RETURN \
-if (!this->is_evaluated_) \
-  { \
-    ACE_GUARD_RETURN (ACE_Lock , mon, *this->refcount_lock_, 0); \
-    if (!this->is_evaluated_) \
-      CORBA::Object::tao_object_initialize (this); \
-  }
-
-void
-CORBA::Object::_add_ref (void)
-{
-  if (this->is_local_)
-    return;
-
-  ACE_ASSERT (this->refcount_lock_ != 0);
-
-  ACE_GUARD (ACE_Lock ,
-             mon,
-             *this->refcount_lock_);
-
-  this->refcount_++;
-}
-
-void
-CORBA::Object::_remove_ref (void)
-{
-  if (this->is_local_)
-    return;
-
-  ACE_ASSERT (this->refcount_lock_ != 0);
-
-  {
-    ACE_GUARD (ACE_Lock,
-               mon,
-               *this->refcount_lock_);
-
-  this->refcount_--;
-
-  if (this->refcount_ != 0)
-    return;
-  }
-
-  ACE_ASSERT (this->refcount_ == 0);
-
-  delete this;
-}
-
-void
-CORBA::Object::_tao_any_destructor (void *x)
-{
-  CORBA::Object_ptr tmp = static_cast<CORBA::Object_ptr> (x);
-  CORBA::release (tmp);
-}
-
-/*static*/ CORBA::Boolean
-CORBA::Object::marshal (CORBA::Object_ptr x,
-                        TAO_OutputCDR &cdr)
-{
-  if (x == 0)
-    {
-      // NIL objrefs ... marshal as empty type hint, no elements.
-      cdr.write_ulong (1);
-      cdr.write_char ('\0');
-      cdr.write_ulong (0);
-      return (CORBA::Boolean) cdr.good_bit ();
-    }
-
-  return x->marshal (cdr);
-}
-
-
-TAO_Abstract_ServantBase*
-CORBA::Object::_servant (void) const
-{
-  return this->servant_;
-}
-
-// IS_A ... ask the object if it's an instance of the type whose
-// logical type ID is passed as a parameter.
-
-CORBA::Boolean
-CORBA::Object::_is_a (const char *type_id
-                      ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  // NOTE: if istub->type_id is nonzero and we have local knowledge of
-  // it, we can answer this question without a costly remote call.
-  //
-  // That "local knowledge" could come from stubs or skeletons linked
-  // into this process in the best case, or a "near" repository in a
-  // slightly worse case.  Or in a trivial case, if the ID being asked
-  // about is the ID we have recorded, we don't need to ask about the
-  // inheritance relationships at all!
-  //
-  // In real systems having local knowledge will be common, though as
-  // the systems built atop ORBs become richer it'll also become
-  // common to have the "real type ID" not be directly understood
-  // because it's more deeply derived than any locally known types.
-  //
-  // XXX if type_id is that of CORBA::Object, "yes, we comply" :-)
-
-  if (this->protocol_proxy_ == 0)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-
-  if (this->_stubobj ()->type_id.in () != 0
-      && ACE_OS::strcmp (type_id,
-                         this->_stubobj ()->type_id.in ()) == 0)
-    return 1;
-
-  return this->proxy_broker_->_is_a (this,
-                                     type_id
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-const char*
-CORBA::Object::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Object:1.0";
-}
-
-CORBA::Boolean
-CORBA::Object::_is_collocated (void) const
-{
-  return this->is_collocated_;
-}
-
-CORBA::Boolean
-CORBA::Object::_is_local (void) const
-{
-  return this->is_local_;
-}
-
-TAO_Stub *
-CORBA::Object::_stubobj (void)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->protocol_proxy_;
-}
-
-CORBA::ULong
-CORBA::Object::_hash (CORBA::ULong maximum
-                      ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (this->protocol_proxy_ != 0)
-    return this->protocol_proxy_->hash (maximum ACE_ENV_ARG_PARAMETER);
-  else
-    {
-      // Locality-constrained object.
-
-      // Note that we reinterpret_cast to an "unsigned long" instead
-      // of CORBA::ULong since we need to first cast to an integer
-      // large enough to hold an address to avoid compile-time
-      // warnings on some 64-bit platforms.
-      const CORBA::ULong hash =
-        static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this));
-
-      return hash % maximum;
-    }
-}
-
-CORBA::Boolean
-CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC (())
-{
-  if (other_obj == this)
-    {
-      return 1;
-    }
-
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (this->protocol_proxy_ != 0)
-    return this->protocol_proxy_->is_equivalent (other_obj);
-
-  return 0;
-}
-
-// TAO's extensions
-
-TAO::ObjectKey *
-CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
-    return this->_stubobj ()->profile_in_use ()->_key ();
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) Null object key return from ")
-                  ACE_TEXT ("profile in use\n")));
-    }
-
-  ACE_THROW_RETURN (CORBA::INTERNAL (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        EINVAL),
-                      CORBA::COMPLETED_NO),
-                    0);
-}
-
-void
-CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
-{
-  this->proxy_broker_ = proxy_broker;
-}
-
-CORBA::Boolean
-CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
-{
-  // If the profile length is zero for a non-evaluted IOR it is a
-  // null-object.
-  if ((!obj->is_evaluated ()) &&
-      obj->ior ().profiles.length () == 0)
-  return 1;
-
-  // To accomodate new definitions.
-  if (obj->orb_core_)
-    {
-      return obj->orb_core_->object_is_nil (obj);
-    }
-
-  return 0;
-}
-
-
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-void
-CORBA::Object::_create_request (CORBA::Context_ptr ctx,
-                                const char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags
-                                ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE;
-
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  // Neither can we create a request object from locality constrained
-  // object references.
-  if (ctx != 0 || this->protocol_proxy_ == 0)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  TAO_Dynamic_Adapter *dynamic_adapter =
-    ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-        TAO_ORB_Core::dynamic_adapter_name ()
-      );
-
-  dynamic_adapter->create_request (
-                       this,
-                       this->protocol_proxy_->orb_core ()-> orb (),
-                       operation,
-                       arg_list,
-                       result,
-                       0,
-                       request,
-                       req_flags
-                       ACE_ENV_ARG_PARAMETER
-                     );
-}
-
-void
-CORBA::Object::_create_request (CORBA::Context_ptr ctx,
-                                const char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::ExceptionList_ptr exceptions,
-                                CORBA::ContextList_ptr,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags
-                                ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE;
-
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  // Neither can we create a request object from locality constrained
-  // object references.
-  if (ctx != 0 || this->protocol_proxy_ == 0)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  TAO_Dynamic_Adapter *dynamic_adapter =
-    ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-        TAO_ORB_Core::dynamic_adapter_name ()
-      );
-
-  dynamic_adapter->create_request (
-                       this,
-                       this->protocol_proxy_->orb_core ()-> orb (),
-                       operation,
-                       arg_list,
-                       result,
-                       exceptions,
-                       request,
-                       req_flags
-                       ACE_ENV_ARG_PARAMETER
-                     );
-}
-
-CORBA::Request_ptr
-CORBA::Object::_request (const char *operation
-                         ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-  if (this->protocol_proxy_)
-    {
-      TAO_Dynamic_Adapter *dynamic_adapter =
-        ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-            TAO_ORB_Core::dynamic_adapter_name ()
-          );
-
-      return dynamic_adapter->request (
-                                  this,
-                                  this->protocol_proxy_->orb_core ()->orb (),
-                                  operation
-                                  ACE_ENV_ARG_PARAMETER
-                                );
-    }
-  else
-    {
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                        0);
-    }
-}
-
-// NON_EXISTENT ... send a simple call to the object, which will
-// either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
-// the latter case, return FALSE.
-
-CORBA::Boolean
-CORBA::Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  return this->proxy_broker_->_non_existent (this
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-
-CORBA::InterfaceDef_ptr
-CORBA::Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker_->_get_interface (this
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::ImplementationDef_ptr
-CORBA::Object::_get_implementation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-CORBA::Object_ptr
-CORBA::Object::_get_component (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker_->_get_component (this
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-// @@ Does it make sense to support policy stuff for locality constrained
-//    objects?  Also, does it make sense to bind policies with stub object?
-//    - nw.
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-CORBA::Policy_ptr
-CORBA::Object::_get_policy (
-  CORBA::PolicyType type
-  ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy (type
-                                              ACE_ENV_ARG_PARAMETER);
-  else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
-}
-
-CORBA::Policy_ptr
-CORBA::Object::_get_cached_policy (
-  TAO_Cached_Policy_Type type
-  ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_cached_policy (type
-                                                     ACE_ENV_ARG_PARAMETER);
-  else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
-}
-
-CORBA::Object_ptr
-CORBA::Object::_set_policy_overrides (
-  const CORBA::PolicyList & policies,
-  CORBA::SetOverrideType set_add
-  ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  if (!this->protocol_proxy_)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
-
-  TAO_Stub* stub =
-    this->protocol_proxy_->set_policy_overrides (policies,
-                                                 set_add
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  ACE_NEW_THROW_EX (obj,
-                    CORBA::Object (stub,
-                                  this->is_collocated_),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  (void) safe_stub.release ();
-
-  return obj;
-}
-
-CORBA::PolicyList *
-CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                      ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-  if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy_overrides (types
-                                                        ACE_ENV_ARG_PARAMETER);
-  else
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-}
-
-CORBA::Boolean
-CORBA::Object::_validate_connection (
-  CORBA::PolicyList_out inconsistent_policies
-  ACE_ENV_ARG_DECL)
-{
-  TAO_OBJECT_IOR_EVALUATE_RETURN;
-
-  inconsistent_policies = 0;
-
-  CORBA::Boolean retval = 0;
-
-#if (TAO_HAS_MINIMUM_CORBA == 1)
-
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-
-  retval = false;
-#else
-
-  // If the object is collocated then use non_existent to see whether
-  // it's there.
-  if (this->is_collocated_)
-      return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER));
-
-  TAO::LocateRequest_Invocation_Adapter tao_call (this);
-  ACE_TRY
-    {
-      tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
-    {
-      inconsistent_policies =
-        tao_call.get_inconsistent_policies ();
-      retval = false;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
-
-  retval = true;
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  return retval;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-/*****************************************************************
- * Global Functions
- ****************************************************************/
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x)
-{
-  if (x == 0)
-    {
-      // NIL objrefs ... marshal as empty type hint, no elements.
-      cdr.write_ulong (1);
-      cdr.write_char ('\0');
-      cdr.write_ulong (0);
-      return (CORBA::Boolean) cdr.good_bit ();
-    }
-
-  if (!x->is_evaluated ())
-    {
-      // @@ This is too inefficient. Need to speed this up if this is
-      // a bottle neck.
-      cdr << const_cast<IOP::IOR &> (x->ior ());
-      return cdr.good_bit ();
-    }
-
-   TAO_Stub *stubobj = x->_stubobj ();
-
-   if (stubobj == 0)
-     return 0;
-
-  // STRING, a type ID hint
-  if ((cdr << stubobj->type_id.in ()) == 0)
-    return 0;
-
-  const TAO_MProfile& mprofile = stubobj->base_profiles ();
-
-  CORBA::ULong profile_count = mprofile.profile_count ();
-  if ((cdr << profile_count) == 0)
-    return 0;
-
-  // @@ The MProfile should be locked during this iteration, is there
-  // anyway to achieve that?
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      const TAO_Profile* p = mprofile.get_profile (i);
-      if (p->encode (cdr) == 0)
-        return 0;
-    }
-  return (CORBA::Boolean) cdr.good_bit ();
-}
-
-/*static*/ void
-CORBA::Object::tao_object_initialize (CORBA::Object *obj)
-{
-  CORBA::ULong profile_count =
-    obj->ior_->profiles.length ();
-
-  // Assumption is that after calling this method, folks should test
-  // for protocol_proxy_ or whatever to make sure that things have
-  // been initialized!
-  if (profile_count == 0)
-    return;
-
-  // get a profile container to store all profiles in the IOR.
-  TAO_MProfile mp (profile_count);
-
-  TAO_ORB_Core *&orb_core = obj->orb_core_;
-  if (orb_core == 0)
-    {
-      orb_core = TAO_ORB_Core_instance ();
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) - Object::tao_object_initialize ")
-                      ACE_TEXT ("WARNING: extracting object from ")
-                      ACE_TEXT ("default ORB_Core\n")));
-        }
-    }
-
-  TAO_Stub *objdata = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_Connector_Registry *connector_registry =
-        orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (CORBA::ULong i = 0; i != profile_count; ++i)
-        {
-          IOP::TaggedProfile &tpfile =
-            obj->ior_->profiles[i];
-
-          // NOTE: This is a place for optimizations. Here we have an
-          // 2 allocations and 2 copies. Future optimizations should
-          // target this place.
-          TAO_OutputCDR o_cdr;
-
-          o_cdr << tpfile;
-
-          TAO_InputCDR cdr (o_cdr,
-                            orb_core->input_cdr_buffer_allocator (),
-                            orb_core->input_cdr_dblock_allocator (),
-                            orb_core->input_cdr_msgblock_allocator (),
-                            orb_core);
-
-          TAO_Profile *pfile =
-            connector_registry->create_profile (cdr);
-
-          if (pfile != 0)
-            mp.give_profile (pfile);
-        }
-
-      // Make sure we got some profiles!
-      if (mp.profile_count () != profile_count)
-        {
-          // @@ This occurs when profile creation fails when decoding the
-          //    profile from the IOR.
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) ERROR: XXXXX Could not create all ")
-                      ACE_TEXT ("profiles while extracting object\n")
-                      ACE_TEXT ("TAO (%P|%t) ERROR: reference from the ")
-                      ACE_TEXT ("CDR stream.\n")));
-        }
-
-
-      objdata =
-        orb_core->create_stub (obj->ior_->type_id.in (),
-                               mp
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
-                             ACE_TEXT ("object when demarshaling object ")
-                             ACE_TEXT ("reference.\n"));
-
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  TAO_Stub_Auto_Ptr safe_objdata (objdata);
-
-  if (orb_core->initialize_object (safe_objdata.get (),
-                                   obj) == -1)
-    return;
-
-  obj->protocol_proxy_ = objdata;
-
-  // If the object is collocated then set the broker using the
-  // factory otherwise use the remote proxy broker.
-  if (obj->is_collocated_ &&
-    _TAO_Object_Proxy_Broker_Factory_function_pointer != 0)
-    obj->proxy_broker_ =
-      _TAO_Object_Proxy_Broker_Factory_function_pointer (obj);
-    else
-      obj->proxy_broker_ = the_tao_remote_object_proxy_broker ();
-
-  obj->is_evaluated_ = 1;
-
-  // Release the contents of the ior to keep memory consumption down.
-  obj->ior_ = 0;
-
-  // Transfer ownership to the CORBA::Object
-  (void) safe_objdata.release ();
-  return;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
-{
-  int lazy_strategy = 0;
-  TAO_ORB_Core *orb_core = cdr.orb_core ();
-
-  if (orb_core == 0)
-    {
-      orb_core = TAO_ORB_Core_instance ();
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) WARNING: extracting object from ")
-                      ACE_TEXT ("default ORB_Core\n")));
-        }
-    }
-  else
-    {
-      if (orb_core->resource_factory ()->resource_usage_strategy () ==
-          TAO_Resource_Factory::TAO_LAZY)
-        lazy_strategy = 1;
-    }
-
-  if (!lazy_strategy)
-    {
-      // If the user has set up a eager strategy..
-      CORBA::String_var type_hint;
-
-      if ((cdr >> type_hint.inout ()) == 0)
-        return 0;
-
-      CORBA::ULong profile_count;
-      if ((cdr >> profile_count) == 0)
-        return 0;
-
-      if (profile_count == 0)
-        {
-          x = CORBA::Object::_nil ();
-          return (CORBA::Boolean) cdr.good_bit ();
-        }
-
-      // get a profile container to store all profiles in the IOR.
-      TAO_MProfile mp (profile_count);
-
-      TAO_ORB_Core *orb_core = cdr.orb_core ();
-      if (orb_core == 0)
-        {
-          orb_core = TAO_ORB_Core_instance ();
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_WARNING,
-                          ACE_TEXT ("TAO (%P|%t) - Object::tao_object_initialize ")
-                          ACE_TEXT ("WARNING: extracting object from ")
-                          ACE_TEXT ("default ORB_Core\n")));
-            }
-        }
-
-      // Ownership of type_hint is given to TAO_Stub
-      // TAO_Stub will make a copy of mp!
-
-      TAO_Stub *objdata = 0;
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          TAO_Connector_Registry *connector_registry =
-            orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i)
-            {
-              TAO_Profile *pfile =
-                connector_registry->create_profile (cdr);
-              if (pfile != 0)
-                mp.give_profile (pfile);
-            }
-
-          // Make sure we got some profiles!
-          if (mp.profile_count () != profile_count)
-            {
-              // @@ This occurs when profile creation fails when decoding the
-              //    profile from the IOR.
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) ERROR: Could not create all ")
-                                 ACE_TEXT ("profiles while extracting object\n")
-                                 ACE_TEXT ("TAO (%P|%t) ERROR: reference from the ")
-                                 ACE_TEXT ("CDR stream.\n")),
-                                0);
-            }
-
-
-          objdata = orb_core->create_stub (type_hint.in (),
-                                           mp
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 0)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
-                                 ACE_TEXT ("object when demarshaling object ")
-                                 ACE_TEXT ("reference.\n"));
-
-          return 0;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-
-      TAO_Stub_Auto_Ptr safe_objdata (objdata);
-
-      x = orb_core->create_object (safe_objdata.get ());
-      if (x == 0)
-        return 0;
-
-      // Transfer ownership to the CORBA::Object
-      (void) safe_objdata.release ();
-    }
-  else
-    {
-      // Lazy strategy!
-      IOP::IOR *ior = 0;
-
-      ACE_NEW_RETURN (ior,
-                      IOP::IOR (),
-                      0);
-
-      cdr >> *ior;
-      ACE_NEW_RETURN (x,
-                      CORBA::Object (ior,
-                                     orb_core),
-                      0);
-    }
-
-  return (CORBA::Boolean) cdr.good_bit ();
-}
-
-
-// =========================================================
-// Traits specializations for CORBA::Object.
-namespace TAO
-{
-  CORBA::Object_ptr
-  Objref_Traits<CORBA::Object>::duplicate (CORBA::Object_ptr p)
-  {
-    return CORBA::Object::_duplicate (p);
-  }
-
-  void
-  Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p)
-  {
-    CORBA::release (p);
-  }
-
-  CORBA::Object_ptr
-  Objref_Traits<CORBA::Object>::nil (void)
-  {
-    return CORBA::Object::_nil ();
-  }
-
-  CORBA::Boolean
-  Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p,
-                                         TAO_OutputCDR & cdr)
-  {
-    return p->marshal (cdr);
-  }
-
-//============================================================================
-  using namespace CORBA;
-
-  CORBA::Boolean
-  Ret_Object_Argument_T<Object_ptr,Object_var>::demarshal (TAO_InputCDR &cdr)
-  {
-    return cdr >> this->x_.out ();
-  }
-
-  void
-  Ret_Object_Argument_T<Object_ptr,Object_var>::interceptor_result (CORBA::Any * )
-  {
-    if (TAO_debug_level > 2)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
-                    " into an Any for returning the return argument \n"));
-      }
-  }
-
-  Ret_Object_Argument_T<Object_ptr,Object_var>::Ret_Object_Argument_T (void)
-  {
-  }
-
-  Object_ptr &
-  Ret_Object_Argument_T<Object_ptr,Object_var>::arg (void)
-  {
-    return this->x_.out ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::excp (void)
-  {
-    return this->x_.ptr ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::retn (void)
-  {
-    return this->x_._retn ();
-  }
-} // close TAO namespace
-
-
-TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-    ) = 0;
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Pseudo_Var_T<CORBA::Object>;
-template class TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>;
-
-template class TAO::Arg_Traits<CORBA::Object>;
-template class
-  TAO::Object_Arg_Traits_T<CORBA::Object_ptr,
-                           CORBA::Object_var,
-                           CORBA::Object_out,
-                           TAO::Objref_Traits<CORBA::Object> >;
-template class TAO::In_Object_Argument_T<CORBA::Object_ptr>;
-template class
-  TAO::Inout_Object_Argument_T<CORBA::Object_ptr,
-                               TAO::Objref_Traits<CORBA::Object> >;
-template class TAO::Out_Object_Argument_T<CORBA::Object_ptr,
-                                          CORBA::Object_out>;
-template class TAO::Ret_Object_Argument_T<CORBA::Object_ptr,
-                                          CORBA::Object_var>;
-
-#if 0
-// Needed in the future
-template class TAO::SArg_Traits<CORBA::Object>;
-template class TAO::Object_SArg_Traits_T<CORBA::Object_ptr,
-                                         CORBA::Object_var,
-                                         CORBA::Object_out>;
-template class TAO::In_Object_SArgument_T<CORBA::Object_ptr,
-                                          CORBA::Object_var>;
-template class TAO::Inout_Object_SArgument_T<CORBA::Object_ptr,
-                                             CORBA::Object_var>;
-template class TAO::Out_Object_SArgument_T<CORBA::Object_ptr,
-                                           CORBA::Object_var,
-                                           CORBA::Object_out>;
-template class TAO::Ret_Object_SArgument_T<CORBA::Object_ptr,
-                                           CORBA::Object_var>;
-#endif /*if 0*/
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Pseudo_Var_T<CORBA::Object>
-#pragma instantiate TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>
-
-#pragma instantiate TAO::Objref_Traits<CORBA::Object>
-#pragma instantiate TAO::Arg_Traits<CORBA::Object>
-#pragma instantiate \
-  TAO::Object_Arg_Traits_T<CORBA::Object_ptr, \
-                           CORBA::Object_var, \
-                           CORBA::Object_out, \
-                           TAO::Objref_Traits<CORBA::Object> >
-#pragma instantiate TAO::In_Object_Argument_T<CORBA::Object_ptr>
-#pragma instantiate \
-  TAO::Inout_Object_Argument_T<CORBA::Object_ptr, \
-                               TAO::Objref_Traits<CORBA::Object> >
-#pragma instantiate TAO::Out_Object_Argument_T<CORBA::Object_ptr, \
-                                               CORBA::Object_out>
-#pragma instantiate TAO::Ret_Object_Argument_T<CORBA::Object_ptr, \
-                                               CORBA::Object_var>
-
-#pragma instantiate TAO::SArg_Traits<CORBA::Object>
-#pragma instantiate TAO::Object_SArg_Traits_T<CORBA::Object_ptr, \
-                                              CORBA::Object_var, \
-                                              CORBA::Object_out>
-#pragma instantiate TAO::In_Object_SArgument_T<CORBA::Object_ptr, \
-                                               CORBA::Object_var>
-#pragma instantiate TAO::Inout_Object_SArgument_T<CORBA::Object_ptr, \
-                                                  CORBA::Object_var>
-#pragma instantiate TAO::Out_Object_SArgument_T<CORBA::Object_ptr, \
-                                                CORBA::Object_var, \
-                                                CORBA::Object_out>
-#pragma instantiate TAO::Ret_Object_SArgument_T<CORBA::Object_ptr, \
-                                                CORBA::Object_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
deleted file mode 100644
index 7db531bc153..00000000000
--- a/TAO/tao/Object.h
+++ /dev/null
@@ -1,473 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object.h
- *
- *  $Id$
- *
- *   A "Object" is an entity that can be the target of an invocation
- *   using an ORB.  All CORBA objects provide this functionality.
- *   See the CORBA 3.x specification for details.
- *
- *  @author  Portions Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Portions Copyright 1997-2002 by Washington University
- */
-//=============================================================================
-
-#ifndef TAO_CORBA_OBJECT_H
-#define TAO_CORBA_OBJECT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOP_IORC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-#include "tao/Policy_ForwardC.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#if defined (HPUX) && defined (IOR)
-   /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
-      and we don't want that definition.  See IOP_IORC.h. */
-# undef IOR
-#endif /* HPUX && IOR */
-
-class TAO_Stub;
-class TAO_Abstract_ServantBase;
-class TAO_ORB_Core;
-
-class ACE_Lock;
-
-namespace TAO
-{
-  class ObjectKey;
-  class Object_Proxy_Broker;
-}
-
-namespace CORBA
-{
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-
-  class ImplementationDef;
-  typedef ImplementationDef *ImplementationDef_ptr;
-
-  class Context;
-  typedef Context *Context_ptr;
-
-  class Request;
-  typedef Request *Request_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
-  class NamedValue;
-  typedef NamedValue * NamedValue_ptr;
-
-  typedef ULong Flags;
-
-  class ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
-
-  class ContextList;
-  typedef ContextList *ContextList_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-
-  /**
-   * @class Object
-   *
-   * @brief Implementation of a CORBA object reference.
-   *
-   * All CORBA objects, both unconstrained and locality-constrained,
-   * inherit from this class.  The interface is defined in the CORBA
-   * specification and the C++ mapping.
-   */
-  class TAO_Export Object
-  {
-  public:
-
-    /// Destructor.
-    virtual ~Object (void);
-
-    /**
-     * @name Spec defined methods
-     *
-     * These methods are defined here since they are required by the
-     * CORBA  spec in a form specified by the C++ mapping.
-     */
-    //@{
-    /// Increment the ref count.
-    static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj);
-
-    /// Return a NULL object.
-    static CORBA::Object_ptr _nil (void);
-
-    /// No-op it is just here to simplify some templates.
-    static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // These calls correspond to over-the-wire operations, or at least
-    // do so in many common cases.  The normal implementation assumes a
-    // particular simple, efficient, protocol-neutral interface for
-    // making such calls, but may be overridden when it appears
-    // appropriate.
-
-    /// Determine if we are of the type specified by the "logical_type_id"
-    virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// The repository ID for the most derived class, this is an
-    /// implementation method and does no remote invocations!
-    virtual const char* _interface_repository_id (void) const;
-
-
-    /**
-     * Return a (potentially non-unique) hash value for this object.
-     * This method relies on the representation of the object
-     * reference's private state.  Since that changes easily (when
-     * different ORB protocols are in use) there is no default
-     * implementation.
-     */
-    virtual CORBA::ULong _hash (CORBA::ULong maximum
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Try to determine if this object is the same as other_obj.  This
-     * method relies on the representation of the object reference's
-     * private state.  Since that changes easily (when different ORB
-     * protocols are in use) there is no default implementation.
-     */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC (());
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-    virtual CORBA::Boolean _non_existent (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// This method is deprecated in the CORBA 2.2 spec, we just return 0
-    /// every time.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Get info about the object from the Interface Repository.
-    virtual InterfaceDef_ptr _get_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    /// Get info about the object from the Interface Repository.
-    virtual CORBA::Object_ptr _get_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-
-    // DII operations to create a request.
-    //
-    // The mapping for create_request is split into two forms,
-    // corresponding to the two usage styles described in CORBA
-    // section 6.2.1.
-
-    virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char *operation,
-                                  CORBA::NVList_ptr arg_list,
-                                  CORBA::NamedValue_ptr result,
-                                  CORBA::Request_ptr &request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char *operation,
-                                  CORBA::NVList_ptr arg_list,
-                                  CORBA::NamedValue_ptr result,
-                                  CORBA::ExceptionList_ptr exclist,
-                                  CORBA::ContextList_ptr ctxtlist,
-                                  CORBA::Request_ptr &request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // The default implementation of this method uses the same simple,
-    // multi-protocol remote invocation interface as is assumed by the
-    // calls above ... that's how it can have a default
-    // implementation.
-
-    /// DII operation to create a request.
-    virtual CORBA::Request_ptr _request (const char *operation
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Object_ptr _set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-    /**
-     * @name Reference Count Managment
-     *
-     * These are the standard CORBA object reference count manipulations
-     * methods.
-     */
-    //@{
-    /// Increment the reference count.
-    virtual void _add_ref (void);
-
-    /// Decrement the reference count.
-    virtual void _remove_ref (void);
-    //@}
-
-    // Useful for template programming.
-    typedef Object_ptr _ptr_type;
-    typedef Object_var _var_type;
-
-    //@} End of CORBA specific methods
-
-
-    /**
-     * @name Methods that are TAO specific.
-     *
-     * These methods are defined here as helper functions to be used
-     * by other parts of TAO. Theoretically they shold all start with
-     * tao_. But we have deviated from that principle.
-     */
-
-    /// Marshalling operator used by the stub code. A long story why
-    /// the stub code uses this, let us keep it short here.
-    static CORBA::Boolean marshal (Object_ptr obj,
-                                   TAO_OutputCDR &strm);
-
-    virtual TAO_Abstract_ServantBase *_servant (void) const;
-
-    /// Is this object collocated with the servant?
-    virtual CORBA::Boolean _is_collocated (void) const;
-
-    /// Is this a local object?
-    virtual CORBA::Boolean _is_local (void) const;
-
-    /// Used in the implementation of CORBA::Any
-    static void _tao_any_destructor (void*);
-
-    /// Uninlined part of the now-inlined CORBA::is_nil().
-    static CORBA::Boolean is_nil_i (CORBA::Object_ptr obj);
-
-    /// Helper function for reading contents of an IOR
-    static void tao_object_initialize (Object *);
-
-    /// Return the object key as an out parameter.  Caller should release
-    /// return value when finished with it.
-    virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Constructor
-    Object (TAO_Stub *p,
-            CORBA::Boolean collocated = 0,
-            TAO_Abstract_ServantBase *servant = 0,
-            TAO_ORB_Core *orb_core = 0);
-
-    Object (IOP::IOR *ior,
-            TAO_ORB_Core *orb_core = 0);
-
-    /// Get the underlying stub object.
-    virtual TAO_Stub *_stubobj (void) const;
-    virtual TAO_Stub *_stubobj (void);
-
-    /// Set the proxy broker.
-    virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker);
-
-
-
-  public:
-
-    /// Allows us to forbid marshaling of local interfaces.
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-    /// Accessor to the flag..
-    CORBA::Boolean is_evaluated (void) const;
-
-    /// Mutator for setting the servant in collocated cases.
-    /**
-     * This is used by the Object_Adapter to set the servant for
-     * collocated cases and only when the object is initialized. The
-     * object initialization takes place when IOR's are lazily
-     * evaluated.
-     */
-    void set_collocated_servant (TAO_Abstract_ServantBase *);
-
-    /// Accessor for the ORB_Core..
-    TAO_ORB_Core *orb_core (void) const;
-
-    /// Accessors for the underlying IOP::IOR's.
-    /**
-     * The steal_ior () call basically relinquishes the ownership of
-     * the IOR. This is useful for cases when one wants to initialize
-     * a new CORBA Object
-     */
-    IOP::IOR *steal_ior (void);
-
-    const IOP::IOR &ior (void) const;
-
-    //@} End of TAO-specific methods..
-
-  protected:
-
-    /// Initializing a local object.
-    Object (int dummy = 0);
-
-  private:
-
-    // = Unimplemented methods
-    Object (const Object &);
-    Object &operator = (const Object &);
-
-  protected:
-
-    /// Servant pointer.  It is 0 except for collocated objects.
-    TAO_Abstract_ServantBase *servant_;
-
-  private:
-
-    /// Pointer to the Proxy Broker
-    /**
-     * This cached pointer instance takes care of routing the call for
-     * standard calls in CORBA::Object like _is_a (), _get_component
-     * () etc.
-     */
-    TAO::Object_Proxy_Broker *proxy_broker_;
-
-    /// Flag to indicate collocation.  It is 0 except for collocated
-    /// objects.
-    CORBA::Boolean is_collocated_;
-
-    /// Specify whether this is a local object or not.
-    CORBA::Boolean is_local_;
-
-    /// Flag to indicate whether the IOP::IOR has been evaluated fully.
-    CORBA::Boolean is_evaluated_;
-
-    /// If the IOR hasnt been evaluated fully, then the contents of
-    /// the IOR that we received  should be in here!
-    IOP::IOR_var ior_;
-
-    /// Cached pointer of our ORB_Core
-    TAO_ORB_Core *orb_core_;
-
-    /**
-     * Pointer to the protocol-specific "object" containing important
-     * profiling information regarding this proxy.
-     * The protocol proxy is (potentially) shared among several
-     * Objects
-     */
-    TAO_Stub * protocol_proxy_;
-
-    /// Number of outstanding references to this object.
-    CORBA::ULong refcount_;
-
-    /// Protect reference count manipulation from race conditions.
-    /**
-     * This lock is only instantiated for unconstrained objects.  The
-     * reason for this is that locality-constrained objects that do
-     * not require reference counting (the default) may be
-     * instantiated in the critical path.
-     */
-    ACE_Lock * refcount_lock_;
-  };
-}   // End CORBA namespace.
-
-namespace TAO
-{
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Object>
-    : public Object_Arg_Traits_T<CORBA::Object_ptr,
-                                 CORBA::Object_var,
-                                 CORBA::Object_out,
-                                 TAO::Objref_Traits<CORBA::Object> >
-  {
-  };
-
-  template<>
-  struct TAO_Export Objref_Traits<CORBA::Object>
-  {
-    static CORBA::Object_ptr duplicate (CORBA::Object_ptr);
-    static void release (CORBA::Object_ptr);
-    static CORBA::Object_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::Object_ptr p,
-                                   TAO_OutputCDR & cdr);
-  };
-
-  /**
-   * @class Ret_Object_Argument_T
-   *
-   * @brief Specialization for CORBA::Object, necessitated since we
-   *  don't have an Any insertion operator for Object.
-   */
-  template<>
-  class TAO_Export Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var>
-    : public Argument
-  {
-  public:
-    Ret_Object_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-    virtual void interceptor_result (CORBA::Any *);
-
-    CORBA::Object_ptr & arg (void);
-
-    CORBA::Object_ptr excp (void);
-    CORBA::Object_ptr retn (void);
-
-  private:
-    CORBA::Object_var x_;
-  };
-}
-
-
-/// This function pointer is set only when the Portable server
-/// library is present.
-extern
-  TAO_Export TAO::Object_Proxy_Broker *
-  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-      CORBA::Object_ptr obj
-    );
-
-TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const CORBA::Object*);
-
-TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA::Object *&);
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Object.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CORBA_OBJECT_H */
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
deleted file mode 100644
index fdcf9939609..00000000000
--- a/TAO/tao/Object.i
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA::Object::Object (int)
-  : servant_ (0),
-    proxy_broker_ (0),
-    is_collocated_ (false),
-    is_local_ (true),
-    is_evaluated_ (true),
-    ior_ (),
-    orb_core_ (0),
-    protocol_proxy_ (0),
-    refcount_ (1),
-    refcount_lock_ (0)
-{
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object::_duplicate (CORBA::Object_ptr obj)
-{
-  if (obj)
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-// ************************************************************
-// These are in CORBA namespace
-
-ACE_INLINE
-void
-CORBA::release (CORBA::Object_ptr obj)
-{
-  if (obj)
-    {
-      obj->_remove_ref ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::Object_ptr obj)
-{
-  if (obj == 0)
-    {
-      return 1;
-    }
-
-  return CORBA::Object::is_nil_i (obj);
-}
-
-// ************************************************************
-
-// Null pointers represent nil objects.
-
-ACE_INLINE
-CORBA::Object_ptr
-CORBA::Object::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE
-CORBA::Object_ptr
-CORBA::Object::_narrow (CORBA::Object_ptr obj
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return CORBA::Object::_duplicate (obj);
-}
-
-ACE_INLINE
-TAO_Stub *
-CORBA::Object::_stubobj (void) const
-{
-  return this->protocol_proxy_;
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::Object::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::Object::is_evaluated (void) const
-{
-  return this->is_evaluated_;
-}
-
-ACE_INLINE void
-CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b)
-{
-  this->servant_ = b;
-  this->is_collocated_ = 1;
-}
-
-ACE_INLINE TAO_ORB_Core *
-CORBA::Object::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE IOP::IOR *
-CORBA::Object::steal_ior (void)
-{
-  return this->ior_._retn ();
-}
-
-ACE_INLINE const IOP::IOR &
-CORBA::Object::ior (void) const
-{
-  return this->ior_.in ();
-}
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
deleted file mode 100644
index 05309585742..00000000000
--- a/TAO/tao/ObjectIdList.pidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file ObjectIdList.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::ORB::ObjectIdList related
- * types.
- *
- * This file is used to generate the code in ObjectIdListC.{h,inl,cpp}.
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -Sa -Ge 1 -GA -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ObjectIdList.pidl
- *
- * and then:
- *
- * cp orig/ObjectIdListC.{h,inl,cpp} .
- * cp orig/ObjectIdListA.cpp .
- *
- * The code is ready for use.
-  */
-
-#ifndef TAO_CORBA_ORB_OBJECTIDLIST_PIDL
-#define TAO_CORBA_ORB_OBJECTIDLIST_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef string ORB_ObjectId;
-  typedef sequence<ORB_ObjectId> ORB_ObjectIdList;
-};
-
-#endif /* TAO_CORBA_ORB_OBJECTIDLIST_PIDL */
-
-
diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp
deleted file mode 100644
index a04726855a3..00000000000
--- a/TAO/tao/ObjectIdListA.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ObjectIdListC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectId:1.0",
-    "ORB_ObjectId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId =
-    &_tao_tc_CORBA_ORB_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-#define _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ORB_ObjectIdList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ORB_ObjectId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ORB_ObjectIdList_0 =
-      &CORBA_ORB_ObjectIdList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectIdList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectIdList:1.0",
-    "ORB_ObjectIdList",
-    &TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList =
-    &_tao_tc_CORBA_ORB_ObjectIdList;
-}
-
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
deleted file mode 100644
index 801332187b8..00000000000
--- a/TAO/tao/ObjectIdListC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ObjectIdListC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
-#define _CORBA_ORB_OBJECTIDLIST_CS_
-
-CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void)
-{}
-
-CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
-    const ORB_ObjectIdList &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_
-#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ORB_ObjectIdList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ORB_ObjectIdList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
deleted file mode 100644
index f0d4cc61ce3..00000000000
--- a/TAO/tao/ObjectIdListC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OBJECTIDLISTC_H_
-#define _TAO_IDL_ORIG_OBJECTIDLISTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ORB_ObjectId;
-  typedef CORBA::String_var ORB_ObjectId_var;
-  typedef CORBA::String_out ORB_ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
-#define _CORBA_ORB_OBJECTIDLIST_CH_
-  
-  class ORB_ObjectIdList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ORB_ObjectIdList,
-        TAO_SeqElem_String_Manager
-      >
-    ORB_ObjectIdList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ORB_ObjectIdList,
-        ORB_ObjectIdList_var,
-        TAO_SeqElem_String_Manager
-      >
-    ORB_ObjectIdList_out;
-  
-  class TAO_Export ORB_ObjectIdList
-    : public
-        TAO_Unbounded_String_Sequence
-  {
-  public:
-    ORB_ObjectIdList (void);
-    ORB_ObjectIdList (CORBA::ULong max);
-    ORB_ObjectIdList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    ORB_ObjectIdList (const ORB_ObjectIdList &);
-    ~ORB_ObjectIdList (void);
-    
-    typedef ORB_ObjectIdList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
-#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ORB_ObjectIdList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ORB_ObjectIdList &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
deleted file mode 100644
index f52f03a4615..00000000000
--- a/TAO/tao/ObjectKey_Table.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// $Id$
-
-#include "ObjectKey_Table.h"
-#include "ORB_Core.h"
-#include "Refcounted_ObjectKey.h"
-
-ACE_RCSID(tao,
-          ObjectKey_Table,
-          "$Id$")
-
-int
-TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
-                                       const TAO::ObjectKey &rhs) const
-{
-  if (lhs.length () < rhs.length ())
-    {
-      return 1;
-    }
-  else if (lhs.length () > rhs.length ())
-    {
-      return 0;
-    }
-
-  for (CORBA::ULong i = 0; i < rhs.length (); ++i)
-    {
-      if (lhs[i] < rhs[i])
-        {
-          return 1;
-        }
-      else if (lhs[i] > rhs[i])
-	{
-	  return 0;
-	}
-    }
-
-  return 0;
-}
-
-/********************************************************/
-TAO::ObjectKey_Table::ObjectKey_Table (void)
-  : lock_ (0)
-  , table_ ()
-{
-
-}
-
-TAO::ObjectKey_Table::~ObjectKey_Table (void)
-{
-  this->table_.close ();
-  delete this->lock_;
-}
-
-int
-TAO::ObjectKey_Table::init (TAO_ORB_Core *oc)
-{
-  /// Create the lock that is needed for internal usage.
-  this->lock_ =
-    oc->resource_factory ()->create_object_key_table_lock ();
-
-  return 0;
-}
-
-int
-TAO::ObjectKey_Table::bind (const TAO::ObjectKey &key,
-                            TAO::Refcounted_ObjectKey *&key_new)
-
-{
-  key_new = 0;
-
-  int retval = 0;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      0);
-
-    // This is a tradeoff.. We could avoid this two stage process of
-    // using a find () and then a bind () , which would make things
-    // efficient. BUT we may have to do allocation upfront and delete if
-    // bind () returns with an entry. We take one of the routes that
-    // avoids allocation.
-    retval = this->table_.find (key,
-                                key_new);
-
-    if (retval == -1)
-      {
-        return this->bind_i (key,
-                             key_new);
-      }
-
-    (void) key_new->incr_refcount ();
-  }
-
-  return retval;
-}
-
-int
-TAO::ObjectKey_Table::unbind (TAO::Refcounted_ObjectKey *&key_new)
-
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->lock_,
-                    0);
-
-  // If the refcount has dropped to 1, just go ahead and unbind it
-  // from the table.
-  if (key_new && key_new->decr_refcount () == 1)
-    {
-      return this->unbind_i (key_new);
-    }
-
-  return 0;
-}
-
-int
-TAO::ObjectKey_Table::destroy (void)
-{
-  if (this->table_.current_size ())
-    {
-      ACE_GUARD_RETURN (ACE_Lock,
-                        ace_mon,
-                        *this->lock_,
-                        0);
-
-      TABLE::ITERATOR end_iter = this->table_.end ();
-      TABLE::ITERATOR start;
-
-      while ((start = this->table_.begin ()) != end_iter)
-        {
-          TABLE::ENTRY &ent = (*start);
-
-          ent.item ()->decr_refcount ();
-          this->table_.unbind (&ent);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key,
-                              TAO::Refcounted_ObjectKey *&key_new)
-{
-  ACE_NEW_RETURN (key_new,
-                  TAO::Refcounted_ObjectKey (key),
-                  -1);
-
-
-
-  int retval =  this->table_.bind (key,
-                                   key_new);
-
-  if (retval != -1)
-    {
-      key_new->incr_refcount ();
-    }
-  else
-    {
-      key_new->decr_refcount ();
-    }
-
-  return retval;
-}
-
-int
-TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new)
-{
-  TAO::Refcounted_ObjectKey *tmp = 0;
-
-  if (this->table_.unbind (key_new->object_key (),
-                           tmp) != -1)
-    {
-      // @@ Cant do much if the unbind fails.
-      // Remove our refcount on the ObjectKey
-      (void) tmp->decr_refcount ();
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_RB_Tree <TAO::ObjectKey,
-                            TAO::Refcounted_ObjectKey *,
-                            TAO::Less_Than_ObjectKey,
-                            ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator_Base <class TAO::ObjectKey,
-                                          class TAO::Refcounted_ObjectKey *,
-                                          class TAO::Less_Than_ObjectKey,
-                                          class ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Iterator <TAO::ObjectKey,
-                                     TAO::Refcounted_ObjectKey *,
-                                     TAO::Less_Than_ObjectKey,
-                                     ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Reverse_Iterator <TAO::ObjectKey,
-                                             TAO::Refcounted_ObjectKey *,
-                                             TAO::Less_Than_ObjectKey,
-                                             ACE_Null_Mutex>;
-
-template class ACE_RB_Tree_Node <TAO::ObjectKey,
-                                 TAO::Refcounted_ObjectKey *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_RB_Tree <TAO::ObjectKey,
-                                 TAO::Refcounted_ObjectKey *,
-                                 TAO::Less_Than_ObjectKey,
-                                 ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator_Base <TAO::ObjectKey,
-                                               TAO::Refcounted_ObjectKey *,
-                                               TAO::Less_Than_ObjectKey,
-                                               ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Iterator <TAO::ObjectKey,
-                                          TAO::Refcounted_ObjectKey *,
-                                          TAO::Less_Than_ObjectKey,
-                                          ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator <TAO::ObjectKey,
-                                                  TAO::Refcounted_ObjectKey *,
-                                                  TAO::Less_Than_ObjectKey,
-                                                  ACE_Null_Mutex>
-
-#pragma instantiate ACE_RB_Tree_Node <TAO::ObjectKey,
-                                      TAO::Refcounted_ObjectKey *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
deleted file mode 100644
index db3027c7d05..00000000000
--- a/TAO/tao/ObjectKey_Table.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ObjectKey_Table.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJECTKEY_TABLE_H
-#define TAO_OBJECTKEY_TABLE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/RB_Tree.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Null_Mutex.h"
-
-#include "tao/Object_KeyC.h"
-
-// Forward declarations
-class TAO_ORB_Core;
-
-namespace TAO
-{
-
-  // Forward declarations within the namespace..
-  class Refcounted_ObjectKey;
-  class ObjectKey;
-
-  /**
-   * @class Less_Than_ObjectKey
-   *
-   * @brief Compares the length and then the contents of ObjectKeys.
-   *
-   * Should have been a specialization of the functor
-   * ACE_Less_Than<sequence<CORBA::Octet>>. But that will not work
-   * so easily across bunch of stuff. Hence let us put up with this
-   * for the time being.
-   */
-  class TAO_Export Less_Than_ObjectKey
-  {
-  public:
-    int operator () (const TAO::ObjectKey &lhs,
-                     const TAO::ObjectKey &rhs) const;
-  };
-
-  /**
-   * @class ObjectKey_Table
-   *
-   * @brief Table that maintains the set of ObjectKey's seen by the
-   * ORB.
-   *
-   * The ORB maintains one table for the whole ORB. ObjectKeys
-   * generated by the ORB or the ones seen by the ORB from remote
-   * ORB's are stored here. The ObjectKeys are stored through a
-   * wrapper which encapsulates the refcount on them. This class
-   * actually provides the synchronization mechanism for manipulating
-   * the reference counts on the object keys provided by the wrapper
-   * class.
-   *
-   * This class does not offer a find () call with a reason. The call
-   * to bind () will return a pointer which is expected to be cached
-   * by the client/caller and use the pointer in every invocation.
-   *
-   * @note This class uses the ACE_RB_Tree to maintain the table of
-   * ObjectKeys. The RB_Tree has good insertion and lookup
-   * properties. Its Iteration properties are not that good, but we
-   * dont need to do much iteration unless we are closing down the
-   * table.
-   *
-   * @note The reasons to use RB_Tree are its good dynamic
-   * properties. We should try to strategize the class to use either a
-   * Hash_Map or a RB_Tree based on some runtime option. For that we
-   * need an adapter class in ACE, like an ACE_Lock_Adapter class. We
-   * will do that if our instrumentation shows the need for it.
-   *
-   */
-  class TAO_Export ObjectKey_Table
-  {
-  public:
-    /// Default Constructor and destructor..
-    ObjectKey_Table (void);
-
-    ~ObjectKey_Table (void);
-
-    /// Initialize method that sets up the underlying lock and other
-    /// related stuff.
-    int init (TAO_ORB_Core *orb);
-
-    /// Iterates and unbinds the contents of the table.
-    int destroy (void);
-
-    /// Bind the ObjectKey in the table.
-    /**
-     * Bind an ObjectKey in the table and return a pointer to the
-     * Refcounted_ObjectKey which the client can use. If the ObjectKey
-     * is already available in the table, this operation just
-     * increments the refcount on the ObjectKey. If the ObjectKey is
-     * new it is bounded to the table. Returns a 0 on success and a -1
-     * on failure.
-     */
-    int bind (const ObjectKey &key,
-              Refcounted_ObjectKey *&key_new);
-
-    /// Unbind an ObjectKey from the table.
-    int unbind (TAO::Refcounted_ObjectKey *&key);
-
-  protected:
-    /// Implementation for bind ().
-    int bind_i (const ObjectKey &key,
-                Refcounted_ObjectKey *&key_new);
-
-    /// Implementation for unbind ().
-    int unbind_i (Refcounted_ObjectKey *&key);
-
-  private:
-
-    // Some useful typedefs.
-    typedef ACE_RB_Tree<TAO::ObjectKey,
-                        TAO::Refcounted_ObjectKey *,
-                        TAO::Less_Than_ObjectKey,
-                        ACE_Null_Mutex> TABLE;
-
-    /// Lock for the table.
-    ACE_Lock *lock_;
-
-    /// Table that contains the data
-    TABLE table_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_OBJECT_KEY_TABLE_H*/
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
deleted file mode 100644
index db3a85f5329..00000000000
--- a/TAO/tao/Object_Argument_T.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// $Id$
-
-#ifndef TAO_OBJECT_ARGUMENT_T_C
-#define TAO_OBJECT_ARGUMENT_T_C
-
-#include "tao/Object_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Object_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Object_Argument_T,
-           "$Id$")
-
-template<typename S_ptr>
-CORBA::Boolean
-TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr>
-void
-TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S_ptr, typename S_traits>
-CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S_ptr, typename S_traits>
-CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
-{
-  S_traits::release (this->x_);
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_traits>
-void
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S_ptr, typename S_out>
-CORBA::Boolean
-TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_out>
-void
-TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_var>
-void
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_OBJECT_ARGUMENT_T_C */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
deleted file mode 100644
index 2e2d86fb2a3..00000000000
--- a/TAO/tao/Object_Argument_T.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_OBJECT_ARGUMENT_T_H
-#define TAO_OBJECT_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This set of classes is also used by valuetype arguments. If the
-// specialization is done using S * for the parameter, the semantics
-// are the same as for interfaces, so there's no need for another
-// set of classes.
-
-namespace TAO
-{
-  /**
-   * @class In_Object_Argument_T
-   *
-   * @brief Template class for IN object argument.
-   *
-   */
-  template<typename S_ptr>
-  class In_Object_Argument_T : public Argument
-  {
-  public:
-    In_Object_Argument_T (S_ptr x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr arg (void) const;
-
-  private:
-    S_ptr x_;
-  };
-
-  /**
-   * @class Inout_Object_Argument_T
-   *
-   * @brief Template class for INOUT object argument.
-   *
-   */
-  template<typename S_ptr, typename S_traits>
-  class Inout_Object_Argument_T : public Argument
-  {
-  public:
-    Inout_Object_Argument_T (S_ptr & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr & arg (void);
-
-  private:
-    S_ptr & x_;
-  };
-
-  /**
-   * @class Out_Object_Argument_T
-   *
-   * @brief Template class for INOUT object argument.
-   *
-   */
-  template<typename S_ptr, typename S_out>
-  class Out_Object_Argument_T : public Argument
-  {
-  public:
-    Out_Object_Argument_T (S_out & x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_out arg (void);
-
-  private:
-    S_ptr & x_;
-  };
-
-  /**
-   * @class Ret_Object_Argument_T
-   *
-   * @brief Template class for return stub value of object argument.
-   *
-   */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_Argument_T : public Argument
-  {
-  public:
-
-    Ret_Object_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr & arg (void);
-
-    S_ptr excp (void);
-    S_ptr retn (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Object_Tag
-   *
-   * @brief Struct for object arguments id tag.
-   *
-   */
-  struct TAO_Export Object_Tag {};
-
-  /**
-   * @struct Basic_Arg_Traits_T
-   *
-   * @brief Template class for stub argument traits of objects.
-   *
-   */
-
-  template<typename T_ptr, typename T_var, typename T_out, typename T_traits>
-  struct Object_Arg_Traits_T
-  {
-    typedef T_ptr                                         ret_type;
-    typedef T_ptr                                         in_type;
-    typedef T_ptr &                                       inout_type;
-    typedef T_out                                         out_type;
-
-    typedef In_Object_Argument_T<T_ptr>                   in_arg_val;
-    typedef Inout_Object_Argument_T<T_ptr, T_traits>      inout_arg_val;
-    typedef Out_Object_Argument_T<T_ptr,T_out>            out_arg_val;
-    typedef Ret_Object_Argument_T<T_ptr,T_var>            ret_val;
-
-    typedef Object_Tag                                    idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Object_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Object_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_ARGUMENT_T_H */
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
deleted file mode 100644
index feb64a6af6e..00000000000
--- a/TAO/tao/Object_Argument_T.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S_ptr>
-ACE_INLINE
-TAO::In_Object_Argument_T<S_ptr>::In_Object_Argument_T (S_ptr x)
-  : x_ (x)
-{}
-
-template<typename S_ptr>
-ACE_INLINE
-S_ptr
-TAO::In_Object_Argument_T<S_ptr>::arg (void) const
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_traits>
-ACE_INLINE
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::Inout_Object_Argument_T (
-    S_ptr & x
-  )
-  : x_ (x)
-{}
-
-template<typename S_ptr, typename S_traits>
-ACE_INLINE
-S_ptr &
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_out>
-ACE_INLINE
-TAO::Out_Object_Argument_T<S_ptr,S_out>::Out_Object_Argument_T (S_out & x)
-  : x_ (x.ptr ())
-{}
-
-template<typename S_ptr, typename S_out>
-ACE_INLINE
-S_out
-TAO::Out_Object_Argument_T<S_ptr,S_out>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::Ret_Object_Argument_T (void)
-{}
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr &
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::retn (void)
-{
-  return this->x_._retn ();
-}
-
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
deleted file mode 100644
index 31e914a6505..00000000000
--- a/TAO/tao/Object_Key.pidl
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-// TAO specific IDL definition of an octet sequence that we use to represent
-// Object keys inside the POA.
-//   This file was used to generate the code in Object_KeyC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -St -Gp -Gd -Sc -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,export_macro="tao/TAO_Export"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          Object_Key.pidl
-//
-// After generation the file diffs/Object_Key.diff must be used to manually
-// patch this file
-
-module TAO
-{
-  typedef sequence<octet> ObjectKey;
-};
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
deleted file mode 100644
index e0fea62d9ea..00000000000
--- a/TAO/tao/Object_KeyC.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Object_KeyC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_TAO_OBJECTKEY_CS_)
-#define _TAO_OBJECTKEY_CS_
-
-TAO::ObjectKey::ObjectKey (void)
-{}
-
-TAO::ObjectKey::ObjectKey (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max)
-{}
-
-TAO::ObjectKey::ObjectKey (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Octet * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max, length, buffer, release)
-{}
-
-TAO::ObjectKey::ObjectKey (
-    const ObjectKey &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (seq)
-{}
-
-TAO::ObjectKey::~ObjectKey (void)
-{}
-
-// Hand crafted.
-
-void
-TAO::ObjectKey::encode_sequence_to_string (char * &str,
-                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (str + len) && i < seq.length();
-       ++i)
-    {
-      u_char bt = seq[i];
-      if (is_legal (bt))
-        {
-          *cp++ = (char) bt;
-          continue;
-        }
-
-      *cp++ = '%';
-      *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
-      *cp++ = ACE::nibble2hex (bt & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-int TAO::ObjectKey::is_legal (u_char & c)
-{
-  if (isalnum(c))
-  {
-    return 1;
-  }
-  else
-  {
-    return ( c == ';' || c == '/' ||c == ':' || c == '?' ||
-             c == '@' || c == '&' ||c == '=' || c == '+' ||
-             c == '$' || c == ',' ||c == '_' || c == '.' ||
-             c == '!' || c == '~' ||c == '*' || c == '\'' ||
-             c == '-' || c == '(' || c == ')' );
-  }
-}
-
-void
-TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                           const char *str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       ++i)
-    {
-      if (*cp == '%' || *cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        // Copy it in
-        seq[i] = *cp++;
-    }
-
-  // Set the length appropriately
-  seq.length (i);
-}
-
-/*static*/ CORBA::Boolean
-TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
-                               TAO_InputCDR &strm)
-{
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-
-      // Set the length of the sequence.
-      key.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return 1;
-        }
-
-      // Retrieve all the elements.
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
-        oseq->replace (_tao_seq_len, strm.start ());
-        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-        strm.skip_bytes (_tao_seq_len);
-        return 1;
-      }
-      return strm.read_octet_array (key.get_buffer (),
-                                    _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (key.get_buffer (), key.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-
-    }
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_TAO_ObjectKey_CPP_
-#define _TAO_CDR_OP_TAO_ObjectKey_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::ObjectKey &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<TAO::ObjectKey *> (&_tao_sequence));
-        if (_tao_octet_seq->mb ())
-          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-      
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::ObjectKey &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-            static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
deleted file mode 100644
index 2198a47af4f..00000000000
--- a/TAO/tao/Object_KeyC.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_
-#define _TAO_IDL_ORIG_OBJECT_KEYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_TAO_OBJECTKEY_CH_)
-#define _TAO_OBJECTKEY_CH_
-  
-  class ObjectKey;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ObjectKey,
-        CORBA::Octet
-      >
-    ObjectKey_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ObjectKey,
-        ObjectKey_var,
-        CORBA::Octet
-      >
-    ObjectKey_out;
-  
-  class TAO_Export ObjectKey
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Octet
-          >
-  {
-  public:
-    ObjectKey (void);
-    ObjectKey (CORBA::ULong max);
-    ObjectKey (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ObjectKey (const ObjectKey &);
-    ~ObjectKey (void);
-    
-    typedef ObjectKey_var _var_type;
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    ObjectKey (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-
-    // Hand crafted.
-
-    static void encode_sequence_to_string (
-        char * &str,
-        const TAO_Unbounded_Sequence<CORBA::Octet> &seq
-      );
-    static void decode_string_to_sequence (
-        TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-        const char *str
-      );
-    static int is_legal (u_char & c);
-
-    /// A special method that gives no regard to how the ORB has
-    /// configured  the resource factory. This will be used only
-    /// during Profile decoding and should be safe. This is a solution
-    /// for the bug report [BUG 1616]
-    static CORBA::Boolean demarshal_key (ObjectKey &key,
-                                         TAO_InputCDR &cdr);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_TAO_ObjectKey_H_
-#define _TAO_CDR_OP_TAO_ObjectKey_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const TAO::ObjectKey &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO::ObjectKey &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
deleted file mode 100644
index 0ae0e4ec4e5..00000000000
--- a/TAO/tao/Object_Loader.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "Object_Loader.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           Object_Loader,
-           "$Id$")
-
-TAO_Object_Loader::~TAO_Object_Loader (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Object_Loader>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Object_Loader>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
deleted file mode 100644
index fd9279e1fd0..00000000000
--- a/TAO/tao/Object_Loader.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// ================================================================
-/**
- *  @file   Object_Loader.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-// ================================================================
-
-#ifndef TAO_OBJECT_LOADER_H
-#define TAO_OBJECT_LOADER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ORB;
-  typedef ORB *ORB_ptr;
-}
-
-/**
- * @class TAO_Object_Loader
- *
- * @brief A class to dynamically load object implementations into an
- * ORB.
- *
- * Many services and components of the ORB can be dynamically
- * loaded, often these components are returned to the application via
- * an object reference (CORBA::Object_ptr).  This class is used to
- * dynamically load such components, and encapsulate the creation of
- * the object reference.
- *
- */
-class TAO_Export TAO_Object_Loader : public ACE_Service_Object
-{
-public:
-  /// The destructor
-  virtual ~TAO_Object_Loader (void);
-
-  /**
-   * Create and activate a new object into the orb.
-   * This method cannot throw any exception, but it can return a nil
-   * object to indicate an error condition.
-   */
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                           int argc,
-                                           ACE_TCHAR* argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OBJECT_LOADER_H */
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
deleted file mode 100644
index b718a9886ea..00000000000
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "tao/Object_Proxy_Broker.h"
-
-ACE_RCSID (tao,
-           TAO_Object_Proxy_Broker,
-           "$Id$")
-
-namespace TAO
-{
-  Object_Proxy_Broker::~Object_Proxy_Broker (void)
-  {
-    // No-Op.
-  }
-}
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
deleted file mode 100644
index de46ccee6e1..00000000000
--- a/TAO/tao/Object_Proxy_Broker.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_Proxy_Broker.h
- *
- *  $Id$
- *
- *  This files contains the abstract class for the CORBA Object
- *  proxy brokers.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  Modified by
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_OBJECT_PROXY_BROKER_H
-#define TAO_OBJECT_PROXY_BROKER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-namespace CORBA
-{
-  class InterfaceDef;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Object_Proxy_Broker
-   *
-   * @brief Object_Proxy_Broker
-   *
-   */
-  class TAO_Export Object_Proxy_Broker
-  {
-  public:
-
-    /// Destructor
-    virtual ~Object_Proxy_Broker (void);
-
-    virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL) = 0;
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::InterfaceDef *_get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    ) = 0;
-
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_PROXY_BROKER_H_ */
diff --git a/TAO/tao/Object_Proxy_Impl.cpp b/TAO/tao/Object_Proxy_Impl.cpp
deleted file mode 100644
index 9f61e119c4e..00000000000
--- a/TAO/tao/Object_Proxy_Impl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "tao/Object_Proxy_Impl.h"
-
-ACE_RCSID (tao,
-           Object_Proxy_Impl,
-           "$Id$")
-
-TAO_Object_Proxy_Impl::~TAO_Object_Proxy_Impl (void)
-{
-}
diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h
deleted file mode 100644
index 5b80dc288f7..00000000000
--- a/TAO/tao/Object_Proxy_Impl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_Proxy_Impl.h
- *
- *  $Id$
- *
- *  This files contains the proxy definition of the interface that
- *  all the Object proxy have to implement.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_OBJECT_PROXY_IMPL_H_
-#define TAO_OBJECT_PROXY_IMPL_H_
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-
-namespace CORBA
-{
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Environment;
-}
-
-/**
- * @class TAO_Object_Proxy_Impl
- *
- * @brief TAO_Object_Proxy_Impl
- *
- * This class defines the interface that the proxy for the class
- * CORBA::Object have to implement.
- */
-class TAO_Export TAO_Object_Proxy_Impl
-{
-public:
-
-  virtual ~TAO_Object_Proxy_Impl (void);
-
-  virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
-                                const char *logical_type_id
-                                ACE_ENV_ARG_DECL) = 0;
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      const CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    ) = 0;
-
-  virtual CORBA::Object_ptr _get_component (const CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_PROXY_IMPL_H_ */
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
deleted file mode 100644
index af00050eba3..00000000000
--- a/TAO/tao/Object_Ref_Table.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-#include "Object_Ref_Table.h"
-#include "ORB.h"
-#include "Environment.h"
-#include "debug.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-#include "Object.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Object_Ref_Table,
-           "$Id$")
-
-
-// ****************************************************************
-
-TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
-  : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
-{
-}
-
-TAO_Object_Ref_Table::~TAO_Object_Ref_Table (void)
-{
-  // Must explicitly call destroy() in the destructor since not all
-  // applications will invoke ORB::shutdown() or ORB::destroy().
-  this->destroy ();
-}
-
-void
-TAO_Object_Ref_Table::register_initial_reference (
-  const char *id,
-  CORBA::Object_ptr obj
-  ACE_ENV_ARG_DECL)
-{
-  if (id == 0 || ACE_OS::strlen (id) == 0)
-    {
-      ACE_THROW (CORBA::ORB::InvalidName ());
-    }
-  else if (CORBA::is_nil (obj))
-    {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27,
-                                   CORBA::COMPLETED_NO));
-    }
-
-  int result = this->bind (id, obj);
-
-  if (result == 1)
-    {
-      if (TAO_debug_level > 1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Object_Ref_Table::register_initial_reference:")
-                      ACE_TEXT ("  Could not register duplicate object <%s> ")
-                      ACE_TEXT ("with the ORB\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (id)));
-        }
-
-      ACE_THROW (CORBA::ORB::InvalidName ());
-    }
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Object_Ref_Table::register_initial_reference:")
-                    ACE_TEXT ("  Could not register object <%s> with ")
-                    ACE_TEXT ("the ORB\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-CORBA::Object_ptr
-TAO_Object_Ref_Table::resolve_initial_references (
-  const char *id
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return this->find (id);  // Returns a duplicate.
-}
-
-void
-TAO_Object_Ref_Table::destroy (void)
-{
-  for (Iterator i = this->begin ();
-       i != this->end ();
-       ++i)
-    {
-      // Deallocate the id.
-      CORBA::string_free (const_cast<char *> ((*i).ext_id_));
-
-      // Release the Object.
-      CORBA::release ((*i).int_id_);
-    }
-
-  this->table_.unbind_all ();
-}
-
-TAO_Object_Ref_Table::Iterator
-TAO_Object_Ref_Table::begin (void)
-{
-  return this->table_.begin ();
-}
-
-TAO_Object_Ref_Table::Iterator
-TAO_Object_Ref_Table::end (void)
-{
-  return this->table_.end ();
-}
-
-size_t
-TAO_Object_Ref_Table::current_size (void) const
-{
-  return this->table_.current_size ();
-}
-
-int
-TAO_Object_Ref_Table::bind (const char *id,
-                            CORBA::Object_ptr obj)
-{
-  // Make sure that the supplied Object reference is valid,
-  // i.e. not nil.
-  if (id == 0 || CORBA::is_nil (obj))
-    {
-      errno = EINVAL;
-      return -1;
-    };
-
-  CORBA::String_var name = CORBA::string_dup (id);
-  CORBA::Object_var object = CORBA::Object::_duplicate (obj);
-
-  int result = this->table_.bind (name.in (),
-                                  object.in ());
-
-  if (result == 0)
-    {
-      // Transfer ownership to the Object Table.
-      (void) name._retn ();
-      (void) object._retn ();
-    }
-
-  return result;
-}
-
-CORBA::Object_ptr
-TAO_Object_Ref_Table::find (const char *id)
-{
-  CORBA::Object_ptr found = CORBA::Object::_nil ();
-
-  this->table_.find (id, found);
-
-  return CORBA::Object::_duplicate (found);
-}
-
-int
-TAO_Object_Ref_Table::unbind (const char *id)
-{
-  Table::ENTRY *entry = 0;
-
-  int result = this->table_.find (id, entry);
-
-  if (result == 0)
-    {
-      // Deallocate the external ID and obtain the ORB core pointer
-      // before unbinding the entry since the entry is deallocated
-      // during the call to unbind().
-      CORBA::string_free (const_cast<char *> (entry->ext_id_));
-      CORBA::Object_ptr obj = entry->int_id_;
-
-      result = this->table_.unbind (entry);
-
-      if (result != 0)
-        return result;
-
-      CORBA::release (obj);
-    }
-
-  return result;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Entry<const char *, CORBA::Object_ptr>;
-template class ACE_Hash_Map_Manager_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA::Object_ptr>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::Object_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
deleted file mode 100644
index 0d94eff9c19..00000000000
--- a/TAO/tao/Object_Ref_Table.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Object_Ref_Table.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_OBJECT_REF_TABLE_H
-#define TAO_OBJECT_REF_TABLE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Thread_Mutex.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Environment;
-}
-
-/**
- * @class TAO_Object_Ref_Table
- *
- * @brief Keep a table de-stringified object references registered
- * with the ORB.
- *
- * The class is necessary to allow local objects to be accessible via
- * the resolve_initial_references() mechanism.  Since local object
- * references cannot be stringified, they cannot be placed into the
- * initial reference map that maps object key/name to stringified
- * object reference.  Hence, another table is needed.
- *
- * @note
- * The stringified reference table is still needed since it is
- * sometimes necessary to delay de-stringification of an IOR until it
- * is needed.  For example, "corbaname" may return different results
- * on each use.
- */
-class TAO_Export TAO_Object_Ref_Table
-{
-public:
-
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  CORBA::Object_ptr,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  TAO_SYNCH_MUTEX>
-    Table;
-
-  typedef Table::iterator Iterator;
-
-  /// Constructor
-  TAO_Object_Ref_Table (void);
-
-  /// Destructor
-  ~TAO_Object_Ref_Table (void);
-
-  /// Register an object reference with the table, and map the given
-  /// ID to it.
-  void register_initial_reference (const char * id,
-                                   CORBA::Object_ptr obj
-                                   ACE_ENV_ARG_DECL);
-
-  /// Return the object reference associated with the given ID.
-  /// A duplicate is returned.
-  CORBA::Object_ptr resolve_initial_references (
-    const char * id
-    ACE_ENV_ARG_DECL);
-
-  /// Explicitly destroy the contents of the object reference table.
-  void destroy (void);
-
-  /**
-   * @name Forward Iterators
-   */
-  //@{
-  Iterator begin (void);
-  Iterator end (void);
-  //@}
-
-  /// Return the current size of the underlying table.
-  size_t current_size (void) const;
-
-private:
-
-  /**
-   * @name The canonical ACE_Map methods
-   */
-  //@{
-  int bind (const char *orb_id, CORBA::Object_ptr obj);
-  CORBA::Object_ptr find (const char *orb_id); // Returns a duplicate.
-  int unbind (const char *orb_id);
-  //@}
-
-private:
-
-  /// Prevent copying
-  ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &))
-
-private:
-
-  /// The implementation.
-  Table table_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_OBJECT_REF_TABLE_H */
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
deleted file mode 100644
index 69ad710c664..00000000000
--- a/TAO/tao/Object_T.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// $Id$
-#ifndef TAO_OBJECT_T_C
-#define TAO_OBJECT_T_C
-
-#include "tao/Object_T.h"
-#include "tao/Stub.h"
-#include "tao/SystemException.h"
-
-ACE_RCSID (tao,
-           Object_T,
-           "$Id$")
-
-namespace TAO
-{
-  template<typename T>
-  T *
-  Narrow_Utils<T>::narrow (CORBA::Object_ptr obj,
-                           const char *repo_id,
-                           Proxy_Broker_Factory pbf
-                           ACE_ENV_ARG_DECL)
-  {
-    if (CORBA::is_nil (obj))
-      {
-        return T::_nil ();
-      }
-
-    CORBA::Boolean is_it = obj->_is_a (repo_id
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
-
-    if (is_it == 0)
-      {
-        return T::_nil ();
-      }
-
-    return TAO::Narrow_Utils<T>::unchecked_narrow (obj,
-                                                   repo_id,
-                                                   pbf
-                                                   ACE_ENV_ARG_PARAMETER);
-  }
-
-  template<typename T> T *
-  Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj,
-                                     Proxy_Broker_Factory pbf)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-
-    T *proxy = 0;
-    ACE_TRY
-      {
-        proxy =
-          TAO::Narrow_Utils<T>::unchecked_narrow (obj,
-                                                  0,
-                                                  pbf
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        // Swallow the exception
-        return T::_nil ();
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (proxy);
-
-    return proxy;
-  }
-
-  template<typename T> T *
-  Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj,
-                                     const char *,
-                                     Proxy_Broker_Factory pbf
-                                     ACE_ENV_ARG_DECL)
-  {
-    if (CORBA::is_nil (obj))
-      {
-        return T::_nil ();
-      }
-
-    if (obj->_is_local ())
-      {
-        return T::_duplicate (dynamic_cast<T *> (obj));
-      }
-
-    T_ptr proxy = Narrow_Utils<T>::lazy_evaluation (obj);
-
-    if (!CORBA::is_nil (proxy))
-      {
-        return proxy;
-      }
-      
-    TAO_Stub* stub = obj->_stubobj ();
-
-    if (stub == 0)
-      {
-        // If we're here, we have been passed a bogus objref.
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (), T::_nil ());
-      }
-
-    stub->_incr_refcnt ();
-
-    bool collocated =
-      !CORBA::is_nil (stub->servant_orb_var ().ptr ())
-      && stub->optimize_collocation_objects ()
-      && obj->_is_collocated ()
-      && pbf != 0;
-
-    ACE_NEW_THROW_EX (proxy,
-                      T (stub,
-                         collocated ? 1 : 0,
-                         obj->_servant ()),
-                      CORBA::NO_MEMORY ());
-    return proxy;
-  }
-
-  template<typename T>
-  T *
-  Narrow_Utils<T>::lazy_evaluation (CORBA::Object_ptr obj)
-  {
-    T_ptr default_proxy = T::_nil ();
-
-    // Code for lazily evaluated IORs.
-    if (!obj->is_evaluated ())
-      {
-        ACE_NEW_RETURN (default_proxy,
-                        T (obj->steal_ior (),
-                           obj->orb_core ()),
-                        T::_nil ());
-      }
-
-    return default_proxy;
-  }
-}
-
-#endif /* TAO_OBJECT_T_C */
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
deleted file mode 100644
index 57c11c5950a..00000000000
--- a/TAO/tao/Object_T.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_T.h
- *
- *  $Id$
- *
- *   Templatized utilities common to all IDL interfaces.
- *
- *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CORBA_OBJECT_T_H
-#define TAO_CORBA_OBJECT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CORBA_macros.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-}
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-
-  typedef
-    Collocation_Proxy_Broker * (* Proxy_Broker_Factory)(CORBA::Object_ptr);
-
-  template<typename T>
-  class Narrow_Utils
-  {
-  public:
-    typedef T *T_ptr;
-
-    static T_ptr narrow (CORBA::Object_ptr,
-                         const char *repo_id,
-                         Proxy_Broker_Factory
-                         ACE_ENV_ARG_DECL);
-
-    // Version used the operators.
-    static T_ptr unchecked_narrow (CORBA::Object_ptr,
-                                   Proxy_Broker_Factory);
-
-    static T_ptr unchecked_narrow (CORBA::Object_ptr,
-                                   const char *repo_id,
-                                   Proxy_Broker_Factory
-                                   ACE_ENV_ARG_DECL);
-
-  private:
-    // Code for lazily evaluated IORs.
-    static T_ptr lazy_evaluation (CORBA::Object_ptr);
-  };
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Object_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CORBA_OBJECT_T_H */
diff --git a/TAO/tao/Objref_TypeCode.cpp b/TAO/tao/Objref_TypeCode.cpp
deleted file mode 100644
index 03c5b129e63..00000000000
--- a/TAO/tao/Objref_TypeCode.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-#ifndef TAO_OBJREF_TYPECODE_CPP
-#define TAO_OBJREF_TYPECODE_CPP
-
-#include "tao/Objref_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_string.h"
-
-
-template <typename StringType, class RefCountPolicy>
-bool
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<StringType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-#endif  /*  TAO_OBJREF_TYPECODE_CPP */
diff --git a/TAO/tao/Objref_TypeCode.h b/TAO/tao/Objref_TypeCode.h
deleted file mode 100644
index 0f49b5d99f7..00000000000
--- a/TAO/tao/Objref_TypeCode.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_H
-#define TAO_OBJREF_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Objref_Base
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template <typename StringType, class RefCountPolicy>
-    class Objref
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<StringType> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Objref_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Objref_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_H */
diff --git a/TAO/tao/Objref_TypeCode.inl b/TAO/tao/Objref_TypeCode.inl
deleted file mode 100644
index e40aa1e10d9..00000000000
--- a/TAO/tao/Objref_TypeCode.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/Objref_TypeCode_Static.cpp b/TAO/tao/Objref_TypeCode_Static.cpp
deleted file mode 100644
index fb2e89240a3..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "tao/Objref_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Objref_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
diff --git a/TAO/tao/Objref_TypeCode_Static.h b/TAO/tao/Objref_TypeCode_Static.h
deleted file mode 100644
index 69e86efe82b..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_STATIC_H
-#define TAO_OBJREF_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType, class RefCountPolicy> class Objref;
-
-    /**
-     * @class Objref
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template<>
-    class TAO_Export Objref<char const *, TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<char const *> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Objref_TypeCode_Static.inl b/TAO/tao/Objref_TypeCode_Static.inl
deleted file mode 100644
index 07c5d36ece2..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
deleted file mode 100644
index 0a93b48c86a..00000000000
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-// $Id$
-#ifndef TAO_OBJREF_VAROUT_T_C
-#define TAO_OBJREF_VAROUT_T_C
-
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Environment.h"
-
-ACE_RCSID (tao,
-           Objref_VarOut_T,
-           "$Id$")
-
-template <typename T>
-TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void)
-  : ptr_ (TAO::Objref_Traits<T>::nil ())
-{
-}
-
-template <typename T>
-TAO_Objref_Var_T<T>::TAO_Objref_Var_T (
-    const TAO_Objref_Var_T<T> & p
-  )
-  : TAO_Base_var (),
-    ptr_ (TAO::Objref_Traits<T>::duplicate (p.ptr ()))
-{
-}
-
-template <typename T>
-TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void)
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-}
-
-template <typename T>
-TAO_Objref_Var_T<T> &
-TAO_Objref_Var_T<T>::operator= (T * p)
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-TAO_Objref_Var_T<T> &
-TAO_Objref_Var_T<T>::operator= (
-    const TAO_Objref_Var_T<T> & p
-  )
-{
-  if (this != &p)
-    {
-      TAO::Objref_Traits<T>::release (this->ptr_);
-      this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ());
-    }
-
-  return *this;
-}
-
-template <typename T>
-T *
-TAO_Objref_Var_T<T>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-TAO_Objref_Var_T<T>::operator T * const & () const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-TAO_Objref_Var_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Objref_Var_T<T>::in (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Objref_Var_T<T>::inout (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Objref_Var_T<T>::out (void)
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Objref_Var_T<T>::_retn (void)
-{
-  T * val = this->ptr_;
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
-  return val;
-}
-
-template <typename T>
-T *
-TAO_Objref_Var_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-void
-TAO_Objref_Var_T<T>::free (void)
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-}
-
-template <typename T>
-void
-TAO_Objref_Var_T<T>::reset (T * p)
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = p;
-}
-
-// ******************************************************
-
-template <typename T>
-TAO_Objref_Out_T<T>::TAO_Objref_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
-}
-
-template <typename T>
-TAO_Objref_Out_T<T>::TAO_Objref_Out_T (
-    TAO_Objref_Var_T<T> & p
-  )
-  : ptr_ (p.out ())
-{
-  TAO::Objref_Traits<T>::release (this->ptr_);
-  this->ptr_ = TAO::Objref_Traits<T>::nil ();
-}
-
-template <typename T>
-TAO_Objref_Out_T<T>::TAO_Objref_Out_T (
-    const TAO_Objref_Out_T<T> & p
-  )
-  : ptr_ (p.ptr_)
-{
-}
-
-template <typename T>
-TAO_Objref_Out_T<T> &
-TAO_Objref_Out_T<T>::operator= (
-    const TAO_Objref_Out_T<T> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template <typename T>
-TAO_Objref_Out_T<T> &
-TAO_Objref_Out_T<T>::operator= (
-    const TAO_Objref_Var_T<T> & p
-  )
-{
-  this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ());
-  return *this;
-}
-
-template <typename T>
-TAO_Objref_Out_T<T> &
-TAO_Objref_Out_T<T>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-TAO_Objref_Out_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Objref_Out_T<T>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Objref_Out_T<T>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#endif /* TAO_OBJREF_VAROUT_T_C */
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
deleted file mode 100644
index f3fc6ac260f..00000000000
--- a/TAO/tao/Objref_VarOut_T.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_VarOut_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_VAROUT_T_H
-#define TAO_OBJREF_VAROUT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/varbase.h"
-
-class TAO_OutputCDR;
-
-namespace TAO
-{
-  /**
-   * struct Objref_Traits
-   *
-   * @brief Specialized for each interface in generated code.
-   *
-   */
-  template<typename T>
-  struct Objref_Traits
-  {
-    static T * duplicate (T *);
-    static void release (T *);
-    static T * nil (void);
-    static CORBA::Boolean marshal (T *,
-                                   TAO_OutputCDR &);
-  };
-}
-
-/**
- * @class TAO_Objref_Var_T
- *
- * @brief Parameterized implementation of @c _var class for object
- *       references.
- *
- */
-template <typename T>
-class TAO_Objref_Var_T : private TAO_Base_var
-{
-public:
-  TAO_Objref_Var_T (void);
-  TAO_Objref_Var_T (T * p) : ptr_ (p) {}
-  TAO_Objref_Var_T (const TAO_Objref_Var_T<T> &);
-  ~TAO_Objref_Var_T (void);
-
-  TAO_Objref_Var_T<T> & operator= (T *);
-  TAO_Objref_Var_T<T> & operator= (
-      const TAO_Objref_Var_T<T> &
-    );
-  T * operator-> (void) const;
-
-  // Cast operators.
-  operator T * const & () const;
-  operator T *& ();
-
-  typedef T     _obj_type;
-  typedef T *   _in_type;
-  typedef T *&  _inout_type;
-  typedef T *&  _out_type;
-  typedef T *   _retn_type;
-
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
-
-  // TAO extension.
-  _retn_type    ptr (void) const;
-
-protected:
-  T * ptr_;
-  void free (void);
-  void reset (T *);
-
-private:
-  // Unimplemented - prevents widening assignment.
-  TAO_Objref_Var_T (const TAO_Base_var &);
-  void operator= (const TAO_Base_var &);
-};
-
-/**
- * @class TAO_Objref_Out_T
- *
- * @brief Parametrized implementation of _out class for object references.
- *
- */
-template <typename T>
-class TAO_Objref_Out_T
-{
-public:
-  TAO_Objref_Out_T (T *&);
-  TAO_Objref_Out_T (TAO_Objref_Var_T<T> &);
-  TAO_Objref_Out_T (const TAO_Objref_Out_T<T> &);
-
-  TAO_Objref_Out_T &operator= (const TAO_Objref_Out_T<T> &);
-  TAO_Objref_Out_T &operator= (const TAO_Objref_Var_T<T> &);
-  TAO_Objref_Out_T &operator= (T *);
-
-  // Cast operator.
-  operator T *& ();
-
-  T *& ptr (void);
-  T * operator-> (void);
-
-private:
-  typedef TAO_Objref_Out_T<T> THIS_OUT_TYPE;
-  T *& ptr_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Objref_VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Objref_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_VAROUT_T_H */
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
deleted file mode 100644
index e1f1cb3850f..00000000000
--- a/TAO/tao/OctetSeq.pidl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-//
-//   This file was used to generate the code in OctetSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -GA -Sc -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          OctetSeq.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
-
-
-#ifndef TAO_CORBA_OCTET_SEQ_IDL
-#define TAO_CORBA_OCTET_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<octet> OctetSeq;
-};
-
-#endif  /* TAO_CORBA_OCTET_SEQ_IDL */
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
deleted file mode 100644
index 8a63efa4664..00000000000
--- a/TAO/tao/OctetSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "OctetSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OctetSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_octet,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 =
-      &CORBA_OctetSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OctetSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OctetSeq:1.0",
-    "OctetSeq",
-    &TAO::TypeCode::tc_CORBA_OctetSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
-    &_tao_tc_CORBA_OctetSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OctetSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OctetSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OctetSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
-        _tao_any,
-        CORBA::OctetSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OctetSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
deleted file mode 100644
index ae05d6dc3e0..00000000000
--- a/TAO/tao/OctetSeqC.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "OctetSeqC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_OCTETSEQ_CS_)
-#define _CORBA_OCTETSEQ_CS_
-
-CORBA::OctetSeq::OctetSeq (void)
-{}
-
-CORBA::OctetSeq::OctetSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max)
-{}
-
-CORBA::OctetSeq::OctetSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Octet * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::OctetSeq::OctetSeq (
-    const OctetSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (seq)
-{}
-
-CORBA::OctetSeq::~OctetSeq (void)
-{}
-
-void CORBA::OctetSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  OctetSeq * _tao_tmp_pointer =
-    static_cast<OctetSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_
-#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OctetSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = 
-          static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<CORBA::OctetSeq *> (&_tao_sequence));
-        if (_tao_octet_seq->mb ())
-          return strm.write_octet_array_mb (_tao_octet_seq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-      
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OctetSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-            static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
deleted file mode 100644
index 860e2422858..00000000000
--- a/TAO/tao/OctetSeqC.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
-#define _TAO_IDL_ORIG_OCTETSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_OCTETSEQ_CH_)
-#define _CORBA_OCTETSEQ_CH_
-  
-  class OctetSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        OctetSeq,
-        CORBA::Octet
-      >
-    OctetSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        OctetSeq,
-        OctetSeq_var,
-        CORBA::Octet
-      >
-    OctetSeq_out;
-  
-  class TAO_Export OctetSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Octet
-          >
-  {
-  public:
-    OctetSeq (void);
-    OctetSeq (CORBA::ULong max);
-    OctetSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet* buffer, 
-        CORBA::Boolean release = 0
-      );
-    OctetSeq (const OctetSeq &);
-    ~OctetSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef OctetSeq_var _var_type;
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    OctetSeq (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// Workaround for a Visual Studio .NET bug where this class is not
-// properly imported by an application if typedef'd or subclassed,
-// resulting in 'multiply defined' link errors. The export macro
-// here forces an explicit import by the application. Please see
-// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-// The problem stems from use of the type below in PortableServer,
-// but we put the instantiation here because the application will
-// need to see it in *C.h to avoid the error.
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-  template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
-#define _TAO_CDR_OP_CORBA_OctetSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OctetSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::OctetSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/OctetSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
deleted file mode 100644
index 0a31a936a8d..00000000000
--- a/TAO/tao/PICurrent.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-#include "PICurrent.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-ACE_RCSID (tao,
-           PICurrent,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "PICurrent.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ORB_Core.h"
-#include "TAO_Server_Request.h"
-#include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
-
-
-TAO::PICurrent::PICurrent (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core),
-    slot_count_ (0)
-{
-  // ACE_ASSERT (orb_core != 0);
-}
-
-TAO::PICurrent::~PICurrent (void)
-{
-}
-
-CORBA::Any *
-TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  PICurrent_Impl *impl = this->tsc ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                            CORBA::COMPLETED_NO),
-                      0);
-
-  return impl->get_slot (identifier ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
-                         const CORBA::Any &data
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PICurrent_Impl *impl = this->tsc ();
-
-  if (impl == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
-
-  impl->set_slot (identifier, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO::PICurrent_Impl *
-TAO::PICurrent::tsc (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_core_->get_tss_resources ();
-
-  return &tss->pi_current_;
-}
-
-// ------------------------------------------------------------------
-
-TAO::PICurrent_Impl::PICurrent_Impl (void)
-  : slot_table_ (),
-    lc_slot_table_ (0),
-    copy_callback_ (0),
-    destruction_callback_ (0)
-{
-}
-
-TAO::PICurrent_Impl::~PICurrent_Impl (void)
-{
-  // Break any existing ties with PICurrent to which our table was
-  // logically copied since our table no longer exists once this
-  // destructor completes.
-  if (this->destruction_callback_ != 0)
-    this->destruction_callback_->execute_destruction_callback (0);
-}
-
-
-CORBA::Any *
-TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  // No need to check validity of SlotId.  It is validated before this
-  // method is invoked.
-
-  PICurrent_Impl::Table & table = this->current_slot_table ();
-
-  ACE_ASSERT (this->lc_slot_table_ != &this->slot_table_);
-
-  CORBA::Any * any = 0;
-
-  if (identifier < table.size ())
-    {
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any (table[identifier]), // Make a copy.
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
-    }
-  else
-    {
-      // In accordance with the Portable Interceptor specification,
-      // return an Any with a TCKind of tk_null.  A default
-      // constructed Any has that TCKind.
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
-    }
-
-  return any;
-}
-
-void
-TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
-                               const CORBA::Any & data
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  // No need to check validity of SlotId.  It is validated before this
-  // method is invoked.
-
-  // Perform deep copy of the logically copied slot table, if
-  // necessary, before modifying our own slot table.
-  if (this->copy_callback_ != 0
-      && this->copy_callback_->execute () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  // If the slot table array isn't large enough, then increase its
-  // size.  We're guaranteed not to exceed the number of allocated
-  // slots for the reason stated above.
-  if (identifier >= this->slot_table_.size ()
-      && this->slot_table_.size (identifier + 1) != 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  this->slot_table_[identifier] = CORBA::Any (data);
-}
-
-void
-TAO::PICurrent_Impl::execute_destruction_callback (
-  TAO::PICurrent_Impl::Table * old_lc_slot_table)
-{
-  this->lc_slot_table_ = old_lc_slot_table;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Array_Base<CORBA::Any>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<CORBA::Any>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h
deleted file mode 100644
index 36e1d1f9484..00000000000
--- a/TAO/tao/PICurrent.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   PICurrent.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_PI_CURRENT_H
-#define TAO_PI_CURRENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "ace/Array_Base.h"
-#include "Any.h"
-#include "PortableInterceptorC.h"
-#include "LocalObject.h"
-
-#if defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable:4250)
-# pragma warning(disable:4251)
-#endif /* _MSC_VER */
-
-/// Forward declarations.
-class TAO_ORB_Core;
-
-namespace TAO
-{
-  class PICurrent_Copy_Callback;
-  class PICurrent_Impl;
-
-  /**
-   * @class PICurrent
-   *
-   * @brief Implementation of the PortableInterceptor::Current
-   * interface.
-   *
-   * PortableInterceptor::Current is useful for passing data between
-   * request interceptors, in addition to passing data from an
-   * interceptor to the calling thread.
-   */
-  class TAO_Export PICurrent
-    : public virtual PortableInterceptor::Current,
-      public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    /// Constructor.
-    PICurrent (TAO_ORB_Core *orb_core);
-
-    /**
-     * @name PortableInterceptor::Current Methods
-     *
-     * These are methods exposed by the PortableInterceptor::Current
-     * interface.
-     */
-    //@{
-    /// Retrieve information stored in the slot table at the given
-    /// SlotId.
-    virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-
-    /// Set information in the slot table at the given SlotId.
-    virtual void set_slot (PortableInterceptor::SlotId identifier,
-                           const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-    //@}
-
-    /// Number of slots allocated in the slot table.
-    PortableInterceptor::SlotId slot_count (void) const;
-
-    /// Retrieve the PICurrent implementation from TSS, i.e. the thread
-    /// scope current (TSC).
-    PICurrent_Impl * tsc (void);
-
-    /// Verify the validity of the given SlotId.
-    void check_validity (const PortableInterceptor::SlotId &identifier
-                         ACE_ENV_ARG_DECL);
-
-    /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc);
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce the fact this class is reference
-     * counted, and should not be destroyed using delete() by anything
-     * other than the reference counting mechanism.
-     */
-    ~PICurrent (void);
-
-  private:
-
-    /// Prevent copying through the copy constructor and the assignment
-    /// operator.
-    //@{
-    PICurrent (const PICurrent &);
-    void operator= (const PICurrent &);
-    //@}
-
-  private:
-
-    /// Pointer to the orb core.
-    TAO_ORB_Core * orb_core_;
-
-    /// The number of allocated slots.
-    PortableInterceptor::SlotId slot_count_;
-
-  };
-
-  // ------------------------------------------------------------------
-
-  /**
-   * @class PICurrent_Impl
-   *
-   * @brief Implementation of the PortableInterceptor::Current
-   *        interface.
-   *
-   * This class implements both the "request scope current" and the
-   * "thread scope current" objects as required by Portable
-   * Interceptors.
-   */
-  class TAO_Export PICurrent_Impl
-  {
-  public:
-
-    /// Typedef for the underyling "slot table."
-    typedef ACE_Array_Base<CORBA::Any> Table;
-
-    /// Constructor.
-    PICurrent_Impl (void);
-
-    /// Destructor.
-    ~PICurrent_Impl (void);
-
-    /// Retrieve information stored in the slot table at the given
-    /// SlotId.
-    CORBA::Any *get_slot (PortableInterceptor::SlotId identifier
-                          ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-
-    /// Set information in the slot table at the given SlotId.
-    void set_slot (PortableInterceptor::SlotId identifier,
-                   const CORBA::Any & data
-                   ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-
-    /// Set the PICurrent copy callback object responsible for deep
-    /// copying the source PICurrent's slot table.
-    void copy_callback (PICurrent_Copy_Callback *cb);
-
-    /// Set the PICurrent destruction callback object that will be
-    /// notified of this object's destruction.
-    void destruction_callback (PICurrent_Impl *p);
-
-    void execute_destruction_callback (Table *old_lc_slot_table);
-
-    /// Return a reference to the underlying slot table.
-    Table & slot_table (void);
-
-    /// Return a reference to the slot table currently associated
-    /// with this PICurrent_Impl object.
-    /**
-     * @return Logically copied slot table if available, otherwise
-     *         underlying slot table.
-     */
-    Table & current_slot_table (void);
-
-    /// Logically (shallow) copy the given slot table.
-    void lc_slot_table (PICurrent_Impl *p);
-
-    /// Return pointer to the logically copied slot table.
-    /**
-     * @return Zero if no logically copied slot table.  Non-zero
-     *         otherwise.
-     */
-    Table *lc_slot_table (void) const;
-
-  private:
-
-    /// Prevent copying through the copy constructor and the assignment
-    //operator.
-    //@{
-    PICurrent_Impl (const PICurrent_Impl &);
-    void operator= (const PICurrent_Impl &);
-    //@}
-
-  private:
-
-    /// Array of CORBA::Anys that is the underlying "slot table."
-    Table slot_table_;
-
-    /// Table that was logically copied from a PICurrent in another
-    /// scope, i.e. either the request scope or the thread scope.
-    Table *lc_slot_table_;
-
-    /// Callback object responsible for performing deep copies of a
-    /// PICurrent's slot table.
-    PICurrent_Copy_Callback *copy_callback_;
-
-    /// PICurrent_Impl object that will be notified of this object's
-    /// destruction.
-    PICurrent_Impl *destruction_callback_;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "PICurrent.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_CURRENT_H */
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PICurrent.inl
deleted file mode 100644
index d1fa66ff78a..00000000000
--- a/TAO/tao/PICurrent.inl
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE PortableInterceptor::SlotId
-TAO::PICurrent::slot_count (void) const
-{
-  return this->slot_count_;
-}
-
-ACE_INLINE void
-TAO::PICurrent::initialize (PortableInterceptor::SlotId sc)
-{
-  this->slot_count_ = sc;
-}
-
-ACE_INLINE void
-TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
-                                ACE_ENV_ARG_DECL)
-{
-  // No need to acquire a lock for this check.  At this point, these
-  // attributes are read only.
-  if (identifier >= this->slot_count_)
-    ACE_THROW (PortableInterceptor::InvalidSlot ());
-}
-
-// ------------------------------------------------------------------
-
-ACE_INLINE void
-TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb)
-{
-  this->copy_callback_ = cb;
-}
-
-ACE_INLINE void
-TAO::PICurrent_Impl::destruction_callback (TAO::PICurrent_Impl *p)
-{
-  this->destruction_callback_ = p;
-}
-
-ACE_INLINE TAO::PICurrent_Impl::Table &
-TAO::PICurrent_Impl::slot_table (void)
-{
-  return this->slot_table_;
-}
-
-ACE_INLINE TAO::PICurrent_Impl::Table &
-TAO::PICurrent_Impl::current_slot_table (void)
-{
-  return
-    this->lc_slot_table_ == 0 ? this->slot_table_ : *this->lc_slot_table_;
-}
-
-ACE_INLINE void
-TAO::PICurrent_Impl::lc_slot_table (TAO::PICurrent_Impl *p)
-{
-  if (p != 0)
-    {
-      Table * t = &p->current_slot_table ();
-
-      if (t != this->lc_slot_table_)
-        {
-          this->lc_slot_table_ = t;
-
-          if (this != p)
-            p->destruction_callback (this);
-        }
-      else
-        this->lc_slot_table_ = 0;
-    }
-  else
-    this->lc_slot_table_ = 0;
-}
-
-ACE_INLINE TAO::PICurrent_Impl::Table *
-TAO::PICurrent_Impl::lc_slot_table (void) const
-{
-  return this->lc_slot_table_;
-}
diff --git a/TAO/tao/PICurrent_Copy_Callback.cpp b/TAO/tao/PICurrent_Copy_Callback.cpp
deleted file mode 100644
index 349adcf0c63..00000000000
--- a/TAO/tao/PICurrent_Copy_Callback.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "PICurrent_Copy_Callback.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "PICurrent.h"
-
-
-ACE_RCSID (tao,
-           PICurrent_Copy_Callback,
-           "$Id$")
-
-
-TAO::PICurrent_Copy_Callback::PICurrent_Copy_Callback (void)
-  : src_ (0),
-    dst_ (0)
-{
-}
-
-TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void)
-{
-  // Disable copy callbacks through this callback object in the source
-  // PICurrent_Impl object to prevent the source PICurrent_Impl from
-  // potentially calling back on a destructed copy callback object.
-  if (this->src_ != 0)
-    this->src_->copy_callback (0);
-}
-
-int
-TAO::PICurrent_Copy_Callback::execute (void *)
-{
-  if (this->src_ != 0 && this->dst_ != 0
-      && this->src_ != this->dst_)
-    {
-      const PICurrent_Impl::Table & s = this->src_->current_slot_table ();
-
-      // Disable use of the logically copied slot table before
-      // performing the deep copy.
-      this->dst_->lc_slot_table (0);
-
-      PICurrent_Impl::Table & d = this->dst_->slot_table ();
-
-      d = s;
-
-      // Prevent subsequent deep copies, effectively disabling this
-      // callback.
-      this->src_->copy_callback (0);
-    }
-
-  return 0;
-}
-
-void
-TAO::PICurrent_Copy_Callback::src_and_dst (PICurrent_Impl * src,
-                                           PICurrent_Impl * dst)
-{
-  this->src_ = src;
-  this->dst_ = dst;
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent_Copy_Callback.h b/TAO/tao/PICurrent_Copy_Callback.h
deleted file mode 100644
index 09e5b384c76..00000000000
--- a/TAO/tao/PICurrent_Copy_Callback.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   PICurrent_Copy_Callback.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_PI_CURRENT_CALLBACK_H
-#define TAO_PI_CURRENT_CALLBACK_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "ace/Functor.h"
-
-namespace TAO
-{
-  class PICurrent_Impl;
-
-  /**
-   * @class PICurrent_Copy_Callback
-   *
-   * @brief PICurrent copy callback class.
-   *
-   * This class performs deep copies from the source PICurrent_Impl
-   * object's slot table to the destination PICurrent_Impl object's
-   * slot table.
-   */
-  class TAO_Export PICurrent_Copy_Callback
-    : public ACE_Command_Base
-  {
-  public:
-
-    /// Constructor.
-    PICurrent_Copy_Callback (void);
-
-    /// Destructor.
-    ~PICurrent_Copy_Callback (void);
-
-    /// Perform the copy.
-    virtual int execute (void * arg = 0);
-
-    /// Set the source and destination PICurrent_Impl objects.
-    void src_and_dst (PICurrent_Impl * src, PICurrent_Impl * dst);
-
-  private:
-
-    /// Source PICurrent from which copies will be made.
-    PICurrent_Impl * src_;
-
-    /// Destination PICurrent to which copies will be made.
-    PICurrent_Impl * dst_;
-
-  };
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_CURRENT_CALLBACK_H */
diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp
deleted file mode 100644
index f86a18151eb..00000000000
--- a/TAO/tao/PICurrent_ORBInitializer.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "PICurrent_ORBInitializer.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "ORB_Core.h"
-#include "ORBInitInfo.h"
-#include "SystemException.h"
-
-ACE_RCSID (tao,
-           PICurrent_ORBInitializer,
-           "$Id$")
-
-void
-TAO_PICurrent_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_ORB_Core * orb_core = tao_info->orb_core ();
-
-  TAO::PICurrent * tao_pi_current = 0;
-  ACE_NEW_THROW_EX (tao_pi_current,
-                    TAO::PICurrent (orb_core),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::Current_var current = tao_pi_current;
-
-  info->register_initial_reference ("PICurrent",
-                                    current.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Cache the downcasted pointer in the ORB Core.
-  orb_core->pi_current (tao_pi_current);
-}
-
-void
-TAO_PICurrent_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h
deleted file mode 100644
index b94ba1f70d2..00000000000
--- a/TAO/tao/PICurrent_ORBInitializer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file PICurrent_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_PI_CURRENT_ORB_INITIALIZER_H
-#define TAO_PI_CURRENT_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "LocalObject.h"
-#include "ORBInitializerC.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_PICurrent_ORBInitializer
- *
- * @brief ORBInitializer for the PICurrent support.
- *
- * This class simply registers the PICurrent object with the ORB
- * resolve_initial_references() mechanism.
- */
-class TAO_Export TAO_PICurrent_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /**
-   * @name PortableInterceptor::ORBInitializer Methods
-   *
-   * Methods required by the PortableInterceptor::ORBInitializer
-   * interface.
-   */
-  //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  //@}
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_CURRENT_ORB_INITIALIZER_H */
diff --git a/TAO/tao/PIForwardRequest.pidl b/TAO/tao/PIForwardRequest.pidl
deleted file mode 100644
index 8b2d6fd1ec9..00000000000
--- a/TAO/tao/PIForwardRequest.pidl
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file PIForwardRequest.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableInterceptor
- * components in the ORB.
- *
- * This file was used to generate the code in PIForwardRequestC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PIForwardRequest.pidl
- *
- */
-
-#ifndef _PIFORWARD_REQUEST_IDL_
-#define _PIFORWARD_REQUEST_IDL_
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  exception ForwardRequest
-  {
-    Object forward;
-  };
-};
-
-#endif  /* _PIFORWARD_REQUEST_IDL_ */
diff --git a/TAO/tao/PIForwardRequestA.cpp b/TAO/tao/PIForwardRequestA.cpp
deleted file mode 100644
index 54623f6c617..00000000000
--- a/TAO/tao/PIForwardRequestA.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PIForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
-  {
-    { "forward", &CORBA::_tc_Object }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ForwardRequest (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
-    "ForwardRequest",
-    _tao_fields_PortableInterceptor_ForwardRequest,
-    1);
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
-    &_tao_tc_PortableInterceptor_ForwardRequest;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ForwardRequest &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ForwardRequest::_tao_any_destructor,
-      PortableInterceptor::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ForwardRequest *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::insert (
-      _tao_any,
-      PortableInterceptor::ForwardRequest::_tao_any_destructor,
-      PortableInterceptor::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ForwardRequest *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ForwardRequest *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ForwardRequest *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::extract (
-        _tao_any,
-        PortableInterceptor::ForwardRequest::_tao_any_destructor,
-        PortableInterceptor::_tc_ForwardRequest,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PIForwardRequestC.cpp b/TAO/tao/PIForwardRequestC.cpp
deleted file mode 100644
index 6108fd7a077..00000000000
--- a/TAO/tao/PIForwardRequestC.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PIForwardRequestC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::ForwardRequest::ForwardRequest (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
-        "ForwardRequest"
-      )
-{
-}
-
-PortableInterceptor::ForwardRequest::~ForwardRequest (void)
-{
-}
-
-PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
-}
-
-PortableInterceptor::ForwardRequest&
-PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
-  return *this;
-}
-
-void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ForwardRequest *_tao_tmp_pointer =
-    static_cast<ForwardRequest *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ForwardRequest *> (_tao_excp);
-}
-
-const PortableInterceptor::ForwardRequest *
-PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ForwardRequest *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::ForwardRequest::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::ForwardRequest (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::ForwardRequest::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::ForwardRequest::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::ForwardRequest::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-PortableInterceptor::ForwardRequest::ForwardRequest (
-    const CORBA::Object_ptr  _tao_forward
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
-        "ForwardRequest"
-      )
-{
-  this->forward = CORBA::Object::_duplicate (_tao_forward);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const
-{
-  return ::PortableInterceptor::_tc_ForwardRequest;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::ForwardRequest &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.forward.in ())
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableInterceptor::ForwardRequest &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.forward.out ())
-  );
-}
diff --git a/TAO/tao/PIForwardRequestC.h b/TAO/tao/PIForwardRequestC.h
deleted file mode 100644
index 58931164882..00000000000
--- a/TAO/tao/PIForwardRequestC.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PI_FORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_PI_FORWARDREQUESTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
-#define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-  
-  class TAO_Export ForwardRequest : public CORBA::UserException
-  {
-  public:
-    
-    CORBA::Object_var forward;
-    ForwardRequest (void);
-    ForwardRequest (const ForwardRequest &);
-    ~ForwardRequest (void);
-
-    ForwardRequest &operator= (const ForwardRequest &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static ForwardRequest *_downcast (CORBA::Exception *);
-    static const ForwardRequest *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-    
-    ForwardRequest (
-        const CORBA::Object_ptr  _tao_forward
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PIForwardRequestS.h b/TAO/tao/PIForwardRequestS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PIForwardRequestS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
deleted file mode 100644
index e7428115760..00000000000
--- a/TAO/tao/PI_Forward.pidl
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file PI_Forward.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for typedefs in the
- * PortableInterceptor module.
- *
- * This file is used to generate PI_Forward.{h,cpp},
- * using the following command:
-	 *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        PI_Forward.pidl
- *
- * and then:
- *
- * cp orig/PI_ForwardC.{h,cpp} .
- *
- * The code left in PI_ForwardC.{h,cpp}
- *
- */
-
-// File: PI_Forward.pidl
-
-#ifndef _PI_FORWARD_IDL_
-#define _PI_FORWARD_IDL_
-
-#include <OctetSeq.pidl>
-#include <StringSeq.pidl>
-
-module PortableInterceptor
-{
-  typeprefix PortableInterceptor "omg.org";
-
-  typedef string ServerId;
-  typedef string ORBId;
-  typedef CORBA::StringSeq AdapterName;
-  typedef CORBA::OctetSeq ObjectId;
-  typedef long AdapterManagerId;
-  typedef short AdapterState;
-  typedef unsigned long SlotId;
-  typedef short ReplyStatus;
-
-};
-
-#endif  /* _PI_FORWARD_IDL_ */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
deleted file mode 100644
index 73540f670ed..00000000000
--- a/TAO/tao/PI_ForwardC.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "PI_ForwardC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ServerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ServerId:1.0",
-    "ServerId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerId =
-    &_tao_tc_PortableInterceptor_ServerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ORBId:1.0",
-    "ORBId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBId =
-    &_tao_tc_PortableInterceptor_ORBId;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterName (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterName:1.0",
-    "AdapterName",
-    &CORBA::_tc_StringSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterName =
-    &_tao_tc_PortableInterceptor_AdapterName;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_OctetSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectId =
-    &_tao_tc_PortableInterceptor_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterManagerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0",
-    "AdapterManagerId",
-    &CORBA::_tc_long);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterManagerId =
-    &_tao_tc_PortableInterceptor_AdapterManagerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterState (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterState:1.0",
-    "AdapterState",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterState =
-    &_tao_tc_PortableInterceptor_AdapterState;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_SlotId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
-    "SlotId",
-    &CORBA::_tc_ulong);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_SlotId =
-    &_tao_tc_PortableInterceptor_SlotId;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ReplyStatus (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
-    "ReplyStatus",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
-    &_tao_tc_PortableInterceptor_ReplyStatus;
-}
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
deleted file mode 100644
index dc7bd5e48f6..00000000000
--- a/TAO/tao/PI_ForwardC.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
-#define _TAO_IDL_ORIG_PI_FORWARDC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#include "tao/OctetSeqC.h"
-#include "tao/StringSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ServerId;
-  typedef CORBA::String_var ServerId_var;
-  typedef CORBA::String_out ServerId_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerId;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ORBId;
-  typedef CORBA::String_var ORBId_var;
-  typedef CORBA::String_out ORBId_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBId;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq AdapterName;
-  typedef CORBA::StringSeq_var AdapterName_var;
-  typedef CORBA::StringSeq_out AdapterName_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterName;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::OctetSeq ObjectId;
-  typedef CORBA::OctetSeq_var ObjectId_var;
-  typedef CORBA::OctetSeq_out ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Long AdapterManagerId;
-  typedef CORBA::Long_out AdapterManagerId_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterManagerId;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short AdapterState;
-  typedef CORBA::Short_out AdapterState_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterState;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong SlotId;
-  typedef CORBA::ULong_out SlotId_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ReplyStatus;
-  typedef CORBA::Short_out ReplyStatus_out;
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PP_Memory_Management.txt b/TAO/tao/PP_Memory_Management.txt
deleted file mode 100644
index f9516139582..00000000000
--- a/TAO/tao/PP_Memory_Management.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
-
-@page PP_Memory_Management Memory Management Rules for TAO's Pluggable Protocol Framework
-
-@section background Background
-
-    This document proposes a clearer set of memory management rules
-    for the pluggable protocols framework.
-    To understand this proposal some basic background on how does the
-    pluggable protocol framework works, and how each abstraction
-    relates to the other components in the ORB.
-
-    The pluggable protocol framework uses the Acceptor and Connector
-    patterns, unlike ACE, however, it must treat all of them
-    homogenously.
-    The basic abstraction in TAO's pluggable protocol framework is the
-    <CODE>TAO_Transport</CODE>,
-    an instance of this class represents a single connection, for
-    example, the IIOP plugin uses one instance of TAO_Transport for
-    each socket.
-    To integrate this abstraction with the ACE_Reactor framework,
-    all the protocols implemented so far use
-    specializations of the ACE_Svc_Handler class.
-    However, the original design considered the possibility of using
-    protocols without any ACE abstractions, though in practice this
-    hasn't happenned so far,
-    all changes to the framework should keep this possibility open.
-
-    This is the main source of memory management problems in the
-    pluggable protocol framework:
-    a single entity (a connection) is represented by two instances of
-    two separate classes.  On one side the ORB uses an instance of the
-    TAO_Transport abstraction, on the other the Reactor uses an
-    instance of an ACE_Svc_Handler.
-
-    To complicate matters even further the ORB caches both passively
-    accepted and actively established connections.
-    The actively established connections are cached by the client-side
-    to minimize or amortize the cost of connection establishment.
-    The passively accepted connections are kept in the same cache
-    mainly to support bi-directional GIOP, however, they also allow us
-    to close both accepted and established idle connections using a
-    single component, this is useful when the ORB shutdowns, but it is
-    crucial in the implementation of connection recycling strategies,
-    where the total number of connections kept by the ORB must be
-    known.
-
-    The design must also support multithreaded clients and servers, in
-    both cases multiple threads may be using a connection
-    simultaneously, for example, multiple client threads can be
-    waiting for replys over the same connection, or multiple server
-    threads can be servicing requests received on the same connection,
-    or, if bi-dir GIOP is enabled, maybe a mix of both.
-
-    Some aspects of the GIOP protocol require special treatment of
-    connections with pending requests, both on the server and client
-    side.
-    On the server side connections that have pending requests cannot
-    be closed (section 15.5.1.1 in the CORBA/IIOP 2.4 specification),
-    therefore, the ORB needs to know how many requests are pending, at
-    all times.
-    Despite this, it is possible that the underlying connection is
-    broken, for example, because the client crashed.  In such cases,
-    the ORB should be able to reclaim the OS resources, but the
-    TAO_Transport must remain valid until the upcall threads finish.
-    Similarly, the client side should be able to distinguish between
-    orderly and abortive disconnects, essentially the ORB needs to
-    know if a <CODE>CloseConnection</CODE> message has been received.
-
-    Finally we must never forget that the ORB can be used in
-    thread-per-connection mode.  In this concurrency model there is no
-    reactor used to detect when the connection can accept more input,
-    though normally this is a global setting, it is possible for a
-    pluggable protocol to *always* work in thread-per-connection and
-    no other architecture.
-    Similarly, the ORB can be configured to wait for replys using
-    read() operations, instead of the more generic wait-on-reactor or
-    wait-on-leader-follower strategies.
-    Therefore, we cannot always rely on the Reactor framework to
-    perform all the memory management for us.
-
-@section requirements Requirements
-
-    To summarize, the TAO_Transport class should:
-
-    - Not be deleted until all threads using it is released by all the
-      threads using it.
-    - As many OS and ORB resources must be released when the ORB
-      detects that the connection has been terminated.  For example,
-      the socket should be closed and the ACE_Svc_Handler, if any,
-      should be destroyed.
-    - Not be deleted until it is removed from the connection cache.
-    - Support a mechanism to proactively close the connection.
-    - Keep track of the number of pending requests in a connection.
-
-@section rules Memory Management Rules
-
-    Instances of TAO_Transport are reference counted,
-    this is a simple way to share it among the threads using it to
-    send or receive invocations, the cache, and the potential
-    connection handler using it.
-    However, the service handler should follow the standard rules for
-    the Reactor, i.e. the Reactor owns it, and is destroyed as soon as
-    the connection is closed.
-
-    The underlying connection can be closed by the remote peer,
-    in this case, either the Reactor or the thread blocked on
-    <CODE>read()</CODE> will detect the problem.
-    Following the normal conventions, the ACE_Svc_Handler would be
-    closed as soon as this is detected.
-    The corresponding TAO_Transport must be informed, otherwise it
-    could attempt to use a connection already closed.
-
-    Finally if the connection is proactively closed, the TAO_Transport
-    informs the ACE_Svc_Handler, at this point the ACE_Svc_Handler
-    commits suicide by removing itself from the reactor.
-    Notice that it must still callback the TAO_Transport in this
-    case.
-
-@section data Processing Incoming and Outgoing Data
-
-    The final aspect to consider is the processing of incoming and
-    outgoing data.  We are still working on this problem, but the
-    current approach is more complex than it has to be.
-    The usual path is as follows: the Reactor signals (via
-    handle_input) that there is some data available in the socket.
-    The message is forwarded from the ACE_Svc_Handler to the
-    TAO_Transport, then to several helper classes in the pluggable
-    protocol framework.  Eventually a method is invoked on the
-    TAO_Tranport to read the actual data, this forwards on the
-    ACE_Svc_Handler (again), and eventually returns.
-
-    A much simpler approach would be to read the data on the
-    handle_input() method itself, and forward the data up the stream.
-
-*/
diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl
deleted file mode 100644
index 5cd0b8a36c4..00000000000
--- a/TAO/tao/ParameterMode.pidl
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   ParameterMode.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in ParameterModeC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ParameterMode.pidl
- */
-// ================================================================
-
-#ifndef TAO_PARAMETERMODE_IDL
-#define TAO_PARAMETERMODE_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-};
-
-#endif /* TAO_PARAMETERMODE_IDL */
diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp
deleted file mode 100644
index 6581f8715e1..00000000000
--- a/TAO/tao/ParameterModeA.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ParameterModeC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_ParameterMode[] =
-  {
-    "PARAM_IN",
-    "PARAM_OUT",
-    "PARAM_INOUT"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterMode (
-    "IDL:omg.org/CORBA/ParameterMode:1.0",
-    "ParameterMode",
-    _tao_enumerators_CORBA_ParameterMode,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterMode =
-    &_tao_tc_CORBA_ParameterMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::insert (
-      _tao_any,
-      CORBA::_tc_ParameterMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::extract (
-        _tao_any,
-        CORBA::_tc_ParameterMode,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
deleted file mode 100644
index 2c438c1a24d..00000000000
--- a/TAO/tao/ParameterModeC.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ParameterModeC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::ParameterMode _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::ParameterMode> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
deleted file mode 100644
index 8f03c9dcb15..00000000000
--- a/TAO/tao/ParameterModeC.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PARAMETERMODEC_H_
-#define _TAO_IDL_ORIG_PARAMETERMODEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-  
-  typedef ParameterMode &ParameterMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterMode;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::ParameterMode);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ParameterModeS.h b/TAO/tao/ParameterModeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ParameterModeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
deleted file mode 100644
index 879df0fd0f1..00000000000
--- a/TAO/tao/Parser_Registry.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "tao/Parser_Registry.h"
-#include "tao/IOR_Parser.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Dynamic_Service.h"
-
-#if !defined(__ACE_INLINE__)
-#include "tao/Parser_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Parser_Registry, 
-           "$Id$")
-
-TAO_Parser_Registry::TAO_Parser_Registry (void)
-  : parsers_ (0),
-    size_ (0)
-{
-}
-
-TAO_Parser_Registry::~TAO_Parser_Registry (void)
-{
-  delete [] this->parsers_;
-}
-
-int
-TAO_Parser_Registry::open (TAO_ORB_Core *orb_core)
-{
-  char **names;
-  int number_of_names = 0;
-
-  orb_core->resource_factory ()->get_parser_names (names,
-                                                   number_of_names);
-
-  if (number_of_names == 0)
-    {
-      return -1;
-    }
-
-  this->size_ = number_of_names;
-  ACE_NEW_RETURN (this->parsers_,
-                  TAO_IOR_Parser*[this->size_],
-                  -1);
-
-  for (size_t i = 0; i != this->size_; ++i)
-    {
-      this->parsers_[i] =
-        ACE_Dynamic_Service<TAO_IOR_Parser>::instance (names [i]);
-
-      if (this->parsers_[i] == 0)
-        {
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-TAO_IOR_Parser *
-TAO_Parser_Registry::match_parser (const char *ior_string)
-{
-  for (Parser_Iterator i = this->begin (); i != this->end (); ++i)
-    {
-      if ((*i)->match_prefix (ior_string))
-        {
-          return *i;
-        }
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h
deleted file mode 100644
index 13571c9bd2b..00000000000
--- a/TAO/tao/Parser_Registry.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Parser_Registry.h
- *
- *  $Id$
- *
- *  @author  Priyanka Gontla <pgontla@uci.edu>
- *  @author  Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_PARSER_REGISTRY_H
-#define TAO_PARSER_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#include "ace/os_include/os_stddef.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declarations.
-class TAO_ORB_Core;
-class TAO_IOR_Parser;
-
-/**
- * @class TAO_Parser_Registry
- *
- * @brief Maintain the collection of known IOR format parsers
- *
- * The ORB dynamically loads a collection of IOR parsers (check
- * the IOR_Parser class).  The collection is kept in this class
- * for easy lookup and use.
- */
-class TAO_Export TAO_Parser_Registry
-{
-public:
-  // = Initialization and termination methods.
-  /// Default constructor.
-  TAO_Parser_Registry (void);
-
-  /// Dstructor.
-  ~TAO_Parser_Registry (void);
-
-  /// Initialize the parser registry with the list of known protocols.
-  /// Invoked by the ORB during startup.
-  int open (TAO_ORB_Core *orb_core);
-
-  /// Find the parser that can parse @a ior_string
-  /// The lookup is based on the prefix in the string
-  TAO_IOR_Parser *match_parser (const char *ior_string);
-
-  // = Iterator.
-  typedef TAO_IOR_Parser** Parser_Iterator;
-  Parser_Iterator begin (void) const;
-  Parser_Iterator end (void) const;
-
-private:
-
-  // The parser registry should not be copied.
-  TAO_Parser_Registry (const TAO_Parser_Registry&);
-  void operator= (const TAO_Parser_Registry&);
-
-private:
-
-  /// List of parsers
-  TAO_IOR_Parser **parsers_;
-
-  /// Number of parsers
-  size_t size_;
-
-};
-
-#if defined(__ACE_INLINE__)
-#include "tao/Parser_Registry.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PARSER_REGISTRY_H */
diff --git a/TAO/tao/Parser_Registry.i b/TAO/tao/Parser_Registry.i
deleted file mode 100644
index 29aabd26ddc..00000000000
--- a/TAO/tao/Parser_Registry.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_Parser_Registry::Parser_Iterator
-TAO_Parser_Registry::begin (void) const
-{
-  return this->parsers_;
-}
-
-ACE_INLINE TAO_Parser_Registry::Parser_Iterator
-TAO_Parser_Registry::end (void) const
-{
-  return this->parsers_ + this->size_;
-}
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
deleted file mode 100644
index c63880b3fa4..00000000000
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "Pluggable_Messaging.h"
-
-ACE_RCSID (tao,
-           Pluggable_Messaging,
-           "$Id$")
-
-TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void)
-{
-
-}
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
deleted file mode 100644
index 86989c0865b..00000000000
--- a/TAO/tao/Pluggable_Messaging.h
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Pluggable_Messaging.h
- *
- *  $Id$
- *
- *   Interface for the TAO pluggable messaging framework.
- *
- *
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PLUGGABLE_MESSAGING_H
-#define TAO_PLUGGABLE_MESSAGING_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class Exception;
-}
-
-class TAO_Target_Specification;
-class TAO_Pluggable_Reply_Params;
-class TAO_Pluggable_Reply_Params_Base;
-class TAO_Transport;
-class TAO_Operation_Details;
-class TAO_Target_Specification;
-class TAO_OutputCDR;
-class TAO_Queued_Data;
-
-class ACE_Time_Value;
-
-// @@ The more I think I about this class, I feel that this class need
-// not be a ABC as it is now. Instead we have these options
-// (1) Parametrize this class with the "Messaging Object". Then the
-//     implementations  can just redirect the request to the class
-//     that it has been specialised with
-// (2) Use a bridge pattern here ie. the interface exposed by this
-//     class will redirect the request to the implementation which
-//     would be "right messaging" object.
-// Both of them feasible. If we are not going like templates much, (2)
-// is seems to be a better option.
-// I am going to take a closer look on this after my MS defense -
-// Bala
-
-/**
- * @class TAO_Pluggable_Messaging
- *
- * @brief Generic definitions  Messaging class.
- *
- * This interface tries to define generic methods that could be
- * different messaging protocols
- */
-class TAO_Export TAO_Pluggable_Messaging
-{
-public:
-  /// Dtor
-  virtual ~TAO_Pluggable_Messaging (void);
-
-  /// Write the RequestHeader in to the @a cdr stream. The underlying
-  /// implementation of the mesaging should do the right thing.
-  virtual int generate_request_header (
-      TAO_Operation_Details &op,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &cdr) = 0;
-
-  /// Write the RequestHeader in to the @a cdr stream.
-  virtual int generate_locate_request_header (
-      TAO_Operation_Details &op,
-      TAO_Target_Specification &spec,
-      TAO_OutputCDR &cdr) = 0;
-
-  /**
-   * Write the reply header
-   * The reply header is a part of any messaging protocol. The
-   * messaging protocol implementation would implement the way the
-   * reply header is written.
-   */
-  virtual int generate_reply_header (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params) = 0;
-
-  /**
-   * Write the locate reply header
-   * The locate reply header is a part of any messaging protocol. The
-   * messaging protocol implementation would implement the way the
-   * locate reply header is written.
-   */
-  virtual int generate_locate_reply_header (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params) = 0;
-
-  /**
-   * This method reads the message on the connection. Returns 0 when
-   * there is short read on the connection. Returns 1 when the full
-   * message is read and handled. Returns -1 on errors. If @a block is
-   * 1, then reply is read in a blocking manner.
-   */
-  virtual int read_message (TAO_Transport *transport,
-                            int block = 0,
-                            ACE_Time_Value *max_wait_time = 0) = 0;
-
-  /// Format the message in the @a cdr. May not be needed in
-  /// general.
-  virtual int format_message (TAO_OutputCDR &cdr) = 0;
-
-  /// Do any initialisations that may be needed.
-  virtual void init (CORBA::Octet major,
-                     CORBA::Octet minor) = 0;
-
-  /// Parse the incoming messages..
-  virtual int parse_incoming_messages (ACE_Message_Block &message_block) = 0;
-
-  /// Calculate the amount of data that is missing in the @a incoming
-  /// message block.
-  virtual ssize_t missing_data (ACE_Message_Block &incoming) = 0;
-
-  /// Get the details of the message parsed through the @a qd.
-  virtual void get_message_data (TAO_Queued_Data *qd) = 0;
-
-  /* Extract the details of the next message from the @a incoming
-   * through @a qd. Returns 1 if there are more messages and returns a
-   * 0 if there are no more messages in @a incoming.
-  */
-  virtual int extract_next_message (ACE_Message_Block &incoming,
-                                    TAO_Queued_Data *&qd) = 0;
-
-  /// Check whether the node @a qd needs consolidation from @a incoming
-  virtual int consolidate_node (TAO_Queued_Data *qd,
-                                ACE_Message_Block &incoming) = 0;
-
-  /// Parse the request message, make an upcall and send the reply back
-  /// to the "request initiator"
-  virtual int process_request_message (TAO_Transport *transport,
-                                       TAO_Queued_Data *qd) = 0;
-
-
-  /// Parse the reply message that we received and return the reply
-  /// information through @a reply_info
-  virtual int process_reply_message (
-      TAO_Pluggable_Reply_Params &reply_info,
-      TAO_Queued_Data *qd) = 0;
-
-
-  /// Generate a reply message with the exception @a ex.
-  virtual int generate_exception_reply (
-      TAO_OutputCDR &cdr,
-      TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &ex) = 0;
-
-  /// Is the messaging object ready for processing BiDirectional
-  /// request/response?
-  virtual int is_ready_for_bidirectional (TAO_OutputCDR &msg) = 0;
-
-  /// Reset the messaging the object
-  virtual void reset (void) = 0;
-
-  /// Header length
-  virtual size_t header_length (void) const = 0;
-
-  /// Fragment header length
-  virtual size_t fragment_header_length (CORBA::Octet major,
-                                         CORBA::Octet minor) const = 0;
-
-  /// Accessor for the output CDR stream
-  virtual TAO_OutputCDR &out_stream (void) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_PLUGGABLE_MESSAGING_H*/
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
deleted file mode 100644
index d7f79cecec5..00000000000
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//$Id$
-
-#include "Pluggable_Messaging_Utils.h"
-#include "ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Pluggable_Messaging_Utils.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Pluggable_Messaging_Utils,
-           "$Id$")
-
-
-TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (
-    TAO_Transport *t
-  )
-  : input_cdr_ (0)
-  ,  transport_ (t)
-{
-}
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
deleted file mode 100644
index 9a7b421ecbf..00000000000
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Pluggable_Messaging_Utils.h
- *
- *  $Id$
- *
- *   Utility classes for the TAO pluggable messaging framework.
- *
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_PLUGGABLE_MESSAGING_UTILS_H
-#define TAO_PLUGGABLE_MESSAGING_UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOP_IORC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class TAO_Transport;
-
-/**
- * @class TAO_Pluggable_Reply_Params_Base
- *
- * @brief TAO_Pluggable_Acceptor_Params
- *
- * This represents a set of data that would be assembled by the
- * acceptor to pass to the connector. This base class is used by
- * TAO_ServerRequest. The child class TAO_Pluggable_Reply_Params
- * is used on the client side, and contains an additional
- * TAO_InputCDR member, not needed on the server side.
- */
-class TAO_Export TAO_Pluggable_Reply_Params_Base
-{
-public:
-  /// Constructor.
-  TAO_Pluggable_Reply_Params_Base (void);
-
-  /// The IOP service context list.
-  IOP::ServiceContextList svc_ctx_;
-
-  /// The request id for which the reply we (connector) has received.
-  CORBA::ULong request_id_;
-
-  // @@ Bala: this is (again) an GIOPism (to coin a word).  Other
-  // protocol may choose to send different *messages* instead.
-  // @@ Carlos: I agree. Please see above.
-  /// The reply status.
-  CORBA::ULong reply_status_;
-
-  /**
-   * Since this class no longer contains an NVList, this is the
-   * way to determine if the request was DSI, so we can use Carlos'
-   * service context list no-deep-copy optimization.
-   */
-  CORBA::Boolean is_dsi_;
-
-  /// Info required for DSI optimization that pads the outgoing
-  /// CDR stream according to the alignment of the NVList.
-  ptrdiff_t dsi_nvlist_align_;
-
-  /**
-   * Get and Set methods for the service context list that we dont
-   * own. This is useful for cases  where the application objects own
-   * a service context list and would like to pass on their contents
-   * without a copy.
-   */
-  IOP::ServiceContextList &service_context_notowned (void);
-  void service_context_notowned (IOP::ServiceContextList *svc);
-
-  /// A flag that indicates if there is any data is going to get
-  /// marshalled in the reply
-  CORBA::Boolean argument_flag_;
-
-protected:
-  /// The service context list that we don't own.
-  IOP::ServiceContextList *service_context_;
-};
-
-/**
- * @class TAO_Pluggable_Reply_Params
- *
- * @brief TAO_Pluggable_Connector_Params
- *
- */
-class TAO_Export TAO_Pluggable_Reply_Params
-  : public TAO_Pluggable_Reply_Params_Base
-{
-public:
-  /// Constructor.
-  TAO_Pluggable_Reply_Params (TAO_Transport *t);
-
-  /// The stream with the non-demarshaled reply. This stream will be
-  /// passed up to the stubs to demarshal the parameter values.
-  TAO_InputCDR *input_cdr_;
-
-  TAO_Transport *transport_;
-};
-
-// @@ Bala: this is a GIOPism too, there is no such thing as locate
-// request in HTTP (the basis for SOAP and XIOP), i don't know about
-// HTTP-NG, but i wouldn't be surprised if it had.  Furthermore, some
-// very influential people (Michi) is arguing against it in the OMG.
-//
-// @@Carlos: Yes, I also saw some of Michi's ideas. Even if OMG
-// decides to remove this, can I point that we may have to support that
-// for the existsing GIOP1.0,1.1 & GIOP 1.2.  Above all, the enum type
-// contains things that I know of today. I can go ahead and add HTTP-NG
-// stuff. They all seem to be in Working Draft stage. So, I am just
-// keeping off. I dont want to add something for the kick of it :-)
-enum TAO_Pluggable_Header_Type
-{
-  TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER = 0,
-  TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER
-};
-
-
-/**
- * Provide an external interface for the users of this pluggable
- * messaging framework to denote  existing message types. This has
- * an inspiration from GIOP. So if anybody wants to add more message
- * types you are welcome but please do not change the numbering
- * scheme as this would affect GIOP.
- *
- * @note
- * We may not need everything here. It would be good if we
- * have only the following messages TAO_PLUGGABLE_MESSAGE_REQUEST,
- * TAO_PLUGGABLE_MESSAGE_REPLY,
- * TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION,
- * TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR.  Changes will be made once
- * the rest of the stuff gets ready to roll
- */
-enum TAO_Pluggable_Message_Type
-{
-  TAO_PLUGGABLE_MESSAGE_REQUEST = 0,                // sent by client.
-  TAO_PLUGGABLE_MESSAGE_REPLY = 1,                  // by server.
-  TAO_PLUGGABLE_MESSAGE_CANCELREQUEST = 2,          // by client.
-  TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST = 3,          // by client.
-  TAO_PLUGGABLE_MESSAGE_LOCATEREPLY = 4,
-  TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION = 5,
-  TAO_PLUGGABLE_MESSAGE_MESSAGERROR = 6,
-  TAO_PLUGGABLE_MESSAGE_FRAGMENT = 7
-};
-
-// @@ Bala: This is a hopeless GIOPism.
-// @@ Carlos: Agreed.
-
-/**
- * Provide an external interface for the users of this pluggable
- * messaging framework to denote  existing Exception types. This has
- * an inspiration from GIOP. So if anybody wants to add more message
- * types you are welcome but please do not change the numbering
- * scheme as this would affect GIOP.
- */
-enum TAO_Pluggable_Message_Exception_Type
-{
-  /// Request completed successfully
-  TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION = 0,
-
-  /// Request terminated with user exception
-  TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION,
-
-  /// Request terminated with system exception
-  TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION,
-
-  /// Reply is a location forward type
-  TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD,
-
-  /// PLUGGABLE_MESSAGE 1.2, Reply is a location forward perm type..
-  TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM,
-
-  /// GIOP1.2,
-  TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Pluggable_Messaging_Utils.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_PLUGGABLE_MESSAGING_UTILS_H*/
diff --git a/TAO/tao/Pluggable_Messaging_Utils.i b/TAO/tao/Pluggable_Messaging_Utils.i
deleted file mode 100644
index 0aa88955e5d..00000000000
--- a/TAO/tao/Pluggable_Messaging_Utils.i
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-
-//$Id$
-
-ACE_INLINE
-TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
-  : svc_ctx_ (),
-    request_id_ (0),
-    reply_status_ (0),
-    is_dsi_ (0),
-    dsi_nvlist_align_ (0),
-    argument_flag_ (0),
-    service_context_ (0)
-{
-}
-
-ACE_INLINE void
-TAO_Pluggable_Reply_Params_Base::service_context_notowned (
-    IOP::ServiceContextList *svc
-  )
-{
-  this->service_context_ = svc;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_Pluggable_Reply_Params_Base::service_context_notowned (void)
-{
-  return *this->service_context_;
-}
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
deleted file mode 100644
index 479d31708c3..00000000000
--- a/TAO/tao/Policy.pidl
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * @file Policy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::Policy related
- * classes.
- *
- * This file is used to generate the code in PolicyC.{h,inl,cpp}.
- * Also, skeleton code for the only non local Policy interface is
- * generated from this pidl file and then the declaration code is
- * moved to tao/PortableServer/PolicyS.{h,inl,cpp}
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GA -Ssi
- *          -Wb,stub_export_macro=TAO_Export
- *          -Wb,stub_export_include="tao/TAO_Export.h"
- *          -Wb,skel_export_macro=TAO_PortableServer_Export
- *          -Wb,skel_export_include=portableserver_export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Policy.pidl
- *
- *   2. Then patch the generated code using patches in
- *      diff/Policy.diff. To patch  the generated code in
- *      PortableServer look for diffs in PortableServer/diffs
- *      directory.
- *
- *   Note: The diffs were generated with these commands:
- *
- *   for i in PolicyC.{h,i,cpp}; do
- *     diff -wBbu orig/$i $i;
- *   done > diffs/Policy.diff
- *   for i in Policy{S,S_T}.{h,i,cpp}; do
- *     diff -wBbu orig/$i PortableServer/$i;
- *   done >> diffs/Policy.diff
- */
-
-#ifndef TAO_CORBA_POLICY_PIDL
-#define TAO_CORBA_POLICY_PIDL
-
-#include <UShortSeq.pidl>
-#include <Current.pidl>
-#include <Policy_Forward.pidl>
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short PolicyErrorCode;
-  const PolicyErrorCode BAD_POLICY               = 0;
-  const PolicyErrorCode UNSUPPORTED_POLICY       = 1;
-  const PolicyErrorCode BAD_POLICY_TYPE          = 2;
-  const PolicyErrorCode BAD_POLICY_VALUE         = 3;
-  const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-  exception PolicyError
-  {
-    PolicyErrorCode reason;
-  };
-
-  exception InvalidPolicies
-  {
-    UShortSeq indices;
-  };
-
-  interface Policy
-  {
-    readonly attribute PolicyType policy_type;
-    Policy copy ();
-    void destroy ();
-  };
-
-  local interface PolicyManager
-  {
-    PolicyList get_policy_overrides (in PolicyTypeSeq ts);
-    void set_policy_overrides (
-             in PolicyList policies,
-             in SetOverrideType set_add)
-        raises (InvalidPolicies);
-  };
-
-  local interface PolicyCurrent : PolicyManager, Current
-  {
-  };
-
-};
-
-#pragma prefix ""
-
-#endif /* TAO_CORBA_POLICY_PIDL */
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
deleted file mode 100644
index d09e7c674d7..00000000000
--- a/TAO/tao/PolicyA.cpp
+++ /dev/null
@@ -1,552 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-    "PolicyErrorCode",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode =
-    &_tao_tc_CORBA_PolicyErrorCode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] =
-  {
-    { "reason", &CORBA::_tc_PolicyErrorCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/PolicyError:1.0",
-    "PolicyError",
-    _tao_fields_CORBA_PolicyError,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyError =
-    &_tao_tc_CORBA_PolicyError;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] =
-  {
-    { "indices", &CORBA::_tc_UShortSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-    "InvalidPolicies",
-    _tao_fields_CORBA_InvalidPolicies,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidPolicies =
-    &_tao_tc_CORBA_InvalidPolicies;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Policy:1.0",
-    "Policy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tao_tc_CORBA_Policy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyManager:1.0",
-    "PolicyManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyManager =
-    &_tao_tc_CORBA_PolicyManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyCurrent (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyCurrent:1.0",
-    "PolicyCurrent");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyCurrent =
-    &_tao_tc_CORBA_PolicyCurrent;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyError &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert_copy (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyError *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyError *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyError *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyError *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyError>::extract (
-        _tao_any,
-        CORBA::PolicyError::_tao_any_destructor,
-        CORBA::_tc_PolicyError,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert_copy (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InvalidPolicies *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::extract (
-        _tao_any,
-        CORBA::InvalidPolicies::_tao_any_destructor,
-        CORBA::_tc_InvalidPolicies,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Policy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr _tao_elem
-  )
-{
-  CORBA::Policy_ptr _tao_objptr =
-    CORBA::Policy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Policy>::insert (
-      _tao_any,
-      CORBA::Policy::_tao_any_destructor,
-      CORBA::_tc_Policy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Policy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Policy>::extract (
-        _tao_any,
-        CORBA::Policy::_tao_any_destructor,
-        CORBA::_tc_Policy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr _tao_elem
-  )
-{
-  CORBA::PolicyManager_ptr _tao_objptr =
-    CORBA::PolicyManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyManager>::insert (
-      _tao_any,
-      CORBA::PolicyManager::_tao_any_destructor,
-      CORBA::_tc_PolicyManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyManager>::extract (
-        _tao_any,
-        CORBA::PolicyManager::_tao_any_destructor,
-        CORBA::_tc_PolicyManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr _tao_elem
-  )
-{
-  CORBA::PolicyCurrent_ptr _tao_objptr =
-    CORBA::PolicyCurrent::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyCurrent>::insert (
-      _tao_any,
-      CORBA::PolicyCurrent::_tao_any_destructor,
-      CORBA::_tc_PolicyCurrent,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyCurrent>::extract (
-        _tao_any,
-        CORBA::PolicyCurrent::_tao_any_destructor,
-        CORBA::_tc_PolicyCurrent,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
deleted file mode 100644
index 6d04b497b02..00000000000
--- a/TAO/tao/PolicyC.cpp
+++ /dev/null
@@ -1,1018 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PolicyC.h"
-#include "tao/CDR.h"
-#include "tao/Exception_Data.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "PolicyC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
-#define _CORBA_POLICY__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Policy>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::PolicyError::PolicyError (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PolicyError:1.0",
-        "PolicyError"
-      )
-{
-}
-
-CORBA::PolicyError::~PolicyError (void)
-{
-}
-
-CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->reason = _tao_excp.reason;
-}
-
-CORBA::PolicyError&
-CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->reason = _tao_excp.reason;
-  return *this;
-}
-
-void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyError *_tao_tmp_pointer =
-    static_cast<PolicyError *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::PolicyError *
-CORBA::PolicyError::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<PolicyError *> (_tao_excp);
-}
-
-const CORBA::PolicyError *
-CORBA::PolicyError::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const PolicyError *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::PolicyError::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::PolicyError::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::PolicyError (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::PolicyError::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::PolicyError::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::PolicyError::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-CORBA::PolicyError::PolicyError (
-    CORBA::PolicyErrorCode _tao_reason
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PolicyError:1.0",
-        "PolicyError"
-      )
-{
-  this->reason = _tao_reason;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::PolicyError::_tao_type (void) const
-{
-  return ::CORBA::_tc_PolicyError;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::InvalidPolicies::InvalidPolicies (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-        "InvalidPolicies"
-      )
-{
-}
-
-CORBA::InvalidPolicies::~InvalidPolicies (void)
-{
-}
-
-CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->indices = _tao_excp.indices;
-}
-
-CORBA::InvalidPolicies&
-CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->indices = _tao_excp.indices;
-  return *this;
-}
-
-void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidPolicies *_tao_tmp_pointer =
-    static_cast<InvalidPolicies *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::InvalidPolicies *
-CORBA::InvalidPolicies::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidPolicies *> (_tao_excp);
-}
-
-const CORBA::InvalidPolicies *
-CORBA::InvalidPolicies::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidPolicies *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::InvalidPolicies::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::InvalidPolicies, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::InvalidPolicies::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::InvalidPolicies (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::InvalidPolicies::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::InvalidPolicies::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::InvalidPolicies::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-CORBA::InvalidPolicies::InvalidPolicies (
-    const CORBA::UShortSeq & _tao_indices
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-        "InvalidPolicies"
-      )
-{
-  this->indices = _tao_indices;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::InvalidPolicies::_tao_type (void) const
-{
-  return ::CORBA::_tc_InvalidPolicies;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Policy.
-
-CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::duplicate (
-    CORBA::Policy_ptr p
-  )
-{
-  return CORBA::Policy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Policy>::release (
-    CORBA::Policy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::nil (void)
-{
-  return CORBA::Policy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Policy>::marshal (
-    CORBA::Policy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::PolicyType CORBA::Policy::policy_type (
-    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_Policy_Proxy_Broker_ == 0)
-    {
-      CORBA_Policy_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_policy_type",
-      16,
-      this->the_TAO_Policy_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
-
-::CORBA::Policy_ptr CORBA::Policy::copy (
-    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_Policy_Proxy_Broker_ == 0)
-    {
-      CORBA_Policy_setup_collocation ();
-    }
-  
-  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "copy",
-      4,
-      this->the_TAO_Policy_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 CORBA::Policy::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_Policy_Proxy_Broker_ == 0)
-    {
-      CORBA_Policy_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_Policy_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Policy::Policy (void)
- : the_TAO_Policy_Proxy_Broker_ (0)
-{
-  this->CORBA_Policy_setup_collocation ();
-}
-
-void
-CORBA::Policy::CORBA_Policy_setup_collocation ()
-{
-  if (::CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_Policy_Proxy_Broker_ =
-        ::CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-CORBA::Policy::~Policy (void)
-{}
-
-void 
-CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Policy *_tao_tmp_pointer =
-    static_cast<Policy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Policy>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Policy:1.0",
-        CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<Policy>::unchecked_narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Policy:1.0",
-        CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_duplicate (Policy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Policy::_tao_release (Policy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Policy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* CORBA::Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-CORBA::Boolean
-CORBA::Policy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::PolicyManager.
-
-CORBA::PolicyManager_ptr
-TAO::Objref_Traits<CORBA::PolicyManager>::duplicate (
-    CORBA::PolicyManager_ptr p
-  )
-{
-  return CORBA::PolicyManager::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::PolicyManager>::release (
-    CORBA::PolicyManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::PolicyManager_ptr
-TAO::Objref_Traits<CORBA::PolicyManager>::nil (void)
-{
-  return CORBA::PolicyManager::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::PolicyManager>::marshal (
-    CORBA::PolicyManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::PolicyManager::PolicyManager (void)
-{}
-
-CORBA::PolicyManager::~PolicyManager (void)
-{}
-
-void 
-CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyManager *_tao_tmp_pointer =
-    static_cast<PolicyManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::PolicyManager_ptr
-CORBA::PolicyManager::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyManager::_nil ();
-    }
-  
-  PolicyManager_ptr proxy =
-    dynamic_cast<PolicyManager_ptr> (_tao_objref);
-  
-  return PolicyManager::_duplicate (proxy);
-}
-
-CORBA::PolicyManager_ptr
-CORBA::PolicyManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyManager::_nil ();
-    }
-  
-  PolicyManager_ptr proxy =
-    dynamic_cast<PolicyManager_ptr> (_tao_objref);
-  
-  return PolicyManager::_duplicate (proxy);
-}
-
-CORBA::PolicyManager_ptr
-CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::PolicyManager::_tao_release (PolicyManager_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::PolicyManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/PolicyManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::PolicyManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyManager:1.0";
-}
-
-CORBA::Boolean
-CORBA::PolicyManager::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::PolicyCurrent.
-
-CORBA::PolicyCurrent_ptr
-TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate (
-    CORBA::PolicyCurrent_ptr p
-  )
-{
-  return CORBA::PolicyCurrent::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::PolicyCurrent>::release (
-    CORBA::PolicyCurrent_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::PolicyCurrent_ptr
-TAO::Objref_Traits<CORBA::PolicyCurrent>::nil (void)
-{
-  return CORBA::PolicyCurrent::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal (
-    CORBA::PolicyCurrent_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::PolicyCurrent::PolicyCurrent (void)
-{}
-
-CORBA::PolicyCurrent::~PolicyCurrent (void)
-{}
-
-void 
-CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyCurrent *_tao_tmp_pointer =
-    static_cast<PolicyCurrent *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyCurrent::_nil ();
-    }
-  
-  PolicyCurrent_ptr proxy =
-    dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-  
-  return PolicyCurrent::_duplicate (proxy);
-}
-
-CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyCurrent::_nil ();
-    }
-  
-  PolicyCurrent_ptr proxy =
-    dynamic_cast<PolicyCurrent_ptr> (_tao_objref);
-  
-  return PolicyCurrent::_duplicate (proxy);
-}
-
-CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::PolicyCurrent::_tao_release (PolicyCurrent_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::PolicyCurrent::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/PolicyManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/PolicyCurrent:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::PolicyCurrent::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
-}
-
-CORBA::Boolean
-CORBA::PolicyCurrent::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyError &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.reason)
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyError &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.reason)
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InvalidPolicies &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.indices)
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InvalidPolicies &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.indices)
-  );
-}
-
-// Hand crafted.
-//
-// ****************************************************************
-CORBA::Boolean
-CORBA::Policy::_tao_encode (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-CORBA::Boolean
-CORBA::Policy::_tao_decode (TAO_InputCDR &)
-{
-  return 0;
-}
-
-TAO_Cached_Policy_Type
-CORBA::Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_UNCACHED;
-}
-
-TAO_Policy_Scope
-CORBA::Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_DEFAULT_SCOPE;
-}
-// ****************************************************************
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Policy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Policy_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-  
-  typedef ::CORBA::Policy RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
deleted file mode 100644
index 9473de1a3ce..00000000000
--- a/TAO/tao/PolicyC.h
+++ /dev/null
@@ -1,748 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLICYC_H_
-#define _TAO_IDL_ORIG_POLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/UShortSeqC.h"
-#include "tao/CurrentC.h"
-#include "tao/Policy_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short PolicyErrorCode;
-  typedef CORBA::Short_out PolicyErrorCode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyErrorCode BAD_POLICY = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_POLICYERROR_CH_)
-#define _CORBA_POLICYERROR_CH_
-  
-  class TAO_Export PolicyError : public CORBA::UserException
-  {
-  public:
-    
-    CORBA::PolicyErrorCode reason;
-    PolicyError (void);
-    PolicyError (const PolicyError &);
-    ~PolicyError (void);
-
-    PolicyError &operator= (const PolicyError &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static PolicyError *_downcast (CORBA::Exception *);
-    static const PolicyError *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-    
-    PolicyError (
-        ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyError;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_INVALIDPOLICIES_CH_)
-#define _CORBA_INVALIDPOLICIES_CH_
-  
-  class TAO_Export InvalidPolicies : public CORBA::UserException
-  {
-  public:
-    
-    CORBA::UShortSeq indices;
-    InvalidPolicies (void);
-    InvalidPolicies (const InvalidPolicies &);
-    ~InvalidPolicies (void);
-
-    InvalidPolicies &operator= (const InvalidPolicies &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static InvalidPolicies *_downcast (CORBA::Exception *);
-    static const InvalidPolicies *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-    
-    InvalidPolicies (
-        const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidPolicies;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICY__VAR_OUT_CH_)
-#define _CORBA_POLICY__VAR_OUT_CH_
-  
-  class Policy;
-  typedef Policy *Policy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Policy
-      >
-    Policy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Policy
-      >
-    Policy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLICY_CH_)
-#define _CORBA_POLICY_CH_
-  
-  class TAO_Export Policy
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<Policy>;
-    typedef Policy_ptr _ptr_type;
-    typedef Policy_var _var_type;
-    
-    // The static operations.
-    static Policy_ptr _duplicate (Policy_ptr obj);
-    
-    static void _tao_release (Policy_ptr obj);
-    
-    static Policy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Policy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Policy_ptr _nil (void)
-    {
-      return static_cast<Policy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::PolicyType policy_type (
-        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 ::CORBA::Policy_ptr copy (
-        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 destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    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);
-
-    // Handcrafted
-    // ****************************************************************
-    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);
-    virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-    virtual TAO_Policy_Scope _tao_scope (void) const;
-    // ****************************************************************
-
-  private:
-    TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    Policy (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void CORBA_Policy_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    Policy (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    Policy (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~Policy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Policy (const Policy &);
-    
-    void operator= (const Policy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Policy;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
-#define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-  
-  class PolicyManager;
-  typedef PolicyManager *PolicyManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PolicyManager
-      >
-    PolicyManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PolicyManager
-      >
-    PolicyManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLICYMANAGER_CH_)
-#define _CORBA_POLICYMANAGER_CH_
-  
-  class TAO_Export PolicyManager
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef PolicyManager_ptr _ptr_type;
-    typedef PolicyManager_var _var_type;
-    
-    // The static operations.
-    static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-    
-    static void _tao_release (PolicyManager_ptr obj);
-    
-    static PolicyManager_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyManager_ptr _nil (void)
-    {
-      return static_cast<PolicyManager_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PolicyList * get_policy_overrides (
-        const ::CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_policy_overrides (
-        const ::CORBA::PolicyList & policies,
-        ::CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::InvalidPolicies
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PolicyManager (void);
-    
-    virtual ~PolicyManager (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PolicyManager (const PolicyManager &);
-    
-    void operator= (const PolicyManager &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyManager;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
-#define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-  
-  class PolicyCurrent;
-  typedef PolicyCurrent *PolicyCurrent_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PolicyCurrent
-      >
-    PolicyCurrent_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PolicyCurrent
-      >
-    PolicyCurrent_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLICYCURRENT_CH_)
-#define _CORBA_POLICYCURRENT_CH_
-  
-  class TAO_Export PolicyCurrent
-    : public virtual ::CORBA::PolicyManager,
-      public virtual ::CORBA::Current
-  {
-  public:
-    typedef PolicyCurrent_ptr _ptr_type;
-    typedef PolicyCurrent_var _var_type;
-    
-    // The static operations.
-    static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-    
-    static void _tao_release (PolicyCurrent_ptr obj);
-    
-    static PolicyCurrent_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyCurrent_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyCurrent_ptr _nil (void)
-    {
-      return static_cast<PolicyCurrent_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PolicyCurrent (void);
-    
-    virtual ~PolicyCurrent (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PolicyCurrent (const PolicyCurrent &);
-    
-    void operator= (const PolicyCurrent &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyCurrent;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// Proxy Broker Factory function pointer declarations.
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
-
-extern TAO_Export
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::Policy>
-  {
-    static ::CORBA::Policy_ptr duplicate (
-        ::CORBA::Policy_ptr
-      );
-    static void release (
-        ::CORBA::Policy_ptr
-      );
-    static ::CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
-  {
-    static ::CORBA::PolicyCurrent_ptr duplicate (
-        ::CORBA::PolicyCurrent_ptr
-      );
-    static void release (
-        ::CORBA::PolicyCurrent_ptr
-      );
-    static ::CORBA::PolicyCurrent_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
-#define _CORBA_POLICYMANAGER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
-  {
-    static ::CORBA::PolicyManager_ptr duplicate (
-        ::CORBA::PolicyManager_ptr
-      );
-    static void release (
-        ::CORBA::PolicyManager_ptr
-      );
-    static ::CORBA::PolicyManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PolicyManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined (__ACE_INLINE__)
-#include "PolicyC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl
deleted file mode 100644
index 2bc9b36e2dc..00000000000
--- a/TAO/tao/PolicyC.inl
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_CORBA_POLICY___CI_)
-#define _CORBA_POLICY___CI_
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    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_Policy_Proxy_Broker_ (0)
-{
-  this->CORBA_Policy_setup_collocation ();
-}
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_Policy_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/PolicyFactory.pidl b/TAO/tao/PolicyFactory.pidl
deleted file mode 100644
index 57a5366b279..00000000000
--- a/TAO/tao/PolicyFactory.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file PolicyFactory.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PolicyFactory
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PolicyFactory.pidl
- */
-
-// File: PortableInterceptor.idl
-#ifndef _POLICYFACTORY_PIDL_
-#define _POLICYFACTORY_PIDL_
-
-#include <Policy.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface PolicyFactory
-  {
-    CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
-      raises (CORBA::PolicyError);
-  };
-};
-
-#endif  /* _PORTABLE_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/PolicyFactoryA.cpp b/TAO/tao/PolicyFactoryA.cpp
deleted file mode 100644
index b00f549d49b..00000000000
--- a/TAO/tao/PolicyFactoryA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PolicyFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_PolicyFactory (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
-    "PolicyFactory");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
-    &_tao_tc_PortableInterceptor_PolicyFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr _tao_elem
-  )
-{
-  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
-    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
-      _tao_any,
-      PortableInterceptor::PolicyFactory::_tao_any_destructor,
-      PortableInterceptor::_tc_PolicyFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
-        _tao_any,
-        PortableInterceptor::PolicyFactory::_tao_any_destructor,
-        PortableInterceptor::_tc_PolicyFactory,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PolicyFactoryC.cpp b/TAO/tao/PolicyFactoryC.cpp
deleted file mode 100644
index 070362161df..00000000000
--- a/TAO/tao/PolicyFactoryC.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "PolicyFactoryC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::PolicyFactory.
-
-PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate (
-    PortableInterceptor::PolicyFactory_ptr p
-  )
-{
-  return PortableInterceptor::PolicyFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
-    PortableInterceptor::PolicyFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
-{
-  return PortableInterceptor::PolicyFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
-    PortableInterceptor::PolicyFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::PolicyFactory::PolicyFactory (void)
-{}
-
-PortableInterceptor::PolicyFactory::~PolicyFactory (void)
-{}
-
-void
-PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyFactory *_tao_tmp_pointer =
-    static_cast<PolicyFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-
-  return PolicyFactory::_duplicate (proxy);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-
-  return PolicyFactory::_duplicate (proxy);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::PolicyFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// Hand-crafted.
-::CORBA::Policy_ptr
-PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
diff --git a/TAO/tao/PolicyFactoryC.h b/TAO/tao/PolicyFactoryC.h
deleted file mode 100644
index 3f605106599..00000000000
--- a/TAO/tao/PolicyFactoryC.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_
-#define _TAO_IDL_ORIG_POLICYFACTORYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-
-  class PolicyFactory;
-  typedef PolicyFactory *PolicyFactory_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        PolicyFactory
-      >
-    PolicyFactory_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        PolicyFactory
-      >
-    PolicyFactory_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-
-  class TAO_Export PolicyFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef PolicyFactory_ptr _ptr_type;
-    typedef PolicyFactory_var _var_type;
-
-    // The static operations.
-    static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-
-    static void _tao_release (PolicyFactory_ptr obj);
-
-    static PolicyFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PolicyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static PolicyFactory_ptr _nil (void)
-    {
-      return static_cast<PolicyFactory_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr create_policy (
-        ::CORBA::PolicyType type,
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::PolicyError
-      )) = 0;
-
-    // Hand-crafted addition.
-    virtual ::CORBA::Policy_ptr _create_policy (
-        CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PolicyError
-      ));
-
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    PolicyFactory (void);
-
-    virtual ~PolicyFactory (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PolicyFactory (const PolicyFactory &);
-
-    void operator= (const PolicyFactory &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
-  {
-    static ::PortableInterceptor::PolicyFactory_ptr duplicate (
-        ::PortableInterceptor::PolicyFactory_ptr
-      );
-    static void release (
-        ::PortableInterceptor::PolicyFactory_ptr
-      );
-    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::PolicyFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PolicyFactoryS.h b/TAO/tao/PolicyFactoryS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PolicyFactoryS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
deleted file mode 100644
index 2fc7b7da091..00000000000
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "PolicyFactory_Registry.h"
-#include "PortableInterceptorC.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-#include "PolicyC.h"
-
-
-ACE_RCSID (tao,
-           PolicyFactory_Registry,
-           "$Id$")
-
-
-// ****************************************************************
-
-TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
-  : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
-{
-}
-
-TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
-{
-  const TABLE::iterator end (this->factories_.end ());
-
-  for (TABLE::iterator i = this->factories_.begin (); i != end; ++i)
-    {
-      CORBA::release ((*i).int_id_);
-    }
-
-  this->factories_.close ();
-}
-
-void
-TAO_PolicyFactory_Registry::register_policy_factory (
-  CORBA::PolicyType type,
-  PortableInterceptor::PolicyFactory_ptr policy_factory
-  ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (policy_factory))
-    {
-      ACE_THROW (CORBA::BAD_PARAM (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  PortableInterceptor::PolicyFactory_ptr factory =
-    PortableInterceptor::PolicyFactory::_duplicate (policy_factory);
-
-  const int result = this->factories_.bind (type,
-                                            factory);
-
-  if (result == 1)
-    {
-      // PolicyFactory of given type already exists.
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16,
-                                       CORBA::COMPLETED_NO));
-    }
-  else if (result == -1)
-    {
-      // Could not add PolicyFactory due to internal bind failures.
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-CORBA::Policy_ptr
-TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL)
-{
-  PortableInterceptor::PolicyFactory_ptr policy_factory =
-    PortableInterceptor::PolicyFactory::_nil ();
-
-  if (this->factories_.find (type, policy_factory) == -1)
-    {
-      // Policy factory corresponding to given policy type does not
-      // exist in policy factory map.
-      ACE_THROW_RETURN (
-         CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),  // @@ Right exception?
-         CORBA::Policy::_nil ());
-    }
-
-  return policy_factory->create_policy (type,
-                                        value
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
-                                            ACE_ENV_ARG_DECL)
-{
-  PortableInterceptor::PolicyFactory_ptr policy_factory =
-    PortableInterceptor::PolicyFactory::_nil ();
-
-  if (this->factories_.find (type,
-                             policy_factory) == -1)
-    {
-      // Policy factory corresponding to given policy type does not
-      // exist in policy factory map.
-      ACE_THROW_RETURN (
-         CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),  // @@ Right exception?
-         CORBA::Policy::_nil ());
-    }
-
-  return policy_factory->_create_policy (type
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-bool
-TAO_PolicyFactory_Registry::factory_exists (CORBA::PolicyType & type) const
-{
-  return (this->factories_.find (type) == 0);
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Map_Entry<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr>;
-template class ACE_Map_Iterator_Base<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>;
-template class ACE_Map_Manager<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Entry<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr>
-#pragma instantiate ACE_Map_Iterator_Base<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Manager<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
deleted file mode 100644
index 4ca44e31975..00000000000
--- a/TAO/tao/PolicyFactory_Registry.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   PolicyFactory_Registry.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_POLICY_FACTORY_REGISTRY_H
-#define TAO_POLICY_FACTORY_REGISTRY_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Basic_Types.h"
-
-#include "ace/Map_Manager.h"
-#include "ace/Null_Mutex.h"
-#include "ace/CORBA_macros.h"
-
-//-- Forward Declarations--
-namespace CORBA
-{
-  typedef ULong PolicyType;
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-
-  class Any;
-
-  class Environment;
-}
-
-namespace PortableInterceptor
-{
-  class PolicyFactory;
-  typedef PolicyFactory *PolicyFactory_ptr;
-}
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_PolicyFactory_Registry
- *
- * @brief ORB-specific PortableInterceptor::PolicyFactory registry.
- *
- * ORB-specific registry that contains all portable interceptor
- * policy factories.
- */
-class TAO_Export TAO_PolicyFactory_Registry
-{
-public:
-
-  /**
-   * The type of table that maps policy type to policy factory.
-   *
-   * @note
-   * An ACE_Null_Mutex is used for this type since policy factories
-   * are only registered when CORBA::ORB_init() is called, at which a
-   * point a lock has already been acquired.  In short, the table is
-   * only modified during ORB bootstrap-time.
-   */
-  typedef ACE_Map_Manager<CORBA::PolicyType,
-                          PortableInterceptor::PolicyFactory_ptr,
-                          ACE_Null_Mutex>
-    TABLE;
-
-public:
-
-  /// Constructor
-  TAO_PolicyFactory_Registry (void);
-
-  /// Destructor.  Releases duplicated PolicyFactory references.
-  ~TAO_PolicyFactory_Registry (void);
-
-  /// Register a PolicyFactory with the underlying PolicyFactory
-  /// sequence.  This method should only be called during ORB
-  /// initialization.
-  void register_policy_factory (
-    CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL);
-
-  /// Construct a policy of the given type with the information
-  /// contained in the CORBA::Any @a value.
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL);
-
-  /// Create an empty policy, usually to be filled in later by
-  /// demarshaling.
-  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL);
-
-  /// Check if a @c PolicyFactory corresponding to the given type,
-  /// exists.
-  bool factory_exists (CORBA::PolicyType & type) const;
-
-private:
-
-  /// The table that maps policy type to policy factory.
-  TABLE factories_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_POLICY_FACTORY_REGISTRY_H */
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
deleted file mode 100644
index 70b87da46b6..00000000000
--- a/TAO/tao/PolicyS.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- C++ -*- $Id$ */
-//=============================================================================
-/**
- *  @file   PolicyS.h
- *
- *  $Id$
- *
- * The file is almost empty and only present to keep other IDL files
- * that include Policy.pidl happy.
- *
- */
-//=============================================================================
-
-#ifndef TAO_PIDL_POLICY_S_H
-#define TAO_PIDL_POLICY_S_H
-#include "tao/PolicyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#endif /* TAO_PIDL_POLICY_S_H*/
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
deleted file mode 100644
index d29bdb445c6..00000000000
--- a/TAO/tao/Policy_Forward.pidl
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file Policy_Forward.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source to forward declare some critical
- * Policy-related types.
- *
- * This file is used to generate the code in
- * Policy_ForwardC.{h,cpp}.
- *
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the patched pidl file.  The
- *   command used for this is:
- *
- *     tao_idl.exe
- *        -o orig -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_macro="tao/TAO_Export"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Policy_Forward.pidl
- *
- *   2. Then patch the generated code.  This patch (a) eliminates
- *   cycles in the include dependencies.
- *
- *   Apply patches using the following commands:
- *
- *   patch < diffs/Policy_Forward.diff
- *
- *   Note: The diffs were generated with these commands:
- *
- *   for i in Policy_ForwardC.{h,cpp}; do
- *     diff -wBbu orig/$i $i;
- *   done > diffs/Policy_Forward.diff
- */
-
-#ifndef TAO_CORBA_POLICY_FORWARD_PIDL
-#define TAO_CORBA_POLICY_FORWARD_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef unsigned long PolicyType;
-
-  interface Policy;
-
-  typedef sequence<Policy> PolicyList;
-
-  typedef sequence<PolicyType> PolicyTypeSeq;
-
-  local interface PolicyCurrent;
-
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-};
-
-#endif /* TAO_CORBA_POLICY_FORWARD_PIDL */
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
deleted file mode 100644
index 5f7c8f436d5..00000000000
--- a/TAO/tao/Policy_ForwardA.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Policy_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyType:1.0",
-    "PolicyType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyType =
-    &_tao_tc_CORBA_PolicyType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_Policy;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyList_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Policy,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyList_0 =
-      &CORBA_PolicyList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyList:1.0",
-    "PolicyList",
-    &TAO::TypeCode::tc_CORBA_PolicyList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyList =
-    &_tao_tc_CORBA_PolicyList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyTypeSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_PolicyType,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyTypeSeq_0 =
-      &CORBA_PolicyTypeSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyTypeSeq:1.0",
-    "PolicyTypeSeq",
-    &TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq =
-    &_tao_tc_CORBA_PolicyTypeSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_SetOverrideType[] =
-  {
-    "SET_OVERRIDE",
-    "ADD_OVERRIDE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SetOverrideType (
-    "IDL:omg.org/CORBA/SetOverrideType:1.0",
-    "SetOverrideType",
-    _tao_enumerators_CORBA_SetOverrideType,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SetOverrideType =
-    &_tao_tc_CORBA_SetOverrideType;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
-        _tao_any,
-        CORBA::PolicyList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyTypeSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyTypeSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
-        _tao_any,
-        CORBA::PolicyTypeSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SetOverrideType _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
-      _tao_any,
-      CORBA::_tc_SetOverrideType,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SetOverrideType &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
-        _tao_any,
-        CORBA::_tc_SetOverrideType,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
deleted file mode 100644
index 46f576bb40b..00000000000
--- a/TAO/tao/Policy_ForwardC.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Policy_ForwardC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_POLICYLIST_CS_)
-#define _CORBA_POLICYLIST_CS_
-
-CORBA::PolicyList::PolicyList (void)
-{}
-
-CORBA::PolicyList::PolicyList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
-      >
-    (max)
-{}
-
-CORBA::PolicyList::PolicyList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Policy_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::PolicyList::PolicyList (
-    const PolicyList &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
-      >
-    (seq)
-{}
-
-CORBA::PolicyList::~PolicyList (void)
-{}
-
-void CORBA::PolicyList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  PolicyList * _tao_tmp_pointer =
-    static_cast<PolicyList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_POLICYTYPESEQ_CS_)
-#define _CORBA_POLICYTYPESEQ_CS_
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
-      >
-    (max)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (
-    const PolicyTypeSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
-      >
-    (seq)
-{}
-
-CORBA::PolicyTypeSeq::~PolicyTypeSeq (void)
-{}
-
-void CORBA::PolicyTypeSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  PolicyTypeSeq * _tao_tmp_pointer =
-    static_cast<PolicyTypeSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_PolicyList_CPP_
-#define _TAO_CDR_OP_CORBA_PolicyList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            TAO::Objref_Traits<CORBA::Policy>::marshal (
-                _tao_sequence[i].in (), strm
-              );
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_
-#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyTypeSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyTypeSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::SetOverrideType _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::SetOverrideType> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
deleted file mode 100644
index 385cd6f768b..00000000000
--- a/TAO/tao/Policy_ForwardC.h
+++ /dev/null
@@ -1,402 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
-#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong PolicyType;
-  typedef CORBA::ULong_out PolicyType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyType;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICY__VAR_OUT_CH_)
-#define _CORBA_POLICY__VAR_OUT_CH_
-  
-  class Policy;
-  typedef Policy *Policy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Policy
-      >
-    Policy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Policy
-      >
-    Policy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_POLICYLIST_CH_)
-#define _CORBA_POLICYLIST_CH_
-  
-  class PolicyList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        PolicyList,
-        TAO_Object_Manager<
-            Policy,
-            Policy_var
-          >
-      >
-    PolicyList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        PolicyList,
-        PolicyList_var,
-        TAO_Object_Manager<
-            Policy,
-            Policy_var
-          >
-      >
-    PolicyList_out;
-  
-  class TAO_Export PolicyList
-    : public
-        TAO_Unbounded_Object_Sequence<
-            Policy,
-            Policy_var
-          >
-  {
-  public:
-    PolicyList (void);
-    PolicyList (CORBA::ULong max);
-    PolicyList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Policy_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    PolicyList (const PolicyList &);
-    ~PolicyList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef PolicyList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_POLICYTYPESEQ_CH_)
-#define _CORBA_POLICYTYPESEQ_CH_
-  
-  class PolicyTypeSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        PolicyTypeSeq,
-        PolicyType
-      >
-    PolicyTypeSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        PolicyTypeSeq,
-        PolicyTypeSeq_var,
-        PolicyType
-      >
-    PolicyTypeSeq_out;
-  
-  class TAO_Export PolicyTypeSeq
-    : public
-        TAO_Unbounded_Sequence<
-            PolicyType
-          >
-  {
-  public:
-    PolicyTypeSeq (void);
-    PolicyTypeSeq (CORBA::ULong max);
-    PolicyTypeSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    PolicyTypeSeq (const PolicyTypeSeq &);
-    ~PolicyTypeSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef PolicyTypeSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
-#define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-  
-  class PolicyCurrent;
-  typedef PolicyCurrent *PolicyCurrent_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PolicyCurrent
-      >
-    PolicyCurrent_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PolicyCurrent
-      >
-    PolicyCurrent_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-  
-  typedef SetOverrideType &SetOverrideType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SetOverrideType;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::Policy>
-  {
-    static ::CORBA::Policy_ptr duplicate (
-        ::CORBA::Policy_ptr
-      );
-    static void release (
-        ::CORBA::Policy_ptr
-      );
-    static ::CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
-  {
-    static ::CORBA::PolicyCurrent_ptr duplicate (
-        ::CORBA::PolicyCurrent_ptr
-      );
-    static void release (
-        ::CORBA::PolicyCurrent_ptr
-      );
-    static ::CORBA::PolicyCurrent_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_PolicyList_H_
-#define _TAO_CDR_OP_CORBA_PolicyList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::PolicyList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::PolicyList &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
-#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::PolicyTypeSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::PolicyTypeSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::SetOverrideType);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Policy_ForwardS.h b/TAO/tao/Policy_ForwardS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/Policy_ForwardS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
deleted file mode 100644
index 830260f6f80..00000000000
--- a/TAO/tao/Policy_Manager.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-#include "Policy_Manager.h"
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-#include "tao/TSS_Resources.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Policy_Manager,
-           "$Id$")
-
-
-TAO_Policy_Current_Impl &
-TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_Policy_Current_Impl *old = tss->policy_current_;
-  tss->policy_current_ = &current;
-  return *old;
-}
-
-TAO_Policy_Current_Impl &
-TAO_Policy_Current::implementation (void) const
-{
-  return *TAO_TSS_RESOURCES::instance ()->policy_current_;
-}
-
-void
-TAO_Policy_Current_Impl::set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add
-    ACE_ENV_ARG_DECL
-  )
-{
-  this->manager_impl_.set_policy_overrides (policies, 
-                                            set_add 
-                                            ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::PolicyList *
-TAO_Policy_Current_Impl::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & ts
-    ACE_ENV_ARG_DECL
-  )
-{
-  return this->manager_impl_.get_policy_overrides (ts 
-                                                   ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
deleted file mode 100644
index 32a5b53bb0f..00000000000
--- a/TAO/tao/Policy_Manager.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Policy_Manager.h
- *
- *  $Id$
- *
- * An implementation for the CORBA::PolicyManager interface.
- *
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_POLICY_MANAGER_H
-#define TAO_POLICY_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Guard_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-#include "tao/PolicyC.h"
-#include "tao/LocalObject.h"
-#include "tao/Policy_Set.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-class TAO_Export TAO_Policy_Manager :
-  public CORBA::PolicyManager,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  /// constructor
-  TAO_Policy_Manager (void);
-
-  /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
-
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void set_policy_overrides (const CORBA::PolicyList & policies,
-                                     CORBA::SetOverrideType set_add
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::InvalidPolicies));
-
-private:
-  /// Protect access
-  TAO_SYNCH_MUTEX mutex_;
-
-  /// The implementation.
-  TAO_Policy_Set impl_;
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Current_Impl
-{
-public:
-
-  TAO_Policy_Current_Impl (void);
-
-  /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
-
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  // = The CORBA::PolicyManager operations
-
-  CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-  void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-private:
-  /// The implementation.
-  TAO_Policy_Set manager_impl_;
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Current :
-  public CORBA::PolicyCurrent,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor
-  TAO_Policy_Current (void);
-
-  /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL);
-
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::InvalidPolicies));
-
-  // = Set and get the implementation.
-  TAO_Policy_Current_Impl &implementation (void) const;
-  TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &);
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POLICY_MANAGER_H */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
deleted file mode 100644
index 56505e6a2b0..00000000000
--- a/TAO/tao/Policy_Manager.i
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Policy_Manager::TAO_Policy_Manager (void)
-  : impl_ (TAO_POLICY_ORB_SCOPE)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_policy (
-  CORBA::PolicyType policy
-  ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
-                                          ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      CORBA::InvalidPolicies))
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
-{
-
-  // @@ Previous code used a "double-checked locking hack" to check
-  // if the policy was set before grabbing the lock to actually get
-  // it, so that could save a lock operation.  This was removed, as
-  // it is not as easy to do this anymore.
-
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-
-  return this->impl_.get_cached_policy (type
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Policy_Current::TAO_Policy_Current (void)
-{
-}
-
-ACE_INLINE
-TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
-  : manager_impl_ (TAO_POLICY_THREAD_SCOPE)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL)
-{
-  return this->manager_impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
-                                            ACE_ENV_ARG_DECL)
-{
-  return this->manager_impl_.get_cached_policy (type
-                                                ACE_ENV_ARG_PARAMETER);
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current::get_policy (
-      CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL)
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.get_policy (policy ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::PolicyList *
-TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::InvalidPolicies))
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  impl.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
-{
-  TAO_Policy_Current_Impl &impl = this->implementation ();
-
-  return impl.get_cached_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
deleted file mode 100644
index 9739eabc2bc..00000000000
--- a/TAO/tao/Policy_Set.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// $Id$
-
-#include "Policy_Set.h"
-#include "Environment.h"
-#include "SystemException.h"
-#include "debug.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Policy_Set.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Policy_Set,
-           "$Id$")
-
-
-TAO_Policy_Set::~TAO_Policy_Set (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions...
-    }
-  ACE_ENDTRY;
-}
-
-TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
-  : scope_ (rhs.scope_)
-{
-  // Initialize the cache.
-  for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i)
-    {
-      this->cached_policies_[i] = 0;
-    }
-
-  // Copy over the policy list.
-  this->policy_list_.length (rhs.policy_list_.length ());
-
-  ACE_TRY_NEW_ENV
-    {
-      for (CORBA::ULong i = 0; i < rhs.policy_list_.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = rhs.policy_list_[i];
-
-          if (CORBA::is_nil (policy))
-            {
-              continue;
-            }
-
-          CORBA::Policy_var copy =
-            policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Add the "cacheable" policies into the cache.
-          if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED)
-            {
-              this->cached_policies_[copy->_tao_cached_type ()] =
-                copy.ptr ();
-            }
-
-          this->policy_list_[i] = copy._retn ();
-        }
-
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_Policy_Set::TAO_Policy_Set");
-
-      // "Try" to make this recoverable as we must have run out of memory.
-      this->policy_list_.length (0);
-    }
-  ACE_ENDTRY;
-}
-
-void
-TAO_Policy_Set::copy_from (TAO_Policy_Set *source
-                           ACE_ENV_ARG_DECL)
-{
-  if (source == 0)
-    {
-      return;
-    }
-
-  this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (CORBA::ULong i = 0; i < source->policy_list_.length (); ++i)
-    {
-      CORBA::Policy_ptr policy = source->policy_list_[i];
-
-      if (CORBA::is_nil (policy))
-        {
-          continue;
-        }
-
-      if (! this->compatible_scope (policy->_tao_scope()))
-        {
-          ACE_THROW (CORBA::NO_PERMISSION ());
-        }
-
-      CORBA::Policy_var copy =
-        policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::ULong length = this->policy_list_.length ();
-      this->policy_list_.length (length + 1);
-
-      // Add the "cacheable" policies into the cache.
-      if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED)
-        {
-          this->cached_policies_[copy->_tao_cached_type ()] = copy.ptr ();
-        }
-
-      this->policy_list_[length] = copy._retn ();
-    }
-}
-
-void
-TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  const CORBA::ULong len = this->policy_list_.length ();
-  // Cleanup the policy list.
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->policy_list_[i] = CORBA::Policy::_nil ();
-    }
-
-  this->policy_list_.length (0);
-
-  // Cleanup the cache.
-  for (CORBA::ULong j = 0; j < TAO_CACHED_POLICY_MAX_CACHED; ++j)
-    {
-      this->cached_policies_[j] = 0;
-    }
-}
-
-  // @@ !!! Add comments regarding Policy lifetimes, etc.
-void
-TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
-                                      CORBA::SetOverrideType set_add
-                                      ACE_ENV_ARG_DECL)
-{
-  // @@ The spec does not say what to do on this case.
-  if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE)
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // Flag, indicating whether we have already overridden
-  // RTCORBA::ServerProtocolPolicy during this call.
-  bool server_protocol_set = false;
-
-  const CORBA::ULong plen = policies.length ();
-
-  for (CORBA::ULong i = 0; i < plen; ++i)
-    {
-#if defined (__INTEL_COMPILER) && defined (_MSC_VER) && (_MSC_VER <= 1200)
-      // The XICL6 compiler (Intel C++ 7.1 in Visual C++ compatible
-      // mode) has a bug and can't handle the normal construct
-      CORBA::Policy_ptr temp = policies[i];
-      CORBA::Policy_var policy = CORBA::Policy::_duplicate (temp);
-#else
-      CORBA::Policy_var policy = policies[i];
-#endif
-
-      if (CORBA::is_nil (policy.in ()))
-        {
-          continue;
-        }
-
-      const CORBA::PolicyType policy_type =
-        policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE)
-        {
-          // Only one ServerProtocolPolicy should be included in a
-          // given PolicyList (section 4.15.2 of RTCORBA 1.0, i.e.,
-          // ptc/99-05-03).
-          // User-caused exceptional conditions can leave the Policy
-          // Manager in an inconsistent state.  It is the
-          // responsibility of the user to return it to consistent state.
-          if (server_protocol_set)
-            {
-              ACE_THROW (CORBA::INV_POLICY ());
-            }
-
-          server_protocol_set = true;
-        }
-
-      this->set_policy (policy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
-                                     ACE_ENV_ARG_DECL)
-{
-  if (! this->compatible_scope (policy->_tao_scope()))
-    {
-      ACE_THROW (CORBA::NO_PERMISSION ());
-    }
-
-  const CORBA::PolicyType policy_type =
-    policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong j = 0;
-  const CORBA::ULong length = this->policy_list_.length ();
-
-  while (j != length)
-    {
-      CORBA::ULong current =
-        this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (current == policy_type)
-        {
-          this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->policy_list_[j] = copy.ptr ();
-          break;
-        }
-
-      ++j;
-    }
-
-  if (j == length)
-    {
-      this->policy_list_.length (length + 1);
-      this->policy_list_[j] = copy.ptr ();
-    }
-
-  // If this is a policy that gets accessed on the critical path,
-  // save a pointer to it in the cache.
-  TAO_Cached_Policy_Type cached_policy_type = policy->_tao_cached_type ();
-
-  if (cached_policy_type != TAO_CACHED_POLICY_UNCACHED)
-    {
-      this->cached_policies_[cached_policy_type] = copy.ptr ();
-    }
-
-  // Transfer ownership to the policy list.
-  (void) copy._retn ();
-}
-
-CORBA::PolicyList *
-TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                      ACE_ENV_ARG_DECL)
-{
-  const CORBA::ULong slots = types.length ();
-  CORBA::PolicyList *policy_list_ptr;
-
-  if (slots == 0)
-    {
-      // Copy our own policy list.
-      ACE_NEW_THROW_EX (policy_list_ptr,
-                        CORBA::PolicyList (this->policy_list_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      return policy_list_ptr;
-    }
-
-  ACE_NEW_THROW_EX (policy_list_ptr,
-                    CORBA::PolicyList (slots),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA::PolicyList_var policy_list (policy_list_ptr);
-  policy_list->length (slots);
-  CORBA::ULong n = 0;
-
-  for (CORBA::ULong j = 0; j < slots; ++j)
-    {
-      const CORBA::ULong slot = types[j];
-      const CORBA::ULong length = this->policy_list_.length ();
-
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          const CORBA::ULong current =
-            this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          if (current != slot)
-            {
-              continue;
-            }
-
-          policy_list[n++] =
-            CORBA::Policy::_duplicate (this->policy_list_[i].in ());
-          break;
-        }
-    }
-
-  policy_list->length (n);  // Truncate buffer if necessary.
-
-  return policy_list._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_Policy_Set::get_policy (CORBA::PolicyType type
-                            ACE_ENV_ARG_DECL)
-{
-  const CORBA::ULong length = this->policy_list_.length ();
-
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      const CORBA::ULong current =
-        this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (current != type)
-        {
-          continue;
-        }
-
-      return CORBA::Policy::_duplicate (this->policy_list_[i].in ());
-    }
-
-  return CORBA::Policy::_nil ();
-}
-
-CORBA::Policy_ptr
-TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const
-{
-  if (type != TAO_CACHED_POLICY_UNCACHED
-      && type < TAO_CACHED_POLICY_MAX_CACHED)
-    {
-      return this->cached_policies_[type];
-    }
-
-  return CORBA::Policy::_nil ();
-}
-
-CORBA::Policy_ptr
-TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (type != TAO_CACHED_POLICY_UNCACHED
-      && type < TAO_CACHED_POLICY_MAX_CACHED)
-    {
-      return CORBA::Policy::_duplicate (this->cached_policies_[type]);
-    }
-
-  return CORBA::Policy::_nil ();
-}
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
deleted file mode 100644
index 0e3b8e6bc24..00000000000
--- a/TAO/tao/Policy_Set.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Policy_Set.h
- *
- *  $Id$
- *
- *  A Policy Container that provides O(1) time access for policy that
- *  support caching (see orbconf.h).
- *
- *  @author Angelo Cosaro (corsaro@cs.wustl.edu)
- *  @author Frank Hunleth (fhunleth@cs.wustl.edu)
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-#ifndef TAO_POLICY_SET_H
-#define TAO_POLICY_SET_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PolicyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Policy_Set
- *
- * @brief The policy manager implementation.
- *
- * This class is used to implement both the CORBA::PolicyManager
- * and the CORBA::PolicyCurrent interfaces.
- */
-class TAO_Export TAO_Policy_Set
-{
-public:
-
-  /** Creates a TAO_Policy_Set that has a given scope. The
-   * scope is used to determinate whether or not a given policy can
-   * be set for the given Policy Manager Implementation.
-   */
-  TAO_Policy_Set (TAO_Policy_Scope scope);
-
-  TAO_Policy_Set (const TAO_Policy_Set &rhs);
-
-  /// Destructor
-  ~TAO_Policy_Set (void);
-
-  /// Copy the state from @a source, it uses the copy() operator to
-  /// obtain independent copies of all the policies.
-  void copy_from (TAO_Policy_Set* source
-                  ACE_ENV_ARG_DECL);
-
-  /**
-   * Modify the list of policies to include @a policies.
-   * If @a set_add is @c CORBA::SET_OVERRIDE then we replace all the
-   * old policies. If it is @c CORBA::ADD_OVERRIDE we simply add the
-   * policies in @a policies.
-   * No attempt is made to validate the policies for consistency.
-   */
-  void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add
-                             ACE_ENV_ARG_DECL);
-
-  /// Get the values (if any) for the policies in @a types, if @a
-  /// types is an empty list the method returns *all* the current
-  /// policies.
-  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                            ACE_ENV_ARG_DECL);
-
-  /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
-
-  /// Obtain a cached policy for speedy lookups.
-  /**
-   * This method just returns a const reference to the policy to avoid
-   * obtaining a lock to increment the reference count.  As such, it
-   * can only be used for single threaded cases or cases where the
-   * policies cannot be removed such as at the object and thread level
-   * scopes.  This method is most likely not appropriate for accessing
-   * policies at the ORB level scope in any situation.
-   */
-  CORBA::Policy_ptr get_cached_const_policy (TAO_Cached_Policy_Type type) const;
-
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  /// Utility method to set a single policy.
-  void set_policy (const CORBA::Policy_ptr policy
-                   ACE_ENV_ARG_DECL);
-
-  /// Returns the policy at the specified index.
-  /// @c CORBA::Policy::_nil () is returned if the policy doesn't
-  /// exist.
-  CORBA::Policy *get_policy_by_index (CORBA::ULong index);
-  CORBA::ULong num_policies (void) const;
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
-
-  /// Remove and destroy all the policy objects owned by this policy
-  /// manager.
-  void cleanup_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Utility method to determine if a policy's scope is compatible with ours.
-  CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const;
-
-private:
-
-  /// Policies set for this Policy_Manager
-  CORBA::PolicyList policy_list_;
-
-  /// List of caches.
-  CORBA::Policy *cached_policies_[TAO_CACHED_POLICY_MAX_CACHED];
-
-  /// Scope associated to the Policy Manager Impl
-  TAO_Policy_Scope scope_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Policy_Set.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POLICY_SET_H */
diff --git a/TAO/tao/Policy_Set.i b/TAO/tao/Policy_Set.i
deleted file mode 100644
index 11c35bfdaa8..00000000000
--- a/TAO/tao/Policy_Set.i
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
-  : scope_ (scope)
-{
-  for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; i++)
-    this->cached_policies_[i] = 0;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Policy_Set::compatible_scope (TAO_Policy_Scope policy_scope) const
-{
-  return (((unsigned int) policy_scope & (unsigned int) this->scope_) > 0);
-}
-
-ACE_INLINE CORBA::Policy *
-TAO_Policy_Set::get_policy_by_index (CORBA::ULong index)
-{
-  return CORBA::Policy::_duplicate (this->policy_list_[index]);
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Policy_Set::num_policies (void) const
-{
-  return this->policy_list_.length();
-}
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
deleted file mode 100644
index cd51a8a1426..00000000000
--- a/TAO/tao/Policy_Validator.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-#include "Policy_Validator.h"
-#include "Environment.h"
-#include "debug.h"
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           Policy_Validator,
-           "$Id$")
-
-TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core)
-  : orb_core_ (orb_core),
-    next_ (0)
-{
-  // No-Op.
-}
-
-TAO_Policy_Validator::~TAO_Policy_Validator (void)
-{
-  if (this->next_)
-    {
-      delete this->next_;
-    }
-}
-
-TAO_ORB_Core & 
-TAO_Policy_Validator::orb_core() const
-{ 
-  return this->orb_core_;
-}
-
-void
-TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
-{
-  // The validator we're adding can't be part of another list
-  ACE_ASSERT (validator->next_ == 0);
-
-  // Why would we want to add ourself to our list
-  if (this != validator)
-    {
-      // Get to the end of the list and make sure that the
-      // new validator isn't already part of our list
-      TAO_Policy_Validator* current = this;
-      while (current->next_ != 0)
-        {
-          if (current->next_ == validator)
-            {
-              if (TAO_debug_level > 3)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("(%P|%t) Skipping validator [0x%x] ")
-                              ACE_TEXT ("since it would create a circular list\n"),
-                              validator));
-                }
-
-              return;
-            }
-          current = current->next_;
-        }
-
-      // Add the new validator to the end of the list
-      current->next_ = validator;
-    }
-}
-
-
-void
-TAO_Policy_Validator::validate (TAO_Policy_Set &policies
-                                ACE_ENV_ARG_DECL)
-{
-  this->validate_impl (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->next_ != 0)
-    {
-      this->next_->validate (policies ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
-                                      ACE_ENV_ARG_DECL)
-{
-  this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->next_ != 0)
-    {
-      this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-CORBA::Boolean
-TAO_Policy_Validator::legal_policy (CORBA::PolicyType type)
-{
-  return (this->legal_policy_impl (type)
-          || ((this->next_ != 0)
-              && this->next_->legal_policy_impl (type)));
-}
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
deleted file mode 100644
index 2c1afd96800..00000000000
--- a/TAO/tao/Policy_Validator.h
+++ /dev/null
@@ -1,114 +0,0 @@
-//=============================================================================
-/**
- *  @file    Policy_Validator.h
- *
- *  $Id$
- *
- *  This file contains the declaration for the POA policy validator
- *  interface.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth  <fhuntleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_POLICY_VALIDATOR_H
-#define TAO_POLICY_VALIDATOR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-// Forward declarations.
-class TAO_Policy_Set;
-class TAO_ORB_Core;
-
-namespace CORBA
-{
-  typedef ULong PolicyType;
-
-  class Environment;
-}
-
-/**
- * @class TAO_Policy_Validator
- *
- * @brief An abstract class for plugging in different Policy Validator
- *  mechanisms.
- *
- *  This class was moved form the PortableServer library. The Portable
- *  Serever library used this abstraction to add policy validators to
- *  for the policies in the POA. This class seems so much useful for
- *  passing policy information between different loaded libraries.
- */
-
-class TAO_Export TAO_Policy_Validator
-{
-public:
-  /// Constructor.
-  TAO_Policy_Validator (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  virtual ~TAO_Policy_Validator (void);
-
-  /**
-   * Validate that the policies in the specified set
-   * are consistent and legal.  Throw an appropriate exception
-   * if that is not the case.
-   */
-  void validate (TAO_Policy_Set &policies
-                 ACE_ENV_ARG_DECL);
-
-  /**
-   * Add/merge policies.
-   **/
-  void merge_policies (TAO_Policy_Set &policies
-                       ACE_ENV_ARG_DECL);
-
-  /**
-   * Return whether the specified policy type is legal for the
-   * current configuration.  This is needed since the user can
-   * potentially specify policies that are unknown to an
-   * validate () routine, and these need to be caught.
-   */
-  CORBA::Boolean legal_policy (CORBA::PolicyType type);
-
-  /**
-   * Adds a validator to the "chain of validators". The <code>
-   * TAO_POA_Policy_Validator </code> implements something that looks
-   * like a chain of responsability in which different member of the
-   * chain have the responsability of validating a given set of
-   * policies.
-   */
-  void add_validator (TAO_Policy_Validator *validator);
-
-
- /**
-  * Accessor for the stored ORB core reference
-  */
- TAO_ORB_Core & orb_core() const;
-
-protected:
-  virtual void validate_impl (TAO_Policy_Set &policies
-                              ACE_ENV_ARG_DECL) = 0;
-
-  virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
-
-  TAO_ORB_Core &orb_core_;
-
-private:
-  TAO_Policy_Validator *next_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
deleted file mode 100644
index 75ece3d8de4..00000000000
--- a/TAO/tao/Pollable.pidl
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file   Pollable.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in Pollable{C,S,S_T}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *     -o orig -St -Gp -Gd -Ge 1 -SS -Sci
- *     -Wb,export_macro=TAO_Export
- *     -Wb,pre_include="ace/pre.h"
- *     -Wb,post_include="ace/post.h"
- *     Pollable.pidl
- *
- */
-//=============================================================================
-
-#ifndef TAO_POLLABLE_PIDL
-#define TAO_POLLABLE_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  local interface PollableSet;
-
-  local interface Pollable
-  {
-    boolean is_ready (in unsigned long timeout);
-    PollableSet create_pollable_set ();
-  };
-
-  local interface DIIPollable : Pollable
-  {
-  };
-
-  local interface PollableSet
-  {
-    exception NoPossiblePollable {};
-    exception UnknownPollable {};
-
-    DIIPollable create_dii_pollable ();
-
-    void add_pollable (in Pollable potential);
-
-    Pollable get_ready_pollable (in unsigned long timeout)
-      raises (NoPossiblePollable);
-
-    void remove (in Pollable potential)
-      raises (UnknownPollable);
-
-    unsigned short number_left ();
-  };
-};
-
-#endif /* TAO_POLLABLE_PIDL */
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
deleted file mode 100644
index 59be946fe69..00000000000
--- a/TAO/tao/PollableC.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PollableC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Pollable.
-
-CORBA::Pollable_ptr
-TAO::Objref_Traits<CORBA::Pollable>::duplicate (
-    CORBA::Pollable_ptr p
-  )
-{
-  return CORBA::Pollable::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Pollable>::release (
-    CORBA::Pollable_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::Pollable_ptr
-TAO::Objref_Traits<CORBA::Pollable>::nil (void)
-{
-  return CORBA::Pollable::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Pollable>::marshal (
-    CORBA::Pollable_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::Pollable::Pollable (void)
-{}
-
-CORBA::Pollable::~Pollable (void)
-{}
-
-CORBA::Pollable_ptr
-CORBA::Pollable::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Pollable::_nil ();
-    }
-  
-  Pollable_ptr proxy =
-    dynamic_cast<Pollable_ptr> (_tao_objref);
-  
-  return Pollable::_duplicate (proxy);
-}
-
-CORBA::Pollable_ptr
-CORBA::Pollable::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Pollable::_nil ();
-    }
-  
-  Pollable_ptr proxy =
-    dynamic_cast<Pollable_ptr> (_tao_objref);
-  
-  return Pollable::_duplicate (proxy);
-}
-
-CORBA::Pollable_ptr
-CORBA::Pollable::_duplicate (Pollable_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::Pollable::_tao_release (Pollable_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Pollable::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Pollable:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::Pollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Pollable:1.0";
-}
-
-CORBA::Boolean
-CORBA::Pollable::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::DIIPollable.
-
-CORBA::DIIPollable_ptr
-TAO::Objref_Traits<CORBA::DIIPollable>::duplicate (
-    CORBA::DIIPollable_ptr p
-  )
-{
-  return CORBA::DIIPollable::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::DIIPollable>::release (
-    CORBA::DIIPollable_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::DIIPollable_ptr
-TAO::Objref_Traits<CORBA::DIIPollable>::nil (void)
-{
-  return CORBA::DIIPollable::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::DIIPollable>::marshal (
-    CORBA::DIIPollable_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::DIIPollable::DIIPollable (void)
-{}
-
-CORBA::DIIPollable::~DIIPollable (void)
-{}
-
-CORBA::DIIPollable_ptr
-CORBA::DIIPollable::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DIIPollable::_nil ();
-    }
-  
-  DIIPollable_ptr proxy =
-    dynamic_cast<DIIPollable_ptr> (_tao_objref);
-  
-  return DIIPollable::_duplicate (proxy);
-}
-
-CORBA::DIIPollable_ptr
-CORBA::DIIPollable::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DIIPollable::_nil ();
-    }
-  
-  DIIPollable_ptr proxy =
-    dynamic_cast<DIIPollable_ptr> (_tao_objref);
-  
-  return DIIPollable::_duplicate (proxy);
-}
-
-CORBA::DIIPollable_ptr
-CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::DIIPollable::_tao_release (DIIPollable_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::DIIPollable::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Pollable:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/DIIPollable:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::DIIPollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DIIPollable:1.0";
-}
-
-CORBA::Boolean
-CORBA::DIIPollable::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::PollableSet.
-
-CORBA::PollableSet_ptr
-TAO::Objref_Traits<CORBA::PollableSet>::duplicate (
-    CORBA::PollableSet_ptr p
-  )
-{
-  return CORBA::PollableSet::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::PollableSet>::release (
-    CORBA::PollableSet_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::PollableSet_ptr
-TAO::Objref_Traits<CORBA::PollableSet>::nil (void)
-{
-  return CORBA::PollableSet::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::PollableSet>::marshal (
-    CORBA::PollableSet_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
-        "NoPossiblePollable"
-      )
-{
-}
-
-CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
-{
-}
-
-CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::PollableSet::NoPossiblePollable&
-CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-CORBA::PollableSet::NoPossiblePollable *
-CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<NoPossiblePollable *> (_tao_excp);
-}
-
-const CORBA::PollableSet::NoPossiblePollable *
-CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const NoPossiblePollable *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::PollableSet::NoPossiblePollable::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::PollableSet::NoPossiblePollable, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::PollableSet::NoPossiblePollable::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::PollableSet::NoPossiblePollable (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::PollableSet::NoPossiblePollable::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::PollableSet::NoPossiblePollable::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
-        "UnknownPollable"
-      )
-{
-}
-
-CORBA::PollableSet::UnknownPollable::~UnknownPollable (void)
-{
-}
-
-CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::PollableSet::UnknownPollable&
-CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-CORBA::PollableSet::UnknownPollable *
-CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<UnknownPollable *> (_tao_excp);
-}
-
-const CORBA::PollableSet::UnknownPollable *
-CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const UnknownPollable *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::PollableSet::UnknownPollable::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::PollableSet::UnknownPollable, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::PollableSet::UnknownPollable::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::PollableSet::UnknownPollable (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::PollableSet::UnknownPollable::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::PollableSet::UnknownPollable::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::PollableSet::UnknownPollable::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-CORBA::PollableSet::PollableSet (void)
-{}
-
-CORBA::PollableSet::~PollableSet (void)
-{}
-
-CORBA::PollableSet_ptr
-CORBA::PollableSet::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PollableSet::_nil ();
-    }
-  
-  PollableSet_ptr proxy =
-    dynamic_cast<PollableSet_ptr> (_tao_objref);
-  
-  return PollableSet::_duplicate (proxy);
-}
-
-CORBA::PollableSet_ptr
-CORBA::PollableSet::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PollableSet::_nil ();
-    }
-  
-  PollableSet_ptr proxy =
-    dynamic_cast<PollableSet_ptr> (_tao_objref);
-  
-  return PollableSet::_duplicate (proxy);
-}
-
-CORBA::PollableSet_ptr
-CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::PollableSet::_tao_release (PollableSet_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::PollableSet::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/PollableSet:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
-
-CORBA::Boolean
-CORBA::PollableSet::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
deleted file mode 100644
index c839cb8ec5e..00000000000
--- a/TAO/tao/PollableC.h
+++ /dev/null
@@ -1,571 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLLABLEC_H_
-#define _TAO_IDL_ORIG_POLLABLEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_)
-#define _CORBA_POLLABLESET__VAR_OUT_CH_
-  
-  class PollableSet;
-  typedef PollableSet *PollableSet_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PollableSet
-      >
-    PollableSet_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PollableSet
-      >
-    PollableSet_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLLABLE__VAR_OUT_CH_)
-#define _CORBA_POLLABLE__VAR_OUT_CH_
-  
-  class Pollable;
-  typedef Pollable *Pollable_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Pollable
-      >
-    Pollable_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Pollable
-      >
-    Pollable_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLLABLE_CH_)
-#define _CORBA_POLLABLE_CH_
-  
-  class TAO_Export Pollable
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Pollable_ptr _ptr_type;
-    typedef Pollable_var _var_type;
-    
-    // The static operations.
-    static Pollable_ptr _duplicate (Pollable_ptr obj);
-    
-    static void _tao_release (Pollable_ptr obj);
-    
-    static Pollable_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Pollable_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Pollable_ptr _nil (void)
-    {
-      return static_cast<Pollable_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean is_ready (
-        ::CORBA::ULong timeout
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PollableSet_ptr create_pollable_set (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Pollable (void);
-    
-    virtual ~Pollable (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Pollable (const Pollable &);
-    
-    void operator= (const Pollable &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_)
-#define _CORBA_DIIPOLLABLE__VAR_OUT_CH_
-  
-  class DIIPollable;
-  typedef DIIPollable *DIIPollable_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DIIPollable
-      >
-    DIIPollable_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DIIPollable
-      >
-    DIIPollable_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_DIIPOLLABLE_CH_)
-#define _CORBA_DIIPOLLABLE_CH_
-  
-  class TAO_Export DIIPollable
-    : public virtual ::CORBA::Pollable
-  {
-  public:
-    typedef DIIPollable_ptr _ptr_type;
-    typedef DIIPollable_var _var_type;
-    
-    // The static operations.
-    static DIIPollable_ptr _duplicate (DIIPollable_ptr obj);
-    
-    static void _tao_release (DIIPollable_ptr obj);
-    
-    static DIIPollable_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DIIPollable_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DIIPollable_ptr _nil (void)
-    {
-      return static_cast<DIIPollable_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DIIPollable (void);
-    
-    virtual ~DIIPollable (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DIIPollable (const DIIPollable &);
-    
-    void operator= (const DIIPollable &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLLABLESET_CH_)
-#define _CORBA_POLLABLESET_CH_
-  
-  class TAO_Export PollableSet
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef PollableSet_ptr _ptr_type;
-    typedef PollableSet_var _var_type;
-    
-    // The static operations.
-    static PollableSet_ptr _duplicate (PollableSet_ptr obj);
-    
-    static void _tao_release (PollableSet_ptr obj);
-    
-    static PollableSet_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PollableSet_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PollableSet_ptr _nil (void)
-    {
-      return static_cast<PollableSet_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_)
-#define _CORBA_POLLABLESET_NOPOSSIBLEPOLLABLE_CH_
-    
-    class TAO_Export NoPossiblePollable : public CORBA::UserException
-    {
-    public:
-      
-      NoPossiblePollable (void);
-      NoPossiblePollable (const NoPossiblePollable &);
-      ~NoPossiblePollable (void);
-
-      NoPossiblePollable &operator= (const NoPossiblePollable &);
-      
-      static NoPossiblePollable *_downcast (CORBA::Exception *);
-      static const NoPossiblePollable *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
-#define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
-    
-    class TAO_Export UnknownPollable : public CORBA::UserException
-    {
-    public:
-      
-      UnknownPollable (void);
-      UnknownPollable (const UnknownPollable &);
-      ~UnknownPollable (void);
-
-      UnknownPollable &operator= (const UnknownPollable &);
-      
-      static UnknownPollable *_downcast (CORBA::Exception *);
-      static const UnknownPollable *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::DIIPollable_ptr create_dii_pollable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_pollable (
-        ::CORBA::Pollable_ptr potential
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Pollable_ptr get_ready_pollable (
-        ::CORBA::ULong timeout
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::PollableSet::NoPossiblePollable
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void remove (
-        ::CORBA::Pollable_ptr potential
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::PollableSet::UnknownPollable
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::UShort number_left (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PollableSet (void);
-    
-    virtual ~PollableSet (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PollableSet (const PollableSet &);
-    
-    void operator= (const PollableSet &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLLABLESET__TRAITS_CH_)
-#define _CORBA_POLLABLESET__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::PollableSet>
-  {
-    static ::CORBA::PollableSet_ptr duplicate (
-        ::CORBA::PollableSet_ptr
-      );
-    static void release (
-        ::CORBA::PollableSet_ptr
-      );
-    static ::CORBA::PollableSet_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::PollableSet_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLE__TRAITS_CH_)
-#define _CORBA_POLLABLE__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::Pollable>
-  {
-    static ::CORBA::Pollable_ptr duplicate (
-        ::CORBA::Pollable_ptr
-      );
-    static void release (
-        ::CORBA::Pollable_ptr
-      );
-    static ::CORBA::Pollable_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::Pollable_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DIIPOLLABLE__TRAITS_CH_)
-#define _CORBA_DIIPOLLABLE__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::DIIPollable>
-  {
-    static ::CORBA::DIIPollable_ptr duplicate (
-        ::CORBA::DIIPollable_ptr
-      );
-    static void release (
-        ::CORBA::DIIPollable_ptr
-      );
-    static ::CORBA::DIIPollable_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::DIIPollable_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PollableS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h
deleted file mode 100644
index 63623152d5f..00000000000
--- a/TAO/tao/PortableInterceptor.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    PortableInterceptor.h
- *
- *  $Id$
- *
- *   A series of TAO_INTERCEPTOR* macros are defined in this file.
- *   These macros allows us to disable/enable support of interceptors
- *   easily.
- *
- *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_PORTABLE_INTERCEPTOR_H
-#define TAO_PORTABLE_INTERCEPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-# define TAO_INTERCEPTOR(X) X
-# define TAO_INTERCEPTOR_CHECK ACE_TRY_CHECK
-# define TAO_INTERCEPTOR_CHECK_RETURN(X) ACE_TRY_CHECK
-# define TAO_INTERCEPTOR_THROW(X) ACE_TRY_THROW(X)
-# define TAO_INTERCEPTOR_THROW_RETURN(X,Y) ACE_TRY_THROW(X)
-#else
-# define TAO_INTERCEPTOR(X)
-# define TAO_INTERCEPTOR_CHECK ACE_CHECK
-# define TAO_INTERCEPTOR_CHECK_RETURN(X) ACE_CHECK_RETURN (X)
-# define TAO_INTERCEPTOR_THROW(X) ACE_THROW(X)
-# define TAO_INTERCEPTOR_THROW_RETURN(X,Y) ACE_THROW_RETURN(X,Y)
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLE_INTERCEPTOR_H */
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
deleted file mode 100644
index bf336b0cf4f..00000000000
--- a/TAO/tao/PortableInterceptor.pidl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file PortableInterceptor.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableInterceptor
- * components in the ORB.
- *
- * This file contains the interface definitions for "Portable"
- * Interceptor support.
- * The following is from orbos/99-12-02 Portable Interceptors spec,
- * the full IDL is downloadable from orbos/99-12-02.
- *
- * Additional updates from ptc/00-08-05 are also included.  Changes
- * include:
- *    - addition of the Interceptor::destroy() method
- *    - move of CodecFactory and Codec interfaces to the IOP module
- *
- * This file was used to generate the code in PortableInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PortableInterceptor.pidl
- */
-
-// File: PortableInterceptor.idl
-#ifndef _PORTABLE_INTERCEPTOR_IDL_
-#define _PORTABLE_INTERCEPTOR_IDL_
-
-#include <PI_Forward.pidl>
-#include <Current.pidl>
-#include <Messaging_SyncScope.pidl>
-
-#include <ORBInitializer.pidl>
-#include <ORBInitInfo.pidl>
-#include <InvalidSlot.pidl>
-#include <ClientRequestInfo.pidl>
-#include <ServerRequestInfo.pidl>
-#include <PolicyFactory.pidl>
-#include <ORBInitInfo.pidl>
-#include <ClientRequestInterceptor.pidl>
-#include <ServerRequestInterceptor.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  const AdapterState    HOLDING         = 0;
-  const AdapterState    ACTIVE          = 1;
-  const AdapterState    DISCARDING      = 2;
-  const AdapterState    INACTIVE        = 3;
-  const AdapterState    NON_EXISTENT    = 4;
-
-  // Valid reply_status values:
-  const ReplyStatus SUCCESSFUL = 0;
-  const ReplyStatus SYSTEM_EXCEPTION = 1;
-  const ReplyStatus USER_EXCEPTION = 2;
-  const ReplyStatus LOCATION_FORWARD = 3;
-  const ReplyStatus TRANSPORT_RETRY = 4;
-  const ReplyStatus UNKNOWN = 5;
-
-  local interface Current : CORBA::Current
-  {
-    any get_slot (in SlotId id) raises (InvalidSlot);
-    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
-  };
-};
-
-#endif  /* _PORTABLE_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
deleted file mode 100644
index 9acfbedc2aa..00000000000
--- a/TAO/tao/PortableInterceptorA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PortableInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/Current:1.0",
-    "Current");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_PortableInterceptor_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Current_ptr _tao_elem
-  )
-{
-  PortableInterceptor::Current_ptr _tao_objptr =
-    PortableInterceptor::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::Current>::insert (
-      _tao_any,
-      PortableInterceptor::Current::_tao_any_destructor,
-      PortableInterceptor::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::Current>::extract (
-        _tao_any,
-        PortableInterceptor::Current::_tao_any_destructor,
-        PortableInterceptor::_tc_Current,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
deleted file mode 100644
index 5769b666206..00000000000
--- a/TAO/tao/PortableInterceptorC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PortableInterceptorC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::Current.
-
-PortableInterceptor::Current_ptr
-TAO::Objref_Traits<PortableInterceptor::Current>::duplicate (
-    PortableInterceptor::Current_ptr p
-  )
-{
-  return PortableInterceptor::Current::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::Current>::release (
-    PortableInterceptor::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::Current_ptr
-TAO::Objref_Traits<PortableInterceptor::Current>::nil (void)
-{
-  return PortableInterceptor::Current::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::Current>::marshal (
-    PortableInterceptor::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::Current::Current (void)
-{}
-
-PortableInterceptor::Current::~Current (void)
-{}
-
-void 
-PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::Current_ptr
-PortableInterceptor::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-PortableInterceptor::Current_ptr
-PortableInterceptor::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-PortableInterceptor::Current_ptr
-PortableInterceptor::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::Current::_tao_release (Current_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::Current::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/Current:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::Current::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
deleted file mode 100644
index ffabb20d8bf..00000000000
--- a/TAO/tao/PortableInterceptorC.h
+++ /dev/null
@@ -1,310 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PI_ForwardC.h"
-#include "tao/CurrentC.h"
-#include "tao/Messaging_SyncScopeC.h"
-#include "tao/ORBInitializerC.h"
-#include "tao/ORBInitInfoC.h"
-#include "tao/InvalidSlotC.h"
-#include "tao/ClientRequestInfoC.h"
-#include "tao/ServerRequestInfoC.h"
-#include "tao/PolicyFactoryC.h"
-#include "tao/ORBInitInfoC.h"
-#include "tao/ClientRequestInterceptorC.h"
-#include "tao/ServerRequestInterceptorC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState HOLDING = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState ACTIVE = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState DISCARDING = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState INACTIVE = 3;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ReplyStatus UNKNOWN = 5;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
-  
-  class Current;
-  typedef Current *Current_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Current
-      >
-    Current_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Current
-      >
-    Current_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT_CH_
-  
-  class TAO_Export Current
-    : public virtual ::CORBA::Current
-  {
-  public:
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-    
-    // The static operations.
-    static Current_ptr _duplicate (Current_ptr obj);
-    
-    static void _tao_release (Current_ptr obj);
-    
-    static Current_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _nil (void)
-    {
-      return static_cast<Current_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * get_slot (
-        ::PortableInterceptor::SlotId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::InvalidSlot
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_slot (
-        ::PortableInterceptor::SlotId id,
-        const ::CORBA::Any & data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::InvalidSlot
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Current (void);
-    
-    virtual ~Current (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-    
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::Current>
-  {
-    static ::PortableInterceptor::Current_ptr duplicate (
-        ::PortableInterceptor::Current_ptr
-      );
-    static void release (
-        ::PortableInterceptor::Current_ptr
-      );
-    static ::PortableInterceptor::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::Current_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableInterceptorS.h b/TAO/tao/PortableInterceptorS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PortableInterceptorS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
deleted file mode 100644
index a839d48bc48..00000000000
--- a/TAO/tao/PortableServer.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_PortableServer
-  dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
-
-  Source_Files {
-    PortableServer
-  }
-
-  Header_Files {
-    PortableServer
-  }
-
-  Inline_Files {
-    PortableServer
-  }
-
-  Template_Files {
-    PortableServer
-  }
-
-  Resource_Files {
-    PortableServer
-  }
-
-  PIDL_Files {
-    PortableServer
-  }
-
-  Pkgconfig_Files {
-    PortableServer/TAO_PortableServer.pc.in
-  }
-}
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
deleted file mode 100644
index 673049665c5..00000000000
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ /dev/null
@@ -1,1152 +0,0 @@
-// $Id$
-
-#include "Active_Object_Map.h"
-#include "Active_Object_Map_Entry.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID(PortableServer,
-          Active_Object_Map,
-          "$Id$")
-
-/* static */
-size_t TAO_Active_Object_Map::system_id_size_ = 0;
-
-void
-TAO_Active_Object_Map::set_system_id_size
-  (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Active_Object_Map::system_id_size_ == 0)
-    {
-      if (creation_parameters.allow_reactivation_of_system_ids_)
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-            case TAO_LINEAR:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-            case TAO_DYNAMIC_HASH:
-            default:
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-            }
-
-          size_t hint_size = 0;
-
-          if (creation_parameters.use_active_hint_in_ids_)
-            hint_size = ACE_Active_Map_Manager_Key::size ();
-
-          TAO_Active_Object_Map::system_id_size_ += hint_size;
-        }
-      else
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-            case TAO_LINEAR:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-
-            case TAO_DYNAMIC_HASH:
-              TAO_Active_Object_Map::system_id_size_ =
-                sizeof (CORBA::ULong);
-              break;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-            case TAO_ACTIVE_DEMUX:
-            default:
-              TAO_Active_Object_Map::system_id_size_ =
-                ACE_Active_Map_Manager_Key::size ();
-              break;
-            }
-        }
-    }
-}
-
-TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
-                                              int unique_id_policy,
-                                              int persistent_id_policy,
-                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                                              ACE_ENV_ARG_DECL)
-  : user_id_map_ (0),
-    servant_map_ (0),
-    id_uniqueness_strategy_ (0),
-    lifespan_strategy_ (0),
-    id_assignment_strategy_ (0),
-    id_hint_strategy_ (0),
-    using_active_maps_ (0)
-{
-  TAO_Active_Object_Map::set_system_id_size (creation_parameters);
-
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy = 0;
-
-  if (unique_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Unique_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Multiple_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy);
-
-  TAO_Lifespan_Strategy *lifespan_strategy = 0;
-
-  if (persistent_id_policy)
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Persistent_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Transient_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy);
-
-  TAO_Id_Assignment_Strategy *id_assignment_strategy = 0;
-
-  if (user_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_User_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else if (unique_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_System_Id_With_Unique_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_System_Id_With_Multiple_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy);
-
-  TAO_Id_Hint_Strategy *id_hint_strategy = 0;
-  if ((user_id_policy
-       || creation_parameters.allow_reactivation_of_system_ids_)
-      && creation_parameters.use_active_hint_in_ids_)
-    {
-      this->using_active_maps_ = 1;
-
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_Active_Hint_Strategy (creation_parameters.active_object_map_size_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_No_Hint_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy);
-
-  servant_map *sm = 0;
-  if (unique_id_policy)
-    {
-      switch (creation_parameters.reverse_object_lookup_strategy_for_unique_id_policy_)
-        {
-        case TAO_LINEAR:
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-          ACE_NEW_THROW_EX (sm,
-                            servant_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-#else
-          ACE_ERROR ((LM_ERROR,
-                      "linear option for -ORBUniqueidPolicyReverseDemuxStrategy "
-                      "not supported with minimum POA maps. "
-                      "Ingoring option to use default... \n"));
-          /* FALL THROUGH */
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-        case TAO_DYNAMIC_HASH:
-        default:
-          ACE_NEW_THROW_EX (sm,
-                            servant_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<servant_map> new_servant_map (sm);
-
-  user_id_map *uim = 0;
-  if (user_id_policy
-      || creation_parameters.allow_reactivation_of_system_ids_)
-    {
-      switch (creation_parameters.object_lookup_strategy_for_user_id_policy_)
-        {
-        case TAO_LINEAR:
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-#else
-          ACE_ERROR ((LM_ERROR,
-                      "linear option for -ORBUseridPolicyDemuxStrategy "
-                      "not supported with minimum POA maps. "
-                      "Ingoring option to use default... \n"));
-          /* FALL THROUGH */
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-        case TAO_DYNAMIC_HASH:
-        default:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-  else
-    {
-      switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-        {
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-        case TAO_LINEAR:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-#else
-        case TAO_LINEAR:
-        case TAO_DYNAMIC_HASH:
-          ACE_ERROR ((LM_ERROR,
-                      "linear and dynamic options for -ORBSystemidPolicyDemuxStrategy "
-                      "are not supported with minimum POA maps. "
-                      "Ingoring option to use default... \n"));
-          /* FALL THROUGH */
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-        case TAO_ACTIVE_DEMUX:
-        default:
-
-          this->using_active_maps_ = 1;
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_active_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-
-  // Give ownership to the auto pointer.
-  auto_ptr<user_id_map> new_user_id_map (uim);
-
-  id_uniqueness_strategy->set_active_object_map (this);
-  lifespan_strategy->set_active_object_map (this);
-  id_assignment_strategy->set_active_object_map (this);
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy.release ();
-  this->lifespan_strategy_ = new_lifespan_strategy.release ();
-  this->id_assignment_strategy_ = new_id_assignment_strategy.release ();
-  this->id_hint_strategy_ = new_id_hint_strategy.release ();
-  this->servant_map_ = new_servant_map.release ();
-  this->user_id_map_ = new_user_id_map.release ();
-}
-
-TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
-{
-  user_id_map::iterator iterator = this->user_id_map_->begin ();
-  user_id_map::iterator end = this->user_id_map_->end ();
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      user_id_map::value_type map_entry = *iterator;
-      delete map_entry.second ();
-    }
-
-  delete this->id_uniqueness_strategy_;
-  delete this->lifespan_strategy_;
-  delete this->id_assignment_strategy_;
-  delete this->id_hint_strategy_;
-  delete this->servant_map_;
-  delete this->user_id_map_;
-}
-
-int
-TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                                          CORBA::Short priority,
-                                          int &priorities_match,
-                                          int &deactivated)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->servant_ == 0)
-        {
-          result = 0;
-
-          if (entry->priority_ != priority)
-            priorities_match = 0;
-        }
-      else
-        {
-          result = 1;
-          if (entry->deactivated_)
-            {
-              deactivated = 1;
-            }
-        }
-    }
-  else
-    {
-      result = 0;
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
-{
-}
-
-void
-TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
-                                           int &deactivated)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      result = 1;
-      if (entry->deactivated_)
-        {
-          deactivated = 1;
-        }
-    }
-  else
-    {
-      result = 0;
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                            const PortableServer::ObjectId &user_id,
-                                            CORBA::Short priority,
-                                            TAO_Active_Object_Map_Entry *&entry)
-{
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-  if (result == 0)
-    {
-      if (servant != 0)
-        {
-          entry->servant_ = servant;
-
-          result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                 entry);
-        }
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map_Entry,
-                      -1);
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
-      entry->priority_ = priority;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
-          if (result == 0)
-            {
-              if (servant != 0)
-                result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                       entry);
-              if (result != 0)
-                {
-                  this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-                  this->active_object_map_->id_hint_strategy_->unbind (*entry);
-                  delete entry;
-                }
-            }
-          else
-            {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-  if (result == 0)
-    {
-      if (entry->servant_ != 0)
-        result = this->active_object_map_->servant_map_->unbind (entry->servant_);
-
-      if (result == 0)
-        result =
-          this->active_object_map_->id_hint_strategy_->unbind (*entry);
-
-      if (result == 0)
-        delete entry;
-    }
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                    PortableServer::ObjectId_out user_id)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else
-        ACE_NEW_RETURN (user_id,
-                        PortableServer::ObjectId (entry->user_id_),
-                        -1);
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_system_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out system_id,
-                                                      CORBA::Short &priority)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else
-        {
-          result = this->active_object_map_->id_hint_strategy_->system_id (system_id,
-                                                                           *entry);
-          if (result == 0)
-            priority = entry->priority_;
-        }
-    }
-
-  return result;
-}
-
-CORBA::Boolean
-TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  ACE_UNUSED_ARG (servant);
-
-  // Since servant are always unique here, return false.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant,
-                                             int &)
-{
-  return -1;
-}
-
-int
-TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                              const PortableServer::ObjectId &user_id,
-                                              CORBA::Short priority,
-                                              TAO_Active_Object_Map_Entry *&entry)
-{
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-  if (result == 0)
-    {
-      if (servant != 0)
-        entry->servant_ = servant;
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map_Entry,
-                      -1);
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
-      entry->priority_ = priority;
-
-      result =
-        this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
-          if (result != 0)
-            {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Multiple_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-  if (result == 0)
-    {
-      result = this->active_object_map_->id_hint_strategy_->unbind (*entry);
-
-      if (result == 0)
-        delete entry;
-    }
-
-  return result;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out user_id)
-{
-  ACE_UNUSED_ARG (servant);
-  ACE_UNUSED_ARG (user_id);
-
-  return -1;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_system_id_using_servant (PortableServer::Servant,
-                                                        PortableServer::ObjectId_out,
-                                                        CORBA::Short &)
-{
-  return -1;
-}
-
-CORBA::Boolean
-TAO_Multiple_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map_->user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map_->user_id_map_->begin ();
-       iter != end;
-       ++iter)
-    {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map_Entry *entry = map_pair.second ();
-
-      if (entry->servant_ == servant)
-        return 1;
-    }
-
-  return 0;
-}
-
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
-{
-}
-
-void
-TAO_Lifespan_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                  const PortableServer::ObjectId &user_id,
-                                                                  PortableServer::Servant &servant,
-                                                                  TAO_Active_Object_Map_Entry *&entry)
-{
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
-        {
-          if (entry->deactivated_)
-            result = -1;
-          else if (entry->servant_ == 0)
-            result = -1;
-          else
-            servant = entry->servant_;
-        }
-    }
-
-  if (result == -1)
-    entry = 0;
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                   const PortableServer::ObjectId &user_id,
-                                                                   PortableServer::Servant &servant,
-                                                                   TAO_Active_Object_Map_Entry *&entry)
-{
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0 &&
-      user_id == entry->user_id_)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
-        {
-          if (entry->deactivated_)
-            result = -1;
-          else if (entry->servant_ == 0)
-            result = -1;
-          else
-            servant = entry->servant_;
-        }
-    }
-
-  if (result == -1)
-    entry = 0;
-
-  return result;
-}
-
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy (void)
-{
-}
-
-void
-TAO_Id_Assignment_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-int
-TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant,
-                                            CORBA::Short,
-                                            TAO_Active_Object_Map_Entry *&)
-{
-  return -1;
-}
-
-int
-TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                             CORBA::Short priority,
-                                                             TAO_Active_Object_Map_Entry *&entry)
-{
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map_Entry,
-                  -1);
-
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
-      entry->priority_ = priority;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          if (servant != 0)
-            result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                   entry);
-
-          if (result != 0)
-            {
-              this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
-  else
-    delete entry;
-
-  return result;
-}
-
-int
-TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                               CORBA::Short priority,
-                                                               TAO_Active_Object_Map_Entry *&entry)
-{
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map_Entry,
-                  -1);
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
-      entry->priority_ = priority;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result != 0)
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
-  else
-    delete entry;
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy (void)
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
-  : system_id_map_ (map_size)
-{
-}
-
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Active_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                       PortableServer::ObjectId &user_id)
-{
-  return this->system_id_map_.recover_key (system_id,
-                                           user_id);
-}
-
-int
-TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map_Entry &entry)
-{
-  entry.system_id_ = entry.user_id_;
-
-  return this->system_id_map_.bind_modify_key (&entry,
-                                               entry.system_id_);
-}
-
-int
-TAO_Active_Hint_Strategy::unbind (TAO_Active_Object_Map_Entry &entry)
-{
-  return this->system_id_map_.unbind (entry.system_id_);
-}
-
-int
-TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                                TAO_Active_Object_Map_Entry *&entry)
-{
-  return this->system_id_map_.find (system_id,
-                                    entry);
-}
-
-size_t
-TAO_Active_Hint_Strategy::hint_size (void)
-{
-  return ACE_Active_Map_Manager_Key::size ();
-}
-
-int
-TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                     TAO_Active_Object_Map_Entry &entry)
-{
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.system_id_),
-                  -1);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                   PortableServer::ObjectId &user_id)
-{
-  // Smartly copy all the data; <user_id does not own the data>.
-  user_id.replace (system_id.maximum (),
-                   system_id.length (),
-                   const_cast<CORBA::Octet *> (system_id.get_buffer ()),
-                   0);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map_Entry &entry)
-{
-  ACE_UNUSED_ARG (entry);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map_Entry &entry)
-{
-  ACE_UNUSED_ARG (entry);
-
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                            TAO_Active_Object_Map_Entry *&entry)
-{
-  ACE_UNUSED_ARG (system_id);
-  ACE_UNUSED_ARG (entry);
-
-  return -1;
-}
-
-size_t
-TAO_No_Hint_Strategy::hint_size (void)
-{
-  return 0;
-}
-
-int
-TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                 TAO_Active_Object_Map_Entry &entry)
-{
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.user_id_),
-                  -1);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Id_Uniqueness_Strategy>;
-template class auto_ptr<TAO_Lifespan_Strategy>;
-template class auto_ptr<TAO_Id_Assignment_Strategy>;
-template class auto_ptr<TAO_Id_Hint_Strategy>;
-template class auto_ptr<TAO_Active_Object_Map::servant_map>;
-template class auto_ptr<TAO_Active_Object_Map::user_id_map>;
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map_Entry *value;
-
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
-
-template class ACE_Noop_Key_Generator<servant>;
-
-// Common
-template class ACE_Reference_Pair<const id, value>;
-template class ACE_Reference_Pair<const servant, value>;
-
-// Map and iterator classes.
-template class ACE_Map<id, value>;
-template class ACE_Map<servant, value>;
-template class ACE_Iterator<id_value_type>;
-template class ACE_Iterator<servant_value_type>;
-template class ACE_Reverse_Iterator<id_value_type>;
-template class ACE_Reverse_Iterator<servant_value_type>;
-
-// Iterator base classes.
-template class ACE_Iterator_Impl<id_value_type>;
-template class ACE_Iterator_Impl<servant_value_type>;
-template class ACE_Reverse_Iterator_Impl<id_value_type>;
-template class ACE_Reverse_Iterator_Impl<servant_value_type>;
-
-// Active Map Manager related.
-template class ACE_Pair<id, value>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager<id_expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>;
-
-// Hash Map Manager related.
-template class ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<id, value>;
-template class ACE_Hash_Map_Entry<servant, value>;
-template class ACE_Equal_To<id>;
-template class ACE_Equal_To<servant>;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>;
-template class ACE_Map_Manager<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Manager<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<id, value>;
-template class ACE_Map_Entry<servant, value>;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map>
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map_Entry * value;
-
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
-
-#pragma instantiate ACE_Noop_Key_Generator<servant>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const id, value>
-#pragma instantiate ACE_Reference_Pair<const servant, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<id, value>
-#pragma instantiate ACE_Map<servant, value>
-#pragma instantiate ACE_Iterator<id_value_type>
-#pragma instantiate ACE_Iterator<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator<servant_value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Iterator_Impl<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<servant_value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<id, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<id_expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>
-
-// Hash Map Manager related.
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<id, value>
-#pragma instantiate ACE_Hash_Map_Entry<servant, value>
-#pragma instantiate ACE_Equal_To<id>
-#pragma instantiate ACE_Equal_To<servant>
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>
-#pragma instantiate ACE_Map_Manager<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Manager<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<id, value>
-#pragma instantiate ACE_Map_Entry<servant, value>
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
deleted file mode 100644
index 7b691edd1a0..00000000000
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ /dev/null
@@ -1,620 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Active_Object_Map.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-
-#ifndef TAO_ACTIVE_OBJECT_MAP_H
-#define TAO_ACTIVE_OBJECT_MAP_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Key_Adapters.h"
-
-#include "ace/Map_T.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "Servant_Base.h"
-
-// Forward declarations.
-class TAO_Id_Uniqueness_Strategy;
-class TAO_Lifespan_Strategy;
-class TAO_Id_Assignment_Strategy;
-class TAO_Id_Hint_Strategy;
-struct TAO_Active_Object_Map_Entry;
-
-/**
- * @class TAO_Active_Object_Map
- *
- * @brief Map of object ids to servants.
- *
- * Implementation to be used by the POA.
- */
-class TAO_PortableServer_Export TAO_Active_Object_Map
-{
-public:
-
-  /// Constructor.
-  TAO_Active_Object_Map (int user_id_policy,
-                         int unique_id_policy,
-                         int persistent_id_policy,
-                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                         ACE_ENV_ARG_DECL);
-
-  /// Destructor.
-  ~TAO_Active_Object_Map (void);
-
-  /// Must be used with UNIQUE_ID policy.
-  int is_servant_in_map (PortableServer::Servant servant,
-                         int &deactivated);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                         CORBA::Short priority,
-                         int &priorities_match,
-                         int &deactivated);
-
-  /// Must be used with SYSTEM_ID policy.
-  int bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                CORBA::Short priority,
-                                                PortableServer::ObjectId_out system_id);
-
-  /// Must be used with SYSTEM_ID policy.
-  int bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                              CORBA::Short priority,
-                                              PortableServer::ObjectId_out user_id);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int bind_using_user_id (PortableServer::Servant servant,
-                          const PortableServer::ObjectId &user_id,
-                          CORBA::Short priority);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                    CORBA::Short priority,
-                                    PortableServer::ObjectId_out system_id);
-
-  /// Can be used with any policy.
-  int rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                          const PortableServer::ObjectId &user_id,
-                                          const PortableServer::ObjectId &system_id,
-                                          TAO_Active_Object_Map_Entry *&entry);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int find_user_id_using_servant (PortableServer::Servant servant,
-                                  PortableServer::ObjectId_out user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int find_system_id_using_servant (PortableServer::Servant servant,
-                                    PortableServer::ObjectId_out system_id,
-                                    CORBA::Short &priority);
-
-  /// Can be used with any policy. With the SYSTEM_ID policy,
-  /// user_id is actually system_id.
-  int find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                  PortableServer::Servant &servant);
-
-  /// Can be used with any policy.
-  int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                TAO_Active_Object_Map_Entry *&entry);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// @a user_id is identical to @a system_id.
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                PortableServer::ObjectId_out system_id,
-                                                CORBA::Short &priority);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is identical to <system_id>.
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                TAO_Active_Object_Map_Entry *&entry);
-
-  /// Can be used with any policy.  When the SYSTEM_ID policy is used,
-  /// the <system_id> is identical to <user_id>.
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId_out user_id);
-
-  /// Can be used with any policy.  When the SYSTEM_ID policy is used,
-  /// the <system_id> is identical to <user_id>.
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId &user_id);
-
-  /// Are there any remaining activations of @a servant in the active
-  /// object map?  Can be used with any policy.
-  CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-
-  /// Size of the map.
-  size_t current_size (void);
-
-  /// Can be used with any policy.
-  static size_t system_id_size (void);
-
-  /// Set the system id size.
-  static void set_system_id_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-
-  /// Base class of the id map.
-  typedef ACE_Map<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map_Entry *> user_id_map;
-
-  /// Id hash map.
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map_Entry *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    TAO_Incremental_Key_Generator> user_id_hash_map;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-  /// Id linear map.
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map_Entry *,
-    TAO_Incremental_Key_Generator> user_id_linear_map;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-  /// Id active map.
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map_Entry *,
-    TAO_Ignore_Original_Key_Adapter> user_id_active_map;
-
-  /// Base class of the servant map.
-  typedef ACE_Map<
-  PortableServer::Servant,
-    TAO_Active_Object_Map_Entry *> servant_map;
-
-  /// Servant hash map.
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::Servant,
-    TAO_Active_Object_Map_Entry *,
-    TAO_Servant_Hash,
-    ACE_Equal_To<PortableServer::Servant>,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_hash_map;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-  /// Servant linear map.
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::Servant,
-    TAO_Active_Object_Map_Entry *,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_linear_map;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-  /// Id map.
-  user_id_map *user_id_map_;
-
-  /// Servant map.
-  servant_map *servant_map_;
-
-  /// Id uniqueness strategy.
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy_;
-
-  /// Lifespan strategy.
-  TAO_Lifespan_Strategy *lifespan_strategy_;
-
-  /// Id assignment strategy.
-  TAO_Id_Assignment_Strategy *id_assignment_strategy_;
-
-  /// Id hint strategy.
-  TAO_Id_Hint_Strategy *id_hint_strategy_;
-
-  /// Flag to see if we are using active maps in this active object
-  /// map.
-  int using_active_maps_;
-
-  /// Size of the system id produced by the map.
-  static size_t system_id_size_;
-};
-
-/**
- * @class TAO_Id_Uniqueness_Strategy
- *
- * @brief Id uniqueness strategy.
- *
- * Strategy for implementing points of variation between the
- * UNIQUE_ID and the MULTIPLE_ID policies.
- */
-class TAO_Id_Uniqueness_Strategy
-{
-public:
-  /// Virtual destructor.
-  virtual ~TAO_Id_Uniqueness_Strategy (void);
-
-  /// Must be used with UNIQUE_ID policy.
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated) = 0;
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id) = 0;
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id) = 0;
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id,
-                                            CORBA::Short &priority) = 0;
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  CORBA::Short priority,
-                                  TAO_Active_Object_Map_Entry *&entry) = 0;
-
-  /// Are there any remaining activations of <servant> in the active
-  /// object map?  Can be used with any policy.
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant) = 0;
-
-  /// Set the active map.
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-
-protected:
-
-  /// Pointer to the active map.
-  TAO_Active_Object_Map *active_object_map_;
-};
-
-/**
- * @class TAO_Unique_Id_Strategy
- *
- * @brief Unique id strategy.
- *
- * Strategy for the UNIQUE_ID policy.
- */
-class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy
-{
-public:
-
-  /// Must be used with UNIQUE_ID policy.
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id,
-                                            CORBA::Short &priority);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  CORBA::Short priority,
-                                  TAO_Active_Object_Map_Entry *&entry);
-
-  /// Are there any remaining activations of <servant> in the active
-  /// object map?  Can be used with any policy.
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-};
-
-/**
- * @class TAO_Multiple_Id_Strategy
- *
- * @brief Multiple id strategy.
- *
- * Strategy for the MULTIPLE_ID policy.
- */
-class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy
-{
-public:
-
-  /// Must be used with UNIQUE_ID policy.
-  virtual int is_servant_in_map (PortableServer::Servant servant,
-                                 int &deactivated);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-
-  /// Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id,
-                                            CORBA::Short &priority);
-
-  /// Can be used with any policy.  With the SYSTEM_ID policy,
-  /// <user_id> is actually <system_id>.
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  CORBA::Short priority,
-                                  TAO_Active_Object_Map_Entry *&entry);
-
-  /// Are there any remaining activations of <servant> in the active
-  /// object map?  Can be used with any policy.
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-};
-
-/**
- * @class TAO_Lifespan_Strategy
- *
- * @brief Lifespan strategy.
- *
- * Strategy for implementing points of variation between the
- * TRANSIENT and the PERSISTENT policies.
- */
-class TAO_Lifespan_Strategy
-{
-public:
-
-  /// Virtual destructor.
-  virtual ~TAO_Lifespan_Strategy (void);
-
-  /// Can be used with any policy.
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map_Entry *&entry) = 0;
-
-  /// Set the active map.
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-
-protected:
-
-  /// Pointer to the active map.
-  TAO_Active_Object_Map *active_object_map_;
-};
-
-/**
- * @class TAO_Transient_Strategy
- *
- * @brief Transient strategy.
- *
- * Strategy for the TRANSIENT policy.
- */
-class TAO_Transient_Strategy : public TAO_Lifespan_Strategy
-{
-public:
-  /// Can be used with any policy.
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map_Entry *&entry);
-};
-
-/**
- * @class TAO_Persistent_Strategy
- *
- * @brief Persistent strategy.
- *
- * Strategy for the PERSISTENT policy.
- */
-class TAO_Persistent_Strategy : public TAO_Lifespan_Strategy
-{
-public:
-  /// Can be used with any policy.
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map_Entry *&entry);
-
-};
-
-/**
- * @class TAO_Id_Assignment_Strategy
- *
- * @brief Id uniqueness strategy.
- *
- * Strategy for implementing points of variation between the
- * USER_ID and the SYSTEM_ID policies.
- */
-class TAO_Id_Assignment_Strategy
-{
-public:
-  /// Virtual destructor.
-  virtual ~TAO_Id_Assignment_Strategy (void);
-
-  /// Must be used with SYSTEM_ID policy.
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    TAO_Active_Object_Map_Entry *&entry) = 0;
-
-  /// Set the active map.
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-
-protected:
-
-  /// Pointer to the active map.
-  TAO_Active_Object_Map *active_object_map_;
-};
-
-/**
- * @class TAO_User_Id_Strategy
- *
- * @brief User id strategy.
- *
- * Strategy for the USER_ID policy.
- */
-class TAO_User_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-public:
-  /// Must be used with SYSTEM_ID policy.
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    TAO_Active_Object_Map_Entry *&entry);
-};
-
-/**
- * @class TAO_System_Id_With_Unique_Id_Strategy
- *
- * @brief System id strategy.
- *
- * Strategy for the SYSTEM_ID policy (with UNIQUE_ID policy).
- */
-class TAO_System_Id_With_Unique_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-public:
-  /// Must be used with SYSTEM_ID policy.
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    TAO_Active_Object_Map_Entry *&entry);
-};
-
-/**
- * @class TAO_System_Id_With_Multiple_Id_Strategy
- *
- * @brief System id strategy.
- *
- * Strategy for the SYSTEM_ID policy (with MULTIPLE_ID policy).
- */
-class TAO_System_Id_With_Multiple_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-public:
-  /// Must be used with SYSTEM_ID policy.
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    TAO_Active_Object_Map_Entry *&entry);
-};
-
-/**
- * @class TAO_Id_Hint_Strategy
- *
- * @brief Id uniqueness strategy.
- *
- * Strategy for implementing points of variation between the
- * active hint and the no hint policies.
- */
-class TAO_Id_Hint_Strategy
-{
-public:
-  /// Virtual destructor.
-  virtual ~TAO_Id_Hint_Strategy (void);
-
-  /// Find the user id from the system id.
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id) = 0;
-
-  /// Add to map.
-  virtual int bind (TAO_Active_Object_Map_Entry &entry) = 0;
-
-  /// Remove from map.
-  virtual int unbind (TAO_Active_Object_Map_Entry &entry) = 0;
-
-  /// Find system id.
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map_Entry *&entry) = 0;
-
-  /// How big is the hint generated by this strategy?
-  virtual size_t hint_size (void) = 0;
-
-  /// Get the system id associated with this entry.
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map_Entry &entry) = 0;
-};
-
-/**
- * @class TAO_Active_Hint_Strategy
- *
- * @brief Active hint strategy.
- *
- * Strategy for adding active hints to ids.
- */
-class TAO_Active_Hint_Strategy : public TAO_Id_Hint_Strategy
-{
-public:
-  TAO_Active_Hint_Strategy (CORBA::ULong map_size);
-
-  /// Virtual destructor.
-  virtual ~TAO_Active_Hint_Strategy (void);
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
-
-  virtual int bind (TAO_Active_Object_Map_Entry &entry);
-
-  virtual int unbind (TAO_Active_Object_Map_Entry &entry);
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map_Entry *&entry);
-
-  virtual size_t hint_size (void);
-
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map_Entry &entry);
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map_Entry *,
-    TAO_Preserve_Original_Key_Adapter> system_id_map;
-
-  system_id_map system_id_map_;
-};
-
-/**
- * @class TAO_No_Hint_Strategy
- *
- * @brief No hint strategy.
- *
- * Strategy for not adding active hints to ids.
- */
-class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
-{
-public:
-  /// Virtual destructor.
-  virtual ~TAO_No_Hint_Strategy (void);
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
-
-  virtual int bind (TAO_Active_Object_Map_Entry &entry);
-
-  virtual int unbind (TAO_Active_Object_Map_Entry &entry);
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map_Entry *&entry);
-
-  virtual size_t hint_size (void);
-
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map_Entry &entry);
-};
-
-#if defined (__ACE_INLINE__)
-# include "Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ACTIVE_OBJECT_MAP_H */
diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i
deleted file mode 100644
index 042624a3174..00000000000
--- a/TAO/tao/PortableServer/Active_Object_Map.i
+++ /dev/null
@@ -1,253 +0,0 @@
-// $Id$
-
-#include "Active_Object_Map_Entry.h"
-
-ACE_INLINE int
-TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
-                                          int &deactivated)
-{
-  return this->id_uniqueness_strategy_->is_servant_in_map (servant,
-                                                           deactivated);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                                 CORBA::Short priority,
-                                                                 PortableServer::ObjectId_out system_id)
-{
-  if (servant == 0 &&
-      !this->using_active_maps_)
-    {
-      PortableServer::ObjectId id;
-
-      int result =
-        this->user_id_map_->create_key (id);
-
-      if (result == 0)
-        {
-          ACE_NEW_RETURN (system_id,
-                          PortableServer::ObjectId (id),
-                          -1);
-        }
-
-      return result;
-    }
-
-  TAO_Active_Object_Map_Entry *entry = 0;
-
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    priority,
-                                                                    entry);
-
-  if (result == 0)
-    result = this->id_hint_strategy_->system_id (system_id,
-                                                 *entry);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                                               CORBA::Short priority,
-                                                               PortableServer::ObjectId_out user_id)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    priority,
-                                                                    entry);
-  if (result == 0)
-    ACE_NEW_RETURN (user_id,
-                    PortableServer::ObjectId (entry->user_id_),
-                    -1);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::bind_using_user_id (PortableServer::Servant servant,
-                                           const PortableServer::ObjectId &user_id,
-                                           CORBA::Short priority)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            priority,
-                                                            entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                     CORBA::Short priority,
-                                                     PortableServer::ObjectId_out system_id)
-{
-  if (!this->using_active_maps_)
-    {
-      ACE_NEW_RETURN (system_id,
-                      PortableServer::ObjectId (user_id),
-                      -1);
-
-      return 0;
-    }
-
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->id_uniqueness_strategy_->bind_using_user_id (0,
-                                                                  user_id,
-                                                                  priority,
-                                                                  entry);
-  if (result == 0)
-    result = this->id_hint_strategy_->system_id (system_id,
-                                                 *entry);
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                                           const PortableServer::ObjectId &user_id,
-                                                           const PortableServer::ObjectId &system_id,
-                                                           TAO_Active_Object_Map_Entry *&entry)
-{
-  ACE_UNUSED_ARG (system_id);
-
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            -1,
-                                                            entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  return this->id_uniqueness_strategy_->unbind_using_user_id (user_id);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_servant (PortableServer::Servant servant,
-                                                   PortableServer::ObjectId_out user_id)
-{
-  return this->id_uniqueness_strategy_->find_user_id_using_servant (servant,
-                                                                    user_id);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_servant (PortableServer::Servant servant,
-                                                     PortableServer::ObjectId_out system_id,
-                                                     CORBA::Short &priority)
-{
-  return this->id_uniqueness_strategy_->find_system_id_using_servant (servant,
-                                                                      system_id,
-                                                                      priority);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                                   PortableServer::Servant &servant)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-      else
-        servant = entry->servant_;
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                 const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 TAO_Active_Object_Map_Entry *&entry)
-{
-  return this->lifespan_strategy_->find_servant_using_system_id_and_user_id (system_id,
-                                                                             user_id,
-                                                                             servant,
-                                                                             entry);
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 TAO_Active_Object_Map_Entry *&entry)
-{
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        result = -1;
-      else if (entry->servant_ == 0)
-        result = -1;
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 PortableServer::ObjectId_out system_id,
-                                                                 CORBA::Short &priority)
-{
-  TAO_Active_Object_Map_Entry *entry = 0;
-  int result = this->find_servant_and_system_id_using_user_id (user_id,
-                                                               entry);
-
-  if (result == 0)
-    {
-      result = this->id_hint_strategy_->system_id (system_id,
-                                                   *entry);
-      if (result == 0)
-        {
-          servant = entry->servant_;
-          priority = entry->priority_;
-        }
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId_out user_id)
-{
-  PortableServer::ObjectId id;
-  int result = this->id_hint_strategy_->recover_key (system_id,
-                                                     id);
-  if (result == 0)
-    ACE_NEW_RETURN (user_id,
-                    PortableServer::ObjectId (id),
-                    -1);
-  return 0;
-}
-
-ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId &user_id)
-{
-  return this->id_hint_strategy_->recover_key (system_id,
-                                               user_id);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant)
-{
-  return this->id_uniqueness_strategy_->remaining_activations (servant);
-}
-
-ACE_INLINE size_t
-TAO_Active_Object_Map::current_size (void)
-{
-  return this->user_id_map_->current_size ();
-}
-
-/* static */
-ACE_INLINE size_t
-TAO_Active_Object_Map::system_id_size (void)
-{
-  return TAO_Active_Object_Map::system_id_size_;
-}
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
deleted file mode 100644
index d7a1fa3fe64..00000000000
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-#include "Active_Object_Map_Entry.h"
-
-ACE_RCSID(PortableServer,
-          Active_Object_Map_Entry,
-          "$Id$")
-
-TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
-  : user_id_ (),
-    system_id_ (),
-    servant_ (0),
-    reference_count_ (1),
-    deactivated_ (0),
-    priority_ (-1)
-{
-}
-
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
deleted file mode 100644
index 1c072df4201..00000000000
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Active_Object_Map_Entry.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-
-#ifndef TAO_ACTIVE_OBJECT_MAP_ENTRY_H
-#define TAO_ACTIVE_OBJECT_MAP_ENTRY_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PS_ForwardC.h"
-
-/**
- * @struct TAO_Active_Object_Map_Entry
- *
- * @brief Value field of the active object map.
- *
- * We need a mapping from and to all of the following fields:
- * user_id, system_id, and servant.  Therefore, we keep
- * all the fields together in the map.
- */
-struct TAO_Active_Object_Map_Entry
-{
-  /// Default constructor.
-  TAO_Active_Object_Map_Entry (void);
-
-  /// User id.
-  PortableServer::ObjectId user_id_;
-
-  /// System id.
-  PortableServer::ObjectId system_id_;
-
-  /// Servant.
-  PortableServer::Servant servant_;
-
-  /// Reference count on outstanding requests on this servant.
-  CORBA::UShort reference_count_;
-
-  /// Has this servant been deactivated already?
-  CORBA::Boolean deactivated_;
-
-  /// Priority of this servant.
-  CORBA::Short priority_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ACTIVE_OBJECT_MAP_ENTRY_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
deleted file mode 100644
index 28553a77693..00000000000
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// @(#) $Id$
-
-#include "Active_Policy_Strategies.h"
-#include "POA_Cached_Policies.h"
-#include "IdAssignmentPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "RequestProcessingPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "ThreadPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-
-#include "ThreadStrategy.h"
-#include "ThreadStrategyFactory.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyFactory.h"
-#include "IdAssignmentStrategy.h"
-#include "IdAssignmentStrategyFactory.h"
-#include "LifespanStrategy.h"
-#include "LifespanStrategyFactory.h"
-#include "IdUniquenessStrategy.h"
-#include "IdUniquenessStrategyFactory.h"
-#include "ImplicitActivationStrategy.h"
-#include "ImplicitActivationStrategyFactory.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyFactory.h"
-
-#include "ace/Dynamic_Service.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Active_Policy_Strategies.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(PortableServer,
-          Active_Policy_Strategies,
-          "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    Active_Policy_Strategies::Active_Policy_Strategies() :
-      thread_strategy_ (0),
-      request_processing_strategy_ (0),
-      id_assignment_strategy_ (0),
-      lifespan_strategy_ (0),
-      id_uniqueness_strategy_ (0),
-      implicit_activation_strategy_ (0),
-      servant_retention_strategy_ (0),
-      thread_strategy_factory_ (0),
-      servant_retention_strategy_factory_ (0),
-      request_processing_strategy_factory_ (0),
-      lifespan_strategy_factory_ (0),
-      implicit_activation_strategy_factory_ (0),
-      id_uniqueness_strategy_factory_ (0),
-      id_assignment_strategy_factory_ (0)
-    {
-    }
-
-    void
-    Active_Policy_Strategies::update (Cached_Policies &policies,
-                                      ::TAO_Root_POA *poa
-                                      ACE_ENV_ARG_DECL)
-    {
-      thread_strategy_factory_ =
-        ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory");
-
-      if (thread_strategy_factory_ != 0)
-        thread_strategy_ = thread_strategy_factory_->create (policies.thread());
-
-      /**/
-
-      id_assignment_strategy_factory_ =
-        ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory");
-
-      if (id_assignment_strategy_factory_ != 0)
-        id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment());
-
-      /**/
-
-      id_uniqueness_strategy_factory_ =
-        ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory");
-
-      if (id_uniqueness_strategy_factory_ != 0)
-        id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
-
-      /**/
-
-      servant_retention_strategy_factory_ =
-        ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory");
-
-      if (servant_retention_strategy_factory_ != 0)
-        servant_retention_strategy_ =
-          servant_retention_strategy_factory_->create (policies.servant_retention());
-
-      /**/
-
-      request_processing_strategy_factory_ =
-        ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory");
-
-      if (request_processing_strategy_factory_ != 0)
-        request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
-
-      /**/
-
-      lifespan_strategy_factory_ =
-        ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory");
-
-      if (lifespan_strategy_factory_ != 0)
-        lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan());
-
-      /**/
-
-      implicit_activation_strategy_factory_ =
-        ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory");
-
-      if (implicit_activation_strategy_factory_ != 0)
-        implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation());
-
-      /**/
-
-// @todo, check if all pointers are != 0
-
-      if (lifespan_strategy_ != 0)
-        {
-          lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (request_processing_strategy_ != 0)
-        {
-          request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (id_uniqueness_strategy_ != 0)
-        {
-          id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (implicit_activation_strategy_ != 0)
-        {
-          implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (thread_strategy_ != 0)
-        {
-          thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (servant_retention_strategy_ != 0)
-        {
-          servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      if (id_assignment_strategy_ != 0)
-        {
-          id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    void
-    Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL)
-    {
-
-      if (lifespan_strategy_ != 0)
-        {
-          lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          lifespan_strategy_ = 0;
-        }
-
-      if (request_processing_strategy_ != 0)
-        {
-          request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          request_processing_strategy_ = 0;
-        }
-
-      if (id_uniqueness_strategy_ != 0)
-        {
-          id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          id_uniqueness_strategy_ = 0;
-        }
-
-      if (implicit_activation_strategy_ != 0)
-        {
-          implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          implicit_activation_strategy_ = 0;
-        }
-
-      if (thread_strategy_ != 0)
-        {
-          thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          thread_strategy_ = 0;
-        }
-
-      if (servant_retention_strategy_ != 0)
-        {
-          servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          servant_retention_strategy_ = 0;
-        }
-
-      if (id_assignment_strategy_ != 0)
-        {
-          id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          id_assignment_strategy_ = 0;
-        }
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
deleted file mode 100644
index aedab179e3f..00000000000
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Active_Policy_Strategies.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
-#define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Cached_Policies;
-    class ThreadStrategy;
-    class RequestProcessingStrategy;
-    class IdAssignmentStrategy;
-    class LifespanStrategy;
-    class IdUniquenessStrategy;
-    class ImplicitActivationStrategy;
-    class ServantRetentionStrategy;
-
-    class ThreadStrategyFactory;
-    class ServantRetentionStrategyFactory;
-    class RequestProcessingStrategyFactory;
-    class LifespanStrategyFactory;
-    class ImplicitActivationStrategyFactory;
-    class IdUniquenessStrategyFactory;
-    class IdAssignmentStrategyFactory;
-
-    /**
-     * This class stores the active policy strategies used for a certain POA.
-     */
-    class TAO_PortableServer_Export Active_Policy_Strategies
-    {
-    public:
-      Active_Policy_Strategies();
-
-      void update (Cached_Policies &policies,
-                   TAO_Root_POA* poa
-                   ACE_ENV_ARG_DECL);
-
-      void cleanup (ACE_ENV_SINGLE_ARG_DECL);
-
-      ThreadStrategy *thread_strategy (void) const;
-
-      RequestProcessingStrategy *request_processing_strategy (void) const;
-
-      IdAssignmentStrategy *id_assignment_strategy (void) const;
-
-      IdUniquenessStrategy *id_uniqueness_strategy (void) const;
-
-      LifespanStrategy *lifespan_strategy (void) const;
-
-      ImplicitActivationStrategy *implicit_activation_strategy (void) const;
-
-      ServantRetentionStrategy *servant_retention_strategy (void) const;
-
-    private:
-      ThreadStrategy *thread_strategy_;
-      RequestProcessingStrategy *request_processing_strategy_;
-      IdAssignmentStrategy *id_assignment_strategy_;
-      LifespanStrategy *lifespan_strategy_;
-      IdUniquenessStrategy *id_uniqueness_strategy_;
-      ImplicitActivationStrategy *implicit_activation_strategy_;
-      ServantRetentionStrategy *servant_retention_strategy_;
-
-      ThreadStrategyFactory *thread_strategy_factory_;
-      ServantRetentionStrategyFactory *servant_retention_strategy_factory_;
-      RequestProcessingStrategyFactory *request_processing_strategy_factory_;
-      LifespanStrategyFactory *lifespan_strategy_factory_;
-      ImplicitActivationStrategyFactory *implicit_activation_strategy_factory_;
-      IdUniquenessStrategyFactory *id_uniqueness_strategy_factory_;
-      IdAssignmentStrategyFactory *id_assignment_strategy_factory_;
-    };
-  }
-}
-
-#if defined (__ACE_INLINE__)
-# include "Active_Policy_Strategies.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
deleted file mode 100644
index ff04b364157..00000000000
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ /dev/null
@@ -1,56 +0,0 @@
-// @(#) $Id$
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE
-    ThreadStrategy*
-    Active_Policy_Strategies::thread_strategy (void) const
-    {
-      return thread_strategy_;
-    }
-
-    ACE_INLINE
-    RequestProcessingStrategy*
-    Active_Policy_Strategies::request_processing_strategy (void) const
-    {
-      return request_processing_strategy_;
-    }
-
-    ACE_INLINE
-    IdAssignmentStrategy *
-    Active_Policy_Strategies::id_assignment_strategy (void) const
-    {
-      return id_assignment_strategy_;
-    }
-
-    ACE_INLINE
-    IdUniquenessStrategy *
-    Active_Policy_Strategies::id_uniqueness_strategy (void) const
-    {
-      return id_uniqueness_strategy_;
-    }
-
-    ACE_INLINE
-    LifespanStrategy*
-    Active_Policy_Strategies::lifespan_strategy (void) const
-    {
-      return lifespan_strategy_;
-    }
-
-    ACE_INLINE
-    ImplicitActivationStrategy*
-    Active_Policy_Strategies::implicit_activation_strategy (void) const
-    {
-      return implicit_activation_strategy_;
-    }
-
-    ACE_INLINE
-    ServantRetentionStrategy*
-    Active_Policy_Strategies::servant_retention_strategy (void) const
-    {
-      return servant_retention_strategy_;
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl
deleted file mode 100644
index 0fa4dce9ee9..00000000000
--- a/TAO/tao/PortableServer/AdapterActivator.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file AdapterActivator.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * AdapaterActivatorC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          AdapterActivator.pidl
- */
-
-#ifndef _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
-#define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
-
-///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-  /// AdapterActivator interface.
-  local interface AdapterActivator
-  {
-#   pragma version AdapterActivator 2.3
-
-    boolean unknown_adapter (in POA parent,
-                             in string name);
-  };
-};
-
-#endif // _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
deleted file mode 100644
index 3c7730d22e6..00000000000
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "AdapterActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_AdapterActivator (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/AdapterActivator:2.3",
-    "AdapterActivator");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterActivator =
-    &_tao_tc_PortableServer_AdapterActivator;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr _tao_elem
-  )
-{
-  PortableServer::AdapterActivator_ptr _tao_objptr =
-    PortableServer::AdapterActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
-      _tao_any,
-      PortableServer::AdapterActivator::_tao_any_destructor,
-      PortableServer::_tc_AdapterActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
-        _tao_any,
-        PortableServer::AdapterActivator::_tao_any_destructor,
-        PortableServer::_tc_AdapterActivator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
deleted file mode 100644
index 9dfd6d693f4..00000000000
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "AdapterActivatorC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::AdapterActivator.
-
-PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
-    PortableServer::AdapterActivator_ptr p
-  )
-{
-  return PortableServer::AdapterActivator::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
-    PortableServer::AdapterActivator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void)
-{
-  return PortableServer::AdapterActivator::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal (
-    PortableServer::AdapterActivator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::AdapterActivator::AdapterActivator (void)
-{}
-
-PortableServer::AdapterActivator::~AdapterActivator (void)
-{}
-
-void
-PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterActivator *_tao_tmp_pointer =
-    static_cast<AdapterActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return AdapterActivator::_nil ();
-    }
-
-  AdapterActivator_ptr proxy =
-    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
-
-  return AdapterActivator::_duplicate (proxy);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return AdapterActivator::_nil ();
-    }
-
-  AdapterActivator_ptr proxy =
-    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
-
-  return AdapterActivator::_duplicate (proxy);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::AdapterActivator::_tao_release (AdapterActivator_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::AdapterActivator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/AdapterActivator:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
deleted file mode 100644
index 8eb1558e581..00000000000
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
-#define _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableServer/PS_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
-  
-  class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AdapterActivator
-      >
-    AdapterActivator_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AdapterActivator
-      >
-    AdapterActivator_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-  
-  class TAO_PortableServer_Export AdapterActivator
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef AdapterActivator_ptr _ptr_type;
-    typedef AdapterActivator_var _var_type;
-    
-    // The static operations.
-    static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    
-    static void _tao_release (AdapterActivator_ptr obj);
-    
-    static AdapterActivator_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AdapterActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static AdapterActivator_ptr _nil (void)
-    {
-      return static_cast<AdapterActivator_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean unknown_adapter (
-        ::PortableServer::POA_ptr parent,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    AdapterActivator (void);
-    
-    virtual ~AdapterActivator (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    AdapterActivator (const AdapterActivator &);
-    
-    void operator= (const AdapterActivator &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
-  {
-    static ::PortableServer::AdapterActivator_ptr duplicate (
-        ::PortableServer::AdapterActivator_ptr
-      );
-    static void release (
-        ::PortableServer::AdapterActivator_ptr
-      );
-    static ::PortableServer::AdapterActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::AdapterActivator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
deleted file mode 100644
index 4a8a0386ef1..00000000000
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-#include "Adapter_Activator.h"
-
-ACE_RCSID (PortableServer,
-           Adapter_Activator,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#include "AdapterActivatorC.h"
-#include "POAManagerC.h"
-#include "PortableServer.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    Adapter_Activator::Adapter_Activator (
-      PortableServer::POAManager_ptr pm)
-      : poa_manager_ (PortableServer::POAManager::_duplicate (pm))
-    {
-    }
-
-    CORBA::Boolean
-    Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name
-                                        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      // Default policies
-      CORBA::PolicyList default_policies;
-
-      // This assumes that the lock on the parent is recursive
-      PortableServer::POA_var child =
-        parent->create_POA (name,
-                            this->poa_manager_.in (),
-                            default_policies
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      ACE_TRY
-        {
-          child->the_activator (this ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          (void) child->destroy (1,
-                                 1
-                                 ACE_ENV_ARG_PARAMETER);
-
-          return false;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-
-      // Finally everything is fine
-      return true;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
deleted file mode 100644
index a3cd80dc34c..00000000000
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Adapter_Activator.h
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#ifndef TAO_ADAPTER_ACTIVATOR_H
-#define TAO_ADAPTER_ACTIVATOR_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "AdapterActivatorC.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  class POAManager;
-
-  typedef POAManager *POAManager_ptr;
-  typedef TAO_Objref_Var_T<POAManager> POAManager_var;
-}
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export Adapter_Activator
-      : public PortableServer::AdapterActivator
-    {
-    public:
-
-      Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
-
-      CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                      const char *name
-                                      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    protected:
-
-      /// POA Manager
-      PortableServer::POAManager_var poa_manager_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ADAPTER_ACTIVATOR_H */
diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
deleted file mode 100644
index 1b672c8e571..00000000000
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_SArg_Traits.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- *  @author Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_SARG_TRAITS_H
-#define TAO_ANY_SARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/PortableServer/portableserver_export.h"
-
-namespace CORBA
-{
-  class Any;
-  class Any_var;
-  class Any_out;
-}
-
-namespace TAO
-{
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Any>
-    : public
-        Var_Size_SArg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
deleted file mode 100644
index ad2cabfd5d8..00000000000
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#ifndef TAO_BD_STRING_SARGUMENT_T_CPP
-#define TAO_BD_STRING_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/BD_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/BD_String_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-CORBA::Boolean
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_.out (), BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-void
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_.in (), BOUND);
-}
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_.out (), BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-void
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S,
-         typename S_var,
-         typename S_out,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-CORBA::Boolean
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR &cdr
-  )
-{
-  return cdr << from_S (this->x_.in (), BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_var,
-         typename S_out,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-void
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-CORBA::Boolean
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_.in (), BOUND);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_var,
-         typename to_S,
-         typename from_S,
-         size_t BOUND>
-void
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= from_S (this->x_.in (), BOUND);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_BD_STRING_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
deleted file mode 100644
index 4ad82f430bc..00000000000
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ /dev/null
@@ -1,228 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    BD_String_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_BD_STRING_SARGUMENT_T_H
-#define TAO_BD_STRING_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CDR_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Argument.h"
-
-namespace TAO
-{
-  /**
-   * @class In_BD_String_SArgument_T
-   *
-   * @brief Template class for IN skeleton bd (w)string argument.
-   *
-   */
-  template<typename S,
-           typename S_var,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class In_BD_String_SArgument_T : public Argument
-  {
-  public:
-    In_BD_String_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    const S * arg (void) const;
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Inout_BD_String_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton bd (w)string argument.
-   *
-   */
-  template<typename S,
-           typename S_var,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class Inout_BD_String_SArgument_T : public Argument
-  {
-  public:
-    Inout_BD_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Out_BD_String_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton bd (w)string argument.
-   *
-   */
-  template<typename S,
-           typename S_var,
-           typename S_out,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class Out_BD_String_SArgument_T : public Argument
-  {
-  public:
-    Out_BD_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Ret_BD_String_SArgument_T
-   *
-   * @brief Template class for return skeleton value of bd (w)string.
-   *
-   */
-  template<typename S,
-           typename S_var,
-           typename to_S,
-           typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_SArgument_T : public Argument
-  {
-  public:
-    Ret_BD_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Basic_SArg_Traits_T
-   *
-   * @brief Template class for skeleton argument traits of bounded (w)strings.
-   *
-   */
-  template<typename T,
-           typename T_var,
-           typename T_out,
-           typename to_T,
-           typename from_T,
-           size_t BOUND>
-  struct BD_String_SArg_Traits_T
-  {
-    typedef T *                                   ret_type;
-    typedef const T *                             in_type;
-    typedef T *&                                  inout_type;
-    typedef T_out                                 out_type;
-
-    typedef In_BD_String_SArgument_T<T,
-                                     T_var,
-                                     to_T,
-                                     from_T,
-                                     BOUND>       in_arg_val;
-    typedef Inout_BD_String_SArgument_T<T,
-                                        T_var,
-                                        to_T,
-                                        from_T,
-                                        BOUND>    inout_arg_val;
-    typedef Out_BD_String_SArgument_T<T,
-                                      T_var,
-                                      T_out,
-                                      to_T,
-                                      from_T,
-                                      BOUND>      out_arg_val;
-    typedef Ret_BD_String_SArgument_T<T,
-                                      T_var,
-                                      to_T,
-                                      from_T,
-                                      BOUND>      ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                               in_arg_type;
-    typedef inout_type                            inout_arg_type;
-    typedef inout_type                            out_arg_type;
-    typedef inout_type                            ret_arg_type;
-
-  };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::String_out,
-                                     ACE_InputCDR::to_string,
-                                     ACE_OutputCDR::from_string,
-                                     BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::WChar,
-                                     CORBA::WString_var,
-                                     CORBA::WString_out,
-                                     ACE_InputCDR::to_wstring,
-                                     ACE_OutputCDR::from_wstring,
-                                     BOUND>
-  {
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/BD_String_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/BD_String_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BD_String_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BD_STRING_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
deleted file mode 100644
index f8a76b8938f..00000000000
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-In_BD_String_SArgument_T (void)
-{}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-const S *
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void) const
-{
-  return this->x_.in ();
-}
-
-// ==========================================================================
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-Inout_BD_String_SArgument_T (void)
-{}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_.inout ();
-}
-
-// ==========================================================================
-
-template<typename S, 
-         typename S_var,
-         typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
-Out_BD_String_SArgument_T (void)
-{}
-
-template<typename S, 
-         typename S_var, 
-         typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ==========================================================================
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-Ret_BD_String_SArgument_T (void)
-{}
-
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
-ACE_INLINE
-S *&
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
-{
-  return this->x_.out ();
-}
-
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
deleted file mode 100644
index 79301cfb9aa..00000000000
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-
-#ifndef TAO_BASIC_SARGUMENT_T_CPP
-#define TAO_BASIC_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Basic_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_BASIC_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
deleted file mode 100644
index 4c0518a9674..00000000000
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_BASIC_SARGUMENT_T_H
-#define TAO_BASIC_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Basic_SArgument_T
-   *
-   * @brief Template class for IN skeleton argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class In_Basic_SArgument_T : public Argument
-  {
-  public:
-    In_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S arg (void) const;
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Inout_Basic_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Basic_SArgument_T : public Argument
-  {
-  public:
-    Inout_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Out_Basic_SArgument_T
-   *
-   * @brief Template class for OUT skeleton argument of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Out_Basic_SArgument_T : public Argument
-  {
-  public:
-    Out_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Ret_Basic_SArgument_T
-   *
-   * @brief Template class for return skeleton value of basic IDL types.
-   *
-   */
-  template<typename S>
-  class Ret_Basic_SArgument_T : public Argument
-  {
-  public:
-    Ret_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @struct Basic_SArg_Traits_T
-   *
-   * @brief Template class for skeleton argument traits of basic IDL types.
-   *
-   */
-  template<typename T>
-  struct Basic_SArg_Traits_T
-  {
-    typedef T                           ret_type;
-    typedef T                           in_type;
-    typedef T &                         inout_type;
-    typedef T &                         out_type;
-
-    typedef In_Basic_SArgument_T<T>     in_arg_val;
-    typedef Inout_Basic_SArgument_T<T>  inout_arg_val;
-    typedef Out_Basic_SArgument_T<T>    out_arg_val;
-    typedef Ret_Basic_SArgument_T<T>    ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                     in_arg_type;
-    typedef inout_type                  inout_arg_type;
-    typedef out_type                    out_arg_type;
-    typedef out_type                    ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Basic_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Basic_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Basic_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASIC_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
deleted file mode 100644
index 2bbaba955ab..00000000000
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S>
-ACE_INLINE
-TAO::In_Basic_SArgument_T<S>::In_Basic_SArgument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S
-TAO::In_Basic_SArgument_T<S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Basic_SArgument_T<S>::Inout_Basic_SArgument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Inout_Basic_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Out_Basic_SArgument_T<S>::Out_Basic_SArgument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Out_Basic_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Ret_Basic_SArgument_T<S>::Ret_Basic_SArgument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Ret_Basic_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
diff --git a/TAO/tao/PortableServer/Basic_SArguments.cpp b/TAO/tao/PortableServer/Basic_SArguments.cpp
deleted file mode 100644
index 75c2e33d850..00000000000
--- a/TAO/tao/PortableServer/Basic_SArguments.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-#include "Basic_SArguments.h"
-
-ACE_RCSID (PortableServer,
-           Basic_SArguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::SArg_Traits_T<void>;
-template class TAO::SArg_Traits_T<CORBA::Short>;
-template class TAO::SArg_Traits_T<CORBA::Long>;
-template class TAO::SArg_Traits_T<CORBA::UShort>;
-template class TAO::SArg_Traits_T<CORBA::ULong>;
-template class TAO::SArg_Traits_T<CORBA::Float>;
-template class TAO::SArg_Traits_T<CORBA::Double>;
-template class TAO::SArg_Traits_T<CORBA::LongLong>;
-template class TAO::SArg_Traits_T<CORBA::ULongLong>;
-template class TAO::SArg_Traits_T<CORBA::LongDouble>;
-
-template class TAO::Basic_SArg_Traits_T<CORBA::Short>;
-template class TAO::Basic_SArg_Traits_T<CORBA::Long>;
-template class TAO::Basic_SArg_Traits_T<CORBA::UShort>;
-template class TAO::Basic_SArg_Traits_T<CORBA::ULong>;
-template class TAO::Basic_SArg_Traits_T<CORBA::Float>;
-template class TAO::Basic_SArg_Traits_T<CORBA::Double>;
-template class TAO::Basic_SArg_Traits_T<CORBA::LongLong>;
-template class TAO::Basic_SArg_Traits_T<CORBA::ULongLong>;
-template class TAO::Basic_SArg_Traits_T<CORBA::LongDouble>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::Short>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::Short>;
-template class TAO::Out_Basic_SArgument_T<CORBA::Short>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::Short>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::Long>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::Long>;
-template class TAO::Out_Basic_SArgument_T<CORBA::Long>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::Long>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::UShort>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::UShort>;
-template class TAO::Out_Basic_SArgument_T<CORBA::UShort>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::UShort>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::ULong>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::ULong>;
-template class TAO::Out_Basic_SArgument_T<CORBA::ULong>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::ULong>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::Float>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::Float>;
-template class TAO::Out_Basic_SArgument_T<CORBA::Float>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::Float>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::Double>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::Double>;
-template class TAO::Out_Basic_SArgument_T<CORBA::Double>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::Double>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::LongLong>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::LongLong>;
-template class TAO::Out_Basic_SArgument_T<CORBA::LongLong>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::LongLong>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::ULongLong>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::ULongLong>;
-template class TAO::Out_Basic_SArgument_T<CORBA::ULongLong>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::ULongLong>;
-
-template class TAO::In_Basic_SArgument_T<CORBA::LongDouble>;
-template class TAO::Inout_Basic_SArgument_T<CORBA::LongDouble>;
-template class TAO::Out_Basic_SArgument_T<CORBA::LongDouble>;
-template class TAO::Ret_Basic_SArgument_T<CORBA::LongDouble>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::SArg_Traits_T<void>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::Short>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::Long>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::UShort>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::ULong>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::Float>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::Double>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::LongLong>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::ULongLong>
-#pragma instantiate TAO::SArg_Traits_T<CORBA::LongDouble>
-
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::Short>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::Long>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::UShort>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::ULong>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::Float>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::Double>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::LongLong>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::ULongLong>
-#pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::LongDouble>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Short>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Short>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Short>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Short>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Long>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Long>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Long>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Long>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::UShort>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::UShort>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::UShort>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::UShort>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::ULong>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::ULong>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::ULong>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::ULong>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Float>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Float>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Float>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Float>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Double>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Double>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Double>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Double>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::LongLong>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::LongLong>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::LongLong>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::LongLong>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::ULongLong>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::ULongLong>
-
-#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::LongDouble>
-#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::LongDouble>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
deleted file mode 100644
index a61a5dc68b6..00000000000
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Basic_SArguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_BASIC_SARGUMENTS_H
-#define TAO_BASIC_SARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specialization for void return type.
-   *
-   */
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<void>
-  {
-  public:
-
-    typedef void        ret_type;
-    typedef Argument    ret_val;
-
-  };
-
-  /**
-   *
-   * @brief Specializations for basic skeleton arg types,
-   *  except (w)char/boolean/octet.
-   *
-   */
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Short>
-    : public Basic_SArg_Traits_T<CORBA::Short>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Long>
-    : public Basic_SArg_Traits_T<CORBA::Long>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::UShort>
-    : public Basic_SArg_Traits_T<CORBA::UShort>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::ULong>
-    : public Basic_SArg_Traits_T<CORBA::ULong>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Float>
-    : public Basic_SArg_Traits_T<CORBA::Float>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Double>
-    : public Basic_SArg_Traits_T<CORBA::Double>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::LongLong>
-    : public Basic_SArg_Traits_T<CORBA::LongLong>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::ULongLong>
-    : public Basic_SArg_Traits_T<CORBA::ULongLong>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::LongDouble>
-    : public Basic_SArg_Traits_T<CORBA::LongDouble>
-  {
-  };
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_BASIC_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
deleted file mode 100644
index 720f2842071..00000000000
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-//$Id$
-// -- PortableServer Include --
-#include "Collocated_Object_Proxy_Broker.h"
-#include "Object_Adapter.h"
-#include "Servant_Upcall.h"
-#include "Servant_Base.h"
-
-
-// -- TAO Include --
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/DomainC.h"
-
-ACE_RCSID (PortableServer,
-           Collocated_Object_Proxy_Broker,
-           "$Id$")
-
-
-namespace TAO
-{
-  CORBA::Boolean
-  Collocated_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target,
-                                         const char *type_id
-                                         ACE_ENV_ARG_DECL)
-  {
-    TAO_Stub *stub = target->_stubobj ();
-
-    // Which collocation strategy should we use?
-    if (stub != 0 &&
-        stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()
-          == TAO_ORB_Core::THRU_POA)
-      {
-        TAO::Portable_Server::Servant_Upcall servant_upcall (
-          stub->servant_orb_var ()->orb_core ()
-        );
-
-      CORBA::Object_var forward_to;
-      servant_upcall.prepare_for_upcall (
-          stub->profile_in_use ()->object_key (),
-          "_is_a",
-          forward_to.out ()
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (0);
-
-      servant_upcall.pre_invoke_collocated_request (
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (0);
-
-      return servant_upcall.servant ()->_is_a (type_id
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-
-    // Direct collocation strategy is used.
-    if (target->_servant () != 0)
-      {
-        return target->_servant ()->_is_a (type_id
-                                           ACE_ENV_ARG_PARAMETER);
-      }
-
-    return 0;
-  }
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  CORBA::Boolean
-  Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target
-                                                 ACE_ENV_ARG_DECL)
-  {
-    CORBA::Boolean _tao_retval = 0;
-
-    ACE_TRY
-      {
-        TAO_Stub *stub = target->_stubobj ();
-
-        // Which collocation strategy should we use?
-        if (stub != 0 &&
-            stub->servant_orb_var ()->orb_core ()
-            ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-          {
-            TAO::Portable_Server::Servant_Upcall servant_upcall (
-              target->_stubobj ()->servant_orb_var ()->orb_core ()
-              );
-
-            CORBA::Object_var forward_to;
-
-            servant_upcall.prepare_for_upcall (
-              target->_stubobj ()->object_key (),
-              "_non_existent",
-              forward_to.out ()
-              ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
-
-            servant_upcall.pre_invoke_collocated_request (
-                ACE_ENV_SINGLE_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
-
-            servant_upcall.servant ()->_non_existent (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER
-                                         );
-            ACE_TRY_CHECK;
-          }
-        // Direct collocation strategy is used.
-        else if (target->_servant () != 0)
-          {
-            target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-      }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-      {
-        _tao_retval = 1;
-      }
-    ACE_CATCHANY
-      {
-        ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-
-    return _tao_retval;
-  }
-
-  CORBA::Object_ptr
-  Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target
-                                                  ACE_ENV_ARG_DECL)
-  {
-    CORBA::Object_var _tao_retval (CORBA::Object::_nil ());
-
-    TAO_Stub *stub = target->_stubobj ();
-
-    ACE_TRY
-      {
-        // Which collocation strategy should we use?
-        if (stub != 0 &&
-            stub->servant_orb_var ()->orb_core ()
-              ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-          {
-            TAO::Portable_Server::Servant_Upcall servant_upcall (
-                stub->servant_orb_var ()->orb_core ()
-                );
-
-            CORBA::Object_var forward_to;
-            servant_upcall.prepare_for_upcall (
-                stub->profile_in_use ()->object_key (),
-                "_component",
-                forward_to.out ()
-                ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
-
-            _tao_retval =
-              servant_upcall.servant ()->_get_component (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
-                                           );
-            ACE_TRY_CHECK;
-          }
-        // Direct collocation strategy is used.
-        else if (target->_servant () != 0)
-          {
-            _tao_retval =
-              target->_servant ()->_get_component (
-                                       ACE_ENV_SINGLE_ARG_PARAMETER
-                                     );
-            ACE_TRY_CHECK;
-          }
-      }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-      {
-        // Ignore this exception.
-      }
-    ACE_CATCHANY
-      {
-        ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (_tao_retval.out ());
-
-    return _tao_retval.out ();
-  }
-
-  CORBA::InterfaceDef_ptr
-  Collocated_Object_Proxy_Broker::_get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL)
-  {
-    CORBA::InterfaceDef_ptr _tao_retval = 0;
-
-    TAO_Stub *stub = target->_stubobj ();
-
-    ACE_TRY
-      {
-        // Which collocation strategy should we use?
-        if (stub != 0 &&
-            stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()
-              == TAO_ORB_Core::THRU_POA)
-          {
-            TAO::Portable_Server::Servant_Upcall servant_upcall (
-                target->_stubobj ()->servant_orb_var ()->orb_core ()
-                );
-
-            CORBA::Object_var forward_to;
-
-            servant_upcall.prepare_for_upcall (
-                target->_stubobj ()->object_key (),
-                "_interface",
-                forward_to.out ()
-                ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
-
-            servant_upcall.pre_invoke_collocated_request (
-                ACE_ENV_SINGLE_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
-
-            _tao_retval =
-              servant_upcall.servant ()->_get_interface (
-                  ACE_ENV_SINGLE_ARG_PARAMETER
-                );
-            ACE_TRY_CHECK;
-          }
-        // Direct collocation strategy is used.
-        else if (target->_servant () != 0)
-          {
-            _tao_retval =
-              target->_servant ()->_get_interface (
-                  ACE_ENV_SINGLE_ARG_PARAMETER
-                );
-            ACE_TRY_CHECK;
-          }
-      }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-      {
-        // Ignore this exception.
-      }
-    ACE_CATCHANY
-      {
-        ACE_RE_THROW;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (_tao_retval);
-
-    return _tao_retval;
-  }
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-}
-
-// -----------------------------------------------------
-TAO::Collocated_Object_Proxy_Broker *
-the_tao_collocated_object_proxy_broker (void)
-{
-  static TAO::Collocated_Object_Proxy_Broker the_broker;
-  return &the_broker;
-}
-
-TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (
-                               CORBA::Object_ptr obj
-                               )
-{
-  ACE_UNUSED_ARG (obj);
-  return the_tao_collocated_object_proxy_broker ();
-}
-
-int
-_TAO_collocation_Object_Proxy_Broker_Factory_Initializer (size_t)
-{
-  _TAO_Object_Proxy_Broker_Factory_function_pointer =
-    _TAO_collocation_Object_Proxy_Broker_Factory;
-
-  return 0;
-}
-
-static int
-_TAO_collocation_Object_Proxy_Broker_Factory_Initializer_Scarecrow =
-_TAO_collocation_Object_Proxy_Broker_Factory_Initializer (
-    reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer
-      )
-  );
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
deleted file mode 100644
index 67ff38055c0..00000000000
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Collocated_Object_Proxy_Broker.h
- *
- *  $Id$
- *
- *  This files contains the Collocated Proxy Broker implementation
- *  for the CORBA Object.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Balachandran Natarajan (modified the implementation)
- */
-//=============================================================================
-
-#ifndef TAO_COLLOCATED_OBJECT_PROXY_BROKER_H
-#define TAO_COLLOCATED_OBJECT_PROXY_BROKER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object_Proxy_Broker.h"
-
-namespace TAO
-{
-  /**
-   * @class Collocated_Object_Proxy_Broker
-   *
-   * @brief Collocated_Object_Proxy_Broker
-   *
-   * A broker for standard CORBA::Object calls that needs to be made
-   * on remote objects.
-   */
-  class TAO_PortableServer_Export Collocated_Object_Proxy_Broker
-    : public Object_Proxy_Broker
-  {
-  public:
-    /// Please see the documentation in Object_Proxy_Broker.h for
-    /// details.
-    virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL);
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL);
-
-  virtual CORBA::InterfaceDef * _get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    );
-
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL);
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-  };
-}
-
-// -----------------------------------------------------
-
-/// This function is used to access the unique instance of strategized
-/// proxy broker. All the CORBA::Object share the proxy broker.
-TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void);
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_COLLOCATED_OBJECT_PROXY_BROKER_H*/
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
deleted file mode 100644
index 2b938b862ce..00000000000
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "Creation_Time.h"
-
-ACE_RCSID (PortableServer,
-           Creation_Time,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "Creation_Time.inl"
-#endif /* ! __ACE_INLINE__ */
-
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
deleted file mode 100644
index 5804c01a892..00000000000
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Creation_Time.h
- *
- *  $Id$
- *
- *  Header file for Creation_Time and Temporary_Creation_Time
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CREATION_TIME_H
-#define TAO_CREATION_TIME_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Time_Value.h"
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Temporary_Creation_Time;
-
-    class Creation_Time
-    {
-    public:
-      Creation_Time (const ACE_Time_Value &creation_time);
-
-      Creation_Time (void);
-
-      void creation_time (const void *creation_time);
-
-      const void *creation_time (void) const;
-
-      static CORBA::ULong creation_time_length (void);
-
-      bool operator== (const Creation_Time &rhs) const;
-
-      bool operator!= (const Creation_Time &rhs) const;
-
-      bool operator== (const Temporary_Creation_Time &rhs) const;
-
-      bool operator!= (const Temporary_Creation_Time &rhs) const;
-
-    protected:
-
-      enum
-      {
-        SEC_FIELD = 0,
-        USEC_FIELD = 1
-      };
-
-      /// Timestamp
-      CORBA::ULong time_stamp_[2];
-
-    };
-
-    /**
-     * @class Temporary_Creation_Time
-     *
-     * @brief Special creation time only useful in the lifetime of the
-     *        upcall.
-     *
-     * Special creation time only useful in the lifetime of the upcall.
-     */
-    class Temporary_Creation_Time
-    {
-    public:
-
-      Temporary_Creation_Time (void);
-
-      void creation_time (const void *creation_time);
-
-      bool operator== (const Creation_Time &rhs) const;
-
-      bool operator!= (const Creation_Time &rhs) const;
-
-    protected:
-
-      void *time_stamp_;
-    };
-  }
-}
-
-#if defined (__ACE_INLINE__)
-# include "Creation_Time.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CREATION_TIME_H */
diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl
deleted file mode 100644
index 29ffa245136..00000000000
--- a/TAO/tao/PortableServer/Creation_Time.inl
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ace/OS_NS_string.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE CORBA::ULong
-    Creation_Time::creation_time_length (void)
-    {
-      return 2 * sizeof (CORBA::ULong);
-    }
-
-    ACE_INLINE
-    Creation_Time::Creation_Time (const ACE_Time_Value &creation_time)
-    {
-      this->time_stamp_[Creation_Time::SEC_FIELD]  = (CORBA::ULong) creation_time.sec ();
-      this->time_stamp_[Creation_Time::USEC_FIELD] = (CORBA::ULong) creation_time.usec ();
-    }
-
-    ACE_INLINE
-    Creation_Time::Creation_Time (void)
-    {
-      this->time_stamp_[Creation_Time::SEC_FIELD]  = 0;
-      this->time_stamp_[Creation_Time::USEC_FIELD] = 0;
-    }
-
-    ACE_INLINE void
-    Creation_Time::creation_time (const void *creation_time)
-    {
-      ACE_OS::memcpy (&this->time_stamp_,
-                      creation_time,
-                      Creation_Time::creation_time_length ());
-    }
-
-    ACE_INLINE const void *
-    Creation_Time::creation_time (void) const
-    {
-      return &this->time_stamp_;
-    }
-
-    ACE_INLINE bool
-    Creation_Time::operator== (const Creation_Time &rhs) const
-    {
-    #if (POA_NO_TIMESTAMP == 1)
-      ACE_UNUSED_ARG (rhs);
-      return true;
-    #else
-      return ACE_OS::memcmp (&this->time_stamp_,
-                             &rhs.time_stamp_,
-                             Creation_Time::creation_time_length ()) == 0;
-    #endif /* POA_NO_TIMESTAMP */
-    }
-
-    ACE_INLINE bool
-    Creation_Time::operator!= (const Creation_Time &rhs) const
-    {
-    #if (POA_NO_TIMESTAMP == 1)
-      ACE_UNUSED_ARG (rhs);
-      return false;
-    #else
-      return ACE_OS::memcmp (&this->time_stamp_,
-                             &rhs.time_stamp_,
-                             Creation_Time::creation_time_length ()) != 0;
-    #endif /* POA_NO_TIMESTAMP */
-    }
-
-    ACE_INLINE bool
-    Temporary_Creation_Time::operator== (const Creation_Time &rhs) const
-    {
-    #if (POA_NO_TIMESTAMP == 1)
-      ACE_UNUSED_ARG (rhs);
-      return true;
-    #else
-      return ACE_OS::memcmp (this->time_stamp_,
-                             rhs.creation_time (),
-                             Creation_Time::creation_time_length ()) == 0;
-    #endif /* POA_NO_TIMESTAMP */
-    }
-
-    ACE_INLINE bool
-    Temporary_Creation_Time::operator!= (const Creation_Time &rhs) const
-    {
-    #if (POA_NO_TIMESTAMP == 1)
-      ACE_UNUSED_ARG (rhs);
-      return false;
-    #else
-      return ACE_OS::memcmp (this->time_stamp_,
-                             rhs.creation_time (),
-                             Creation_Time::creation_time_length ()) != 0;
-    #endif /* POA_NO_TIMESTAMP */
-    }
-
-    ACE_INLINE bool
-    Creation_Time::operator== (const Temporary_Creation_Time &rhs) const
-    {
-      return rhs == *this;
-    }
-
-    ACE_INLINE bool
-    Creation_Time::operator!= (const Temporary_Creation_Time &rhs) const
-    {
-      return rhs != *this;
-    }
-
-    ACE_INLINE
-    Temporary_Creation_Time::Temporary_Creation_Time (void)
-      : time_stamp_ (0)
-    {
-    }
-
-    ACE_INLINE void
-    Temporary_Creation_Time::creation_time (const void *creation_time)
-    {
-      this->time_stamp_ = (void *) creation_time;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
deleted file mode 100644
index 2d86d04ba73..00000000000
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// @(#) $Id$
-
-#include "Default_Acceptor_Filter.h"
-#include "tao/Transport_Acceptor.h"
-
-ACE_RCSID(PortableServer,
-          Default_Acceptor_Filter,
-          "$Id$")
-
-TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
-{
-}
-
-int
-TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
-                                           TAO_MProfile &mprofile,
-                                           TAO_Acceptor **acceptors_begin,
-                                           TAO_Acceptor **acceptors_end,
-                                           CORBA::Short priority)
-{
-  // Go through all the acceptors.
-  for (TAO_Acceptor** acceptor = acceptors_begin;
-       acceptor != acceptors_end;
-       ++acceptor)
-    {
-      // Ask each acceptor to make a profile.
-      if ((*acceptor)->create_profile (object_key,
-                                       mprofile,
-                                       priority) == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &)
-{
-  // No encoding required.
-  return 0;
-}
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
deleted file mode 100644
index d6a859d0e3d..00000000000
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Default_Acceptor_Filter.h
- *
- *  $Id$
- *
- *   Default strategy for populating mprofile
- *
- *
- *  @author  Marina Spivak <marina@cs.wustl.edu>
- *  @author  Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DEFAULT_ACCEPTOR_FILTER_H
-#define TAO_DEFAULT_ACCEPTOR_FILTER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Acceptor_Filter.h"
-
-class TAO_Acceptor;
-
-/**
- * @class TAO_Default_Acceptor_Filter
- *
- * @brief Default Acceptor_Filter.
- *
- * Default strategy for populating mprofile: all available
- * endpoints are included.
- */
-class TAO_PortableServer_Export TAO_Default_Acceptor_Filter
-  : public TAO_Acceptor_Filter
-{
-public:
-  TAO_Default_Acceptor_Filter (void);
-
-  /// Populate @a mprofile with all available endpoints.
-  int fill_profile (const TAO::ObjectKey &object_key,
-                    TAO_MProfile &mprofile,
-                    TAO_Acceptor **acceptors_begin,
-                    TAO_Acceptor **acceptors_end,
-                    CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
-  /// tag component of profiles.
-  int encode_endpoints (TAO_MProfile &mprofile);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
deleted file mode 100644
index 0da0643dced..00000000000
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// @(#) $Id$
-
-#include "Default_Policy_Validator.h"
-#include "tao/ORB_Core.h"
-#include "tao/Policy_Set.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           Default_Policy_Validator,
-           "$Id$")
-
-
-TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator (
-  TAO_ORB_Core &orb_core)
-  : TAO_Policy_Validator (orb_core)
-{
-}
-
-TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
-{
-}
-
-void
-TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                                 ACE_ENV_ARG_DECL)
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::ServantRetentionPolicy_var srp =
-    PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ServantRetentionPolicyValue servant_retention =
-    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::RequestProcessingPolicy_var rpp =
-    PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::RequestProcessingPolicyValue request_processing =
-    rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
-  // USE_SERVANT_MANAGER policies.
-  if (servant_retention == PortableServer::NON_RETAIN)
-    if (request_processing != PortableServer::USE_SERVANT_MANAGER &&
-        request_processing  != PortableServer::USE_DEFAULT_SERVANT)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-  // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
-  if (request_processing == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    if (servant_retention != PortableServer::RETAIN)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS
-                                ACE_ENV_ARG_PARAMETER);
-
-  ACE_CHECK;
-
-  PortableServer::IdUniquenessPolicy_var iup =
-    PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::IdUniquenessPolicyValue id_uniqueness =
-    iup->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::ImplicitActivationPolicy_var iap =
-    PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ImplicitActivationPolicyValue implicit_activation =
-    iap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::IdAssignmentPolicy_var idap =
-    PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::IdAssignmentPolicyValue id_assignment =
-    idap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
-  if (request_processing == PortableServer::USE_DEFAULT_SERVANT)
-    if (id_uniqueness != PortableServer::MULTIPLE_ID)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-  // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
-  if (implicit_activation == PortableServer::IMPLICIT_ACTIVATION)
-    if (servant_retention != PortableServer::RETAIN ||
-        id_assignment != PortableServer::SYSTEM_ID)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-#else /* TAO_HAS_MINIMUM_POA == 0 */
-  ACE_UNUSED_ARG (policies);
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-}
-
-
-CORBA::Boolean
-TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
-{
-  // Check known POA policies, or if given PolicyType has a
-  // corresponding PolicyFactory.  The PolicyFactory check is mandated
-  // by the CORBA specification.
-  return
-    (type == PortableServer::THREAD_POLICY_ID
-     || type == PortableServer::LIFESPAN_POLICY_ID
-     || type == PortableServer::ID_UNIQUENESS_POLICY_ID
-     || type == PortableServer::ID_ASSIGNMENT_POLICY_ID
-     || type == PortableServer::IMPLICIT_ACTIVATION_POLICY_ID
-     || type == PortableServer::SERVANT_RETENTION_POLICY_ID
-     || type == PortableServer::REQUEST_PROCESSING_POLICY_ID
-     || this->orb_core_.policy_factory_registry ()->factory_exists (type));
-}
-
-void
-TAO_POA_Default_Policy_Validator::merge_policies_impl (
-  TAO_Policy_Set &
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
deleted file mode 100644
index 0b9f8a33a29..00000000000
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//=============================================================================
-/**
- *  @file    Default_Policy_Validator.h
- *
- *  $Id$
- *
- *  This file contains the declaration for the default POA policy validator.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth  <fhuntleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_POLICY_VALIDATOR_H_
-#define TAO_DEFAULT_POLICY_VALIDATOR_H_
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Policy_Validator.h"
-
-class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
-  : public TAO_Policy_Validator
-{
-public:
-
-  /// Constructor.
-  TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_POA_Default_Policy_Validator (void);
-
-protected:
-  /**
-   * Validate that the policies in the specified set
-   * are consistent and legal.  Throw an appropriate exception
-   * if that is not the case.
-   */
-  void validate_impl (TAO_Policy_Set &policies
-                      ACE_ENV_ARG_DECL);
-
-  /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
-
-  /**
-   * Return whether the specified policy type is legal for the
-   * current configuration.  This is needed since the user can
-   * potentially specify policies that are unknown to an
-   * validate () routine, and these need to be caught.
-   */
-  virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
deleted file mode 100644
index a027ffd58a0..00000000000
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// @(#) $Id$
-
-#include "Default_Servant_Dispatcher.h"
-#include "Root_POA.h"
-
-ACE_RCSID(PortableServer,
-          Default_Servant_Dispatcher,
-          "$Id$")
-
-TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
-{
-}
-
-TAO_Root_POA *
-TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                                 TAO_POA_Manager &poa_manager,
-                                                 const TAO_POA_Policy_Set &policies,
-                                                 ACE_Lock &lock,
-                                                 TAO_SYNCH_MUTEX &thread_lock,
-                                                 TAO_ORB_Core &orb_core,
-                                                 TAO_Object_Adapter *object_adapter
-                                                 ACE_ENV_ARG_DECL)
-{
-  TAO_Root_POA *poa = 0;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_Root_POA (name,
-                             poa_manager,
-                             policies,
-                             0,
-                             lock,
-                             thread_lock,
-                             orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return poa;
-}
-
-void
-TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (
-  TAO_Root_POA &,
-  CORBA::Short,
-  TAO_ServerRequest &,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (
-  TAO_Root_POA &,
-  CORBA::Short,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-TAO_Default_Servant_Dispatcher::post_invoke (
-  TAO_Root_POA &,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
-{
-}
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
deleted file mode 100644
index b0af90027e3..00000000000
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Default_Servant_Dispatcher.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth (fhunleth@cs.wustl.edu)
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_SERVANT_DISPATCHER_H
-#define TAO_DEFAULT_SERVANT_DISPATCHER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Servant_Dispatcher.h"
-
-/**
- * @class TAO_Default_Servant_Dispatcher
- *
- * @brief Concrete instantiation of the Servant_Dispatcher strategy.
- *
- * This class just calls _dispatch on the servant_upcall.  No extra
- * processing is done or needed.
- *
- */
-class TAO_PortableServer_Export TAO_Default_Servant_Dispatcher
-  : public TAO_Servant_Dispatcher
-{
-public:
-  virtual ~TAO_Default_Servant_Dispatcher (void);
-
-  /// Pre_invoke remote request.
-  void pre_invoke_remote_request (
-        TAO_Root_POA &poa,
-        CORBA::Short servant_priority,
-        TAO_ServerRequest &req,
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-        ACE_ENV_ARG_DECL);
-
-  /// Pre_invoke collocated request.
-  void pre_invoke_collocated_request (
-        TAO_Root_POA &poa,
-        CORBA::Short servant_priority,
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-        ACE_ENV_ARG_DECL);
-
-  /// Post_invoke request.
-  void post_invoke (
-        TAO_Root_POA &poa,
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
-
-  /// Factory method for creating new POA's.
-  TAO_Root_POA *create_Root_POA (
-        const ACE_CString &name,
-        TAO_POA_Manager &poa_manager,
-        const TAO_POA_Policy_Set &policies,
-        ACE_Lock &lock,
-        TAO_SYNCH_MUTEX &thread_lock,
-        TAO_ORB_Core &orb_core,
-        TAO_Object_Adapter *object_adapter
-        ACE_ENV_ARG_DECL);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
deleted file mode 100644
index 026f9f44ff5..00000000000
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "Direct_Collocation_Upcall_Wrapper.h"
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "ForwardRequestC.h"
-#endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#include "tao/Abstract_Servant_Base.h"
-#include "tao/SystemException.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Object.h"
-#include "tao/Environment.h"
-
-ACE_RCSID (PortableServer,
-           Direct_Collocation_Upcall_Wrapper,
-           "$Id$")
-
-void
-TAO::Direct_Collocation_Upcall_Wrapper::upcall (
-  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_Abstract_ServantBase * const servant = obj->_servant ();
-
-  TAO_Collocated_Skeleton collocated_skel;
-  int const status = servant->_find (op,
-                                     collocated_skel,
-                                     strategy,
-                                     op_len);
-
-  if (status == -1)
-    {
-      ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
-    }
-
-  ACE_TRY
-    {
-      collocated_skel (servant,
-                       args,
-                       num_args
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-#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 */
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
deleted file mode 100644
index 2d7dc5ff483..00000000000
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Direct_Collocation_Upcall_Wrapper.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
-#ifndef TAO_DIRECT_COLLOCATION_UPCALL_WRAPPER_H
-#define TAO_DIRECT_COLLOCATION_UPCALL_WRAPPER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#ifndef ACE_LACKS_PRAGMA_ONCE
-# pragma once
-#endif /* !ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-#include "tao/Collocation_Strategy.h"
-#include "tao/Exception.h"
-#include "ace/CORBA_macros.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-namespace CORBA
-{
-  class Environment;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-namespace TAO
-{
-  class Argument;
-
-  /**
-   * @class Direct_Collocation_Upcall_Wrapper
-   *
-   * @brief Wraps the activities direct collocation upcall
-   *
-   */
-  class TAO_PortableServer_Export Direct_Collocation_Upcall_Wrapper
-  {
-  public:
-
-    /// Perform the upcall
-    void upcall (
-      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));
-  };
-
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DIRECT_COLLOCATION_UPCALL_WRAPPER_H */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
deleted file mode 100644
index 424e0a8f5b4..00000000000
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP
-#define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Fixed_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Fixed_Array_SArgument_T<S,
-                                S_slice,
-                                S_forany>::demarshal (TAO_InputCDR &cdr)
-{
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::In_Fixed_Array_SArgument_T<S,
-                                S_slice,
-                                S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Fixed_Array_SArgument_T<S,
-                                   S_slice,
-                                   S_forany>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << S_forany (this->x_);
-}
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Fixed_Array_SArgument_T<S,
-                                   S_slice,
-                                   S_forany>::demarshal (TAO_InputCDR & cdr)
-{
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Inout_Fixed_Array_SArgument_T<S,
-                                   S_slice,
-                                   S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Out_Fixed_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << S_forany (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Out_Fixed_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
-{
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << S_forany (this->x_.inout ());
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_slice, typename S_var, typename S_forany>
-void
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= S_forany (this->x_.ptr ());
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_FIXED_ARRAY_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
deleted file mode 100644
index 9dcc5470b2e..00000000000
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_Array_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_FIXED_ARRAY_SARGUMENT_T_H
-#define TAO_FIXED_ARRAY_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Fixed_Array_SArgument_T
-   *
-   * @brief IN skeleton argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_SArgument_T : public Argument
-  {
-  public:
-    In_Fixed_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice const * arg (void) const;
-
-  private:
-    mutable S x_;
-  };
-
-  /**
-   * @class Inout_Fixed_Array_SArgument_T
-   *
-   * @brief INOUT skeleton argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_SArgument_T : public Argument
-  {
-  public:
-    Inout_Fixed_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Out_Fixed_Array_SArgument_T
-   *
-   * @brief OUT skeleton argument of fixed size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_SArgument_T : public Argument
-  {
-  public:
-    Out_Fixed_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Ret_Fixed_Array_SArgument_T
-   *
-   * @brief Skeleton value of fixed size element array.
-   *
-   */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Fixed_Array_SArgument_T : public Argument
-  {
-  public:
-    Ret_Fixed_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Fixed_Array_Arg_Traits_T
-   *
-   * @brief Argument traits of fixed size element array.
-   *
-   */
-  template<typename T,
-           typename T_slice,
-           typename T_var,
-           typename T_forany>
-  struct Fixed_Array_SArg_Traits_T
-  {
-    typedef T_slice *                                   ret_type;
-    typedef const T                                     in_type;
-    typedef T                                           inout_type;
-    typedef T                                           out_type;
-
-    typedef In_Fixed_Array_SArgument_T<T,
-                                       T_slice,
-                                       T_forany>        in_arg_val;
-    typedef Inout_Fixed_Array_SArgument_T<T,
-                                          T_slice,
-                                          T_forany>     inout_arg_val;
-    typedef Out_Fixed_Array_SArgument_T<T,
-                                        T_slice,
-                                        T_forany>       out_arg_val;
-    typedef Ret_Fixed_Array_SArgument_T<T_slice,
-                                        T_var,
-                                        T_forany>       ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef T_slice const *                             in_arg_type;
-    typedef ret_type                                    inout_arg_type;
-    typedef ret_type &                                  out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Fixed_Array_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Array_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_ARRAY_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
deleted file mode 100644
index 25e4ba3ba96..00000000000
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::In_Fixed_Array_SArgument_T<S,
-                                S_slice,
-                                S_forany>::In_Fixed_Array_SArgument_T (void)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice const *
-TAO::In_Fixed_Array_SArgument_T<S, S_slice, S_forany>::arg (void) const
-{
-  S_forany tmp (this->x_);
-  return tmp.in ();
-}
-
-// ===========================================================================
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::Inout_Fixed_Array_SArgument_T<S,
-                                   S_slice,
-                                   S_forany>::
-Inout_Fixed_Array_SArgument_T (void)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice *
-TAO::Inout_Fixed_Array_SArgument_T<S,
-                                   S_slice,
-                                   S_forany>::arg (void)
-{
-  S_forany tmp (this->x_);
-  return tmp.inout ();
-}
-
-// ===========================================================================
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::Out_Fixed_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::Out_Fixed_Array_SArgument_T (void)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice *&
-TAO::Out_Fixed_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::arg (void)
-{
-  S_forany tmp (this->x_);
-  return tmp.out ();
-}
-
-// ===========================================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-ACE_INLINE
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::
-Ret_Fixed_Array_SArgument_T (void)
-{}
-
-template<typename S_slice, typename S_var, typename S_forany>
-ACE_INLINE
-S_slice *&
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
-{
-  return this->x_.out ();
-}
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
deleted file mode 100644
index e31e1aef094..00000000000
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP
-#define TAO_FIXED_SIZE_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Fixed_Size_SArgument_T.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-# include "tao/Dynamic_ParameterC.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
deleted file mode 100644
index dda407ab99c..00000000000
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_Size_SArgument_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
- *  @author Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_FIXED_SIZE_SARGUMENT_T_H
-#define TAO_FIXED_SIZE_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Fixed_Size_SArgument_T
-   *
-   * @brief Skeleton class template for operation "IN" arguments of
-   *        fixed size IDL types.
-   *
-   * Skeleton class template for operation "IN" arguments of fixed
-   * size IDL types.
-   */
-  template<typename S>
-  class In_Fixed_Size_SArgument_T : public Argument
-  {
-  public:
-
-    /**
-     * @name @c TAO::Argument Method Overrides
-     *
-     * @c TAO::Argument method overrides specific to the type of
-     * operation argument represented by this class.
-     *
-     * @see @c TAO::Argument.
-     */
-    //@{
-    virtual CORBA::Boolean demarshal (TAO_InputCDR & cdr);
-
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter & p);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    //@}
-
-    /// Retrieve underlying argument.
-    S const & arg (void) const;
-
-  private:
-
-    /// Reference to the "IN" argument.
-    S x_;
-
-  };
-
-  // ------------------------------------------------------------
-
-  /**
-   * @class Inout_Fixed_Size_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton arg of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Fixed_Size_SArgument_T : public Argument
-  {
-  public:
-
-    /// Constructor.
-    Inout_Fixed_Size_SArgument_T (void);
-
-    /**
-     * @name @c TAO::Argument Method Overrides
-     *
-     * @c TAO::Argument method overrides specific to the type of
-     * operation argument represented by this class.
-     *
-     * @see @c TAO::Argument.
-     */
-    //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    //@}
-
-    S & arg (void);
-
-  private:
-
-    S x_;
-  };
-
-  // ------------------------------------------------------------
-
-  /**
-   * @class Out_Fixed_Size_SArgument_T
-   *
-   * @brief Template class for OUT skeleton argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Out_Fixed_Size_SArgument_T : public Argument
-  {
-  public:
-
-    /// Constructor.
-    Out_Fixed_Size_SArgument_T (void);
-
-    /**
-     * @name @c TAO::Argument Method Overrides
-     *
-     * @c TAO::Argument method overrides specific to the type of
-     * operation argument represented by this class.
-     *
-     * @see @c TAO::Argument.
-     */
-    //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    //@}
-
-    S & arg (void);
-
-  private:
-
-    S x_;
-
-  };
-
-  // ------------------------------------------------------------
-
-  /**
-   * @class Ret_Fixed_Size_SArgument_T
-   *
-   * @brief Template class for return skeleton value of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Ret_Fixed_Size_SArgument_T : public Argument
-  {
-  public:
-
-    /// Constructor.
-    Ret_Fixed_Size_SArgument_T (void);
-
-    /**
-     * @name @c TAO::Argument Method Overrides
-     *
-     * @c TAO::Argument method overrides specific to the type of
-     * operation argument represented by this class.
-     *
-     * @see @c TAO::Argument.
-     */
-    //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    //@}
-
-    S & arg (void);
-
-  private:
-
-    S x_;
-
-  };
-
-  // ------------------------------------------------------------
-
-  /**
-   * @struct Fixed_Size_SArg_Traits_T
-   *
-   * @brief Template class for argument traits of fixed size IDL types.
-   *
-   */
-  template<typename T>
-  struct Fixed_Size_SArg_Traits_T
-  {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
-
-    typedef In_Fixed_Size_SArgument_T<T>      in_arg_val;
-    typedef Inout_Fixed_Size_SArgument_T<T>   inout_arg_val;
-    typedef Out_Fixed_Size_SArgument_T<T>     out_arg_val;
-    typedef Ret_Fixed_Size_SArgument_T<T>     ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                           in_arg_type;
-    typedef inout_type                        inout_arg_type;
-    typedef out_type                          out_arg_type;
-    typedef out_type                          ret_arg_type;
-
-  };
-
-}
-
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Fixed_Size_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Size_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_SIZE_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
deleted file mode 100644
index 0455d607179..00000000000
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S>
-ACE_INLINE
-S const &
-TAO::In_Fixed_Size_SArgument_T<S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Fixed_Size_SArgument_T<S>::Inout_Fixed_Size_SArgument_T (void)
-{}
-
-template<typename S>
-S &
-TAO::Inout_Fixed_Size_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Out_Fixed_Size_SArgument_T<S>::Out_Fixed_Size_SArgument_T (void)
-{}
-
-template<typename S>
-S &
-TAO::Out_Fixed_Size_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Ret_Fixed_Size_SArgument_T<S>::Ret_Fixed_Size_SArgument_T (void)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Ret_Fixed_Size_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
diff --git a/TAO/tao/PortableServer/ForwardRequest.pidl b/TAO/tao/PortableServer/ForwardRequest.pidl
deleted file mode 100644
index c8df7d7d6a3..00000000000
--- a/TAO/tao/PortableServer/ForwardRequest.pidl
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file ForwardRequest.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * ForwardRequestC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ForwardRequest.pidl
- */
-
-#ifndef _PORTABLESERVER_FORWARDREQUEST_IDL_
-#define _PORTABLESERVER_FORWARDREQUEST_IDL_
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  exception ForwardRequest
-  {
-    Object forward_reference;
-  };
-};
-
-#endif // _PORTABLESERVER_SERVANT_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
deleted file mode 100644
index 8577de23a8f..00000000000
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableServer_ForwardRequest[] =
-  {
-    { "forward_reference", &CORBA::_tc_Object }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ForwardRequest (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-    "ForwardRequest",
-    _tao_fields_PortableServer_ForwardRequest,
-    1);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
-    &_tao_tc_PortableServer_ForwardRequest;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::ForwardRequest &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert_copy (
-      _tao_any,
-      PortableServer::ForwardRequest::_tao_any_destructor,
-      PortableServer::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ForwardRequest *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert (
-      _tao_any,
-      PortableServer::ForwardRequest::_tao_any_destructor,
-      PortableServer::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ForwardRequest *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::ForwardRequest *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::ForwardRequest *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::extract (
-        _tao_any,
-        PortableServer::ForwardRequest::_tao_any_destructor,
-        PortableServer::_tc_ForwardRequest,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
deleted file mode 100644
index eae2d53b284..00000000000
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ForwardRequestC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::ForwardRequest::ForwardRequest (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-        "ForwardRequest"
-      )
-{
-}
-
-PortableServer::ForwardRequest::~ForwardRequest (void)
-{
-}
-
-PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-}
-
-PortableServer::ForwardRequest&
-PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-  return *this;
-}
-
-void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ForwardRequest *_tao_tmp_pointer =
-    static_cast<ForwardRequest *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::ForwardRequest *
-PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ForwardRequest *> (_tao_excp);
-}
-
-const PortableServer::ForwardRequest *
-PortableServer::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ForwardRequest *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::ForwardRequest::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::ForwardRequest (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::ForwardRequest::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::ForwardRequest::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::ForwardRequest::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-PortableServer::ForwardRequest::ForwardRequest (
-    const CORBA::Object_ptr  _tao_forward_reference
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-        "ForwardRequest"
-      )
-{
-  this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
-{
-  return ::PortableServer::_tc_ForwardRequest;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ForwardRequest &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.forward_reference.in ())
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ForwardRequest &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.forward_reference.out ())
-  );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
deleted file mode 100644
index 08f5e51e3b0..00000000000
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_FORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_FORWARDREQUESTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST_CH_
-  
-  class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
-  {
-  public:
-    
-    CORBA::Object_var forward_reference;
-    ForwardRequest (void);
-    ForwardRequest (const ForwardRequest &);
-    ~ForwardRequest (void);
-
-    ForwardRequest &operator= (const ForwardRequest &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static ForwardRequest *_downcast (CORBA::Exception *);
-    static const ForwardRequest *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-    
-    ForwardRequest (
-        const CORBA::Object_ptr  _tao_forward_reference
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
deleted file mode 100644
index 89efde0e574..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "IdAssignmentPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           IdAssignmentPolicy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdAssignmentPolicy::IdAssignmentPolicy (
-      ::PortableServer::IdAssignmentPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    IdAssignmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      IdAssignmentPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        IdAssignmentPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    IdAssignmentPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::IdAssignmentPolicyValue
-    IdAssignmentPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    IdAssignmentPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    IdAssignmentPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_ID_ASSIGNMENT;
-    }
-
-    TAO_Policy_Scope
-    IdAssignmentPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
deleted file mode 100644
index d467272019e..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdAssignmentPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H
-#define TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdAssignmentPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdAssignmentPolicy
-      : public virtual ::PortableServer::IdAssignmentPolicy,
-        public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::IdAssignmentPolicyValue value_;
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
deleted file mode 100644
index 1159445ce0b..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file IdAssignmentPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          IdAssignmentPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-
-  local interface IdAssignmentPolicy : CORBA::Policy
-  {
-    readonly attribute IdAssignmentPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
deleted file mode 100644
index d8fe1b85d80..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IdAssignmentPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_IdAssignmentPolicyValue[] =
-  {
-    "USER_ID",
-    "SYSTEM_ID"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_IdAssignmentPolicyValue (
-    "IDL:omg.org/PortableServer/IdAssignmentPolicyValue:2.3",
-    "IdAssignmentPolicyValue",
-    _tao_enumerators_PortableServer_IdAssignmentPolicyValue,
-    2);
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue =
-    &_tao_tc_PortableServer_IdAssignmentPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_IdAssignmentPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3",
-    "IdAssignmentPolicy");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy =
-    &_tao_tc_PortableServer_IdAssignmentPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_IdAssignmentPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_IdAssignmentPolicyValue,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
-    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
-      _tao_any,
-      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdAssignmentPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
-        _tao_any,
-        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdAssignmentPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
deleted file mode 100644
index 745c1bcec9f..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IdAssignmentPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::IdAssignmentPolicy.
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
-    PortableServer::IdAssignmentPolicy_ptr p
-  )
-{
-  return PortableServer::IdAssignmentPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
-    PortableServer::IdAssignmentPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void)
-{
-  return PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal (
-    PortableServer::IdAssignmentPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
-{}
-
-PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
-{}
-
-void 
-PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdAssignmentPolicy *_tao_tmp_pointer =
-    static_cast<IdAssignmentPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdAssignmentPolicy::_nil ();
-    }
-  
-  IdAssignmentPolicy_ptr proxy =
-    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
-  
-  return IdAssignmentPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdAssignmentPolicy::_nil ();
-    }
-  
-  IdAssignmentPolicy_ptr proxy =
-    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
-  
-  return IdAssignmentPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::IdAssignmentPolicy::_tao_release (IdAssignmentPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::IdAssignmentPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::IdAssignmentPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::IdAssignmentPolicyValue> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
deleted file mode 100644
index 1773460d112..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
-#define _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-  
-  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_
-  
-  class IdAssignmentPolicy;
-  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IdAssignmentPolicy
-      >
-    IdAssignmentPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IdAssignmentPolicy
-      >
-    IdAssignmentPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-  
-  class TAO_PortableServer_Export IdAssignmentPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef IdAssignmentPolicy_ptr _ptr_type;
-    typedef IdAssignmentPolicy_var _var_type;
-    
-    // The static operations.
-    static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    
-    static void _tao_release (IdAssignmentPolicy_ptr obj);
-    
-    static IdAssignmentPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IdAssignmentPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IdAssignmentPolicy_ptr _nil (void)
-    {
-      return static_cast<IdAssignmentPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::IdAssignmentPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    IdAssignmentPolicy (void);
-    
-    virtual ~IdAssignmentPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IdAssignmentPolicy (const IdAssignmentPolicy &);
-    
-    void operator= (const IdAssignmentPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdAssignmentPolicy>
-  {
-    static ::PortableServer::IdAssignmentPolicy_ptr duplicate (
-        ::PortableServer::IdAssignmentPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::IdAssignmentPolicy_ptr
-      );
-    static ::PortableServer::IdAssignmentPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::IdAssignmentPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdAssignmentPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
deleted file mode 100644
index 87cb019e4b5..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-#include "IdAssignmentStrategy.h"
-
-ACE_RCSID (PortableServer,
-           IdAssignmentStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    void
-    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
-    {
-    }
-
-    void
-    IdAssignmentStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-
-    char
-    IdAssignmentStrategy::key_type_length (void) const
-    {
-      return sizeof (char);
-    }
-
-    void
-    IdAssignmentStrategy::create_key (
-      CORBA::Octet *buffer,
-      CORBA::ULong& starting_at)
-    {
-      // Copy the system id byte.
-      buffer[starting_at] = (CORBA::Octet) this->id_assignment_key_type ();
-      starting_at += this->key_type_length ();
-    }
-
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
deleted file mode 100644
index 4acdabe2128..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdAssignmentStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ID_ASSIGNMENT_STRATEGY_H
-#define TAO_ID_ASSIGNMENT_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "tao/Basic_Types.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdAssignmentStrategy :
-       public Policy_Strategy
-    {
-    public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      /**
-       * Returns the key type the says which specific policy we have
-       */
-      virtual char id_assignment_key_type (void) const = 0;
-
-      /**
-       * Returns the length of the id_assignment type
-       */
-      char key_type_length (void) const;
-
-      void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
-
-      virtual bool has_system_id (void) const = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ID_ASSIGNMENT_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
deleted file mode 100644
index 73a5e0c050a..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdAssignmentStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "StrategyFactory.h"
-#include "IdAssignmentPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class IdAssignmentStrategy;
-
-    class TAO_PortableServer_Export IdAssignmentStrategyFactory
-      : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual IdAssignmentStrategy* create (
-        ::PortableServer::IdAssignmentPolicyValue value) = 0;
-
-      virtual void destroy (
-        IdAssignmentStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
deleted file mode 100644
index ddbbf2e40b6..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#include "IdAssignmentStrategyFactoryImpl.h"
-#include "IdAssignmentStrategy.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           IdAssignmentStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdAssignmentStrategy*
-    IdAssignmentStrategyFactoryImpl::create (
-      ::PortableServer::IdAssignmentPolicyValue value)
-    {
-      IdAssignmentStrategy* strategy = 0;
-      const char * strategy_name = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::SYSTEM_ID :
-        {
-          strategy_name = "IdAssignmentStrategySystem";
-          break;
-        }
-        case ::PortableServer::USER_ID :
-        {
-          strategy_name = "IdAssignmentStrategyUser";
-          break;
-        }
-      }
-
-      strategy =
-        ACE_Dynamic_Service<IdAssignmentStrategy>::instance (strategy_name);
-
-      if (strategy == 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_name));
-
-      return strategy;
-    }
-
-    void
-    IdAssignmentStrategyFactoryImpl::destroy (
-      IdAssignmentStrategy * /*strategy*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      // Noop because both types are singletons
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategyFactoryImpl,
-        ACE_TEXT ("IdAssignmentStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-      template class ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
deleted file mode 100644
index 2ae4e43b745..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdAssignmentStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "IdAssignmentStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdAssignmentStrategyFactoryImpl
-      : public IdAssignmentStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual IdAssignmentStrategy* create (
-        ::PortableServer::IdAssignmentPolicyValue value);
-
-      virtual void destroy (
-        IdAssignmentStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
deleted file mode 100644
index 5c064e75d7b..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#include "IdAssignmentStrategySystem.h"
-
-ACE_RCSID (PortableServer,
-           Id_Assignment_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    char
-    IdAssignmentStrategySystem::id_assignment_key_type (void) const
-    {
-      return 'S';
-    }
-
-    bool
-    IdAssignmentStrategySystem::has_system_id (void) const
-    {
-      return true;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategySystem)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategySystem,
-        ACE_TEXT ("IdAssignmentStrategySystem"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategySystem),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<IdAssignmentStrategySystem>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategySystem>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
deleted file mode 100644
index 9568bf96d61..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdAssignmentStrategySystem.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
-#define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdAssignmentStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdAssignmentStrategySystem
-      : public IdAssignmentStrategy
-    {
-    public:
-      virtual char id_assignment_key_type (void) const;
-
-      virtual bool has_system_id (void) const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
deleted file mode 100644
index a5124bb5dc7..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#include "IdAssignmentStrategyUser.h"
-
-ACE_RCSID (PortableServer,
-           Id_Assignment_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    char
-    IdAssignmentStrategyUser::id_assignment_key_type (void) const
-    {
-      return 'U';
-    }
-
-    bool
-    IdAssignmentStrategyUser::has_system_id (void) const
-    {
-      return false;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyUser)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdAssignmentStrategyUser,
-        ACE_TEXT ("IdAssignmentStrategyUser"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdAssignmentStrategyUser),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<IdAssignmentStrategyUser>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyUser>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
deleted file mode 100644
index b4eee284501..00000000000
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @fileIdAssignmentStrategyUser.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_IDASSIGNMENTSTRATEGYUSER_H
-#define TAO_IDASSIGNMENTSTRATEGYUSER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdAssignmentStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdAssignmentStrategyUser
-      : public IdAssignmentStrategy
-    {
-    public:
-      virtual char id_assignment_key_type (void) const;
-
-      virtual bool has_system_id (void) const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IDASSIGNMENTSTRATEGYUSER_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
deleted file mode 100644
index 7dc969af49c..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "IdUniquenessPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           IdUniquenessPolicy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdUniquenessPolicy::IdUniquenessPolicy (
-      ::PortableServer::IdUniquenessPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    IdUniquenessPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      IdUniquenessPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        IdUniquenessPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    IdUniquenessPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    IdUniquenessPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    IdUniquenessPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_ID_UNIQUENESS;
-    }
-
-    TAO_Policy_Scope
-    IdUniquenessPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
deleted file mode 100644
index 3064d77924a..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H
-#define TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdUniquenessPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessPolicy
-      : public virtual ::PortableServer::IdUniquenessPolicy,
-        public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::IdUniquenessPolicyValue value_;
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
deleted file mode 100644
index 110ee6471f0..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file IdUniquenessPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          IdUniquenessPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-
-  local interface IdUniquenessPolicy : CORBA::Policy
-  {
-    readonly attribute IdUniquenessPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
deleted file mode 100644
index 47dbeaed1f1..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IdUniquenessPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_IdUniquenessPolicyValue[] =
-  {
-    "UNIQUE_ID",
-    "MULTIPLE_ID"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_IdUniquenessPolicyValue (
-    "IDL:omg.org/PortableServer/IdUniquenessPolicyValue:2.3",
-    "IdUniquenessPolicyValue",
-    _tao_enumerators_PortableServer_IdUniquenessPolicyValue,
-    2);
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue =
-    &_tao_tc_PortableServer_IdUniquenessPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_IdUniquenessPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3",
-    "IdUniquenessPolicy");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy =
-    &_tao_tc_PortableServer_IdUniquenessPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_IdUniquenessPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_IdUniquenessPolicyValue,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
-    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
-      _tao_any,
-      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdUniquenessPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
-        _tao_any,
-        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdUniquenessPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
deleted file mode 100644
index 40e6cc5763f..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "IdUniquenessPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::IdUniquenessPolicy.
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
-    PortableServer::IdUniquenessPolicy_ptr p
-  )
-{
-  return PortableServer::IdUniquenessPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
-    PortableServer::IdUniquenessPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void)
-{
-  return PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal (
-    PortableServer::IdUniquenessPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
-{}
-
-PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
-{}
-
-void 
-PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdUniquenessPolicy *_tao_tmp_pointer =
-    static_cast<IdUniquenessPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdUniquenessPolicy::_nil ();
-    }
-  
-  IdUniquenessPolicy_ptr proxy =
-    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
-  
-  return IdUniquenessPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdUniquenessPolicy::_nil ();
-    }
-  
-  IdUniquenessPolicy_ptr proxy =
-    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
-  
-  return IdUniquenessPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::IdUniquenessPolicy::_tao_release (IdUniquenessPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::IdUniquenessPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::IdUniquenessPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::IdUniquenessPolicyValue> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
deleted file mode 100644
index 936c9f6270a..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
-#define _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-  
-  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_
-  
-  class IdUniquenessPolicy;
-  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IdUniquenessPolicy
-      >
-    IdUniquenessPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IdUniquenessPolicy
-      >
-    IdUniquenessPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-  
-  class TAO_PortableServer_Export IdUniquenessPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef IdUniquenessPolicy_ptr _ptr_type;
-    typedef IdUniquenessPolicy_var _var_type;
-    
-    // The static operations.
-    static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    
-    static void _tao_release (IdUniquenessPolicy_ptr obj);
-    
-    static IdUniquenessPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IdUniquenessPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IdUniquenessPolicy_ptr _nil (void)
-    {
-      return static_cast<IdUniquenessPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::IdUniquenessPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    IdUniquenessPolicy (void);
-    
-    virtual ~IdUniquenessPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IdUniquenessPolicy (const IdUniquenessPolicy &);
-    
-    void operator= (const IdUniquenessPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdUniquenessPolicy>
-  {
-    static ::PortableServer::IdUniquenessPolicy_ptr duplicate (
-        ::PortableServer::IdUniquenessPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::IdUniquenessPolicy_ptr
-      );
-    static ::PortableServer::IdUniquenessPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::IdUniquenessPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdUniquenessPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
deleted file mode 100644
index bdb2f08e182..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ID_UNIQUENESS_STRATEGY_H
-#define TAO_ID_UNIQUENESS_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "IdUniquenessPolicyC.h"
-#include "PS_ForwardC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessStrategy
-      : public Policy_Strategy
-    {
-    public:
-      /*
-       * Validate if the servant may be activated
-       * @retval true This servant may be activated
-       * @retval false This servant may not be activated
-       */
-      virtual bool is_servant_activation_allowed (
-        PortableServer::Servant s,
-        int &w) = 0;
-
-      virtual bool allow_multiple_activations (void) const = 0;
-
-      virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ID_UNIQUENESS_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
deleted file mode 100644
index c4c28dd26e4..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "StrategyFactory.h"
-#include "IdUniquenessPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class IdUniquenessStrategy;
-
-    class TAO_PortableServer_Export IdUniquenessStrategyFactory
-      : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual IdUniquenessStrategy* create (
-        ::PortableServer::IdUniquenessPolicyValue value) = 0;
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
deleted file mode 100644
index 039c9aef279..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-
-#include "IdUniquenessStrategyFactoryImpl.h"
-#include "IdUniquenessStrategy.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           IdUniquenessStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdUniquenessStrategy*
-    IdUniquenessStrategyFactoryImpl::create (
-      ::PortableServer::IdUniquenessPolicyValue value)
-    {
-      IdUniquenessStrategy* strategy = 0;
-      switch (value)
-      {
-        case ::PortableServer::MULTIPLE_ID :
-        {
-          strategy =
-            ACE_Dynamic_Service<IdUniquenessStrategy>::instance ("IdUniquenessStrategyMultiple");
-
-          if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("ERROR, Unable to get ")
-                        ACE_TEXT ("IdUniquenessStrategyMultiple")));
-
-          break;
-        }
-        case ::PortableServer::UNIQUE_ID :
-        {
-          IdUniquenessStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyUniqueFactory");
-
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
-          else
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("ERROR, Unable to get ")
-                        ACE_TEXT ("IdUniquenessStrategyUniqueFactory")));
-
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    IdUniquenessStrategyFactoryImpl::destroy (
-      IdUniquenessStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      switch (strategy->type ())
-      {
-        case ::PortableServer::MULTIPLE_ID :
-        {
-          // Noop
-          break;
-        }
-        case ::PortableServer::UNIQUE_ID :
-        {
-          IdUniquenessStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyUniqueFactory");
-
-          if (strategy_factory != 0)
-            {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-          break;
-        }
-      }
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyFactoryImpl,
-        ACE_TEXT ("IdUniquenessStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
deleted file mode 100644
index a6269f4d364..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "IdUniquenessStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessStrategyFactoryImpl
-      : public IdUniquenessStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual IdUniquenessStrategy* create (
-        ::PortableServer::IdUniquenessPolicyValue value);
-
-      virtual void destroy (
-        IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
deleted file mode 100644
index 94db497d17b..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-
-#include "IdUniquenessStrategyMultiple.h"
-
-ACE_RCSID (PortableServer,
-           Id_Uniqueness_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    void
-    IdUniquenessStrategyMultiple::strategy_init (
-      TAO_Root_POA * /*poa*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-    }
-
-    void
-    IdUniquenessStrategyMultiple::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-
-    bool
-    IdUniquenessStrategyMultiple::is_servant_activation_allowed (
-      PortableServer::Servant /*servant*/,
-      int & /*wait_occurred_restart_call*/)
-    {
-      // With the multiple id strategy we can always activate the servant
-      // another time
-      return true;
-    }
-
-    bool
-    IdUniquenessStrategyMultiple::allow_multiple_activations (void) const
-    {
-      return true;
-    }
-
-    ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessStrategyMultiple::type() const
-    {
-      return ::PortableServer::MULTIPLE_ID;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyMultiple)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyMultiple,
-        ACE_TEXT ("IdUniquenessStrategyMultiple"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<IdUniquenessStrategyMultiple>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyMultiple>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
deleted file mode 100644
index e706f0e7b87..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategyMultiple.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
-#define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdUniquenessStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessStrategyMultiple
-      : public IdUniquenessStrategy
-    {
-    public:
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual bool is_servant_activation_allowed (
-        PortableServer::Servant servant,
-        int &w);
-
-      virtual bool allow_multiple_activations (void) const;
-
-      virtual ::PortableServer::IdUniquenessPolicyValue type() const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
deleted file mode 100644
index e87185a49a8..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-#include "IdUniquenessStrategyUnique.h"
-#include "Root_POA.h"
-
-ACE_RCSID (PortableServer,
-           Id_Uniqueness_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) :
-      poa_ (0)
-    {
-    }
-
-    void
-    IdUniquenessStrategyUnique::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      poa_ = poa;
-    }
-
-    void
-    IdUniquenessStrategyUnique::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      poa_ = 0;
-    }
-
-    bool
-    IdUniquenessStrategyUnique::is_servant_activation_allowed (
-      PortableServer::Servant servant,
-      int &wait_occurred_restart_call)
-    {
-      // If the specified servant is already in the Active Object Map, the
-      // ServantAlreadyActive exception is raised.
-      int result =
-        this->poa_->is_servant_active (servant,
-                                       wait_occurred_restart_call);
-
-      return (!(result || wait_occurred_restart_call));
-    }
-
-    bool
-    IdUniquenessStrategyUnique::allow_multiple_activations (void) const
-    {
-      return false;
-    }
-
-    ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessStrategyUnique::type() const
-    {
-      return ::PortableServer::UNIQUE_ID;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUnique)
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyUnique,
-        ACE_TEXT ("IdUniquenessStrategyUnique"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyUnique),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-      template class ACE_Dynamic_Service<IdUniquenessStrategyUnique>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUnique>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
deleted file mode 100644
index 7af8890f475..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategyUnique.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
-#define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IdUniquenessStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessStrategyUnique
-      : public IdUniquenessStrategy
-    {
-    public:
-      IdUniquenessStrategyUnique (void);
-
-      virtual void strategy_init (TAO_Root_POA *poa
-                                  ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual bool is_servant_activation_allowed (
-        PortableServer::Servant servant,
-        int &wait_occurred_restart_call);
-
-      virtual bool allow_multiple_activations (void) const;
-
-      virtual ::PortableServer::IdUniquenessPolicyValue type() const;
-
-    private:
-      TAO_Root_POA* poa_;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
deleted file mode 100644
index 4c55957752d..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-#include "IdUniquenessStrategyUniqueFactoryImpl.h"
-#include "IdUniquenessStrategyUnique.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           IdUniquenessStrategyUniqueFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    IdUniquenessStrategy*
-    IdUniquenessStrategyUniqueFactoryImpl::create (
-      ::PortableServer::IdUniquenessPolicyValue value)
-    {
-      IdUniquenessStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::UNIQUE_ID :
-        {
-          ACE_NEW_RETURN (strategy, IdUniquenessStrategyUnique, 0);
-          break;
-        }
-        case ::PortableServer::MULTIPLE_ID :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    IdUniquenessStrategyUniqueFactoryImpl::destroy (
-      IdUniquenessStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        IdUniquenessStrategyUniqueFactoryImpl,
-        ACE_TEXT ("IdUniquenessStrategyUniqueFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
deleted file mode 100644
index 927dda0a86b..00000000000
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file IdUniquenessStrategyUniqueFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
-#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "IdUniquenessStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export IdUniquenessStrategyUniqueFactoryImpl
-      : public IdUniquenessStrategyFactory
-    {
-    public:
-      /// Create a new  strategy
-      virtual IdUniquenessStrategy* create (
-        ::PortableServer::IdUniquenessPolicyValue value);
-
-      virtual void destroy (
-        IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
deleted file mode 100644
index bd0afb4930c..00000000000
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// @(#) $Id$
-
-#include "ImR_Client_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           ImR_Client_Adapter,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-
-    ImR_Client_Adapter::~ImR_Client_Adapter (void)
-    {
-    }
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ImR_Client_Adapter>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ImR_Client_Adapter>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
deleted file mode 100644
index 019cc333669..00000000000
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ImR_Client_Adapter.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-
-#ifndef TAO_IMR_CLIENT_ADAPTER_H
-#define TAO_IMR_CLIENT_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
-#include "tao/orbconf.h"
-#include "tao/Environment.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    /**
-     * @class ImR_Client_Adapter
-     *
-     * @brief IFR_Client_Adapter.
-     *
-     * Class that adapts various functions in the PortableServer library
-     * which use the Implementation Repository. This is a base class for
-     * the actual implementation in the TAO_IMR_Client library.
-     */
-    class TAO_PortableServer_Export ImR_Client_Adapter :
-      public ACE_Service_Object
-    {
-    public:
-      virtual ~ImR_Client_Adapter (void);
-
-      /// ImplRepo helper method, notify the ImplRepo on startup
-      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
-
-      /// ImplRepo helper method, notify the ImplRepo on shutdown
-      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IMR_CLIENT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
deleted file mode 100644
index 940a0f05b18..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "ImplicitActivationPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationPolicy,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ImplicitActivationPolicy::ImplicitActivationPolicy (
-      ::PortableServer::ImplicitActivationPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    ImplicitActivationPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ImplicitActivationPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        ImplicitActivationPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    ImplicitActivationPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::ImplicitActivationPolicyValue
-    ImplicitActivationPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    ImplicitActivationPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    ImplicitActivationPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION;
-    }
-
-    TAO_Policy_Scope
-    ImplicitActivationPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
deleted file mode 100644
index 6e9f11bea63..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H
-#define TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ImplicitActivationPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ImplicitActivationPolicy
-      : public virtual ::PortableServer::ImplicitActivationPolicy,
-        public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::ImplicitActivationPolicyValue value_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
deleted file mode 100644
index 9a5351cac56..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file ImplicitActivationPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ImplicitActivationPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum ImplicitActivationPolicyValue
-  {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-
-  local interface ImplicitActivationPolicy : CORBA::Policy
-  {
-    readonly attribute ImplicitActivationPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
deleted file mode 100644
index fbf41ebe7e2..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ImplicitActivationPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
- #if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_ImplicitActivationPolicyValue[] =
-  {
-    "IMPLICIT_ACTIVATION",
-    "NO_IMPLICIT_ACTIVATION"
-
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ImplicitActivationPolicyValue (
-    "IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:2.3",
-    "ImplicitActivationPolicyValue",
-    _tao_enumerators_PortableServer_ImplicitActivationPolicyValue,
-    2);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue =
-    &_tao_tc_PortableServer_ImplicitActivationPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ImplicitActivationPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3",
-    "ImplicitActivationPolicy");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy =
-    &_tao_tc_PortableServer_ImplicitActivationPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ImplicitActivationPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ImplicitActivationPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
-    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
-      _tao_any,
-      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-      PortableServer::_tc_ImplicitActivationPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
-        _tao_any,
-        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-        PortableServer::_tc_ImplicitActivationPolicy,
-        _tao_elem
-      );
-}
-
- #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
deleted file mode 100644
index 0196e389cfa..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ImplicitActivationPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ImplicitActivationPolicy.
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
-    PortableServer::ImplicitActivationPolicy_ptr p
-  )
-{
-  return PortableServer::ImplicitActivationPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
-    PortableServer::ImplicitActivationPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void)
-{
-  return PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal (
-    PortableServer::ImplicitActivationPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
-{}
-
-PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
-{}
-
-void
-PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ImplicitActivationPolicy *_tao_tmp_pointer =
-    static_cast<ImplicitActivationPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ImplicitActivationPolicy::_nil ();
-    }
-
-  ImplicitActivationPolicy_ptr proxy =
-    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
-
-  return ImplicitActivationPolicy::_duplicate (proxy);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ImplicitActivationPolicy::_nil ();
-    }
-
-  ImplicitActivationPolicy_ptr proxy =
-    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
-
-  return ImplicitActivationPolicy::_duplicate (proxy);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ImplicitActivationPolicy::_tao_release (ImplicitActivationPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ImplicitActivationPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::ImplicitActivationPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivationPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::ImplicitActivationPolicyValue> (_tao_temp);
-    }
-
-  return _tao_success;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
deleted file mode 100644
index 15ca233daa4..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
+++ /dev/null
@@ -1,285 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
-#define _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum ImplicitActivationPolicyValue
-  {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_
-
-  class ImplicitActivationPolicy;
-  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ImplicitActivationPolicy
-      >
-    ImplicitActivationPolicy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ImplicitActivationPolicy
-      >
-    ImplicitActivationPolicy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
-  class TAO_PortableServer_Export ImplicitActivationPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ImplicitActivationPolicy_ptr _ptr_type;
-    typedef ImplicitActivationPolicy_var _var_type;
-
-    // The static operations.
-    static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-
-    static void _tao_release (ImplicitActivationPolicy_ptr obj);
-
-    static ImplicitActivationPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ImplicitActivationPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ImplicitActivationPolicy_ptr _nil (void)
-    {
-      return static_cast<ImplicitActivationPolicy_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::ImplicitActivationPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // 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
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    ImplicitActivationPolicy (void);
-
-    virtual ~ImplicitActivationPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ImplicitActivationPolicy (const ImplicitActivationPolicy &);
-
-    void operator= (const ImplicitActivationPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
-
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy>
-  {
-    static ::PortableServer::ImplicitActivationPolicy_ptr duplicate (
-        ::PortableServer::ImplicitActivationPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::ImplicitActivationPolicy_ptr
-      );
-    static ::PortableServer::ImplicitActivationPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ImplicitActivationPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
deleted file mode 100644
index 0e1e4d3002e..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-
-#include "ImplicitActivationStrategy.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    void
-    ImplicitActivationStrategy::strategy_init (
-      TAO_Root_POA * /*poa*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      // dependent on type create the correct strategy.
-    }
-
-    void
-    ImplicitActivationStrategy::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
deleted file mode 100644
index af0599aa4ed..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_ACTIVATION_STRATEGY_H
-#define TAO_ACTIVATION_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ImplicitActivationStrategy
-      : public Policy_Strategy
-    {
-    public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual bool allow_implicit_activation (void) const = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ACTIVATION_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
deleted file mode 100644
index 6ab4461093e..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- C++ -*-
-
-#include "ImplicitActivationStrategyExplicit.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyExplicit,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    bool
-    ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const
-    {
-      return false;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyExplicit,
-        ACE_TEXT ("ImplicitActivationStrategyExplicit"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ImplicitActivationStrategyExplicit>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyExplicit>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
deleted file mode 100644
index 2f749eb662a..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationStrategyExplicit.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
-#define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ImplicitActivationStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ImplicitActivationStrategyExplicit :
-       public ImplicitActivationStrategy
-    {
-    public:
-      virtual bool allow_implicit_activation (void) const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
deleted file mode 100644
index 48ed323d19d..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "StrategyFactory.h"
-#include "ImplicitActivationPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class ImplicitActivationStrategy;
-
-    class TAO_PortableServer_Export ImplicitActivationStrategyFactory
-      : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ImplicitActivationStrategy* create (
-        ::PortableServer::ImplicitActivationPolicyValue value) = 0;
-
-      virtual void destroy (
-        ImplicitActivationStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
deleted file mode 100644
index b62a89daff5..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-#include "ImplicitActivationStrategyFactoryImpl.h"
-#include "ace/Dynamic_Service.h"
-#include "ImplicitActivationStrategyImplicit.h"
-#include "ImplicitActivationStrategyExplicit.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ImplicitActivationStrategy*
-    ImplicitActivationStrategyFactoryImpl::create (
-      ::PortableServer::ImplicitActivationPolicyValue value)
-    {
-      ImplicitActivationStrategy* strategy = 0;
-      const char * strategy_name = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::IMPLICIT_ACTIVATION :
-        {
-          strategy_name = "ImplicitActivationStrategyImplicit";
-          break;
-        }
-        case ::PortableServer::NO_IMPLICIT_ACTIVATION :
-        {
-          strategy_name = "ImplicitActivationStrategyExplicit";
-          break;
-        }
-      }
-
-      strategy =
-        ACE_Dynamic_Service<ImplicitActivationStrategy>::instance (strategy_name);
-
-      if (strategy == 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_name));
-
-      return strategy;
-    }
-
-    void
-    ImplicitActivationStrategyFactoryImpl::destroy (
-      ImplicitActivationStrategy * /*strategy*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      // Noop because both types are singletons
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyFactoryImpl,
-        ACE_TEXT ("ImplicitActivationStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
deleted file mode 100644
index 1f3d9ee895f..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "ImplicitActivationStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ImplicitActivationStrategyFactoryImpl
-      : public ImplicitActivationStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ImplicitActivationStrategy* create (
-        ::PortableServer::ImplicitActivationPolicyValue value);
-
-      virtual void destroy (
-        ImplicitActivationStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
deleted file mode 100644
index 4128271a9a3..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- C++ -*-
-
-#include "ImplicitActivationStrategyImplicit.h"
-
-ACE_RCSID (PortableServer,
-           ImplicitActivationStrategyImplicit,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    bool
-    ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const
-    {
-      return true;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
-
-    ACE_STATIC_SVC_DEFINE (
-        ImplicitActivationStrategyImplicit,
-        ACE_TEXT ("ImplicitActivationStrategyImplicit"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ImplicitActivationStrategyImplicit),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ImplicitActivationStrategyImplicit>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyImplicit>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
deleted file mode 100644
index 766d0aff4cb..00000000000
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ImplicitActivationStrategyImplicit.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
-#define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ImplicitActivationStrategy.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ImplicitActivationStrategyImplicit
-      : public ImplicitActivationStrategy
-    {
-    public:
-      virtual bool allow_implicit_activation (void) const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
deleted file mode 100644
index 0765402e755..00000000000
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "Key_Adapters.h"
-
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Map_T.h"
-
-ACE_RCSID (PortableServer,
-           Key_Adapters,
-           "$Id$")
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
-  : counter_ (0)
-{
-}
-
-int
-TAO_Incremental_Key_Generator::operator() (PortableServer::ObjectId &id)
-{
-  // Resize to accommodate the counter.
-  id.length (sizeof this->counter_);
-
-  // Add new key data.
-  ACE_OS::memcpy (id.get_buffer (),
-                  &++this->counter_,
-                  sizeof this->counter_);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-u_long
-TAO_ObjectId_Hash::operator () (const PortableServer::ObjectId &id) const
-{
-  return ACE::hash_pjw ((const char *) id.get_buffer (),
-                        id.length ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Ignore_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                         const ACE_Active_Map_Manager_Key &active_key,
-                                         PortableServer::ObjectId &modified_key)
-{
-  ACE_UNUSED_ARG (original_key);
-
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (static_cast <CORBA::ULong> (active_key_size));
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         PortableServer::ObjectId &original_key)
-{
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (modified_key.maximum (),
-                        modified_key.length (),
-                        const_cast <CORBA::Octet *>
-                                   (modified_key.get_buffer ()),
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Preserve_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                           const ACE_Active_Map_Manager_Key &active_key,
-                                           PortableServer::ObjectId &modified_key)
-{
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (static_cast <CORBA::ULong> (active_key_size)
-                         + original_key.length ());
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Copy the original key after the active key.
-  ACE_OS::memcpy (modified_key.get_buffer () + active_key_size,
-                  original_key.get_buffer (),
-                  original_key.length ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           PortableServer::ObjectId &original_key)
-{
-  // Size of active key.
-  size_t active_key_size = ACE_Active_Map_Manager_Key::size ();
-
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (static_cast <CORBA::ULong>
-                            (modified_key.maximum () - active_key_size),
-                        static_cast <CORBA::ULong>
-                            (modified_key.length () - active_key_size),
-                        const_cast <CORBA::Octet *>
-                            (modified_key.get_buffer ()) + active_key_size,
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
deleted file mode 100644
index a7f8e544b5c..00000000000
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Key_Adapters.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_KEY_ADAPTERS_H
-#define TAO_KEY_ADAPTERS_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PS_ForwardC.h"
-
-class ACE_Active_Map_Manager_Key;
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * @class TAO_Incremental_Key_Generator
- *
- * @brief Defines a key generator.
- *
- * This class is used in adapters of maps that do not produce keys.
- */
-class TAO_Incremental_Key_Generator
-{
-public:
-
-  TAO_Incremental_Key_Generator (void);
-
-  int operator() (PortableServer::ObjectId &id);
-
-protected:
-
-  CORBA::ULong counter_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * @class TAO_ObjectId_Hash
- *
- * @brief Hashing class for Object Ids.
- *
- * Define the hash() method for Object Ids.
- */
-class TAO_PortableServer_Export TAO_ObjectId_Hash
-{
-public:
-
-  /// Returns hash value.
-  u_long operator () (const PortableServer::ObjectId &id) const;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * @class TAO_Ignore_Original_Key_Adapter
- *
- * @brief A key adapter (encode/decode) class.
- *
- * Define the encoding and decoding methods for converting
- * between Object Ids and active keys.  This class ignores the
- * <original_key> passed to it.
- */
-class TAO_Ignore_Original_Key_Adapter
-{
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * @class TAO_Preserve_Original_Key_Adapter
- *
- * @brief A key adapter (encode/decode) class.
- *
- * Define the encoding and decoding methods for converting
- * between Object Ids and active keys.  This class remembers the
- * <original_key> passed to it.
- */
-class TAO_Preserve_Original_Key_Adapter
-{
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_KEY_ADAPTERS_H */
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
deleted file mode 100644
index 377b34fedd6..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "LifespanPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           LifespanPolicy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanPolicy::LifespanPolicy (
-      ::PortableServer::LifespanPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    LifespanPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      LifespanPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        LifespanPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    LifespanPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::LifespanPolicyValue
-    LifespanPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    LifespanPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::LIFESPAN_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    LifespanPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_LIFESPAN;
-    }
-
-    TAO_Policy_Scope
-    LifespanPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
deleted file mode 100644
index 8d6f3aafc10..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_POA_LIFESPANPOLICY_H
-#define TAO_POA_LIFESPANPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LifespanPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanPolicy
-      : public virtual ::PortableServer::LifespanPolicy,
-        public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      LifespanPolicy (::PortableServer::LifespanPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::LifespanPolicyValue value_;
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_LIFESPANPOLICY_H */
diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl
deleted file mode 100644
index 428503d0157..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file LifespanPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          LifespanPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_
-#define _PORTABLESERVER_LIFESPANPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-
-  local interface LifespanPolicy : CORBA::Policy
-  {
-    readonly attribute LifespanPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_LIFESPANPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
deleted file mode 100644
index 0f2c0b3a0e5..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LifespanPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_LifespanPolicyValue[] =
-  {
-    "TRANSIENT",
-    "PERSISTENT"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_LifespanPolicyValue (
-    "IDL:omg.org/PortableServer/LifespanPolicyValue:2.3",
-    "LifespanPolicyValue",
-    _tao_enumerators_PortableServer_LifespanPolicyValue,
-    2);
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue =
-    &_tao_tc_PortableServer_LifespanPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_LifespanPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/LifespanPolicy:2.3",
-    "LifespanPolicy");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_LifespanPolicy =
-    &_tao_tc_PortableServer_LifespanPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_LifespanPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_LifespanPolicyValue,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::LifespanPolicy_ptr _tao_objptr =
-    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
-      _tao_any,
-      PortableServer::LifespanPolicy::_tao_any_destructor,
-      PortableServer::_tc_LifespanPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
-        _tao_any,
-        PortableServer::LifespanPolicy::_tao_any_destructor,
-        PortableServer::_tc_LifespanPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
deleted file mode 100644
index abd81f5c1da..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "LifespanPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::LifespanPolicy.
-
-PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
-    PortableServer::LifespanPolicy_ptr p
-  )
-{
-  return PortableServer::LifespanPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
-    PortableServer::LifespanPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void)
-{
-  return PortableServer::LifespanPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal (
-    PortableServer::LifespanPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::LifespanPolicy::LifespanPolicy (void)
-{}
-
-PortableServer::LifespanPolicy::~LifespanPolicy (void)
-{}
-
-void 
-PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  LifespanPolicy *_tao_tmp_pointer =
-    static_cast<LifespanPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return LifespanPolicy::_nil ();
-    }
-  
-  LifespanPolicy_ptr proxy =
-    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
-  
-  return LifespanPolicy::_duplicate (proxy);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return LifespanPolicy::_nil ();
-    }
-  
-  LifespanPolicy_ptr proxy =
-    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
-  
-  return LifespanPolicy::_duplicate (proxy);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::LifespanPolicy::_tao_release (LifespanPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::LifespanPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/LifespanPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::LifespanPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::LifespanPolicyValue> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
deleted file mode 100644
index b3eb4d69ed9..00000000000
--- a/TAO/tao/PortableServer/LifespanPolicyC.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
-#define _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-  
-  typedef LifespanPolicyValue &LifespanPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_
-  
-  class LifespanPolicy;
-  typedef LifespanPolicy *LifespanPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        LifespanPolicy
-      >
-    LifespanPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        LifespanPolicy
-      >
-    LifespanPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY_CH_
-  
-  class TAO_PortableServer_Export LifespanPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef LifespanPolicy_ptr _ptr_type;
-    typedef LifespanPolicy_var _var_type;
-    
-    // The static operations.
-    static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    
-    static void _tao_release (LifespanPolicy_ptr obj);
-    
-    static LifespanPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static LifespanPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static LifespanPolicy_ptr _nil (void)
-    {
-      return static_cast<LifespanPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::LifespanPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    LifespanPolicy (void);
-    
-    virtual ~LifespanPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    LifespanPolicy (const LifespanPolicy &);
-    
-    void operator= (const LifespanPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::LifespanPolicy>
-  {
-    static ::PortableServer::LifespanPolicy_ptr duplicate (
-        ::PortableServer::LifespanPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::LifespanPolicy_ptr
-      );
-    static ::PortableServer::LifespanPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::LifespanPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::LifespanPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
deleted file mode 100644
index 42bec436226..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    LifespanStrategy.cpp
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#include "LifespanStrategy.h"
-
-ACE_RCSID (PortableServer,
-           LifespanStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanStrategy::LifespanStrategy () :
-      poa_ (0)
-    {
-    }
-
-    void
-    LifespanStrategy::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      poa_ = poa;
-    }
-
-    void
-    LifespanStrategy::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      poa_ = 0;
-    }
-
-    CORBA::ULong
-    LifespanStrategy::key_type_length (void) const
-    {
-      return sizeof (char);
-    }
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
deleted file mode 100644
index ca22cc7ba54..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_LIFESPANPOLICY_H
-#define TAO_PORTABLESERVER_LIFESPANPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "LifespanPolicyC.h"
-#include "tao/Object_KeyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Temporary_Creation_Time;
-
-    class TAO_PortableServer_Export LifespanStrategy
-      : public Policy_Strategy
-    {
-    public:
-      LifespanStrategy (void);
-
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      void create (const char *name, const TAO::ObjectKey &key);
-
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-      /**
-       * Validate the passed object key if it belongs to this POA.
-       */
-      bool validate (TAO::ObjectKey_var& key);
-
-      /**
-       * Returns the length of the key type
-       */
-      virtual CORBA::ULong key_length (void) const = 0;
-
-      CORBA::ULong key_type_length (void) const;
-
-      /// Do we have set persistent or not,
-      virtual CORBA::Boolean is_persistent (void) const = 0;
-
-      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0;
-
-      /// Validate whether this matches the set lifespan strategy
-      virtual bool validate (
-        CORBA::Boolean is_persistent,
-        const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0;
-
-      /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-      virtual ::PortableServer::LifespanPolicyValue type() const = 0;
-
-      virtual bool use_imr () const = 0;
-
-    protected:
-      TAO_Root_POA *poa_;
-    };
-
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_LIFESPANPOLICY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h
deleted file mode 100644
index ca53f9f58e0..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "StrategyFactory.h"
-#include "LifespanPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class LifespanStrategy;
-
-    class TAO_PortableServer_Export LifespanStrategyFactory
-      : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual LifespanStrategy* create (
-        ::PortableServer::LifespanPolicyValue value) = 0;
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
deleted file mode 100644
index 4b3166af831..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "LifespanStrategyFactoryImpl.h"
-#include "LifespanStrategy.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanStrategy*
-    LifespanStrategyFactoryImpl::create (
-      ::PortableServer::LifespanPolicyValue value)
-    {
-      LifespanStrategy *strategy = 0;
-      const char *strategy_name = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::PERSISTENT :
-        {
-          strategy_name = "LifespanStrategyPersistentFactory";
-          break;
-        }
-        case ::PortableServer::TRANSIENT :
-        {
-          strategy_name = "LifespanStrategyTransientFactory";
-          break;
-        }
-      }
-
-      LifespanStrategyFactory *strategy_factory =
-        ACE_Dynamic_Service<LifespanStrategyFactory>::instance (strategy_name);
-
-      if (strategy_factory != 0)
-        strategy = strategy_factory->create (value);
-      else
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_name));
-
-
-      return strategy;
-    }
-
-    void
-    LifespanStrategyFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      switch (strategy->type ())
-      {
-        case ::PortableServer::PERSISTENT :
-        {
-          LifespanStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyPersistentFactory");
-
-          if (strategy_factory != 0)
-            {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-          break;
-        }
-        case ::PortableServer::TRANSIENT :
-        {
-          LifespanStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyTransientFactory");
-
-          if (strategy_factory != 0)
-            {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-          break;
-        }
-      }
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyFactoryImpl,
-        ACE_TEXT ("LifespanStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<LifespanStrategyFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
deleted file mode 100644
index 273a11a9d0f..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanStrategyFactoryImpl
-      : public LifespanStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual LifespanStrategy* create (
-        ::PortableServer::LifespanPolicyValue value);
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
deleted file mode 100644
index 7a253b6dc16..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-
-#include "LifespanStrategyPersistent.h"
-
-ACE_RCSID (PortableServer,
-           Lifespan_Strategy,
-           "$Id$")
-
-#include "Root_POA.h"
-#include "POAManager.h"
-#include "ImR_Client_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Config.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    bool
-    LifespanStrategyPersistent::validate (
-      CORBA::Boolean is_persistent,
-      const TAO::Portable_Server::Temporary_Creation_Time& /*creation_time*/) const
-    {
-      return is_persistent;
-    }
-
-    char
-    LifespanStrategyPersistent::key_type (void) const
-    {
-      return 'P';
-    }
-
-    CORBA::Boolean
-    LifespanStrategyPersistent::is_persistent (void) const
-    {
-      return true;
-    }
-
-    void
-    LifespanStrategyPersistent::create_key (
-      CORBA::Octet *buffer,
-      CORBA::ULong& starting_at)
-    {
-      // Copy the persistence byte.
-      buffer[starting_at] = static_cast<CORBA::Octet> (this->key_type ());
-      starting_at += this->key_type_length ();
-    }
-
-    CORBA::ULong
-    LifespanStrategyPersistent::key_length () const
-    {
-      return this->key_type_length ();
-    }
-
-    void
-    LifespanStrategyPersistent::notify_startup (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      ImR_Client_Adapter *adapter =
-        ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
-
-#if !defined (TAO_AS_STATIC_LIBS)
-      // In case we build shared, try to load the ImR Client library, in a
-      // static build we just can't do this, so don't try it, lower layers
-      // output an error then.
-      if (adapter == 0)
-        {
-          ACE_Service_Config::process_directive (
-#if !defined ACE_HAS_XML_SVC_CONF
-            ACE_TEXT("dynamic ImR_Client_Adapter Service_Object *")
-            ACE_TEXT("TAO_ImR_Client:_make_ImR_Client_Adapter_Impl()")
-#else
-            ACE_TEXT("<ACE_Svc_Conf>")
-            ACE_TEXT("<dynamic id=\"ImR_Client_Adapter\" type=\"Service_Object\">")
-            ACE_TEXT("<initializer path=\"TAO_ImR_Client\"")
-            ACE_TEXT(" init=\"_make_ImR_Client_Adapter_Impl\"")
-            ACE_TEXT(" params=\"\"/>")
-            ACE_TEXT("</dynamic>")
-            ACE_TEXT("</ACE_Svc_Conf>")
-#endif
-            );
-
-          adapter =
-            ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-              TAO_Root_POA::imr_client_adapter_name ());
-        }
-#endif /* !TAO_AS_STATIC_LIBS */
-
-      if (adapter != 0)
-        {
-          bool old_use_imr = this->use_imr_;
-          this->use_imr_ = false;
-
-          adapter->imr_notify_startup (this->poa_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->use_imr_ = old_use_imr;
-        }
-    }
-
-    void
-    LifespanStrategyPersistent::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      ImR_Client_Adapter *adapter =
-        ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
-
-      if (adapter != 0)
-        {
-          adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER);
-        }
-    }
-
-    LifespanStrategyPersistent::LifespanStrategyPersistent() :
-      use_imr_ (true)
-    {
-    }
-
-    void
-    LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    ::PortableServer::LifespanPolicyValue
-    LifespanStrategyPersistent::type() const
-    {
-      return ::PortableServer::PERSISTENT;
-    }
-
-    bool
-    LifespanStrategyPersistent::use_imr () const
-    {
-      return use_imr_;
-    }
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
deleted file mode 100644
index aa88e3b2ded..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyPersistent.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_LIFESPANSTRATEGYPERSISTENT_H
-#define TAO_LIFESPANSTRATEGYPERSISTENT_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LifespanStrategy.h"
-#include "tao/Object_KeyC.h"
-
-class ServerObject_i;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanStrategyPersistent
-      : public LifespanStrategy
-    {
-    public:
-      LifespanStrategyPersistent ();
-
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
-
-      char key_type (void) const;
-
-      virtual CORBA::Boolean is_persistent (void) const;
-
-      CORBA::ULong key_length (void) const;
-
-      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
-
-      virtual bool
-      validate (CORBA::Boolean is_persistent,
-                const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
-
-      /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual ::PortableServer::LifespanPolicyValue type() const;
-
-      virtual bool use_imr () const;
-
-    private:
-      bool use_imr_;
-    };
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_LIFESPANSTRATEGYPERSISTENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
deleted file mode 100644
index 7d0e38c38d7..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-#include "LifespanStrategyPersistentFactoryImpl.h"
-#include "ace/Dynamic_Service.h"
-#include "LifespanStrategyPersistent.h"
-
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanStrategy*
-    LifespanStrategyPersistentFactoryImpl::create (
-      ::PortableServer::LifespanPolicyValue value)
-    {
-      LifespanStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::PERSISTENT :
-        {
-          ACE_NEW_RETURN (strategy, LifespanStrategyPersistent, 0);
-          break;
-        }
-        case ::PortableServer::TRANSIENT :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    LifespanStrategyPersistentFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyPersistentFactoryImpl,
-        ACE_TEXT ("LifespanStrategyPersistentFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
deleted file mode 100644
index a51984d8a51..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyPersistentFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
-#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanStrategyPersistentFactoryImpl
-      : public LifespanStrategyFactory
-    {
-    public:
-      /// Create a new strategy
-      virtual LifespanStrategy* create (
-        ::PortableServer::LifespanPolicyValue value);
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
deleted file mode 100644
index 14f457efa37..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-#include "LifespanStrategyTransient.h"
-
-ACE_RCSID (PortableServer,
-           Lifespan_Strategy,
-           "$Id$")
-
-#include "ace/OS_NS_sys_time.h"
-#include "ace/OS_NS_string.h"
-#include "POAManager.h"
-#include "Root_POA.h"
-#include "tao/ORB_Constants.h"
-#include "Creation_Time.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanStrategyTransient::LifespanStrategyTransient () :
-      creation_time_ (ACE_OS::gettimeofday ())
-    {
-    }
-
-    void
-    LifespanStrategyTransient::notify_startup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-
-    void
-    LifespanStrategyTransient::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-
-    CORBA::Boolean
-    LifespanStrategyTransient::is_persistent (void) const
-    {
-      return false;
-    }
-
-    bool
-    LifespanStrategyTransient::validate (
-      CORBA::Boolean is_persistent,
-      const TAO::Portable_Server::Temporary_Creation_Time &creation_time) const
-    {
-      return (!is_persistent && this->creation_time_ == creation_time);
-    }
-
-    CORBA::ULong
-    LifespanStrategyTransient::key_length (void) const
-    {
-      CORBA::ULong keylength = sizeof (char);
-
-      #if (POA_NO_TIMESTAMP == 0)
-        // Calculate the space required for the timestamp.
-          keylength += TAO::Portable_Server::Creation_Time::creation_time_length ();
-      #endif /* POA_NO_TIMESTAMP */
-
-      return keylength;
-    }
-
-    void
-    LifespanStrategyTransient::create_key (
-      CORBA::Octet *buffer,
-      CORBA::ULong& starting_at)
-    {
-      // Copy the persistence byte.
-      buffer[starting_at] = (CORBA::Octet) this->key_type ();
-      starting_at += this->key_type_length ();
-
-      #if (POA_NO_TIMESTAMP == 0)
-        // Then copy the timestamp for transient POAs.
-        ACE_OS::memcpy (&buffer[starting_at],
-                        this->creation_time_.creation_time (),
-                       TAO::Portable_Server::Creation_Time::creation_time_length ());
-        starting_at += TAO::Portable_Server::Creation_Time::creation_time_length ();
-      #endif /* POA_NO_TIMESTAMP */
-    }
-
-    char
-    LifespanStrategyTransient::key_type (void) const
-    {
-      return 'T';
-    }
-
-    void
-    LifespanStrategyTransient::check_state (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      if (this->poa_->tao_poa_manager().get_state_i () ==
-            PortableServer::POAManager::INACTIVE)
-      {
-        ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4,
-                                            CORBA::COMPLETED_NO));
-      }
-      else
-      {
-        this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-    }
-
-    bool
-    LifespanStrategyTransient::use_imr () const
-    {
-      return false;
-    }
-
-    ::PortableServer::LifespanPolicyValue
-    LifespanStrategyTransient::type() const
-    {
-      return ::PortableServer::TRANSIENT;
-    }
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
deleted file mode 100644
index 01f0bc4c02f..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyTransient.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_LIFESPANSTRATEGYTRANSIENT_H
-#define TAO_LIFESPANSTRATEGYTRANSIENT_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "LifespanStrategy.h"
-#include "Creation_Time.h"
-#include "tao/Object_KeyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanStrategyTransient
-      : public LifespanStrategy
-    {
-    public:
-      LifespanStrategyTransient (void);
-
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
-
-      char key_type (void) const;
-
-      virtual CORBA::Boolean is_persistent (void) const;
-
-      CORBA::ULong key_length (void) const;
-
-      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
-
-      virtual
-      bool validate (CORBA::Boolean is_persistent,
-                     const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
-
-      /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual ::PortableServer::LifespanPolicyValue type() const;
-
-      virtual bool use_imr () const;
-
-    private:
-      TAO::Portable_Server::Creation_Time creation_time_;
-    };
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_LIFESPANSTRATEGYTRANSIENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
deleted file mode 100644
index 830665f2c8a..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-#include "LifespanStrategyTransientFactoryImpl.h"
-#include "ace/Dynamic_Service.h"
-#include "LifespanStrategyTransient.h"
-
-ACE_RCSID (PortableServer,
-           LifespanStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    LifespanStrategy*
-    LifespanStrategyTransientFactoryImpl::create (
-      ::PortableServer::LifespanPolicyValue value)
-    {
-      LifespanStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::PERSISTENT :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl"));
-          break;
-        }
-        case ::PortableServer::TRANSIENT :
-        {
-          ACE_NEW_RETURN (strategy, LifespanStrategyTransient, 0);
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    LifespanStrategyTransientFactoryImpl::destroy (
-      LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        LifespanStrategyTransientFactoryImpl,
-        ACE_TEXT ("LifespanStrategyTransientFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
deleted file mode 100644
index 5cd7ad9483b..00000000000
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LifespanStrategyTransientFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
-#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "LifespanStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export LifespanStrategyTransientFactoryImpl
-      : public LifespanStrategyFactory
-    {
-    public:
-      /// Create a new strategy
-      virtual LifespanStrategy* create (
-        ::PortableServer::LifespanPolicyValue value);
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
deleted file mode 100644
index 319d5d22acf..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "tao/PortableServer/Local_Servant_Base.h"
-#include "tao/SystemException.h"
-
-ACE_RCSID (PortableServer,
-           Local_Servant_Base,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "Local_Servant_Base.inl"
-#endif /* ! __ACE_INLINE__ */
-
-void
-TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
-                                  void *
-                                  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
deleted file mode 100644
index 6c624d77d01..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Local_Servant_Base.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LOCAL_SERVANT_BASE_H
-#define TAO_LOCAL_SERVANT_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Servant_Base.h"
-
-/**
- * @class TAO_Local_ServantBase
- *
- * @brief Base class for local servants.
- *
- * This servant does not register with the POA and does not
- * produce a valid stub, i.e., object references of this servant
- * cannot be exported.  The (collocated) stubs of these servants
- * will always be direct, i.e., call directly to the servant and
- * don't call through the POA since this servant is not
- * registered with the POA.
- */
-class TAO_PortableServer_Export TAO_Local_ServantBase
-  : public virtual TAO_ServantBase
-{
-protected:
-  /// This is an auxiliar method for _this().  Make sure *not* to
-  /// register with the default POA.
-  TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (TAO_ServerRequest &request,
-                  void *servant_upcall
-                  ACE_ENV_ARG_DECL);
-};
-
-#if defined (__ACE_INLINE__)
-# include "Local_Servant_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LOCAL_SERVANT_BASE_H */
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl
deleted file mode 100644
index e6ac4e794a4..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
-{
-#if 0
-  PortableServer::ObjectId_var invalid_oid =
-    PortableServer::string_to_ObjectId ("invalid");
-
-  TAO::ObjectKey tmp_key (invalid_oid->length (),
-                          invalid_oid->length (),
-                          invalid_oid->get_buffer (),
-                          0);
-
-  // It is ok to use TAO_ORB_Core_instance here since the locality
-  // constrained servant does not really register with a POA or get
-  // exported remotely.
-  //
-  // The correct thing to do is to probably use ORB of the default
-  // POA. The unfortunate part is that calling default_POA() requires
-  // the creation of a local stub, hence causing a infinite loop.
-  return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key,
-                                                               this->_interface_repository_id ()
-                                                               ACE_ENV_ARG_PARAMETER);
-#else
-# if !defined (ACE_HAS_EXCEPTIONS)
-  ACE_UNUSED_ARG (ACE_ENV_SINGLE_ARG_PARAMETER);
-#endif
-  return 0;
-#endif
-}
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
deleted file mode 100644
index c4ac484a1c5..00000000000
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-
-#include "Non_Servant_Upcall.h"
-#include "Object_Adapter.h"
-#include "Root_POA.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Non_Servant_Upcall.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (PortableServer,
-           Non_Servant_Upcall,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    Non_Servant_Upcall::Non_Servant_Upcall (::TAO_Root_POA &poa)
-      : object_adapter_ (poa.object_adapter ()),
-        poa_ (poa),
-        previous_ (0)
-    {
-      // Check if this is a nested non_servant_upcall.
-      if (this->object_adapter_.non_servant_upcall_nesting_level_ != 0)
-        {
-          // Remember previous instance of non_servant_upcall.
-          this->previous_ = this->object_adapter_.non_servant_upcall_in_progress_;
-
-          // Assert that the thread is the same as the one before.
-          ACE_ASSERT (ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
-                                         ACE_OS::thr_self ()));
-        }
-
-      // Remember which thread is calling the adapter activators.
-      this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::thr_self ();
-
-      // Mark the fact that a non-servant upcall is in progress.
-      this->object_adapter_.non_servant_upcall_in_progress_ = this;
-
-      // Adjust the nesting level.
-      this->object_adapter_.non_servant_upcall_nesting_level_++;
-
-      // We always release
-      this->object_adapter_.lock ().release ();
-    }
-
-    Non_Servant_Upcall::~Non_Servant_Upcall (void)
-    {
-      // Reacquire the Object Adapter lock.
-      this->object_adapter_.lock ().acquire ();
-
-      // Adjust the nesting level.
-      this->object_adapter_.non_servant_upcall_nesting_level_--;
-
-      // We are done with this nested upcall.
-      this->object_adapter_.non_servant_upcall_in_progress_ = this->previous_;
-
-      // If we are at the outer nested upcall.
-      if (this->object_adapter_.non_servant_upcall_nesting_level_ == 0)
-        {
-          // Reset thread id.
-          this->object_adapter_.non_servant_upcall_thread_ =
-            ACE_OS::NULL_thread;
-
-          // Check if all pending requests are over.
-          if (this->poa_.waiting_destruction () &&
-              this->poa_.outstanding_requests () == 0)
-            {
-              ACE_TRY_NEW_ENV
-                {
-                  this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                }
-              ACE_CATCHANY
-                {
-                  // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "TAO_POA::complete_destruction_i");
-                }
-              ACE_ENDTRY;
-            }
-
-          // If locking is enabled.
-          if (this->object_adapter_.enable_locking_)
-            // Wakeup all waiting threads.
-            this->object_adapter_.non_servant_upcall_condition_.broadcast ();
-        }
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
deleted file mode 100644
index 98f3eec8ec3..00000000000
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Non_Servant_Upcall.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_NONSERVANT_UPCALL_H
-#define TAO_NONSERVANT_UPCALL_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declaration
-class TAO_Root_POA;
-class TAO_Object_Adapter;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    /**
-     * @class Non_Servant_Upcall
-     *
-     * @brief This class helps us with a recursive thread lock without
-     * using a recursive thread lock.  Non_Servant_Upcall has a
-     * magic constructor and destructor.  We unlock the
-     * Object_Adapter lock for the duration of the non-servant
-     * (i.e., adapter activator and servant activator) upcalls;
-     * reacquiring once the upcalls complete.  Even though we are
-     * releasing the lock, other threads will not be able to make
-     * progress since
-     * <Object_Adapter::non_servant_upcall_in_progress_> has been
-     * set.
-     */
-    class TAO_PortableServer_Export Non_Servant_Upcall
-    {
-    public:
-
-      /// Constructor.
-      Non_Servant_Upcall (::TAO_Root_POA &poa);
-
-      /// Destructor.
-      ~Non_Servant_Upcall (void);
-
-      ::TAO_Root_POA &poa (void) const;
-
-    protected:
-
-      TAO_Object_Adapter &object_adapter_;
-      ::TAO_Root_POA &poa_;
-      Non_Servant_Upcall *previous_;
-    };
-  }
-}
-
-#if defined (__ACE_INLINE__)
-# include "Non_Servant_Upcall.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_NONSERVANT_UPCALL_H */
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
deleted file mode 100644
index 75e0ae843af..00000000000
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE ::TAO_Root_POA &
-    Non_Servant_Upcall::poa (void) const
-    {
-      return this->poa_;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp
deleted file mode 100644
index 2e5546db090..00000000000
--- a/TAO/tao/PortableServer/ORT_Adapter.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#include "ORT_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(PortableServer,
-          ORT_Adapter,
-          "$Id$")
-
-namespace TAO
-{
-  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class ACE_Dynamic_Service<ORT_Adapter>;
-
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-  #pragma instantiate ACE_Dynamic_Service<ORT_Adapter>
-
-  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-}
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
deleted file mode 100644
index 8483a3ee8b3..00000000000
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ORT_Adapter.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-#ifndef TAO_ORT_ADAPTER_H
-#define TAO_ORT_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-#include "ace/Service_Object.h"
-#include "ace/Array_Base.h"
-#include "tao/PI_ForwardC.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-}
-
-namespace PortableInterceptor
-{
-  class ObjectReferenceTemplate;
-  class ObjectReferenceFactory;
-}
-
-namespace PortableServer
-{
-  class POA;
-  typedef POA* POA_ptr;
-}
-
-namespace TAO
-{
-  /**
-   * @class ORT_Adapter
-   *
-   * @brief ORT_Adapter
-   *
-   * Class that offers an interface to the POA to load and manipulate
-   * ORT library.
-   */
-  class TAO_PortableServer_Export ORT_Adapter
-    : public ACE_Service_Object
-  {
-  public:
-    /// Activate the ORT library
-    virtual int activate (const char *server_id,
-                          const char *orb_id,
-                          PortableInterceptor::AdapterName *,
-                          PortableServer::POA_ptr poa
-                          ACE_ENV_ARG_DECL) = 0;
-
-    /// Set a different ort_factory to be used.
-    virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory *current_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
-
-    /// Accessor methods to ObjectReferenceTemplate template
-    virtual PortableInterceptor::ObjectReferenceTemplate *
-      get_adapter_template (void) = 0;
-
-    /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-    virtual PortableInterceptor::ObjectReferenceFactory *
-      get_obj_ref_factory (void) = 0;
-
-    /// Release any references on @c ObjectReferenceTemplate @a t.
-    virtual void release (
-      PortableInterceptor::ObjectReferenceTemplate * t) = 0;
-
-    /**
-     * @name PortableInterceptor::ObjectReferenceFactory Methods
-     *
-     * Methods required by the
-     * PortableInterceptor::ObjectReferenceFactory ValueType.
-     *
-     * @todo
-     * @@ Johnny, we won't be needing the exception specification
-     * below for long.  Once bug 1852 is fixed, we can the
-     * exception specification and the "tao/SystemException.h"
-     * include above.
-     */
-    //@{
-    virtual CORBA::Object_ptr make_object (
-      const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-    //@}
-  };
-
- typedef
-  ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> ORT_Array;
-
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ORT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
deleted file mode 100644
index 746e52f2837..00000000000
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#include "ORT_Adapter_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           ORT_Adapter_Factory,
-           "$Id$")
-
-namespace TAO
-{
-  ORT_Adapter_Factory::~ORT_Adapter_Factory (void)
-  {
-  }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class ACE_Dynamic_Service<ORT_Adapter_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<ORT_Adapter_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-}
-
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
deleted file mode 100644
index 9295cdbed41..00000000000
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ORT_Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-
-#ifndef TAO_ORT_ADAPTER_FACTORY_H
-#define TAO_ORT_ADAPTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-namespace TAO
-{
-  class ORT_Adapter;
-}
-
-namespace TAO
-{
-  /**
-   * @class ORT_Adapter_Factory
-   *
-   * @brief ORT_Adapter_Factory
-   *
-   * Class that creates one instance of TAO::ORT_Adapter per
-   * POA on the POA's first usage of its objectreferencetemplate_adapter.
-   * This is a base class for the actual implementation in the
-   * TAO_ObjectReferenceTemplate library.
-   */
-  class TAO_PortableServer_Export ORT_Adapter_Factory
-    : public ACE_Service_Object
-  {
-  public:
-
-    /// Destructor.
-    /**
-     * @note Even though this class only defines an interface, a
-     *       destructor is necessary to avoid dynamic_cast<> failures
-     *       when using g++ 4.0's -fvisibility-inlines-hidden command
-     *       line option.  Apparently the compiler generated
-     *       destructor is inlined.
-     */
-    virtual ~ORT_Adapter_Factory (void);
-
-    /// Create a new adapter, in case not possible to allocate, returns 0
-    virtual TAO::ORT_Adapter * create () = 0;
-
-    /// Destroy the passed adapter
-    virtual void destroy (TAO::ORT_Adapter * adapter) = 0;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ORT_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
deleted file mode 100644
index b2f82ea0bbe..00000000000
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ /dev/null
@@ -1,1374 +0,0 @@
-// $Id$
-
-// -- PortableServer Include --
-#include "Object_Adapter.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "Root_POA.h"
-#include "Regular_POA.h"
-#include "Creation_Time.h"
-#include "POA_Guard.h"
-#include "ServerRequestInfo.h"
-#include "Default_Servant_Dispatcher.h"
-#include "ServerInterceptorAdapter.h"
-#include "Collocated_Object_Proxy_Broker.h"
-#include "POAManager.h"
-#include "Servant_Base.h"
-
-// -- ACE Include --
-#include "ace/Auto_Ptr.h"
-
-// -- TAO Include --
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/TSS_Resources.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/Thread_Lane_Resources_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Protocols_Hooks.h"
-
-#include "Policy_Creator_T.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-#include "ThreadPolicy.h"
-#include "LifespanPolicy.h"
-#include "IdAssignmentPolicy.h"
-#include "IdUniquenessPolicy.h"
-#include "ImplicitActivationPolicy.h"
-#include "RequestProcessingPolicy.h"
-#include "ServantRetentionPolicy.h"
-
-ACE_RCSID (PortableServer,
-           Object_Adapter,
-           "$Id$")
-
-// Timeprobes class
-#include "tao/Timeprobe.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Object_Adapter_Timeprobe_Description[] =
-{
-  "Object_Adapter::dispatch_servant - start",
-  "Object_Adapter::dispatch_servant - end",
-
-  "POA::parse_key - start",
-  "POA::parse_key - end",
-
-  "Object_Adapter::find_poa - start",
-  "Object_Adapter::find_poa - end",
-
-  "POA::locate_servant - start",
-  "POA::locate_servant - end",
-
-  "Servant::_dispatch - start",
-  "Servant::_dispatch - end",
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START = 200,
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_END,
-
-  TAO_POA_PARSE_KEY_START,
-  TAO_POA_PARSE_KEY_END,
-
-  TAO_OBJECT_ADAPTER_FIND_POA_START,
-  TAO_OBJECT_ADAPTER_FIND_POA_END,
-
-  TAO_POA_LOCATE_SERVANT_START,
-  TAO_POA_LOCATE_SERVANT_END,
-
-  TAO_SERVANT_DISPATCH_START,
-  TAO_SERVANT_DISPATCH_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
-                                  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-/* static */
-CORBA::ULong TAO_Object_Adapter::transient_poa_name_size_ = 0;
-
-void
-TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Object_Adapter::transient_poa_name_size_ == 0)
-    {
-      switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-        {
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-        case TAO_LINEAR:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
-          break;
-        case TAO_DYNAMIC_HASH:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            sizeof (CORBA::ULong);
-          break;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-        case TAO_ACTIVE_DEMUX:
-        default:
-          TAO_Object_Adapter::transient_poa_name_size_ =
-            static_cast <CORBA::ULong>(
-                             ACE_Active_Map_Manager_Key::size ());
-          break;
-        }
-    }
-}
-
-TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                        TAO_ORB_Core &orb_core)
-  : hint_strategy_ (0),
-    servant_dispatcher_ (0),
-    persistent_poa_name_map_ (0),
-    transient_poa_map_ (0),
-    orb_core_ (orb_core),
-    enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()),
-    thread_lock_ (),
-    lock_ (TAO_Object_Adapter::create_lock (enable_locking_,
-                                            thread_lock_)),
-    reverse_lock_ (*lock_),
-    non_servant_upcall_condition_ (thread_lock_),
-    non_servant_upcall_in_progress_ (0),
-    non_servant_upcall_nesting_level_ (0),
-    non_servant_upcall_thread_ (ACE_OS::NULL_thread),
-    root_ (0),
-    default_validator_ (orb_core),
-    default_poa_policies_ ()
-{
-  TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
-
-  Hint_Strategy *hint_strategy = 0;
-  if (creation_parameters.use_active_hint_in_poa_names_)
-    ACE_NEW (hint_strategy,
-             Active_Hint_Strategy (creation_parameters.poa_map_size_));
-  else
-    ACE_NEW (hint_strategy,
-             No_Hint_Strategy);
-
-  // Give ownership to the auto pointer.
-  auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
-
-  new_hint_strategy->object_adapter (this);
-
-  persistent_poa_name_map *ppnm;
-  switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
-    {
-    case TAO_LINEAR:
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-      ACE_NEW (ppnm,
-               persistent_poa_name_linear_map (creation_parameters.poa_map_size_));
-
-      break;
-#else
-      ACE_ERROR ((LM_ERROR,
-                  "linear option for -ORBPersistentidPolicyDemuxStrategy "
-                  "not supported with minimum POA maps. "
-                  "Ingoring option to use default... \n"));
-      /* FALL THROUGH */
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-    case TAO_DYNAMIC_HASH:
-    default:
-      ACE_NEW (ppnm,
-               persistent_poa_name_hash_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm);
-
-  transient_poa_map *tpm = 0;
-  switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-    {
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-    case TAO_LINEAR:
-      ACE_NEW (tpm,
-               transient_poa_linear_map (creation_parameters.poa_map_size_));
-      break;
-    case TAO_DYNAMIC_HASH:
-      ACE_NEW (tpm,
-               transient_poa_hash_map (creation_parameters.poa_map_size_));
-      break;
-#else
-    case TAO_LINEAR:
-    case TAO_DYNAMIC_HASH:
-      ACE_ERROR ((LM_ERROR,
-                  "linear and dynamic options for -ORBTransientidPolicyDemuxStrategy "
-                  "are not supported with minimum POA maps. "
-                  "Ingoring option to use default... \n"));
-      /* FALL THROUGH */
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-    case TAO_ACTIVE_DEMUX:
-    default:
-      ACE_NEW (tpm,
-               transient_poa_active_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<transient_poa_map> new_transient_poa_map (tpm);
-
-  this->hint_strategy_ =
-    new_hint_strategy.release ();
-  this->persistent_poa_name_map_ =
-    new_persistent_poa_name_map.release ();
-  this->transient_poa_map_ =
-    new_transient_poa_map.release ();
-}
-
-void
-TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
-                                           ACE_ENV_ARG_DECL)
-{
-  // Initialize the default policies.
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  TAO::Portable_Server::ThreadPolicy thread_policy (PortableServer::ORB_CTRL_MODEL);
-  policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Lifespan policy.
-  TAO::Portable_Server::LifespanPolicy lifespan_policy (PortableServer::TRANSIENT);
-  policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // ID uniqueness policy.
-  TAO::Portable_Server::IdUniquenessPolicy id_uniqueness_policy (PortableServer::UNIQUE_ID);
-  policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // ID assignment policy.
-  TAO::Portable_Server::IdAssignmentPolicy id_assignment_policy (PortableServer::SYSTEM_ID);
-  policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  // Implicit activation policy.
-  TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
-    (PortableServer::NO_IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Servant retention policy.
-  TAO::Portable_Server::ServantRetentionPolicy servant_retention_policy
-    (PortableServer::RETAIN);
-  policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Request processing policy.
-  TAO::Portable_Server::RequestProcessingPolicy request_processing_policy
-    (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
-  policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-}
-
-TAO_Object_Adapter::~TAO_Object_Adapter (void)
-{
-  delete this->hint_strategy_;
-  delete this->persistent_poa_name_map_;
-  delete this->transient_poa_map_;
-  delete this->lock_;
-
-  delete this->servant_dispatcher_;
-}
-
-/* static */
-ACE_Lock *
-TAO_Object_Adapter::create_lock (int enable_locking,
-                                 TAO_SYNCH_MUTEX &thread_lock)
-{
-#if defined (ACE_HAS_THREADS)
-  if (enable_locking)
-    {
-      ACE_Lock *the_lock;
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
-                      0);
-      return the_lock;
-    }
-#else
-  ACE_UNUSED_ARG (enable_locking);
-  ACE_UNUSED_ARG (thread_lock);
-#endif /* ACE_HAS_THREADS */
-
-  ACE_Lock *the_lock;
-  ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                  0);
-  return the_lock;
-}
-
-int
-TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
-                                      TAO_ServerRequest &req,
-                                      CORBA::Object_out forward_to
-                                      ACE_ENV_ARG_DECL)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-  // This object is magical, i.e., it has a non-trivial constructor
-  // and destructor.
-  TAO::Portable_Server::Servant_Upcall servant_upcall (&this->orb_core_);
-
-  // Set up state in the POA et al (including the POA Current), so
-  // that we know that this servant is currently in an upcall.
-  const char *operation = req.operation ();
-  int result =
-    servant_upcall.prepare_for_upcall (key,
-                                       operation,
-                                       forward_to
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (result);
-
-  if (result != TAO_Adapter::DS_OK)
-    return result;
-
-  // Preprocess request.
-  if (req.collocated ())
-    {
-      servant_upcall.pre_invoke_collocated_request (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (result);
-    }
-  else
-    {
-      servant_upcall.pre_invoke_remote_request (req
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (result);
-    }
-
-  // Servant dispatch.
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
-
-    servant_upcall.servant ()->_dispatch (req,
-                                          &servant_upcall
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (result);
-  }
-
-  return result;
-}
-
-void
-TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
-                                PortableServer::ObjectId &system_id,
-                                TAO_Root_POA *&poa
-                                ACE_ENV_ARG_DECL)
-{
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
-
-  int result = 0;
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
-
-    result = TAO_Root_POA::parse_key (key,
-                                 poa_system_name,
-                                 system_id,
-                                 is_root,
-                                 is_persistent,
-                                 is_system_id,
-                                 poa_creation_time);
-  }
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
-
-    result = this->find_poa (poa_system_name,
-                             is_persistent,
-                             is_root,
-                             poa_creation_time,
-                             poa
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-}
-
-int
-TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_Root_POA *&poa
-                                  ACE_ENV_ARG_DECL)
-{
-  int result = -1;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  iteratable_poa_name ipn (folded_name);
-  iteratable_poa_name::iterator iterator = ipn.begin ();
-  iteratable_poa_name::iterator end = ipn.end ();
-
-  TAO_Root_POA *parent = this->root_;
-  if (parent == 0 || parent->name () != *iterator)
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      -1);
-  else
-    ++iterator;
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      TAO_Root_POA *current = 0;
-
-      ACE_TRY
-        {
-          current = parent->find_POA_i (*iterator,
-                                        1
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex)
-        {
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
-
-      parent = current;
-    }
-
-  poa = parent;
-  result = 0;
-#else
-  ACE_UNUSED_ARG (folded_name);
-  ACE_UNUSED_ARG (poa);
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
-                                        CORBA::Boolean root,
-                                        const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
-                                        TAO_Root_POA *&poa
-                                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  int result = 0;
-
-  if (root)
-    {
-      poa = this->root_;
-    }
-  else
-    {
-      result = this->transient_poa_map_->find (system_name,
-                                               poa);
-    }
-
-  if (poa == 0
-      || (result == 0 && !poa->validate_lifespan (false, poa_creation_time)))
-    result = -1;
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
-                              TAO_Root_POA *poa,
-                              poa_name_out system_name)
-{
-  if (poa->persistent ())
-    return this->bind_persistent_poa (folded_name,
-                                      poa,
-                                      system_name);
-  else
-    return this->bind_transient_poa (poa,
-                                     system_name);
-}
-
-int
-TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa,
-                                const poa_name &folded_name,
-                                const poa_name &system_name)
-{
-  if (poa->persistent ())
-    return this->unbind_persistent_poa (folded_name,
-                                        system_name);
-  else
-    return this->unbind_transient_poa (system_name);
-}
-
-int
-TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
-                                      ACE_ENV_ARG_DECL)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
-
-  PortableServer::ObjectId id;
-  TAO_Root_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::Servant servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    poa->locate_servant_i (id,
-                           servant
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  switch (servant_location)
-    {
-    case TAO_SERVANT_FOUND:
-      // Optimistic attitude
-    case TAO_DEFAULT_SERVANT:
-    case TAO_SERVANT_MANAGER:
-      return 0;
-
-    case TAO_SERVANT_NOT_FOUND:
-      return -1;
-    }
-
-  return -1;
-}
-
-TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
-                                    PortableServer::Servant &servant
-                                    ACE_ENV_ARG_DECL)
-{
-  PortableServer::ObjectId id;
-  TAO_Root_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-  TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant
-                                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-  return servant_location;
-}
-
-void
-TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Add in the default POA policies to the default list.
-  this->init_default_policies (this->default_poa_policies ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If a POA extension hasn't changed the servant dispatcher, initialize the
-  // default one.
-  if (this->servant_dispatcher_ == 0)
-    {
-      ACE_NEW (this->servant_dispatcher_,
-               TAO_Default_Servant_Dispatcher);
-    }
-
-  TAO_POA_Manager *poa_manager;
-  ACE_NEW_THROW_EX (poa_manager,
-                    TAO_POA_Manager (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  PortableServer::POAManager_var safe_poa_manager = poa_manager;
-
-  // This makes sure that the default resources are open when the Root
-  // POA is created.
-  this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_POA_Policy_Set policies (this->default_poa_policies ());
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  // Specify the implicit activation policy since it should
-  // be different from the default.  Note that merge_policy
-  // takes a const reference and makes its own copy of the
-  // policy.  (Otherwise, we'd have to allocate the policy
-  // on the heap.)
-  // Implicit activation policy.
-  TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
-    (PortableServer::IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Merge policies from the ORB level.
-  this->validator ().merge_policies (policies.policies ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If any of the policy objects specified are not valid for the ORB
-  // implementation, if conflicting policy objects are specified, or
-  // if any of the specified policy objects require prior
-  // administrative action that has not been performed, an
-  // InvalidPolicy exception is raised containing the index in the
-  // policies parameter value of the first offending policy object.
-  policies.validate_policies (this->validator (),
-                              this->orb_core_
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Construct a new POA
-  TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
-  this->root_ =
-    this->servant_dispatcher_->create_Root_POA (root_poa_name,
-                                                *poa_manager,
-                                                policies,
-                                                this->lock (),
-                                                this->thread_lock (),
-                                                this->orb_core_,
-                                                this
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // The Object_Adapter will keep a reference to the Root POA so that
-  // on its destruction, it can check whether the Root POA has been
-  // destroyed yet or not.
-  this->root_->_add_ref ();
-
-  // Lock access for the duration of this transaction.
-  TAO::Portable_Server::POA_Guard poa_guard (*this->root_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  this->root_->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Release the POA_Manager_var since we got here without error.  The
-  // TAO_POA object takes ownership of the POA_Manager object
-  // (actually it shares the ownership with its peers).
-  (void) safe_poa_manager._retn ();
-}
-
-void
-TAO_Object_Adapter::close (int wait_for_completion
-                           ACE_ENV_ARG_DECL)
-{
-  this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Shutting down the ORB causes all object adapters to be destroyed,
-  // since they cannot exist in the absence of an ORB. Shut down is
-  // complete when all ORB processing (including request processing
-  // and object deactivation or other operations associated with
-  // object adapters) has completed and the object adapters have been
-  // destroyed. In the case of the POA, this means that all object
-  // etherealizations have finished and root POA has been destroyed
-  // (implying that all descendent POAs have also been destroyed).
-
-  TAO_Root_POA *root = 0;
-  {
-    ACE_GUARD (ACE_Lock, ace_mon, this->lock ());
-    if (this->root_ == 0)
-      return;
-    root = this->root_;
-    this->root_ = 0;
-  }
-  CORBA::Boolean etherealize_objects = 1;
-  root->destroy (etherealize_objects,
-                 wait_for_completion
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  CORBA::release (root);
-}
-
-void
-TAO_Object_Adapter::check_close (int wait_for_completion
-                                 ACE_ENV_ARG_DECL)
-{
-  TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-int
-TAO_Object_Adapter::priority (void) const
-{
-  return 0;
-}
-
-int
-TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
-                              TAO_ServerRequest &request,
-                              CORBA::Object_out forward_to
-                              ACE_ENV_ARG_DECL)
-{
-  if (ACE_OS::memcmp (key.get_buffer (),
-                      &TAO_Root_POA::objectkey_prefix[0],
-                      TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-    {
-      return TAO_Adapter::DS_MISMATCHED_KEY;
-    }
-
-  int result = 0;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  TAO::ServerRequestInterceptor_Adapter sri_adapter (request);
-
-  TAO::ServerRequestInfo ri (request,
-                             0,  // args
-                             0,  // nargs
-                             0,  // servant_upcall
-                             0,  // exceptions
-                             0); // nexceptions
-
-  ACE_TRY
-    {
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-      CORBA::OctetSeq_var ocs;
-      sri_adapter.tao_ft_interception_point (&ri,
-                                             ocs.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      /// If we have a cached result, just go ahead and send the reply
-      /// and let us  return
-      if (ocs.ptr () != 0)
-        {
-          // request.result_seq (
-          request.send_cached_reply (ocs.inout ());
-
-          return TAO_Adapter::DS_OK;
-        }
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-      // The receive_request_service_contexts() interception point
-      // must be invoked before the operation is dispatched to the
-      // servant.
-      sri_adapter.receive_request_service_contexts (&ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If a PortableInterceptor::ForwardRequest exception was
-      // thrown, then set the forward_to object reference and return
-      // with the appropriate return status.
-      if (sri_adapter.location_forwarded ())
-        {
-          forward_to = ri.forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          return TAO_Adapter::DS_FORWARD;
-        }
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-      result = this->dispatch_servant (key,
-                                       request,
-                                       forward_to
-                                       ACE_ENV_ARG_PARAMETER);
-
-#if TAO_HAS_INTERCEPTORS == 1
-      ACE_TRY_CHECK;
-
-      if (result == TAO_Adapter::DS_FORWARD)
-        {
-          ri.forward_reference (forward_to.ptr ());
-          sri_adapter.send_other (&ri
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-
-      sri_adapter.send_exception (&ri
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ReplyStatus status =
-        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Only re-throw the exception if it hasn't been transformed by
-      // the send_exception() interception point (e.g. to a
-      // LOCATION_FORWARD).
-      if (status == PortableInterceptor::SYSTEM_EXCEPTION
-          || status == PortableInterceptor::USER_EXCEPTION)
-        {
-          ACE_RE_THROW;
-        }
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-  return result;
-}
-
-const char *
-TAO_Object_Adapter::name (void) const
-{
-  return TAO_OBJID_ROOTPOA;
-}
-
-CORBA::Object_ptr
-TAO_Object_Adapter::root (void)
-{
-  return CORBA::Object::_duplicate (this->root_);
-}
-
-CORBA::Object_ptr
-TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
-                                              const TAO_MProfile &mp)
-{
-  TAO_ServantBase *sb = this->get_collocated_servant (mp);
-
-  // Set the servant ORB.  Do not duplicate the ORB here since
-  // TAO_Stub::servant_orb() duplicates it.
-  stub->servant_orb (this->orb_core_.orb ());
-
-  // It is ok to create a collocated object even when <sb> is
-  // zero.
-  CORBA::Object_ptr x;
-  ACE_NEW_RETURN (x,
-                  CORBA::Object (stub,
-                                 1,
-                                 sb),
-                  CORBA::Object::_nil ());
-
-  // Here we set the strategized Proxy Broker.
-  x->_proxy_broker (the_tao_collocated_object_proxy_broker ());
-
-  // Success.
-  return x;
-}
-
-CORBA::Long
-TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub,
-                                                  CORBA::Object_ptr obj)
-{
-  // @@ What about forwarding.  With this approach we are never
-  //    forwarded  when we use collocation!
-  const TAO_MProfile &mp = stub->base_profiles ();
-
-  TAO_ServantBase *sb = this->get_collocated_servant (mp);
-
-  // Set the servant ORB.  Do not duplicate the ORB here since
-  // TAO_Stub::servant_orb() duplicates it.
-  stub->servant_orb (this->orb_core_.orb ());
-
-  // It is ok to set the object as a collocated object even when
-  // <sb> is zero.
-  obj->set_collocated_servant (sb);
-
-  // Here we set the strategized Proxy Broker.
-  obj->_proxy_broker (the_tao_collocated_object_proxy_broker ());
-
-  // Success.
-  return 0;
-}
-
-TAO_ServantBase *
-TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
-{
-  for (TAO_PHandle j = 0;
-       j != mp.profile_count ();
-       ++j)
-    {
-      const TAO_Profile *profile = mp.get_profile (j);
-      TAO::ObjectKey_var objkey = profile->_key ();
-
-      if (ACE_OS::memcmp (objkey->get_buffer (),
-                          &TAO_Root_POA::objectkey_prefix[0],
-                          TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-        continue;
-
-      TAO_ServantBase *servant = 0;
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          this->find_servant (objkey.in (),
-              servant
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-
-      return servant;
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
-{
-}
-
-void
-TAO_Object_Adapter::Hint_Strategy::object_adapter (TAO_Object_Adapter *oa)
-{
-  this->object_adapter_ = oa;
-}
-
-TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map_size)
-  : persistent_poa_system_map_ (map_size)
-{
-}
-
-TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
-  const poa_name &system_name,
-  TAO_Root_POA *&poa
-  ACE_ENV_ARG_DECL)
-{
-  poa_name folded_name;
-  int result = this->persistent_poa_system_map_.recover_key (system_name,
-                                                             folded_name);
-
-  if (result == 0)
-    {
-      result = this->persistent_poa_system_map_.find (system_name,
-                                                      poa);
-      if (result != 0
-          || folded_name != poa->folded_name ())
-        {
-          result =
-            this->object_adapter_->persistent_poa_name_map_->find (folded_name,
-                                                                   poa);
-          if (result != 0)
-            {
-              result =
-                this->object_adapter_->activate_poa (folded_name,
-                                                     poa
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
-            }
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::bind_persistent_poa (
-  const poa_name &folded_name,
-  TAO_Root_POA *poa,
-  poa_name_out system_name)
-{
-  poa_name name = folded_name;
-  int result = this->persistent_poa_system_map_.bind_modify_key (poa,
-                                                                 name);
-
-  if (result == 0)
-    {
-      result =
-        this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                               poa);
-
-      if (result != 0)
-        this->persistent_poa_system_map_.unbind (name);
-      else
-        ACE_NEW_RETURN (system_name,
-                        poa_name (name),
-                        -1);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa (
-  const poa_name &folded_name,
-  const poa_name &system_name)
-{
-  int result = this->persistent_poa_system_map_.unbind (system_name);
-
-  if (result == 0)
-    result =
-      this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-
-  return result;
-}
-
-TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
-  const poa_name &system_name,
-  TAO_Root_POA *&poa
-  ACE_ENV_ARG_DECL)
-{
-  int result =
-    this->object_adapter_->persistent_poa_name_map_->find (system_name,
-                                                           poa);
-  if (result != 0)
-    {
-      result =
-        this->object_adapter_->activate_poa (system_name,
-                                             poa
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (
-  const poa_name &folded_name,
-  TAO_Root_POA *poa,
-  poa_name_out system_name)
-{
-  int result =
-    this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                           poa);
-  if (result == 0)
-    ACE_NEW_RETURN (system_name,
-                    poa_name (folded_name),
-                    -1);
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::unbind_persistent_poa (
-  const poa_name & folded_name,
-  const poa_name & /* system_name */)
-{
-  return this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-}
-
-TAO_Object_Adapter::poa_name_iterator::poa_name_iterator (
-  int begin,
-  CORBA::ULong size,
-  const CORBA::Octet *folded_buffer)
-  : size_ (size),
-    folded_buffer_ (folded_buffer),
-    last_separator_ ((CORBA::ULong) ~0)
-{
-  if (begin)
-    {
-      this->position_ = (CORBA::ULong) ~0;
-      this->operator++ ();
-    }
-  else
-    this->position_ = this->size_;
-}
-
-bool
-TAO_Object_Adapter::poa_name_iterator::operator== (const poa_name_iterator &rhs) const
-{
-  return this->position_ == rhs.position_;
-}
-
-bool
-TAO_Object_Adapter::poa_name_iterator::operator!= (const poa_name_iterator &rhs) const
-{
-  return !this->operator== (rhs);
-}
-
-ACE_CString
-TAO_Object_Adapter::poa_name_iterator::operator* () const
-{
-  CORBA::ULong start_at =
-    this->last_separator_ +
-    TAO_Root_POA::name_separator_length ();
-
-  CORBA::ULong how_many =
-    this->position_
-    - this->last_separator_
-    - TAO_Root_POA::name_separator_length ();
-
-  return ACE_CString (reinterpret_cast <const char *>
-                                       (&this->folded_buffer_[start_at]),
-                      how_many);
-}
-
-TAO_Object_Adapter::poa_name_iterator &
-TAO_Object_Adapter::poa_name_iterator::operator++ (void)
-{
-  for (this->last_separator_ = this->position_;
-       ;
-       )
-    {
-      ++this->position_;
-      if (this->position_ < this->size_)
-        {
-          if (this->folded_buffer_[this->position_] == TAO_Root_POA::name_separator ())
-            break;
-        }
-      else
-        break;
-    }
-
-  return *this;
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name (
-  const poa_name &folded_name)
-  : folded_name_ (folded_name)
-{
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::begin (void) const
-{
-  return iterator (1,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::end (void) const
-{
-  return iterator (0,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-void
-TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
-{
-#if defined (ACE_HAS_EXCEPTIONS)
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
-#endif
-
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  while (this->enable_locking_ &&
-         this->non_servant_upcall_in_progress_ &&
-         ! ACE_OS::thr_equal (this->non_servant_upcall_thread_,
-                              ACE_OS::thr_self ()))
-    {
-      // If so wait...
-      int result =
-        this->non_servant_upcall_condition_.wait ();
-      if (result == -1)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-}
-
-void
-TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
-{
-  // Non-exception throwing version.
-  ACE_TRY_NEW_ENV
-    {
-      this->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete "
-                  "threw exception it should not have!\n"));
-    }
-  ACE_ENDTRY;
-}
-
-void
-TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
-{
-  if (this->servant_dispatcher_)
-    delete this->servant_dispatcher_;
-
-  this->servant_dispatcher_ = dispatcher;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_Root_POA *value;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> tao_value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-template class ACE_Noop_Key_Generator<key>;
-
-// Common
-template class ACE_Reference_Pair<const key, value>;
-
-// Map and iterator classes.
-template class ACE_Map<key, value>;
-template class ACE_Iterator<tao_value_type>;
-template class ACE_Reverse_Iterator<tao_value_type>;
-
-// Iterator base classes.
-template class ACE_Iterator_Impl<tao_value_type>;
-template class ACE_Reverse_Iterator_Impl<tao_value_type>;
-
-// Active Map Manager related.
-template class ACE_Pair<key, value>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<tao_value_type, expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, expanded_value>;
-template class ACE_Active_Map_Manager<expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;
-
-// Hash Map Manager related.
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<key, value>;
-
-// Already in Active_Object_Map.cpp
-// template class ACE_Equal_To<key>;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<tao_value_type, key, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, key, value>;
-template class ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<key, value, noop_key_generator>;
-template class ACE_Map_Manager<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<key, value>;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-template class ACE_Unbounded_Set<TAO_POA_Manager *>;
-template class ACE_Node<TAO_POA_Manager *>;
-template class ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_Root_POA *value;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> tao_value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-#pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map>
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#pragma instantiate ACE_Noop_Key_Generator<key>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const key, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<key, value>
-#pragma instantiate ACE_Iterator<tao_value_type>
-#pragma instantiate ACE_Reverse_Iterator<tao_value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<tao_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<tao_value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<key, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<tao_value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>
-
-// Hash Map Manager related.
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<key, value>
-
-// Already in Active_Object_Map.cpp
-// #pragma instantiate ACE_Equal_To<key>
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<tao_value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, noop_key_generator>
-#pragma instantiate ACE_Map_Manager<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<key, value>
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-#pragma instantiate ACE_Unbounded_Set<TAO_POA_Manager *>
-#pragma instantiate ACE_Node<TAO_POA_Manager *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
deleted file mode 100644
index a3605dc2f11..00000000000
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ /dev/null
@@ -1,510 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_Adapter.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_ADAPTER_H
-#define TAO_OBJECT_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Key_Adapters.h"
-#include "poa_macros.h"
-#include "Servant_Location.h"
-#include "Default_Policy_Validator.h"
-#include "POA_Policy_Set.h"
-
-#include "tao/Adapter.h"
-#include "tao/Adapter_Factory.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/LocalObject.h"
-
-#include "ace/Reverse_Lock_T.h"
-#include "ace/Condition_Thread_Mutex.h"
-#include "ace/Map_T.h"
-
-#include "Servant_Location.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Root_POA;
-class TAO_POA_Manager;
-class TAO_TSS_Resources;
-class TAO_Transport;
-class TAO_Servant_Dispatcher;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Non_Servant_Upcall;
-    class Servant_Upcall;
-    class POA_Current_Impl;
-    class Temporary_Creation_Time;
-  }
-}
-
-/**
- * @class TAO_Object_Adapter
- *
- * @brief Defines the Object Adapter abstraction.
- *
- * This class will be used as a facade for the POAs in a server
- */
-class TAO_PortableServer_Export TAO_Object_Adapter
-  : public TAO_Adapter
-{
-public:
-
-  friend class TAO_Root_POA;
-
-  typedef PortableServer::ObjectId poa_name;
-  typedef PortableServer::ObjectId_var poa_name_var;
-  typedef PortableServer::ObjectId_out poa_name_out;
-
-  /// Constructor.
-  TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                      TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_Object_Adapter (void);
-
-  int dispatch_servant (const TAO::ObjectKey &key,
-                        TAO_ServerRequest &req,
-                        CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL);
-
-  int locate_servant (const TAO::ObjectKey &key
-                      ACE_ENV_ARG_DECL);
-
-  TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key,
-                                     PortableServer::Servant &servant
-                                     ACE_ENV_ARG_DECL);
-
-  int find_poa (const poa_name &system_name,
-                CORBA::Boolean activate_it,
-                CORBA::Boolean root,
-                const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
-                TAO_Root_POA *&poa
-                ACE_ENV_ARG_DECL);
-
-  int bind_poa (const poa_name &folded_name,
-                TAO_Root_POA *poa,
-                poa_name_out system_name);
-
-  int unbind_poa (TAO_Root_POA *poa,
-                  const poa_name &folded_name,
-                  const poa_name &system_name);
-
-  int activate_poa (const poa_name &folded_name,
-                    TAO_Root_POA *&poa
-                    ACE_ENV_ARG_DECL);
-
-  ACE_Lock &lock (void);
-
-  TAO_SYNCH_MUTEX &thread_lock (void);
-
-  ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
-
-  /// Access the root poa.
-  TAO_Root_POA *root_poa (void) const;
-
-  /// Access to ORB Core.
-  TAO_ORB_Core &orb_core (void) const;
-
-  /// Wait for non-servant upcalls to complete.
-  void wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV);
-
-  /// Non-exception throwing version.
-  void wait_for_non_servant_upcalls_to_complete (void);
-
-  static CORBA::ULong transient_poa_name_size (void);
-
-  /// Return the validator.
-  TAO_Policy_Validator &validator (void);
-
-  int enable_locking() const;
-
-  /// Return the set of default policies.
-  TAO_POA_Policy_Set &default_poa_policies (void);
-
-  /// Set the servant dispatcher method.  Ownership is transferred to
-  /// this Object Adapter.  Note: This should only be called
-  /// at initialization.
-  void servant_dispatcher (TAO_Servant_Dispatcher *dispatcher);
-
-  /// Initialize the default set of POA policies.
-  void init_default_policies (TAO_POA_Policy_Set &policies
-                              ACE_ENV_ARG_DECL);
-
-  // = The TAO_Adapter methods, please check tao/Adapter.h for the
-  // documentation
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL);
-  virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL);
-  virtual int priority (void) const;
-  virtual int dispatch (TAO::ObjectKey &key,
-                        TAO_ServerRequest &request,
-                        CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL);
-  virtual const char *name (void) const;
-  virtual CORBA::Object_ptr root (void);
-  virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
-                                                      const TAO_MProfile &);
-
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
-                                                    CORBA::Object_ptr);
-
-protected:
-
-  int locate_servant_i (const TAO::ObjectKey &key
-                        ACE_ENV_ARG_DECL);
-
-  TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key,
-                                       PortableServer::Servant &servant
-                                       ACE_ENV_ARG_DECL);
-
-  void dispatch_servant_i (const TAO::ObjectKey &key,
-                           TAO_ServerRequest &req,
-                           void *context
-                           ACE_ENV_ARG_DECL);
-
-  void locate_poa (const TAO::ObjectKey &key,
-                   PortableServer::ObjectId &id,
-                   TAO_Root_POA *&poa
-                   ACE_ENV_ARG_DECL);
-
-  int find_transient_poa (const poa_name &system_name,
-                          CORBA::Boolean root,
-                          const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
-                          TAO_Root_POA *&poa
-                          ACE_ENV_ARG_DECL);
-
-  int find_persistent_poa (const poa_name &system_name,
-                           TAO_Root_POA *&poa
-                           ACE_ENV_ARG_DECL);
-
-  int bind_transient_poa (TAO_Root_POA *poa,
-                          poa_name_out system_name);
-
-  int bind_persistent_poa (const poa_name &folded_name,
-                           TAO_Root_POA *poa,
-                           poa_name_out system_name);
-
-  int unbind_transient_poa (const poa_name &system_name);
-
-  int unbind_persistent_poa (const poa_name &folded_name,
-                             const poa_name &system_name);
-
-  static ACE_Lock *create_lock (int enable_locking,
-                                TAO_SYNCH_MUTEX &thread_lock);
-
-public:
-
-  /**
-   * @class Hint_Strategy
-   *
-   * @brief Base class for POA active hint strategy.
-   *
-   * This class also provides for common structures used by all
-   * the derived classes.
-   */
-  class TAO_PortableServer_Export Hint_Strategy
-  {
-  public:
-
-    virtual ~Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL) = 0;
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_Root_POA *poa,
-                                     poa_name_out system_name) = 0;
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name) = 0;
-
-    void object_adapter (TAO_Object_Adapter *oa);
-
-  protected:
-
-    TAO_Object_Adapter *object_adapter_;
-  };
-
-  /**
-   * @class Active_Hint_Strategy
-   *
-   * @brief This class uses active demux hint for POA active hint
-   * strategy.
-   *
-   * This class will append an active hint to the POA name,
-   * making the POA lookups fast and predictable.
-   */
-  class TAO_PortableServer_Export Active_Hint_Strategy : public Hint_Strategy
-  {
-  public:
-
-    Active_Hint_Strategy (CORBA::ULong map_size);
-
-    virtual ~Active_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_Root_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  protected:
-
-    typedef ACE_Active_Map_Manager_Adapter<
-    poa_name,
-      TAO_Root_POA *,
-      TAO_Preserve_Original_Key_Adapter> persistent_poa_system_map;
-
-    persistent_poa_system_map persistent_poa_system_map_;
-  };
-
-  friend class Active_Hint_Strategy;
-
-  /**
-   * @class No_Hint_Strategy
-   *
-   * @brief This class doesn't use any hints for POA active hint
-   * strategy.
-   *
-   * This class will simply use the POA names as is. And since
-   * no hint is added, the IORs will be smaller.
-   */
-  class TAO_PortableServer_Export No_Hint_Strategy : public Hint_Strategy
-  {
-  public:
-
-    virtual ~No_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_Root_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  };
-
-  friend class No_Hint_Strategy;
-
-protected:
-
-  Hint_Strategy *hint_strategy_;
-
-  /// Base class of the id map.
-  typedef ACE_Map<
-  poa_name,
-    TAO_Root_POA *> transient_poa_map;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-  /// Id hash map.
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_Root_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<poa_name>,
-    TAO_Incremental_Key_Generator> transient_poa_hash_map;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-  /// Id linear map.
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_Root_POA *,
-    TAO_Incremental_Key_Generator> transient_poa_linear_map;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-  /// Id active map.
-  typedef ACE_Active_Map_Manager_Adapter<
-  poa_name,
-    TAO_Root_POA *,
-    TAO_Ignore_Original_Key_Adapter> transient_poa_active_map;
-
-  /// Base class of the name map.
-  typedef ACE_Map<
-  poa_name,
-    TAO_Root_POA *> persistent_poa_name_map;
-
-  /// Id hash map.
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_Root_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_hash_map;
-
-#if (TAO_HAS_MINIMUM_POA_MAPS == 0)
-  /// Id linear map.
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_Root_POA *,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_linear_map;
-#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
-
-  /// Strategy for dispatching a request to a servant.
-  TAO_Servant_Dispatcher *servant_dispatcher_;
-
-  /// Persistent POA map
-  persistent_poa_name_map *persistent_poa_name_map_;
-
-  /// Transient POA map
-  transient_poa_map *transient_poa_map_;
-
-protected:
-
-  static CORBA::ULong transient_poa_name_size_;
-
-  static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-
-  TAO_ORB_Core &orb_core_;
-
-  int enable_locking_;
-
-  TAO_SYNCH_MUTEX thread_lock_;
-
-  ACE_Lock *lock_;
-
-  ACE_Reverse_Lock<ACE_Lock> reverse_lock_;
-
-public:
-
-  /**
-   * @class poa_name_iterator
-   *
-   * @brief Iterator for a folded poa name.
-   */
-  class TAO_PortableServer_Export poa_name_iterator
-  {
-  public:
-
-    /// Constructor.
-    poa_name_iterator (int begin,
-                       CORBA::ULong size,
-                       const CORBA::Octet *folded_buffer);
-
-    /// Comparison operators.
-    bool operator== (const poa_name_iterator &rhs) const;
-    bool operator!= (const poa_name_iterator &rhs) const;
-
-    /// Dereference operator.
-    ACE_CString operator* () const;
-
-    /// Prefix advance.
-    poa_name_iterator &operator++ (void);
-
-  protected:
-
-    CORBA::ULong size_;
-    CORBA::ULong position_;
-    const CORBA::Octet *folded_buffer_;
-    CORBA::ULong last_separator_;
-  };
-
-  /**
-   * @class iteratable_poa_name
-   *
-   * @brief This class allows iteration over a folded poa name.
-   */
-  class TAO_PortableServer_Export iteratable_poa_name
-  {
-  public:
-
-    typedef poa_name_iterator iterator;
-
-    iteratable_poa_name (const poa_name &folded_name);
-
-    iterator begin (void) const;
-    iterator end (void) const;
-
-  protected:
-
-    const poa_name &folded_name_;
-  };
-
-  friend class TAO::Portable_Server::Non_Servant_Upcall;
-
-  friend class TAO::Portable_Server::Servant_Upcall;
-
-public:
-
-  /// Pointer to the non-servant upcall in progress.  If no non-servant
-  /// upcall is in progress, this pointer is zero.
-  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress (void) const;
-
-private:
-
-  /// Helper method to get collocated servant
-  TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp);
-
-private:
-
-  /// Condition variable for waiting on non-servant upcalls to end.
-  TAO_SYNCH_CONDITION non_servant_upcall_condition_;
-
-  /// Pointer to the non-servant upcall in progress.  If no non-servant
-  /// upcall is in progress, this pointer is zero.
-  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress_;
-
-  /// Current nesting level of non_servant_upcalls.
-  unsigned int non_servant_upcall_nesting_level_;
-
-  /// Id of thread making the non-servant upcall.
-  ACE_thread_t non_servant_upcall_thread_;
-
-  /// The Root POA
-  TAO_Root_POA *root_;
-
-  /// The default validator and the beginning of the chain of
-  /// policy validators.
-  TAO_POA_Default_Policy_Validator default_validator_;
-
-  /// Save a list of default policies that should be included in
-  /// every POA (unless overridden).
-  TAO_POA_Policy_Set default_poa_policies_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
deleted file mode 100644
index ae4008bcc17..00000000000
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/SystemException.h"
-
-ACE_INLINE TAO_Policy_Validator &
-TAO_Object_Adapter::validator (void)
-{
-  return this->default_validator_;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::enable_locking (void) const
-{
-  return this->enable_locking_;
-}
-
-ACE_INLINE TAO_POA_Policy_Set &
-TAO_Object_Adapter::default_poa_policies (void)
-{
-  return this->default_poa_policies_;
-}
-
-ACE_INLINE ACE_Lock &
-TAO_Object_Adapter::lock (void)
-{
-  return *this->lock_;
-}
-
-ACE_INLINE TAO_SYNCH_MUTEX &
-TAO_Object_Adapter::thread_lock (void)
-{
-  return this->thread_lock_;
-}
-
-ACE_INLINE ACE_Reverse_Lock<ACE_Lock> &
-TAO_Object_Adapter::reverse_lock (void)
-{
-  return this->reverse_lock_;
-}
-
-/* static */
-ACE_INLINE CORBA::ULong
-TAO_Object_Adapter::transient_poa_name_size ()
-{
-  return TAO_Object_Adapter::transient_poa_name_size_;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
-                                    ACE_ENV_ARG_DECL)
-{
-  // Lock access for the duration of this transaction.
-  TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
-
-  return this->locate_servant_i (key
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE TAO_SERVANT_LOCATION
-TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
-                                  PortableServer::Servant &servant
-                                  ACE_ENV_ARG_DECL)
-{
-  // Lock access for the duration of this transaction.
-  TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
-
-  return this->find_servant_i (key,
-                               servant
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_Root_POA *&poa
-                                         ACE_ENV_ARG_DECL)
-{
-  return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa
-                                                    ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_poa (const poa_name &system_name,
-                              CORBA::Boolean activate_it,
-                              CORBA::Boolean root,
-                              const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
-                              TAO_Root_POA *&poa
-                              ACE_ENV_ARG_DECL)
-{
-  if (activate_it)
-    {
-      return this->find_persistent_poa (system_name,
-                                        poa
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return this->find_transient_poa (system_name,
-                                       root,
-                                       poa_creation_time,
-                                       poa
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_transient_poa (TAO_Root_POA *poa,
-                                        poa_name_out system_name)
-{
-  poa_name name;
-  int result = this->transient_poa_map_->bind_create_key (poa,
-                                                          name);
-
-  if (result == 0)
-    {
-      ACE_NEW_RETURN (system_name,
-                      poa_name (name),
-                      -1);
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_persistent_poa (const poa_name &folded_name,
-                                         TAO_Root_POA *poa,
-                                         poa_name_out system_name)
-{
-  return this->hint_strategy_->bind_persistent_poa (folded_name,
-                                                    poa,
-                                                    system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_transient_poa (const poa_name &system_name)
-{
-  return this->transient_poa_map_->unbind (system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name,
-                                           const poa_name &system_name)
-{
-  return this->hint_strategy_->unbind_persistent_poa (folded_name,
-                                                      system_name);
-}
-
-ACE_INLINE TAO_Root_POA *
-TAO_Object_Adapter::root_poa (void) const
-{
-  return this->root_;
-}
-
-ACE_INLINE TAO_ORB_Core &
-TAO_Object_Adapter::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE TAO::Portable_Server::Non_Servant_Upcall *
-TAO_Object_Adapter::non_servant_upcall_in_progress (void) const
-{
-  return this->non_servant_upcall_in_progress_;
-}
-
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
deleted file mode 100644
index 46e07c53e27..00000000000
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-
-#include "Object_Adapter_Factory.h"
-#include "Object_Adapter.h"
-#include "PortableServer_ORBInitializer.h"
-#include "tao/ORB_Core.h"
-
-TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void)
-{
-}
-
-TAO_Adapter*
-TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
-{
-  return new TAO_Object_Adapter (orb_core->server_factory ()->
-                                    active_object_map_creation_parameters (),
-                                 *orb_core);
-}
-
-int
-TAO_Object_Adapter_Factory::init (int /* argc */,
-                                  ACE_TCHAR* /* argv */ [])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the Messaging ORBInitializer.
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_PortableServer_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P | %t) Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory,
-                       ACE_TEXT ("TAO_Object_Adapter_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Object_Adapter_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h
deleted file mode 100644
index a51054f2060..00000000000
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_ADAPTER_FACTORY_H
-#define TAO_OBJECT_ADAPTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Adapter_Factory.h"
-#include "ace/Service_Config.h"
-
-class TAO_PortableServer_Export TAO_Object_Adapter_Factory
-  : public TAO_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_Object_Adapter_Factory (void);
-
-  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
-  // details.
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
-
-  virtual int init (int argc,
-                    ACE_TCHAR* argv[]);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h
deleted file mode 100644
index f67ee690ea3..00000000000
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_SArg_Traits.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_OBJECT_SARG_TRAITS_H
-#define TAO_OBJECT_SARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-// --------------------------------------------------------------
-
-namespace TAO
-{
-  template <typename T> class SArg_Traits;
-
-  /// Used in generated code if CORBA::Object is an argument or
-  /// return type.
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Object>
-    : public Object_SArg_Traits_T<CORBA::Object_ptr,
-                                  CORBA::Object_var,
-                                  CORBA::Object_out>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_SARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
deleted file mode 100644
index 9a0c2906035..00000000000
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// $Id$
-
-#ifndef TAO_OBJECT_SARGUMENT_T_CPP
-#define TAO_OBJECT_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Object_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::In_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR &cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_var>
-void
-TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_var>
-void
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S_ptr, typename S_var, typename S_out>
-CORBA::Boolean
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_var, typename S_out>
-void
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S_ptr, typename S_var>
-CORBA::Boolean
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_ptr, typename S_var>
-void
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_OBJECT_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
deleted file mode 100644
index b1e5e1a864e..00000000000
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Object_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_OBJECT_SARGUMENT_T_H
-#define TAO_OBJECT_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This set of classes is also used by valuetype arguments. If the
-// specialization is done using S * for the parameter, the semantics
-// are the same as for interfaces, so there's no need for another
-// set of classes.
-
-namespace TAO
-{
-  /**
-   * @class In_Object_SArgument_T
-   *
-   * @brief Template class for IN skeleton object argument.
-   *
-   */
-  template<typename S_ptr, typename S_var>
-  class In_Object_SArgument_T : public Argument
-  {
-  public:
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr arg (void) const;
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Inout_Object_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton object argument.
-   *
-   */
-  template<typename S_ptr, typename S_var>
-  class Inout_Object_SArgument_T : public Argument
-  {
-  public:
-    Inout_Object_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr & arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Out_Object_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton object argument.
-   *
-   */
-  template<typename S_ptr, typename S_var, typename S_out>
-  class Out_Object_SArgument_T : public Argument
-  {
-  public:
-    Out_Object_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_out arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Ret_Object_SArgument_T
-   *
-   * @brief Template class for return skeleton value of object.
-   *
-   */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_SArgument_T : public Argument
-  {
-  public:
-    Ret_Object_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_ptr & arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Object_SArg_Traits_T
-   *
-   * @brief Template class for skeleton argument traits of objects.
-   *
-   */
-  template<typename T_ptr, typename T_var, typename T_out>
-  struct Object_SArg_Traits_T
-  {
-    typedef T_ptr                                         ret_type;
-    typedef T_ptr                                         in_type;
-    typedef T_ptr &                                       inout_type;
-    typedef T_out                                         out_type;
-
-    typedef In_Object_SArgument_T<T_ptr,T_var>            in_arg_val;
-    typedef Inout_Object_SArgument_T<T_ptr,T_var>         inout_arg_val;
-    typedef Out_Object_SArgument_T<T_ptr,T_var,T_out>     out_arg_val;
-    typedef Ret_Object_SArgument_T<T_ptr,T_var>           ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                                       in_arg_type;
-    typedef inout_type                                    inout_arg_type;
-    typedef out_type                                      out_arg_type;
-    typedef inout_type                                    ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Object_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Object_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJECT_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
deleted file mode 100644
index 9588e14e67b..00000000000
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr
-TAO::In_Object_SArgument_T<S_ptr,S_var>::arg (void) const
-{
-  return this->x_.in ();
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::Inout_Object_SArgument_T (void)
-{}
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr&
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::arg (void)
-{
-  return this->x_.inout ();
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_var, typename S_out>
-ACE_INLINE
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::Out_Object_SArgument_T (
-    void
-  )
-{}
-
-template<typename S_ptr, typename S_var, typename S_out>
-ACE_INLINE
-S_out
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ==========================================================================
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::Ret_Object_SArgument_T (void)
-{}
-
-template<typename S_ptr, typename S_var>
-ACE_INLINE
-S_ptr &
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
deleted file mode 100644
index 4d8d3308e46..00000000000
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "Operation_Table.h"
-#include "tao/ORB.h"
-
-ACE_RCSID(PortableServer,
-          Operation_Table,
-          "$Id$")
-
-// destructor
-TAO_Operation_Table::~TAO_Operation_Table (void)
-{
-}
-
-/**************************************************************/
-TAO::Operation_Skeletons::Operation_Skeletons (void)
-  : skel_ptr (0)
-    , thruPOA_skel_ptr (0)
-    , direct_skel_ptr (0)
-{
-}
-
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
deleted file mode 100644
index 2301d7929f6..00000000000
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Operation_Table.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_OPTABLE_H
-#define TAO_OPTABLE_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object.h"
-#include "tao/Collocation_Strategy.h"
-
-class TAO_ServerRequest;
-class TAO_Abstract_ServantBase;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-typedef void (*TAO_Skeleton)(
-    TAO_ServerRequest &,
-    void *,
-    void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-  );
-
-typedef void (*TAO_Collocated_Skeleton)(
-    TAO_Abstract_ServantBase *,
-    TAO::Argument **,
-    int
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
-  );
-
-/**
- * @struct TAO_operation_db_entry
- *
- * @brief Define a table entry that holds an operation name and its
- * corresponding skeleton.  A table of such entries is used to
- * initialize the different lookup strategies.
- */
-struct TAO_operation_db_entry
-{
-  /// Operation name
-  char const * opname;
-
-  /// Remote/thru-POA skeleton pointer
-  TAO_Skeleton skel_ptr;
-
-  /// Collocated skeleton pointers.
-  TAO_Collocated_Skeleton direct_skel_ptr;
-};
-
-
-namespace TAO
-{
-  /**
-   * @class Operation_Skeleton_Ptr
-   *
-   * @brief A logical aggregation of all the operation skeleton pointers
-   * in use.
-   *
-   * This is not used by the IDL compiler. This is used internally
-   * within different strategies.
-   */
-  struct Operation_Skeletons
-  {
-    Operation_Skeletons (void);
-
-    /// Remote skeleton pointer
-    TAO_Skeleton skel_ptr;
-
-    /// Collocated skeleton pointers.
-    TAO_Skeleton thruPOA_skel_ptr;
-    TAO_Collocated_Skeleton direct_skel_ptr;
-  };
-}
-
-/**
- * @class TAO_Operation_Table
- *
- * @brief Abstract class for maintaining and lookup of CORBA IDL
- * operation names.
- */
-class TAO_PortableServer_Export TAO_Operation_Table
-{
-public:
-  /**
-   * Uses @a opname to look up the skeleton function and pass it back
-   * in @a skelfunc.  Returns non-negative integer on success, or -1
-   * on failure.
-   */
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0) = 0;
-
-  /**
-   * Uses @a opname to look up the collocated skeleton function and
-   * pass it back in @a skelfunc.  Returns non-negative integer on
-   * success, or -1 on failure.
-   */
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0) = 0;
-
-  /// Associate the skeleton @a skel_ptr with an operation named
-  /// @a opname.  Returns -1 on failure, 0 on success, 1 on duplicate.
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr) = 0;
-
-  virtual ~TAO_Operation_Table (void);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OPTABLE_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
deleted file mode 100644
index 12ff4cf608e..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-
-#include "Operation_Table_Binary_Search.h"
-#include "tao/Timeprobe.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(PortableServer,
-          Operation_Table_Binary_Search,
-          "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Binary_Search_OpTable::find - start",
-    "TAO_Binary_Search_OpTable::find - end"
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_BINARY_SEARCH_OPTABLE_FIND_START = 608,
-    TAO_BINARY_SEARCH_OPTABLE_FIND_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
-                                  TAO_BINARY_SEARCH_OPTABLE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-
-TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void)
-{
-}
-
-TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
-{
-}
-
-int
-TAO_Binary_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton &skelfunc,
-                                 const unsigned int /* length */)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_BINARY_SEARCH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname);
-
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")),
-                      -1);
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr;
-
-  return 0;
-}
-
-
-int
-TAO_Binary_Search_OpTable::find (const char *opname,
-                                 TAO_Collocated_Skeleton &skelfunc,
-                                 TAO::Collocation_Strategy st,
-                                 const unsigned int /* length */)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_BINARY_SEARCH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname);
-
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")),
-                      -1);
-
-  switch (st)
-    {
-    case TAO::TAO_CS_DIRECT_STRATEGY:
-      skelfunc = entry->direct_skel_ptr;
-      break;
-    default:
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Binary_Search_OpTable::bind (const char *,
-                                 const TAO::Operation_Skeletons )
-{
-  return 0;
-}
-
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
deleted file mode 100644
index 107be238432..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Operation_Table_Binary_Search.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_OPERATION_TABLE_BINARY_SEARCH_H
-#define TAO_OPERATION_TABLE_BINARY_SEARCH_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Operation_Table.h"
-
-/**
- * @class TAO_Binary_Search_OpTable
- *
- * @brief Helper class for using binary search operatin lookup strategy
- * in the server skeletons.
- *
- * This class declares pure virtual method called 'lookup ()'
- * which will be generated by the GPERF program. This method is
- * used by 'bind ()' and 'find ()' methods. Subclasses will
- * define the lookup method.
- */
-class TAO_PortableServer_Export TAO_Binary_Search_OpTable
-  : public TAO_Operation_Table
-{
-public:
-  /// Do nothing constructor.
-  TAO_Binary_Search_OpTable (void);
-
-  /// Do nothing destrctor.
-  virtual ~TAO_Binary_Search_OpTable (void);
-
-  /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
-
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
-
-private:
-  /// Method that should defined by the subclasses. GPERF program
-  /// will generate this routine routines.
-  virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OPERATION_TABLE_BINARY_SEARCH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
deleted file mode 100644
index dd03dbe1f81..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "Operation_Table_Dynamic_Hash.h"
-#include "tao/Timeprobe.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(PortableServer,
-          Operation_Table_Dynamic_Hash,
-          "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Dynamic_Hash_OpTable::find - start",
-    "TAO_Dynamic_Hash_OpTable::find - end",
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_START = 600,
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_END,
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
-                                  TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// constructor
-TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (
-  TAO_operation_db_entry const * db,
-  CORBA::ULong dbsize,
-  CORBA::ULong hashtblsize,
-  ACE_Allocator *alloc)
-  : hash_ (hashtblsize, alloc)
-{
-  // Iterate thru each entry in the database and bind the operation
-  // name to its corresponding skeleton.
-  for (CORBA::ULong i = 0; i < dbsize; ++i)
-    {
-      TAO::Operation_Skeletons s;
-      s.skel_ptr = db[i].skel_ptr;
-      s.thruPOA_skel_ptr = db[i].skel_ptr;
-      s.direct_skel_ptr = db[i].direct_skel_ptr;
-
-      // @@ (ASG): what happens if bind fails ???
-      if (this->bind (db[i].opname, s) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) %p\n"),
-                    ACE_TEXT ("bind failed")));
-    }
-}
-
-TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids.  In this case,
-  // these are strings.
-  OP_MAP_MANAGER::ITERATOR iterator (this->hash_);
-
-  for (OP_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_);
-      entry->ext_id_ = 0;
-    }
-}
-
-int
-TAO_Dynamic_Hash_OpTable::bind (const char *opname,
-                                const TAO::Operation_Skeletons skel_ptr)
-{
-  return this->hash_.bind (CORBA::string_dup (opname),
-                           skel_ptr);
-}
-
-int
-TAO_Dynamic_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr,
-                                const unsigned int )
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
-  TAO::Operation_Skeletons s;
-
-  int retval =
-    this->hash_.find ((const char *)opname,
-                      s);
-
-  if (retval != -1)
-    {
-      skel_ptr = s.skel_ptr;
-    }
-
-  return retval;
-}
-
-int
-TAO_Dynamic_Hash_OpTable::find (const char *opname,
-                                TAO_Collocated_Skeleton& skel_ptr,
-                                TAO::Collocation_Strategy s,
-                                const unsigned int )
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
-
-  TAO::Operation_Skeletons skel;
-
-  int retval =
-    this->hash_.find ((const char *)opname, skel);
-
-  if (retval != -1)
-    {
-      switch (s)
-        {
-        case TAO::TAO_CS_DIRECT_STRATEGY:
-          skel_ptr = skel.direct_skel_ptr;
-          break;
-        default:
-          return -1;
-        }
-    }
-
-  return retval;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *,
-                                             TAO::Operation_Skeletons,
-                                             ACE_Hash<const char *>,
-                                             ACE_Equal_To<const char *>,
-                                             ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *,
-                                        TAO::Operation_Skeletons,
-                                        ACE_Hash<const char *>,
-                                        ACE_Equal_To<const char *>,
-                                        ACE_Null_Mutex>;
-
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *,
-                                                TAO::Operation_Skeletons,
-                                                ACE_Hash<const char *>,
-                                                ACE_Equal_To<const char *>,
-                                                ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<const char *,
-                                       TAO::Operation_Skeletons,
-                                       ACE_Hash<const char *>,
-                                       ACE_Equal_To<const char *>,
-                                       ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<const char *,
-                                  TAO::Operation_Skeletons>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<const char *, TAO::Operation_Skeletons>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
deleted file mode 100644
index a16c3a3acb3..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Operation_Table_Dynamic_Hash.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_OPERATION_TABLE_DYNAMIC_HASH_H
-#define TAO_OPERATION_TABLE_DYNAMIC_HASH_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Operation_Table.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Null_Mutex.h"
-
-/**
- * @class TAO_Dynamic_Hash_OpTable
- *
- * @brief Dynamic Hashing scheme for CORBA IDL operation name lookup.
- */
-class TAO_PortableServer_Export TAO_Dynamic_Hash_OpTable
-  : public TAO_Operation_Table
-{
-public:
-  // = Initialization and termination methods.
-  /**
-   * Initialize the dynamic hash operation table with a database of
-   * operation names. The hash table size may be different from the
-   * size of the database. Hence we use the third argument to specify
-   * the size of the internal hash table.  The <alloc> argument is
-   * used to determine where the memory comes from (usually from
-   * <ACE_Static_Allocator_Base>).
-   */
-  TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-                            CORBA::ULong dbsize,
-                            CORBA::ULong hashtblsize,
-                            ACE_Allocator *alloc);
-
-  /// Destructor
-  ~TAO_Dynamic_Hash_OpTable (void);
-
-  /// See the documentation in the base class for details.
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
-
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
-private:
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  TAO::Operation_Skeletons,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  ACE_Null_Mutex>
-        OP_MAP_MANAGER;
-
-  /// The hash table data structure.
-  OP_MAP_MANAGER hash_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OPERATION_TABLE_DYNAMIC_HASH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
deleted file mode 100644
index 277f0f35269..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#include "Operation_Table_Linear_Search.h"
-#include "tao/Timeprobe.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(PortableServer,
-          Operation_Table_Linear_Searc,
-          "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Linear_Search_OpTable::find - start",
-    "TAO_Linear_Search_OpTable::find - end",
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_START = 602,
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_END,
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
-                                  TAO_LINEAR_SEARCH_OPTABLE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-/***************************************************************/
-
-TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void)
-{
-}
-
-TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void)
-{
-}
-
-int
-TAO_Linear_Search_OpTable::bind (const char *,
-                                 const TAO::Operation_Skeletons )
-{
-  return 0;
-}
-
-int
-TAO_Linear_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton& skelfunc,
-                                 const unsigned int )
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_LINEAR_SEARCH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname);
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")),
-                      -1);
-
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr;
-
-  return 0;
-}
-
-
-int
-TAO_Linear_Search_OpTable::find (const char *opname,
-                                 TAO_Collocated_Skeleton &skelfunc,
-                                 TAO::Collocation_Strategy st,
-                                 const unsigned int )
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_LINEAR_SEARCH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname);
-  if (entry == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")),
-                      -1);
-
-  switch (st)
-    {
-    case TAO::TAO_CS_DIRECT_STRATEGY:
-      skelfunc = entry->direct_skel_ptr;
-      break;
-    default:
-      return -1;
-    }
-
-  return 0;
-}
-
-
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
deleted file mode 100644
index f2055d753d3..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Operation_Table_Linear_Search.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_OPERATION_TABLE_LINEAR_SEARCH_H
-#define TAO_OPERATION_TABLE_LINEAR_SEARCH_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Operation_Table.h"
-
-/**
- * @class TAO_Linear_Search_OpTable
- *
- * @brief Operation table lookup strategy based on
- * linear search.  Not efficient, but it works.
- */
-class TAO_PortableServer_Export TAO_Linear_Search_OpTable
-  : public TAO_Operation_Table
-{
-public:
-  // = Initialization and termination methods.
-  /// Default constructor.
-  TAO_Linear_Search_OpTable (void);
-
-  /// Destructor.
-  ~TAO_Linear_Search_OpTable (void);
-
-  /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
-
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
-
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skelptr);
-
-private:
-  // = Method that should defined by the subclasses. GPERF program
-  //   will generate this routine routines.
-  virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OPERATION_TABLE_LINEAR_SEARCH_H */
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
deleted file mode 100644
index ae294a0297a..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-
-#include "Operation_Table_Perfect_Hash.h"
-#include "tao/Timeprobe.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(PortableServer,
-          Operation_Table_Perfect_Hash,
-          "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Perfect_Hash_OpTable::find - start",
-    "TAO_Perfect_Hash_OpTable::find - end",
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_PERFECT_HASH_OPTABLE_FIND_START = 606,
-    TAO_PERFECT_HASH_OPTABLE_FIND_END,
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
-                                  TAO_PERFECT_HASH_OPTABLE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// Do nothing constructor.
-TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void)
-{
-}
-
-// Do nothing destrctor.
-TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
-{
-}
-
-int
-TAO_Perfect_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton &skelfunc,
-                                const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname,
-                                                       length);
-  if (entry == 0)
-    {
-      skelfunc = 0; // insure that somebody can't call a wrong function!
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
-                         ACE_TEXT ("operation '%s' (length=%d) failed\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length),
-                        -1);
-    }
-
-  // Valid entry. Figure out the skel_ptr.
-  skelfunc = entry->skel_ptr;
-
-  return 0;
-}
-
-int
-TAO_Perfect_Hash_OpTable::find (const char *opname,
-                                TAO_Collocated_Skeleton &skelfunc,
-                                TAO::Collocation_Strategy st,
-                                const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
-
-  TAO_operation_db_entry const * const entry = lookup (opname,
-                                                       length);
-  if (entry == 0)
-    {
-      skelfunc = 0; // insure that somebody can't call a wrong function!
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
-                         ACE_TEXT ("operation '%s' (length=%d) failed\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length),
-                        -1);
-    }
-
-  switch (st)
-    {
-    case TAO::TAO_CS_DIRECT_STRATEGY:
-      skelfunc = entry->direct_skel_ptr;
-      break;
-    default:
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Perfect_Hash_OpTable::bind (const char *,
-                                const TAO::Operation_Skeletons)
-{
-  return 0;
-}
-
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
deleted file mode 100644
index 5c60c7ad69f..00000000000
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Operation_Table_Perfect_Hash.h
- *
- *  $Id$
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_OPERATION_TABLE_PERFECT_HASH_H
-#define TAO_OPERATION_TABLE_PERFECT_HASH_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Operation_Table.h"
-
-/**
- * @class TAO_Perfect_Hash_OpTable
- *
- * @brief Helper class  for use of perfect hashing operation lookup
- * strategy.
- *
- * This class declares pure virtual methods called 'lookup ()'
- * and 'hash ()' which will be generated by the GPERF
- * program. These methods are used by 'bind ()' and 'find ()'
- * methods. Subclasses will define the lookup and hash
- * functions.
- */
-class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
-  : public TAO_Operation_Table
-{
-public:
-  /// Do nothing constructor.
-  TAO_Perfect_Hash_OpTable (void);
-
-  /// Do nothing destrctor.
-  virtual ~TAO_Perfect_Hash_OpTable (void);
-
-  /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
-
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
-
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
-
-private:
-  // = Methods that should defined by the subclasses. GPERF program
-  //   will generate these routines.
-
-  virtual unsigned int hash (const char *str, unsigned int len) = 0;
-
-  virtual const TAO_operation_db_entry* lookup (const char *str,
-                                                unsigned int len) = 0;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_OPERATION_TABLE_PERFECT_HASH_H */
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.cpp b/TAO/tao/PortableServer/PICurrent_Guard.cpp
deleted file mode 100644
index b396f7d9e00..00000000000
--- a/TAO/tao/PortableServer/PICurrent_Guard.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "PICurrent_Guard.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-
-ACE_RCSID (PortableServer,
-           PICurrent_Guard,
-           "$Id$")
-
-
-#include "tao/ORB_Core.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/PICurrent_Copy_Callback.h"
-
-
-TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
-                                       bool tsc_to_rsc)
-  : src_ (0),
-    dest_ (0),
-    copy_callback_ (server_request.pi_current_copy_callback ()),
-    tsc_to_rsc_ (tsc_to_rsc)
-{
-  // This constructor is used on the server side.
-
-  // Retrieve the thread scope current (no TSS access incurred yet).
-  PICurrent * pi_current = server_request.orb_core ()->pi_current ();
-
-  // If the slot count is zero, there is nothing to copy.  Prevent any
-  // copying (and hence TSS accesses) from occurring.
-  if (pi_current != 0 && pi_current->slot_count () != 0)
-    {
-      // Retrieve the request scope current.
-      PICurrent_Impl * rsc = &server_request.rs_pi_current ();
-
-      // Retrieve the thread scope current.
-      PICurrent_Impl * tsc = pi_current->tsc ();
-
-      if (tsc_to_rsc)
-        {
-          // TSC to RSC copy.
-          // Occurs after receive_request() interception point and
-          // upcall.
-          this->src_  = tsc;
-          this->dest_ = rsc;
-        }
-      else
-        {
-          // RSC to TSC copy.
-          // Occurs after receive_request_service_contexts()
-          // interception point.
-          this->src_  = rsc;
-          this->dest_ = tsc;
-        }
-    }
-}
-
-TAO::PICurrent_Guard::~PICurrent_Guard (void)
-{
-  if (this->src_ != 0 && this->dest_ != 0
-      && this->src_ != this->dest_)
-    {
-      // This copy better be exception-safe!
-      this->dest_->lc_slot_table (this->src_);
-
-      // PICurrent will potentially have to call back on the request
-      // scope current so that it can deep copy the contents of the
-      // thread scope current if the contents of the thread scope
-      // current are about to be modified.  It is necessary to do this
-      // deep copy once in order to completely isolate the request
-      // scope current from the thread scope current.  This is only
-      // necessary, if the thread scope current is modified after its
-      // contents have been *logically* copied to the request scope
-      // current.  The same goes for the reverse, i.e. RSC to TSC.
-      this->copy_callback_.src_and_dst (this->src_, this->dest_);
-      this->src_->copy_callback (&this->copy_callback_);
-    }
-}
-
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.h b/TAO/tao/PortableServer/PICurrent_Guard.h
deleted file mode 100644
index c4340fdbbf1..00000000000
--- a/TAO/tao/PortableServer/PICurrent_Guard.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   PICurrent_Guard.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-// ===================================================================
-
-#ifndef TAO_PI_CURRENT_GUARD_H
-#define TAO_PI_CURRENT_GUARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-/// Forward declarations.
-class TAO_ServerRequest;
-
-namespace TAO
-{
-  class PICurrent_Impl;
-  class PICurrent_Copy_Callback;
-
-  /**
-   * @class PICurrent_Guard
-   *
-   * @brief Class used to make copying between request scope current
-   *        and thread scope current exception-safe.
-   *
-   * Since copies between the request scope current and thread scope
-   * current must also occur if an exception is thrown, e.g. made
-   * available to the send_exception() interception points, the
-   * "guard" idiom is used to make this action exception-safe.
-   *
-   * @note This Guard class is only used on the server side.
-   */
-  class TAO_PortableServer_Export PICurrent_Guard
-  {
-  public:
-
-    /// Constructor
-    /**
-     * This constructor sets up this guard to copy the data held in a
-     * given PICurrent when transitioning from that PICurrent's scope
-     * to another scope (e.g. request scope to thread scope transition
-     * immediately following receive_request_service_contexts() on
-     * server side).
-     *
-     * @param tsc_to_rsc true when copying TSC slot table to RSC slot
-     *                        table, i.e. after target operation
-     *                        completes.
-     */
-    PICurrent_Guard (TAO_ServerRequest &server_request,
-                     bool tsc_to_rsc);
-
-    /// Destructor
-    /**
-     * The destructor copies (a logical copy whenever possible) data
-     * held in a given PICurrent when transitioning from one PICurrent
-     * scope to another immediately before any ending interception
-     * points are invoked, and after the starting and intermediate (if
-     * any) interception points are invoked.
-     */
-    ~PICurrent_Guard (void);
-
-  private:
-
-    /// The PICurrent implementation whose slot table will be copied.
-    PICurrent_Impl * src_;
-
-    /// The PICurrent implementation whose slot table will be filled
-    /// with the contents of another PICurrent's slot table.
-    PICurrent_Impl * dest_;
-
-    /// Callback object responsible for performing deep copies of a
-    /// PICurrent's slot table.
-    PICurrent_Copy_Callback & copy_callback_;
-
-    /// Flag that indicates if the TSC is to be copied to the RSC.
-    /**
-     * If false, then the RSC must be deep copied upon leaving the
-     * request scope and entering the thread scope.  This is necessary
-     * since the RSC slot table is no longer available upon leaving
-     * the thread scope, meaning that a logical copy is not enough.
-     */
-    const bool tsc_to_rsc_;
-  };
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_CURRENT_GUARD_H */
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
deleted file mode 100644
index 02794454b12..00000000000
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-// $Id$
-
-#include "POAManager.h"
-#include "Root_POA.h"
-#include "poa_macros.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
-#include "tao/IORInterceptor_Adapter.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POAManager.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (PortableServer,
-           POAManager,
-           "$Id$")
-
-TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
-  : state_ (PortableServer::POAManager::HOLDING),
-    lock_ (object_adapter.lock ()),
-    poa_collection_ (),
-    object_adapter_ (object_adapter),
-    poa_manager_id_ (this->generate_manager_id ())
-{
-}
-
-TAO_POA_Manager::~TAO_POA_Manager (void)
-{
-}
-
-PortableInterceptor::AdapterManagerId
-TAO_POA_Manager::get_manager_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->poa_manager_id_;
-}
-
-void
-TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // This operation changes the state of the POA manager to active. If
-  // issued while the POA manager is in the inactive state, the
-  // AdapterInactive exception is raised.  Entering the active state
-  // enables the associated POAs to process requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::ACTIVE;
-    }
-
-  this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
-                               CORBA::Boolean wait_for_completion
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // inactive. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // inactive state causes the associated POAs to reject requests that
-  // have not begun to be executed as well as any new requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::INACTIVE;
-    }
-
-  // After changing the state, if the etherealize_objects parameter is:
-  //
-  // a) TRUE - the POA manager will cause all associated POAs that
-  // have the RETAIN and USE_SERVANT_MANAGER policies to perform the
-  // etherealize operation on the associated servant manager for all
-  // active objects.
-  //
-  // b) FALSE - the etherealize operation is not called. The purpose
-  // is to provide developers with a means to shut down POAs in a
-  // crisis (for example, unrecoverable error) situation.
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // will return immediately after changing the state. If the
-  // parameter is TRUE and the current thread is not in an invocation
-  // context dispatched by some POA belonging to the same ORB as this
-  // POA, this operation does not return until there are no actively
-  // executing requests in any of the POAs associated with this POA
-  // manager (that is, all requests that were started prior to the
-  // state change have completed) and, in the case of a TRUE
-  // etherealize_objects, all invocations of etherealize have
-  // completed for POAs having the RETAIN and USE_SERVANT_MANAGER
-  // policies. If the parameter is TRUE and the current thread is in
-  // an invocation context dispatched by some POA belonging to the
-  // same ORB as this POA the BAD_INV_ORDER exception is raised and
-  // the state is not changed.
-
-  for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-       iterator != this->poa_collection_.end ();
-       ++iterator)
-    {
-      TAO_Root_POA *poa = *iterator;
-      poa->deactivate_all_objects_i (etherealize_objects,
-                                     wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // If the ORB::shutdown operation is called, it makes a call on
-  // deactivate with a TRUE etherealize_objects parameter for each POA
-  // manager known in the process; the wait_for_completion parameter
-  // to deactivate will be the same as the similarly named parameter
-  // of ORB::shutdown.
-
-  this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state
-                                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::AdapterState adapter_state = state;
-
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->object_adapter_.orb_core ().ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->adapter_manager_state_changed (TAO_POA_Manager::poa_manager_id_,
-                                                  adapter_state
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-void
-TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // holding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // holding state causes the associated POAs to queue incoming
-  // requests.  Any requests that have been queued but have not
-  // started executing will continue to be queued while in the holding
-  // state.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::HOLDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE and the current thread is not in an invocation context
-  // dispatched by some POA belonging to the same ORB as this POA,
-  // this operation does not return until either there are no actively
-  // executing requests in any of the POAs associated with this POA
-  // manager (that is, all requests that were started prior to the
-  // state change have completed) or the state of the POA manager is
-  // changed to a state other than holding. If the parameter is TRUE
-  // and the current thread is in an invocation context dispatched by
-  // some POA belonging to the same ORB as this POA the BAD_INV_ORDER
-  // exception is raised and the state is not changed.
-
-  if (wait_for_completion)
-    {
-      for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-           iterator != this->poa_collection_.end ();
-           ++iterator)
-        {
-          TAO_Root_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                      wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // This operation changes the state of the POA manager to
-  // discarding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // discarding state causes the associated POAs to discard incoming
-  // requests.  In addition, any requests that have been queued but
-  // have not started executing are discarded. When a request is
-  // discarded, a TRANSIENT system exception is returned to the
-  // client.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::DISCARDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the
-  // parameter is TRUE and the current thread is not in an
-  // invocation context dispatched by some POA belonging to the
-  // same ORB as this POA, this operation does not return until
-  // either there are no actively executing requests in any of the
-  // POAs associated with this POA manager (that is, all requests
-  // that were started prior to the state change have completed)
-  // or the state of the POA manager is changed to a state other
-  // than discarding. If the parameter is TRUE and the current
-  // thread is in an invocation context dispatched by some POA
-  // belonging to the same ORB as this POA the BAD_INV_ORDER
-  // exception is raised and the state is not changed.
-
-  if (wait_for_completion)
-    {
-      for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-           iterator != this->poa_collection_.end ();
-           ++iterator)
-        {
-          TAO_Root_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-int
-TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
-{
-  int result = this->poa_collection_.remove (poa);
-
-  if (result == 0)
-    {
-      if (this->poa_collection_.is_empty ())
-        {
-          CORBA::release (this);
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_POA_Manager::register_poa (TAO_Root_POA *poa)
-{
-  return this->poa_collection_.insert (poa);
-}
-
-void
-TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (state_ == PortableServer::POAManager::ACTIVE)
-    {
-      // When a POA manager is in the active state, the associated
-      // POAs will receive and start processing requests (assuming
-      // that appropriate thread resources are available).
-      return;
-    }
-
-  if (state_ == PortableServer::POAManager::DISCARDING)
-    {
-      // When a POA manager is in the discarding state, the associated
-      // POAs will discard all incoming requests (whose processing has
-      // not yet begun). When a request is discarded, the TRANSIENT
-      // system exception, with standard minor code 1, must be
-      // returned to the client-side to indicate that the request
-      // should be re-issued. (Of course, an ORB may always reject a
-      // request for other reasons and raise some other system
-      // exception.)
-      ACE_THROW (
-        CORBA::TRANSIENT (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_POA_DISCARDING,
-            1),
-          CORBA::COMPLETED_NO));
-    }
-
-  if (state_ == PortableServer::POAManager::HOLDING)
-    {
-      // When a POA manager is in the holding state, the associated
-      // POAs will queue incoming requests. The number of requests
-      // that can be queued is an implementation limit. If this limit
-      // is reached, the POAs may discard requests and return the
-      // TRANSIENT system exception, with standard minor code 1, to
-      // the client to indicate that the client should reissue the
-      // request. (Of course, an ORB may always reject a request for
-      // other reasons and raise some other system exception.)
-
-      // Since there is no queuing in TAO, we immediately raise a
-      // TRANSIENT exception.
-      ACE_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_HOLDING,
-          1),
-        CORBA::COMPLETED_NO));
-    }
-
-  if (state_ == PortableServer::POAManager::INACTIVE)
-    {
-      // The inactive state is entered when the associated POAs are to
-      // be shut down. Unlike the discarding state, the inactive state
-      // is not a temporary state. When a POA manager is in the
-      // inactive state, the associated POAs will reject new
-      // requests. The rejection mechanism used is specific to the
-      // vendor. The GIOP location forwarding mechanism and
-      // CloseConnection message are examples of mechanisms that could
-      // be used to indicate the rejection. If the client is
-      // co-resident in the same process, the ORB could raise the
-      // OBJ_ADAPTER system exception, with standard minor code 1, to
-      // indicate that the object implementation is unavailable.
-      ACE_THROW (CORBA::OBJ_ADAPTER (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_INACTIVE,
-          1),
-        CORBA::COMPLETED_NO));
-    }
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Unbounded_Set<TAO_Root_POA *>;
-template class ACE_Unbounded_Set_Iterator<TAO_Root_POA *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Unbounded_Set<TAO_Root_POA *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Root_POA *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
deleted file mode 100644
index f3c05ece1f1..00000000000
--- a/TAO/tao/PortableServer/POAManager.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    POAManager.h
- *
- *  $Id$
- *
- *   POAManager
- *
- *  @author  Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POAMANAGER_H
-#define TAO_POAMANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "poa_macros.h"
-#include "POAManagerC.h"
-
-// Local Object
-#include "tao/LocalObject.h"
-#include "tao/PI_ForwardC.h"
-#include "ace/Unbounded_Set.h"
-
-// Forward decl.
-class TAO_Root_POA;
-class TAO_Object_Adapter;
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_PortableServer_Export TAO_POA_Manager :
-  public PortableServer::POAManager,
-  public TAO_Local_RefCounted_Object
-{
-  friend class TAO_Root_POA;
-  friend class TAO_Object_Adapter;
-
-public:
-
-  void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  void hold_requests (CORBA::Boolean wait_for_completion
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-  void discard_requests (CORBA::Boolean wait_for_completion
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-  void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  TAO_POA_Manager (TAO_Object_Adapter &object_adapter);
-
-  ~TAO_POA_Manager (void);
-
-  PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Check the state of this POA manager
-  void check_state (ACE_ENV_SINGLE_ARG_DECL);
-
-  PortableServer::POAManager::State get_state_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-
-  void activate_i (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-  void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-  /// Method needed for notifying the IORInterceptors that the state
-  /// of POAManager changed.
-  void adapter_manager_state_changed (PortableServer::POAManager::State state
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  void hold_requests_i (CORBA::Boolean wait_for_completion
-                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-  void discard_requests_i (CORBA::Boolean wait_for_completion
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POAManager::AdapterInactive));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  ACE_Lock &lock (void);
-
-  int remove_poa (TAO_Root_POA *poa);
-
-  int register_poa (TAO_Root_POA *poa);
-
-  /**
-   * Generate an AdapterManagerId for this POAManager.
-   * @return A value that uniquely identifies the POAManager within a
-   *         given process.
-   */
-  PortableInterceptor::AdapterManagerId generate_manager_id (void) const;
-
-protected:
-
-  PortableServer::POAManager::State state_;
-
-  ACE_Lock &lock_;
-
-  typedef ACE_Unbounded_Set<TAO_Root_POA *> POA_COLLECTION;
-
-  POA_COLLECTION poa_collection_;
-
-  TAO_Object_Adapter &object_adapter_;
-
-  PortableInterceptor::AdapterManagerId poa_manager_id_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "POAManager.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POAMANAGER_H */
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
deleted file mode 100644
index c38b1bd02ef..00000000000
--- a/TAO/tao/PortableServer/POAManager.i
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-
-
-ACE_INLINE ACE_Lock &
-TAO_POA_Manager::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE void
-TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
-
-  this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
-
-  this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
-
-  this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POAManager::AdapterInactive))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD;
-
-  this->deactivate_i (etherealize_objects,
-                      wait_for_completion
-                      ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->state_;
-}
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_);
-
-  return this->get_state_i ();
-}
-
-ACE_INLINE PortableInterceptor::AdapterManagerId
-TAO_POA_Manager::generate_manager_id (void) const
-{
-  // The AdapterManagerId must be unique across all Adapter Managers
-  // (e.g. POAManagers) within a given process.  To avoid locking
-  // overhead, the address of the POAManager object is used as the
-  // AdapterManagerId.  This guarantees that the AdapterManagerId is
-  // unique.
-  //
-  // For 64-bit platforms, only the lower 32 bits are used.  Hopefully
-  // that will be enough to ensure uniqueness.
-
-  // This is basically the same trick used in
-  // TAO_GIOP_Invocation::generate_request_id().  However, no right
-  // shifting of 64 bit addresses is performed since the
-  // TAO_POA_Manager object is not large enough to allow that trick.
-
-  PortableInterceptor::AdapterManagerId id = 0;
-
-  // Note that we reinterpret_cast to an "unsigned long" instead of
-  // CORBA::ULong since we need to first cast to an integer large
-  // enough to hold an address to avoid compile-time warnings on some
-  // 64-bit platforms.
-
-  if (sizeof (this) == 4)       // 32 bit address
-    id =
-      static_cast <PortableInterceptor::AdapterManagerId>
-                       (reinterpret_cast <ptrdiff_t> (this));
-
-  else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
-    id =
-      static_cast <PortableInterceptor::AdapterManagerId>
-                       (reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu);
-
-  // @@ If we ever hit a platform where neither of the above cases are
-  //    satisfied, we're up the creek!
-
-//   else
-//     // Fallback on an atomically incremented variable specific to the
-//     // ORB, or perhaps specific to the process.
-//     id = ...GENERATE_ID_ATOMICALLY...;  // Fallback
-
-  return id;
-}
diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl
deleted file mode 100644
index 6c9f72580be..00000000000
--- a/TAO/tao/PortableServer/POAManager.pidl
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @file POAManager.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          POAManager.pidl
- */
-
-#ifndef _PORTABLESERVER_POA_MANAGER_IDL_
-#define _PORTABLESERVER_POA_MANAGER_IDL_
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  // POAManager interface
-  local interface POAManager
-  {
-    exception AdapterInactive {};
-
-    enum State
-    {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-
-    void activate ()
-      raises(AdapterInactive);
-
-    void hold_requests (in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    void discard_requests (in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    void deactivate (in boolean etherealize_objects,
-                     in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    State get_state ();
-  };
-};
-
-#endif // _PORTABLESERVER_POA_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
deleted file mode 100644
index 086da1ec2da..00000000000
--- a/TAO/tao/PortableServer/POAManagerA.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "POAManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_AdapterInactive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
-    "AdapterInactive",
-    _tao_fields_PortableServer_POAManager_AdapterInactive,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
-  &_tao_tc_PortableServer_POAManager_AdapterInactive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
-  {
-    "HOLDING",
-    "ACTIVE",
-    "DISCARDING",
-    "INACTIVE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_State (
-    "IDL:omg.org/PortableServer/POAManager/State:2.3",
-    "State",
-    _tao_enumerators_PortableServer_POAManager_State,
-    4);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
-  &_tao_tc_PortableServer_POAManager_State;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/POAManager:2.3",
-    "POAManager");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POAManager =
-    &_tao_tc_PortableServer_POAManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr _tao_elem
-  )
-{
-  PortableServer::POAManager_ptr _tao_objptr =
-    PortableServer::POAManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tao_any_destructor,
-      PortableServer::_tc_POAManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tao_any_destructor,
-        PortableServer::_tc_POAManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POAManager::AdapterInactive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract (
-        _tao_any,
-        PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-        PortableServer::POAManager::_tc_AdapterInactive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::State _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tc_State,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::State &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tc_State,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
deleted file mode 100644
index 670181ce65c..00000000000
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "POAManagerC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::POAManager.
-
-PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
-    PortableServer::POAManager_ptr p
-  )
-{
-  return PortableServer::POAManager::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::POAManager>::release (
-    PortableServer::POAManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::nil (void)
-{
-  return PortableServer::POAManager::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POAManager>::marshal (
-    PortableServer::POAManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
-        "AdapterInactive"
-      )
-{
-}
-
-PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POAManager::AdapterInactive&
-PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterInactive *_tao_tmp_pointer =
-    static_cast<AdapterInactive *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POAManager::AdapterInactive *
-PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<AdapterInactive *> (_tao_excp);
-}
-
-const PortableServer::POAManager::AdapterInactive *
-PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const AdapterInactive *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POAManager::AdapterInactive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POAManager::AdapterInactive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POAManager::AdapterInactive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_tao_type (void) const
-{
-  return ::PortableServer::POAManager::_tc_AdapterInactive;
-}
-
-PortableServer::POAManager::POAManager (void)
-{}
-
-PortableServer::POAManager::~POAManager (void)
-{}
-
-void 
-PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POAManager *_tao_tmp_pointer =
-    static_cast<POAManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::POAManager_ptr
-PortableServer::POAManager::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POAManager::_nil ();
-    }
-  
-  POAManager_ptr proxy =
-    dynamic_cast<POAManager_ptr> (_tao_objref);
-  
-  return POAManager::_duplicate (proxy);
-}
-
-PortableServer::POAManager_ptr
-PortableServer::POAManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POAManager::_nil ();
-    }
-  
-  POAManager_ptr proxy =
-    dynamic_cast<POAManager_ptr> (_tao_objref);
-  
-  return POAManager::_duplicate (proxy);
-}
-
-PortableServer::POAManager_ptr
-PortableServer::POAManager::_duplicate (POAManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::POAManager::_tao_release (POAManager_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::POAManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/POAManager:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManager:2.3";
-}
-
-CORBA::Boolean
-PortableServer::POAManager::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
deleted file mode 100644
index 52606904b70..00000000000
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ /dev/null
@@ -1,359 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POAMANAGERC_H_
-#define _TAO_IDL_ORIG_POAMANAGERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
-  
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POAManager
-      >
-    POAManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POAManager
-      >
-    POAManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_POAMANAGER_CH_)
-#define _PORTABLESERVER_POAMANAGER_CH_
-  
-  class TAO_PortableServer_Export POAManager
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef POAManager_ptr _ptr_type;
-    typedef POAManager_var _var_type;
-    
-    // The static operations.
-    static POAManager_ptr _duplicate (POAManager_ptr obj);
-    
-    static void _tao_release (POAManager_ptr obj);
-    
-    static POAManager_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POAManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POAManager_ptr _nil (void)
-    {
-      return static_cast<POAManager_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-    
-    class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
-    {
-    public:
-      
-      AdapterInactive (void);
-      AdapterInactive (const AdapterInactive &);
-      ~AdapterInactive (void);
-
-      AdapterInactive &operator= (const AdapterInactive &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static AdapterInactive *_downcast (CORBA::Exception *);
-      static const AdapterInactive *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_AdapterInactive;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_enum/enum_ch.cpp:57
-    
-    enum State
-    {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-    
-    typedef State &State_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_State;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POAManager::AdapterInactive
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    virtual void hold_requests (
-        ::CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POAManager::AdapterInactive
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void discard_requests (
-        ::CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POAManager::AdapterInactive
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void deactivate (
-        ::CORBA::Boolean etherealize_objects,
-        ::CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POAManager::AdapterInactive
-      )) = 0;
-    
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POAManager::State get_state (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    POAManager (void);
-    
-    virtual ~POAManager (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POAManager (const POAManager &);
-    
-    void operator= (const POAManager &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAManager;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
-  {
-    static ::PortableServer::POAManager_ptr duplicate (
-        ::PortableServer::POAManager_ptr
-      );
-    static void release (
-        ::PortableServer::POAManager_ptr
-      );
-    static ::PortableServer::POAManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::POAManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
deleted file mode 100644
index e5755bb3994..00000000000
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// @(#) $Id$
-
-#include "POA_Cached_Policies.h"
-#include "POA_Policy_Set.h"
-#include "IdAssignmentPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "RequestProcessingPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "ThreadPolicyC.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POA_Cached_Policies.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(PortableServer,
-          POA_Cached_Policies,
-          "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    Cached_Policies::Cached_Policies () :
-        thread_ (PortableServer::ORB_CTRL_MODEL),
-        lifespan_ (PortableServer::TRANSIENT),
-        id_uniqueness_ (PortableServer::UNIQUE_ID),
-        id_assignment_ (PortableServer::SYSTEM_ID),
-        implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-        servant_retention_ (PortableServer::RETAIN),
-        request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
-        priority_model_ (Cached_Policies::NOT_SPECIFIED),
-        server_priority_ (TAO_INVALID_PRIORITY)
-    {
-    }
-
-
-    Cached_Policies::~Cached_Policies (void)
-    {
-    }
-
-    void
-    Cached_Policies::update (TAO_POA_Policy_Set &policy_set
-                                     ACE_ENV_ARG_DECL)
-    {
-      for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
-        {
-          CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
-
-          this->update_policy (policy.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    void
-    Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                            ACE_ENV_ARG_DECL)
-    {
-
-    #if (TAO_HAS_MINIMUM_POA == 0)
-
-      PortableServer::ThreadPolicy_var thread
-        = PortableServer::ThreadPolicy::_narrow (policy
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (thread.in ()))
-        {
-          this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-    #endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-      PortableServer::LifespanPolicy_var lifespan
-        = PortableServer::LifespanPolicy::_narrow (policy
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (lifespan.in ()))
-        {
-          this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-      PortableServer::IdUniquenessPolicy_var id_uniqueness
-        = PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (id_uniqueness.in ()))
-        {
-          this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-      PortableServer::IdAssignmentPolicy_var id_assignment
-        = PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (id_assignment.in ()))
-        {
-          this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-    #if (TAO_HAS_MINIMUM_POA == 0)
-
-      PortableServer::ImplicitActivationPolicy_var implicit_activation
-        = PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (implicit_activation.in ()))
-        {
-          this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-      PortableServer::ServantRetentionPolicy_var servant_retention
-        = PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (servant_retention.in ()))
-        {
-          this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-      PortableServer::RequestProcessingPolicy_var request_processing
-        = PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (request_processing.in ()))
-        {
-          this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-
-    #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
deleted file mode 100644
index d0d26a5bb8d..00000000000
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file POA_Cached_Policies.h
- *
- *  $Id$
- *
- *   POA
- *
- *  @author  Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POA_CACHED_POLICIES_H
-#define TAO_POA_CACHED_POLICIES_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ThreadPolicyC.h"
-#include "LifespanPolicyC.h"
-#include "IdUniquenessPolicyC.h"
-#include "IdAssignmentPolicyC.h"
-#include "ImplicitActivationPolicyC.h"
-#include "ServantRetentionPolicyC.h"
-#include "RequestProcessingPolicyC.h"
-
-// Forward references.
-class TAO_POA_Policy_Set;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export Cached_Policies
-    {
-    public:
-
-      enum PriorityModel
-      {
-        CLIENT_PROPAGATED,
-        SERVER_DECLARED,
-        NOT_SPECIFIED
-      };
-
-      Cached_Policies ();
-
-      ~Cached_Policies (void);
-
-      /// Update the cached policy values.
-      void update (TAO_POA_Policy_Set &policy_set
-                   ACE_ENV_ARG_DECL);
-
-      /**
-       * @name Accessor methods to cached values.
-       */
-      //@{
-      PortableServer::ThreadPolicyValue thread (void) const;
-      PortableServer::LifespanPolicyValue lifespan (void) const;
-      PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-      PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-      PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-      PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-      PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-      PriorityModel priority_model (void) const;
-      CORBA::Short server_priority (void) const;
-
-      void priority_model (PriorityModel priority_model);
-      void server_priority (CORBA::Short priority);
-      void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
-      //@}
-
-    protected:
-
-      /// Helper method to update a particular policy.
-      void update_policy (const CORBA::Policy_ptr policy
-                          ACE_ENV_ARG_DECL);
-
-      PortableServer::ThreadPolicyValue thread_;
-
-      PortableServer::LifespanPolicyValue lifespan_;
-
-      PortableServer::IdUniquenessPolicyValue id_uniqueness_;
-
-      PortableServer::IdAssignmentPolicyValue id_assignment_;
-
-      PortableServer::ImplicitActivationPolicyValue implicit_activation_;
-
-      PortableServer::ServantRetentionPolicyValue servant_retention_;
-
-      PortableServer::RequestProcessingPolicyValue request_processing_;
-
-      PriorityModel priority_model_;
-
-      CORBA::Short server_priority_;
-    };
-  }
-}
-
-#if defined (__ACE_INLINE__)
-# include "POA_Cached_Policies.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_CACHED_POLICIES_H */
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.i b/TAO/tao/PortableServer/POA_Cached_Policies.i
deleted file mode 100644
index 279ed235683..00000000000
--- a/TAO/tao/PortableServer/POA_Cached_Policies.i
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE PortableServer::ThreadPolicyValue
-    Cached_Policies::thread (void) const
-    {
-      return this->thread_;
-    }
-
-    ACE_INLINE PortableServer::LifespanPolicyValue
-    Cached_Policies::lifespan (void) const
-    {
-      return this->lifespan_;
-    }
-
-    ACE_INLINE PortableServer::IdUniquenessPolicyValue
-    Cached_Policies::id_uniqueness (void) const
-    {
-      return this->id_uniqueness_;
-    }
-
-    ACE_INLINE PortableServer::IdAssignmentPolicyValue
-    Cached_Policies::id_assignment (void) const
-    {
-      return this->id_assignment_;
-    }
-
-    ACE_INLINE PortableServer::ImplicitActivationPolicyValue
-    Cached_Policies::implicit_activation (void) const
-    {
-      return this->implicit_activation_;
-    }
-
-    ACE_INLINE PortableServer::ServantRetentionPolicyValue
-    Cached_Policies::servant_retention (void) const
-    {
-      return this->servant_retention_;
-    }
-
-    ACE_INLINE PortableServer::RequestProcessingPolicyValue
-    Cached_Policies::request_processing (void) const
-    {
-      return this->request_processing_;
-    }
-
-    ACE_INLINE Cached_Policies::PriorityModel
-    Cached_Policies::priority_model (void) const
-    {
-      return this->priority_model_;
-    }
-
-    ACE_INLINE CORBA::Short
-    Cached_Policies::server_priority (void) const
-    {
-      return this->server_priority_;
-    }
-
-    ACE_INLINE void
-    Cached_Policies::priority_model (PriorityModel priority_model)
-    {
-      this->priority_model_ = priority_model;
-    }
-
-    ACE_INLINE void
-    Cached_Policies::server_priority (CORBA::Short priority)
-    {
-      this->server_priority_ = priority;
-    }
-
-    ACE_INLINE void
-    Cached_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
-    {
-      this->implicit_activation_ = value;
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
deleted file mode 100644
index 7e6bc594412..00000000000
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-// -- PortableServer Include --
-#include "POA_Current.h"
-#include "POA_Current_Impl.h"
-
-// -- TAO Include --
-#include "tao/TSS_Resources.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POA_Current.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (PortableServer,
-           POA_Current,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    PortableServer::POA_ptr
-    POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      POA_Current_Impl *impl = this->implementation ();
-
-      if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
-      return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    PortableServer::ObjectId *
-    POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      POA_Current_Impl *impl = this->implementation ();
-
-      if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
-      return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    PortableServer::Servant
-    POA_Current::get_servant (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      POA_Current_Impl *impl = this->implementation ();
-
-      if (impl == 0)
-        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                          0);
-      return impl->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-
-    POA_Current_Impl *
-    POA_Current::implementation (void)
-    {
-      return static_cast <POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-    }
-
-    POA_Current_Impl *
-    POA_Current::implementation (POA_Current_Impl *new_current)
-    {
-      TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
-
-      POA_Current_Impl *old =
-        static_cast <POA_Current_Impl *>
-                     (tss->poa_current_impl_);
-      tss->poa_current_impl_ = new_current;
-      return old;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
deleted file mode 100644
index 24def1e7e31..00000000000
--- a/TAO/tao/PortableServer/POA_Current.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    POA_Current.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POA_CURRENT_H
-#define TAO_POA_CURRENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Local Object
-#include "tao/LocalObject.h"
-
-#include "PS_CurrentC.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class POA_Current_Impl;
-
-    class TAO_PortableServer_Export POA_Current
-      : public PortableServer::Current,
-        public TAO_Local_RefCounted_Object
-    {
-    public:
-      /// Constructor
-      POA_Current (void);
-
-      /**
-       * Returns the POA on which the current request is being invoked.
-       * Can raise the @c NoContext exception if this function is
-       * not invoked in the context of an upcall.
-       */
-      PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /**
-       * Returns the object id of the current request being invoked.  Can
-       * raise the @c NoContext exception if this function is not
-       * invoked in the context of an upcall.
-       */
-      PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /**
-       * Returns a reference to the servant that hosts the object in whose
-       * context it is called. If called outside the context of the POA
-       * dispatched operation, a NoContext exception is raised
-       */
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /// Returns the class that implements this interface.
-      POA_Current_Impl *implementation (void);
-
-      /// Sets the thread-specific pointer to the new POA Current state,
-      /// returning a pointer to the existing POA Current state.
-      POA_Current_Impl *implementation (POA_Current_Impl *new_current);
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "POA_Current.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POA_CURRENT_H */
diff --git a/TAO/tao/PortableServer/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl
deleted file mode 100644
index 4c445f2d29c..00000000000
--- a/TAO/tao/PortableServer/POA_Current.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/SystemException.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE
-    POA_Current::POA_Current (void)
-    {
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
deleted file mode 100644
index a91ed0a3244..00000000000
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// $Id$
-
-// -- PortableServer Include --
-#include "Object_Adapter.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
-#include "POA_Guard.h"
-#include "ServerRequestInfo.h"
-#include "Default_Servant_Dispatcher.h"
-#include "ServerInterceptorAdapter.h"
-#include "Collocated_Object_Proxy_Broker.h"
-
-// -- ACE Include --
-#include "ace/Auto_Ptr.h"
-
-// -- TAO Include --
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/TSS_Resources.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/Thread_Lane_Resources_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Protocols_Hooks.h"
-
-#include "Policy_Creator_T.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POA_Current_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           POA_Current_IMpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    POA_Current_Impl::POA_Current_Impl (void)
-      : poa_ (0),
-        object_id_ (),
-        object_key_ (0),
-        servant_ (0),
-        priority_ (TAO_INVALID_PRIORITY),
-        previous_current_impl_ (0),
-        setup_done_ (0)
-    {
-    }
-
-    void
-    POA_Current_Impl::setup (::TAO_Root_POA *p,
-                             const TAO::ObjectKey &key)
-    {
-      // Remember information about this upcall.
-      this->poa_ = p;
-      this->object_key_ = &key;
-
-      // Set the current context and remember the old one.
-      this->tss_resources_ = TAO_TSS_RESOURCES::instance ();
-
-      this->previous_current_impl_ =
-        static_cast <POA_Current_Impl *>
-                         (this->tss_resources_->poa_current_impl_);
-      this->tss_resources_->poa_current_impl_ = this;
-
-      // Setup is complete.
-      this->setup_done_ = 1;
-    }
-
-    POA_Current_Impl *
-    POA_Current_Impl::previous (void) const
-    {
-      return this->previous_current_impl_;
-    }
-
-    void
-    POA_Current_Impl::teardown (void)
-    {
-      if (this->setup_done_)
-        {
-          // Reset the old context.
-          this->tss_resources_->poa_current_impl_ = this->previous_current_impl_;
-        }
-    }
-
-    PortableServer::POA_ptr
-    POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      return PortableServer::POA::_duplicate (this->poa_);
-    }
-
-    PortableServer::ObjectId *
-    POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      PortableServer::ObjectId *objid = 0;
-
-      // Create a new one and pass it back
-      ACE_NEW_RETURN (objid,
-                      PortableServer::ObjectId (this->object_id_),
-                      0);
-      return objid;
-    }
-
-    PortableServer::Servant
-    POA_Current_Impl::get_servant (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::Current::NoContext))
-    {
-      return this->servant_;
-    }
-
-    TAO_ORB_Core &
-    POA_Current_Impl::orb_core (void) const
-
-    {
-      return this->poa_->orb_core ();
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
deleted file mode 100644
index 240e9ad9694..00000000000
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    POA_Current_Impl.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POA_CURRENT_IMPL_H
-#define TAO_POA_CURRENT_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PS_CurrentC.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Non_Servant_Upcall;
-    class Servant_Upcall;
-  }
-}
-
-// ****************************************************************
-
-// Forward declaration
-class TAO_Root_POA;
-class TAO_POA_Manager;
-class TAO_TSS_Resources;
-class TAO_Transport;
-class TAO_Servant_Dispatcher;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    /**
-     * @class POA_Current_Impl
-     *
-     * @brief Implementation of the PortableServer::Current object.
-     *
-     * Objects of this class hold state information regarding the
-     * current POA invocation.  Savvy readers will notice that this
-     * contains substantially more methods than the POA spec shows;
-     * they exist because the ORB either (a) needs them or (b) finds
-     * them useful for implementing a more efficient ORB.
-     * The intent is that instances of this class are held in
-     * Thread-Specific Storage so that upcalls can get context
-     * information regarding their invocation.  The POA itself must
-     * insure that all <set_*> operations are performed in the
-     * execution thread so that the proper <TAO_POA_Current> pointer
-     * is obtained from TSS.
-     */
-    class TAO_PortableServer_Export POA_Current_Impl
-    {
-    public:
-      friend class ::TAO_Root_POA;
-
-      /// Return pointer to the invoking POA.  Raises the
-      /// <CORBA::NoContext> exception.
-      PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /**
-       * Return pointer to the object id through which this was invoked.
-       * This may be necessary in cases where a <Servant> is serving under
-       * the guise of multiple object ids.  This has _out semantics Raises
-       * the <CORBA::NoContext> exception.
-       */
-      PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /**
-       * Returns a reference to the servant that hosts the object in whose
-       * context it is called. If called outside the context of the POA
-       * dispatched operation, a NoContext exception is raised
-       */
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::Current::NoContext));
-
-      /// Set the POA implementation.
-      void poa (::TAO_Root_POA *);
-
-      /// Get the POA implemantation
-      ::TAO_Root_POA *poa (void) const;
-
-      /// ORB Core for this current.
-      TAO_ORB_Core &orb_core (void) const;
-
-      /// Set the object ID.
-      void object_id (const PortableServer::ObjectId &id);
-
-      /// Get the object ID.
-      const PortableServer::ObjectId &object_id (void) const;
-
-      /// Just replace the object id smartly
-      void replace_object_id (const PortableServer::ObjectId &system_id);
-
-      /// Set the object key.
-      void object_key (const TAO::ObjectKey &key);
-
-      /// Get the object key.
-      const TAO::ObjectKey &object_key (void) const;
-
-      /// Set the servant for the current upcall.
-      void servant (PortableServer::Servant servant);
-
-      /// Get the servant for the current upcall.
-      PortableServer::Servant servant (void) const;
-
-      /// Set the priority for the current upcall.
-      void priority (CORBA::Short priority);
-
-      /// Get the priority for the current upcall.
-      CORBA::Short priority (void) const;
-
-      /// Convenience constructor combining construction & initialization.
-      POA_Current_Impl (void);
-
-      /// Return the previous current implementation.
-      POA_Current_Impl *previous (void) const;
-
-      /// Teardown the current for this request.
-      void teardown (void);
-
-      /// Setup the current.
-      void setup (::TAO_Root_POA *impl,
-                  const TAO::ObjectKey &key);
-
-    protected:
-      /// The POA implementation invoking an upcall
-      ::TAO_Root_POA *poa_;
-
-      /**
-       * The object ID of the current context.  This is the user id and
-       * not the id the goes into the IOR.  Note also that unlike the
-       * <object_key>, this field is stored by value.
-       */
-      PortableServer::ObjectId object_id_;
-
-      /// The object key of the current context.
-      const TAO::ObjectKey *object_key_;
-
-      /// The servant for the current upcall.
-      PortableServer::Servant servant_;
-
-      /// The priority for the current upcall.
-      CORBA::Short priority_;
-
-      /// Current previous from <this>.
-      POA_Current_Impl *previous_current_impl_;
-
-      /// Is setup complete?
-      int setup_done_;
-
-      /// Pointer to tss resources.
-      TAO_TSS_Resources *tss_resources_;
-
-      // = Hidden because we don't allow these
-      POA_Current_Impl (const POA_Current_Impl &);
-      void operator= (const POA_Current_Impl &);
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "POA_Current_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POA_CURRENT_IMPL_H */
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl
deleted file mode 100644
index 350d1cf820b..00000000000
--- a/TAO/tao/PortableServer/POA_Current_Impl.inl
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/SystemException.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE void
-    POA_Current_Impl::poa (::TAO_Root_POA *p)
-    {
-      this->poa_ = p;
-    }
-
-    ACE_INLINE ::TAO_Root_POA *
-    POA_Current_Impl::poa (void) const
-    {
-      return this->poa_;
-    }
-
-    ACE_INLINE void
-    POA_Current_Impl::object_id (const PortableServer::ObjectId &id)
-    {
-      this->object_id_ = id;
-    }
-
-    ACE_INLINE const PortableServer::ObjectId &
-    POA_Current_Impl::object_id (void) const
-    {
-      return this->object_id_;
-    }
-
-    ACE_INLINE void
-    POA_Current_Impl::replace_object_id (
-      const PortableServer::ObjectId &system_id)
-    {
-      object_id_.replace (system_id.maximum (),
-                          system_id.length (),
-                          const_cast <CORBA::Octet *> (system_id.get_buffer ()),
-                          0);
-    }
-
-    ACE_INLINE void
-    POA_Current_Impl::object_key (const TAO::ObjectKey &key)
-    {
-      this->object_key_ = &key;
-    }
-
-    ACE_INLINE const TAO::ObjectKey &
-    POA_Current_Impl::object_key (void) const
-    {
-      return *this->object_key_;
-    }
-
-    ACE_INLINE void
-    POA_Current_Impl::servant (PortableServer::Servant servant)
-    {
-      this->servant_ = servant;
-    }
-
-    ACE_INLINE PortableServer::Servant
-    POA_Current_Impl::servant (void) const
-    {
-      return this->servant_;
-    }
-
-    ACE_INLINE void
-    POA_Current_Impl::priority (CORBA::Short priority)
-    {
-      this->priority_ = priority;
-    }
-
-    ACE_INLINE CORBA::Short
-    POA_Current_Impl::priority (void) const
-    {
-      return this->priority_;
-    }
-
-  }
-}
-
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
deleted file mode 100644
index cbf2eb0bba7..00000000000
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "POA_Guard.h"
-#include "Root_POA.h"
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID(PortableServer,
-          POA_Guard,
-          "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    POA_Guard::POA_Guard (::TAO_Root_POA &poa
-                          ACE_ENV_ARG_DECL,
-                          int check_for_destruction)
-      : guard_ (poa.lock ())
-    {
-      if (!this->guard_.locked ())
-        ACE_THROW (
-          CORBA::INTERNAL (
-            CORBA::SystemException::_tao_minor_code (
-              TAO_GUARD_FAILURE,
-              0),
-            CORBA::COMPLETED_NO));
-
-      // Check if a non-servant upcall is in progress.  If a non-servant
-      // upcall is in progress, wait for it to complete.  Unless of
-      // course, the thread making the non-servant upcall is this thread.
-      poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (check_for_destruction &&
-          poa.cleanup_in_progress ())
-        ACE_THROW (
-          CORBA::BAD_INV_ORDER (
-            CORBA::SystemException::_tao_minor_code (
-              TAO_POA_BEING_DESTROYED,
-              0),
-            CORBA::COMPLETED_NO));
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
deleted file mode 100644
index a7347130783..00000000000
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    POA_Guard.h
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#ifndef TAO_POA_GUARD_H
-#define TAO_POA_GUARD_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Guard_T.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    /**
-     * @class POA_Guard
-     *
-     * @brief POA_Guard
-     *
-     * POA_Guard
-     */
-    class TAO_PortableServer_Export POA_Guard
-    {
-    public:
-      POA_Guard (::TAO_Root_POA &poa
-                 ACE_ENV_ARG_DECL,
-                 int check_for_destruction = 1);
-
-    private:
-      ACE_Guard<ACE_Lock> guard_;
-    };
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_GUARD_H */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
deleted file mode 100644
index 1857737deaf..00000000000
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// @(#) $Id$
-
-#include "POA_Policy_Set.h"
-#include "POA_Cached_Policies.h"
-#include "PortableServer.h"
-
-#include "tao/Policy_Validator.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POA_Policy_Set.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (PortableServer,
-           POA_Policy_Set,
-           "$Id$")
-
-TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
-  :
-    impl_ (TAO_POLICY_POA_SCOPE)
-{
-}
-
-TAO_POA_Policy_Set::TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs)
-  :
-    impl_ (rhs.impl_)
-{
-}
-
-TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
-{
-}
-
-void
-TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                                       ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong cep_index = client_exposed_policies->length ();
-
-  for (CORBA::ULong i = 0;
-       i < this->num_policies ();
-       ++i)
-    {
-      CORBA::Policy_var policy = this->get_policy_by_index (i);
-
-      // If this policy is client exposed, add it to the list.
-      if (policy->_tao_scope () & TAO_POLICY_CLIENT_EXPOSED)
-        {
-          client_exposed_policies->length (cep_index + 1);
-          (*client_exposed_policies)[cep_index] =
-                                  policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          cep_index++;
-        }
-    }
-}
-
-void
-TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
-                                       TAO_ORB_Core &orb_core
-                                       ACE_ENV_ARG_DECL)
-{
-  // Just give a last chance for all the unloaded validators in other
-  // libraries to be registered
-  orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
-
-  // Validate that all of the specified policies make sense.
-  validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Verify that all policies are legal for the currently loaded
-  // POA extensions.
-  for (CORBA::ULong i = 0;
-       i < this->impl_.num_policies ();
-       i++)
-    {
-      CORBA::Policy_var policy = this->impl_.get_policy_by_index (i);
-
-      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (validator.legal_policy (type) == 0)
-        {
-          // An invalid policy was specified.  Let the user know about
-          // it.
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        }
-    }
-}
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
deleted file mode 100644
index 46fc0f4b5b7..00000000000
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file POA_Policy_Set.h
- *
- *  $Id$
- *
- *   POA
- *
- *
- *  @author  Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POA_POLICY_SET_H
-#define TAO_POA_POLICY_SET_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Policy_Set.h"
-
-class TAO_Policy_Validator;
-
-class TAO_PortableServer_Export TAO_POA_Policy_Set
-{
-public:
-
-  TAO_POA_Policy_Set ();
-
-  TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs);
-
-  ~TAO_POA_Policy_Set (void);
-
-  /// Returns the policy at the specified index.
-  /// CORBA::Policy::_nil () is returned if the policy doesn't exist
-  CORBA::Policy *get_policy_by_index (CORBA::ULong index);
-
-  /// Get the number of policies
-  CORBA::ULong num_policies (void) const;
-
-  /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  void merge_policies (const CORBA::PolicyList &policies
-                       ACE_ENV_ARG_DECL);
-
-  void merge_policy (const CORBA::Policy_ptr policy
-                     ACE_ENV_ARG_DECL);
-
-  void validate_policies (TAO_Policy_Validator &validator,
-                          TAO_ORB_Core &orb_core
-                          ACE_ENV_ARG_DECL);
-
-  /// Add all of the client exposed policies to the specified list.
-  void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                          ACE_ENV_ARG_DECL);
-
-  TAO_Policy_Set &policies (void);
-
-  /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
-
-protected:
-  TAO_Policy_Set impl_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "POA_Policy_Set.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_POLICY_SET_H */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
deleted file mode 100644
index fee42969600..00000000000
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_POA_Policy_Set::num_policies (void) const
-{
-  return this->impl_.num_policies ();
-}
-
-ACE_INLINE CORBA::Policy *
-TAO_POA_Policy_Set::get_policy_by_index (CORBA::ULong index)
-{
-  return this->impl_.get_policy_by_index (index);
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
-{
-  return this->impl_.get_cached_policy (type
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies
-                                    ACE_ENV_ARG_DECL)
-{
-  // Add the policies if they don't exist, override them if they do.
-  this->impl_.set_policy_overrides (policies,
-                                    CORBA::ADD_OVERRIDE
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ACE_INLINE void
-TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
-                                  ACE_ENV_ARG_DECL)
-{
-  this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL)
-{
-  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE TAO_Policy_Set &
-TAO_POA_Policy_Set::policies (void)
-{
-  return this->impl_;
-}
diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl
deleted file mode 100644
index a1b7ab68b61..00000000000
--- a/TAO/tao/PortableServer/PS_Current.pidl
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file PS_Current.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * PS_CurrentC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PS_Current.pidl
- */
-
-#ifndef _PORTABLESERVER_CURRENT_IDL_
-#define _PORTABLESERVER_CURRENT_IDL_
-
-///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <Current.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  // Current interface.
-  local interface Current : CORBA::Current
-  {
-#   pragma version Current 2.3
-
-    exception NoContext {};
-
-    POA get_POA ()
-      raises (NoContext);
-
-    ObjectId get_object_id ()
-      raises (NoContext);
-
-    Servant get_servant ()
-      raises (NoContext);
-  };
-};
-
-#endif // _PORTABLESERVER_CURRENT_IDL_
diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp
deleted file mode 100644
index 5bc7503aea0..00000000000
--- a/TAO/tao/PortableServer/PS_CurrentA.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PS_CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_Current_NoContext = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_Current_NoContext (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/Current/NoContext:2.3",
-    "NoContext",
-    _tao_fields_PortableServer_Current_NoContext,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
-  &_tao_tc_PortableServer_Current_NoContext;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/Current:2.3",
-    "Current");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_PortableServer_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr _tao_elem
-  )
-{
-  PortableServer::Current_ptr _tao_objptr =
-    PortableServer::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::Current>::insert (
-      _tao_any,
-      PortableServer::Current::_tao_any_destructor,
-      PortableServer::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::Current>::extract (
-        _tao_any,
-        PortableServer::Current::_tao_any_destructor,
-        PortableServer::_tc_Current,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert_copy (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::Current::NoContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::extract (
-        _tao_any,
-        PortableServer::Current::NoContext::_tao_any_destructor,
-        PortableServer::Current::_tc_NoContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
deleted file mode 100644
index cf2095eef69..00000000000
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PS_CurrentC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::Current.
-
-PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::duplicate (
-    PortableServer::Current_ptr p
-  )
-{
-  return PortableServer::Current::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::Current>::release (
-    PortableServer::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::nil (void)
-{
-  return PortableServer::Current::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::Current>::marshal (
-    PortableServer::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::Current::NoContext::NoContext (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/Current/NoContext:2.3",
-        "NoContext"
-      )
-{
-}
-
-PortableServer::Current::NoContext::~NoContext (void)
-{
-}
-
-PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::Current::NoContext&
-PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NoContext *_tao_tmp_pointer =
-    static_cast<NoContext *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<NoContext *> (_tao_excp);
-}
-
-const PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const NoContext *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::Current::NoContext::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::Current::NoContext (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::Current::NoContext::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::Current::NoContext::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::Current::NoContext::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const
-{
-  return ::PortableServer::Current::_tc_NoContext;
-}
-
-PortableServer::Current::Current (void)
-{}
-
-PortableServer::Current::~Current (void)
-{}
-
-void 
-PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::Current_ptr
-PortableServer::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-PortableServer::Current_ptr
-PortableServer::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-PortableServer::Current_ptr
-PortableServer::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::Current::_tao_release (Current_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::Current::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/Current:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/Current:2.3";
-}
-
-CORBA::Boolean
-PortableServer::Current::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h
deleted file mode 100644
index f4e40c3f543..00000000000
--- a/TAO/tao/PortableServer/PS_CurrentC.h
+++ /dev/null
@@ -1,309 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PS_CURRENTC_H_
-#define _TAO_IDL_ORIG_PS_CURRENTC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "tao/CurrentC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_)
-#define _PORTABLESERVER_CURRENT__VAR_OUT_CH_
-  
-  class Current;
-  typedef Current *Current_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Current
-      >
-    Current_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Current
-      >
-    Current_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_CURRENT_CH_)
-#define _PORTABLESERVER_CURRENT_CH_
-  
-  class TAO_PortableServer_Export Current
-    : public virtual ::CORBA::Current
-  {
-  public:
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-    
-    // The static operations.
-    static Current_ptr _duplicate (Current_ptr obj);
-    
-    static void _tao_release (Current_ptr obj);
-    
-    static Current_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _nil (void)
-    {
-      return static_cast<Current_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-    
-    class TAO_PortableServer_Export NoContext : public CORBA::UserException
-    {
-    public:
-      
-      NoContext (void);
-      NoContext (const NoContext &);
-      ~NoContext (void);
-
-      NoContext &operator= (const NoContext &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static NoContext *_downcast (CORBA::Exception *);
-      static const NoContext *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_NoContext;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POA_ptr get_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::Current::NoContext
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::ObjectId * get_object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::Current::NoContext
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::Servant get_servant (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::Current::NoContext
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Current (void);
-    
-    virtual ~Current (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-    
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_Current;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
-#define _PORTABLESERVER_CURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current>
-  {
-    static ::PortableServer::Current_ptr duplicate (
-        ::PortableServer::Current_ptr
-      );
-    static void release (
-        ::PortableServer::Current_ptr
-      );
-    static ::PortableServer::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::Current_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
deleted file mode 100644
index 86f8af6f927..00000000000
--- a/TAO/tao/PortableServer/PS_Forward.pidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file PS_Forward.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * PS_ForwardC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PS_Forward.pidl
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PS_Forward.diff
- */
-
-#ifndef _PORTABLESERVER_PS_FORWARD_IDL_
-#define _PORTABLESERVER_PS_FORWARD_IDL_
-
-#include <OctetSeq.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  typedef CORBA::OctetSeq ObjectId;
-
-  local interface POA;
-
-  native Servant;
-};
-
-#endif // _PORTABLESERVER_PS_FORWARD_IDL_
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
deleted file mode 100644
index bdbefa07fb5..00000000000
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PS_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableServer/ObjectId:2.3",
-    "ObjectId",
-    &CORBA::_tc_OctetSeq);
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectId =
-    &_tao_tc_PortableServer_ObjectId;
-}
-
-
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
deleted file mode 100644
index 52b1831cc27..00000000000
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PS_ForwardC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
deleted file mode 100644
index 6bc80ec6676..00000000000
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PS_FORWARDC_H_
-#define _TAO_IDL_ORIG_PS_FORWARDC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/OctetSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-class TAO_ServantBase;
-class TAO_ServantBase_var;
-class TAO_Local_ServantBase;
-class TAO_Root_POA;
-class TAO_DynamicImplementation;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-    typedef TAO_ServantBase ServantBase;
-    struct RefCountServantBase {};
-    typedef TAO_ServantBase_var ServantBase_var;
-    typedef ServantBase *Servant;
-
-    typedef TAO_Local_ServantBase LocalServantBase;
-    typedef TAO_DynamicImplementation DynamicImplementation;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-
-  typedef CORBA::OctetSeq ObjectId;
-  typedef CORBA::OctetSeq_var ObjectId_var;
-  typedef CORBA::OctetSeq_out ObjectId_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
-#define _PORTABLESERVER_POA__VAR_OUT_CH_
-
-  class POA;
-  typedef POA *POA_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        POA
-      >
-    POA_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        POA
-      >
-    POA_out;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
deleted file mode 100644
index c10a16fefa7..00000000000
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ /dev/null
@@ -1,1126 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_ORIG_POLICYS_CPP_
-#define _TAO_IDL_ORIG_POLICYS_CPP_
-
-
-#include "PolicyS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.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/TypeCode_SArg_Traits.h"
-#include "tao/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_SS_
-  
-  template<>
-  class  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:69
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
-#define _CORBA_POLICY__ARG_TRAITS_SS_
-  
-  template<>
-  class  Arg_Traits<CORBA::Policy>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1455
-
-class TAO_CORBA_Policy_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: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,
-#else
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
-      0,  5, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
-     22,  0, 22, 22, 22, 22, 22, 22,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 7,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 21,
-      HASH_VALUE_RANGE = 18,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 11
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy},
-      {"_is_a", &POA_CORBA::Policy::_is_a_skel, 0},
-      {"",0,0},
-      {"destroy", &POA_CORBA::Policy::destroy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy},
-      {"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::Policy::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_CORBA::Policy::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_CORBA::Policy::_interface_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type},
-    };
-
-  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];
-        }
-    }
-  return 0;
-}
-
-static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
-{
-  static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker
-  strategized_proxy_broker;
-  
-  return &strategized_proxy_broker;
-}
-
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::_TAO_Policy_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_CORBA::_TAO_Policy_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;
-}
-
-void
-POA_CORBA::_TAO_Policy_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::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
-  collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
-    ACE_ENV_ARG_PARAMETER);
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
-
-TAO::Collocation_Proxy_Broker *
-CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker ();
-}
-
-int
-CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
-{
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-  
-  return 0;
-}
-
-static int
-CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<size_t> (CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer)
-    );
-
-
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-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
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
-    dynamic_cast<POA_CORBA::Policy_ptr>
-      (servant)
-    ->policy_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
-    dynamic_cast<POA_CORBA::Policy_ptr>
-      (servant)
-    ->copy (
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  dynamic_cast<POA_CORBA::Policy_ptr>
-    (servant)
-  ->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
-
-POA_CORBA::Policy::Policy (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_CORBA_Policy_optable;
-}
-
-POA_CORBA::Policy::Policy (const Policy& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_CORBA::Policy::~Policy (void)
-{
-}
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_policy_type_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_policy_type_Policy (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_->policy_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::_get_policy_type_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _get_policy_type_Policy command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class copy_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline copy_Policy (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_->copy (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::copy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  copy_Policy command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class destroy_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline destroy_Policy (
-      POA_CORBA::Policy * servant)
-      : servant_ (servant)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->servant_->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-  };
-  
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::destroy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< void>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  destroy_Policy command (
-    impl);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _is_a_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
-          this->operation_details_,
-          this->args_,
-          1);
-        
-      
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-  
-  static size_t const nargs = 2;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  
-  _is_a_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _non_existent_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  
-  _non_existent_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request, 
-    void * /* servant_upcall */,
-    void * servant
-    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_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
-    }
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-namespace POA_CORBA
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class _get_component_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
-          this->operation_details_,
-          this->args_);
-      
-      
-      retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-        
-    }
-  
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-  
-}
-void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static size_t const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-  
-  static size_t const nargs = 1;
-  
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  
-  _get_component_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-  
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-CORBA::Boolean POA_CORBA::Policy::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_CORBA::Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_CORBA::Policy::_dispatch (
-    TAO_ServerRequest & req,
-    void * 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:891
-
-CORBA::Policy *
-POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
-  
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
-  
-  typedef ::CORBA::Policy STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Policy>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var,
-        CORBA::Policy_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Policy>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Policy_ptr, \
-        CORBA::Policy_var, \
-        CORBA::Policy_out, \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
deleted file mode 100644
index a329243c0a0..00000000000
--- a/TAO/tao/PortableServer/PolicyS.h
+++ /dev/null
@@ -1,322 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_ORIG_POLICYS_H_
-#define _TAO_IDL_ORIG_POLICYS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PolicyC.h"
-#include "tao/UShortSeqS.h"
-#include "tao/CurrentS.h"
-#include "tao/Policy_ForwardS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-#include "portableserver_export.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-
-  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
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-
-    ::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
-
-    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 & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // 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 & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        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_Policy_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public:
-    _TAO_Policy_Strategized_Proxy_Broker (void);
-
-    virtual ~_TAO_Policy_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_Policy_Strategized_Proxy_Broker *
-    the_TAO_Policy_Strategized_Proxy_Broker (void);
-  };
-
-  //
-  //            End Strategized Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-
-  class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_Policy_Direct_Proxy_Impl (void);
-
-    virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
-    static void
-    _get_policy_type (
-        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
-    copy (
-        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
-      ));
-  };
-
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:995
-
-#include "PolicyS_T.h"
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
deleted file mode 100644
index a53bc9459b6..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:677
-
-#ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
-#define _TAO_IDL_ORIG_POLICYS_T_CPP_
-
-#include "PolicyS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
deleted file mode 100644
index 2e8d80a5198..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:536
-
-#ifndef _TAO_IDL_ORIG_POLICYS_T_H_
-#define _TAO_IDL_ORIG_POLICYS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/tie_sh.cpp:87
-  
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class  Policy_tie : public Policy
-  {
-  public:
-    Policy_tie (T &t);
-    // the T& ctor
-    Policy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Policy_tie (T *tp, CORBA::Boolean release = 1);
-    // ctor taking pointer and an ownership flag
-    Policy_tie (
-        T *tp,
-        PortableServer::POA_ptr poa,
-        CORBA::Boolean release = 1
-      );
-    // ctor with T*, ownership flag and a POA
-    ~Policy_tie (void);
-    // dtor
-    
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release = 1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-    
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-    
-    void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-  private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-    
-    // copy and assignment are not allowed
-    Policy_tie (const Policy_tie &);
-    void operator= (const Policy_tie &);
-  };
-} // module CORBA
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:1096
-
-#if defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PolicyS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PolicyS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
deleted file mode 100644
index 42c4ad90eac..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::~Policy_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Policy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-  
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Policy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-  
-  return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->policy_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  return this->ptr_->copy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Policy_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
-  );
-}
-
diff --git a/TAO/tao/PortableServer/Policy_Creator_T.h b/TAO/tao/PortableServer/Policy_Creator_T.h
deleted file mode 100644
index 3846ef81c88..00000000000
--- a/TAO/tao/PortableServer/Policy_Creator_T.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Policy_Creator_T.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_POLICY_CREATOR_T_H
-#define TAO_PORTABLESERVER_POLICY_CREATOR_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB_Constants.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    template <class POLICYTYPE, class POLICYVALUE>
-    void create_policy (
-        POLICYTYPE *& policy,
-        POLICYVALUE &value,
-        const CORBA::Any& val
-        ACE_ENV_ARG_DECL)
-      {
-        if ((val >>= value) == 0)
-          ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE));
-
-        ACE_NEW_THROW_EX (policy,
-                          POLICYTYPE (value),
-                          CORBA::NO_MEMORY (TAO::VMCID,
-                                            CORBA::COMPLETED_NO));
-        ACE_CHECK;
-      }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
deleted file mode 100644
index bb2431e3b43..00000000000
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Policy_Strategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_POLICY_STRATEGY_H
-#define TAO_POLICY_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export Policy_Strategy
-      : public ACE_Service_Object
-    {
-    public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL) = 0;
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-      virtual ~Policy_Strategy (void) {};
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POLICY_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
deleted file mode 100644
index 22d7b1879a8..00000000000
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id$
-#include "PortableServer.h"
-#include "Object_Adapter.h"
-#include "Object_Adapter_Factory.h"
-
-#include "ThreadStrategyFactoryImpl.h"
-#include "LifespanStrategyFactoryImpl.h"
-#include "IdAssignmentStrategyFactoryImpl.h"
-#include "IdUniquenessStrategyFactoryImpl.h"
-#include "ImplicitActivationStrategyFactoryImpl.h"
-#include "RequestProcessingStrategyFactoryImpl.h"
-#include "ServantRetentionStrategyFactoryImpl.h"
-
-#include "ThreadStrategyORBControl.h"
-#include "ThreadStrategySingle.h"
-#include "ThreadStrategySingleFactoryImpl.h"
-
-#include "IdAssignmentStrategySystem.h"
-#include "IdAssignmentStrategyUser.h"
-
-#include "IdUniquenessStrategyMultiple.h"
-#include "IdUniquenessStrategyUnique.h"
-
-#include "ImplicitActivationStrategyExplicit.h"
-#include "ImplicitActivationStrategyImplicit.h"
-
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "RequestProcessingStrategyServantManager.h"
-
-#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "ServantRetentionStrategyRetainFactoryImpl.h"
-
-#include "RequestProcessingStrategyDefaultServantFI.h"
-#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "RequestProcessingStrategyServantActivatorFI.h"
-#include "RequestProcessingStrategyServantLocatorFI.h"
-
-#include "IdUniquenessStrategyUniqueFactoryImpl.h"
-
-#include "LifespanStrategyPersistentFactoryImpl.h"
-#include "LifespanStrategyTransientFactoryImpl.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer,
-           "$Id$")
-
-int
-TAO_POA_Initializer::init (void)
-{
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategySystem
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyUser
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyMultiple
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUnique
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyExplicit
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyImplicit
-    );
-
-  // Strategy factories
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategyFactoryImpl
-    );
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingleFactoryImpl
-    );
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyPersistentFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_LifespanStrategyTransientFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
-    );
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
-    );
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyFactoryImpl
-    );
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
-    );
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
-    );
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Strategy implementations
-
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategyORBControl
-    );
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  ACE_Service_Config::process_directive (
-      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingle
-    );
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  return
-    ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Object_Adapter_Factory
-      );
-}
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
deleted file mode 100644
index 30d687c5bc6..00000000000
--- a/TAO/tao/PortableServer/PortableServer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file PortableServer.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_H
-#define TAO_PORTABLESERVER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_PortableServer_Export TAO_POA_Initializer
-{
-public:
-  /// Used to force the initialization of the ORB code.
-  static int init (void);
-};
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_POA_Initializer = &TAO_POA_Initializer::init;
-
-#else
-
-static int
-TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_PORTABLESERVER_SAFE_INCLUDE
-#include "PortableServerC.h"
-#undef TAO_PORTABLESERVER_SAFE_INCLUDE
-#include "POAManagerC.h"
-#include "PortableServer_Functions.h"
-#include "PortableServer_WFunctions.h"
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_H */
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
deleted file mode 100644
index fd221867830..00000000000
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * @file PortableServer.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * PortableServerC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Sci -Gp -Gd -Ge 1 -Sc -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          PortableServer.pidl
- *
- * After the file is generated a patch from the diffs directory must
- * be applied.  The patch:
- *
- *   - Disables parts of the code under certain configurations.
- *
- *   - Eliminates cycles in the include dependencies.
- *
- *   - Adds non-idl components of PortableServer to the namespace.
- *     This includes (a) Servant (b) ServantBase (c) RefCountServantBase
- *     (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g)
- *     ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var
- *     (j) DynamicImplementation (k) LocalServantBase
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PortableServer.diff
- *
- * Note: The diffs were generated using:
- *
- *   rm diffs/PortableServer.diff
- *   for i in PortableServerC.{h,i,cpp}; do
- *     diff -wub orig/$i $i >> diffs/PortableServer.diff
- *   done
- */
-
-#ifndef _PORTABLE_SERVER_IDL_
-#define _PORTABLE_SERVER_IDL_
-
-///FUZZ: disable check_for_include/
-#include <Policy_Forward.pidl>
-#include <OctetSeq.pidl>
-#include <orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/IdAssignmentPolicy.pidl>
-#include <tao/PortableServer/IdUniquenessPolicy.pidl>
-#include <tao/PortableServer/ImplicitActivationPolicy.pidl>
-#include <tao/PortableServer/LifespanPolicy.pidl>
-#include <tao/PortableServer/RequestProcessingPolicy.pidl>
-#include <tao/PortableServer/ServantRetentionPolicy.pidl>
-#include <tao/PortableServer/ThreadPolicy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  typedef sequence<POA> POAList;
-
-  // Policy IDs
-  const CORBA::PolicyType THREAD_POLICY_ID                = 16;
-  const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
-  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
-  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID         = 19;
-  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID   = 20;
-  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
-  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
-
-  // Forward declaration
-  local interface POAManager;
-
-  // Forward declaration AdapterActivator interface.
-  local interface AdapterActivator;
-
-  // Forward declaration servantManager interface.
-  local interface ServantManager;
-
-  local interface POA
-  {
-#   pragma version POA 2.3
-
-    exception AdapterAlreadyExists {};
-    exception AdapterNonExistent {};
-    exception InvalidPolicy {unsigned short index;};
-    exception NoServant {};
-    exception ObjectAlreadyActive {};
-    exception ObjectNotActive {};
-    exception ServantAlreadyActive {};
-    exception ServantNotActive {};
-    exception WrongAdapter {};
-    exception WrongPolicy {};
-
-    // POA creation and destruction.
-
-    POA create_POA (in string adapter_name,
-                    in POAManager a_POAManager,
-                    in CORBA::PolicyList policies)
-      raises (AdapterAlreadyExists,
-              InvalidPolicy);
-
-    POA find_POA (in string adapter_name,
-                  in boolean activate_it)
-      raises (AdapterNonExistent);
-
-    void destroy (in boolean etherealize_objects,
-                  in boolean wait_for_completion);
-
-    // Factories for Policy objects.
-
-    ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
-
-    LifespanPolicy create_lifespan_policy (
-        in LifespanPolicyValue value
-      );
-
-    IdUniquenessPolicy  create_id_uniqueness_policy (
-        in IdUniquenessPolicyValue value
-      );
-
-    IdAssignmentPolicy  create_id_assignment_policy (
-        in IdAssignmentPolicyValue value
-      );
-
-    ImplicitActivationPolicy create_implicit_activation_policy (
-        in ImplicitActivationPolicyValue value
-      );
-
-    ServantRetentionPolicy create_servant_retention_policy (
-        in ServantRetentionPolicyValue value
-      );
-
-    RequestProcessingPolicy create_request_processing_policy (
-        in RequestProcessingPolicyValue value
-      );
-
-    // POA attributes
-    readonly attribute string       the_name;
-    readonly attribute POA          the_parent;
-    readonly attribute POAList      the_children;
-    readonly attribute POAManager   the_POAManager;
-    attribute AdapterActivator      the_activator;
-
-    // Servant Manager registration:
-
-    ServantManager get_servant_manager ()
-      raises (WrongPolicy);
-
-    void set_servant_manager (in ServantManager imgr)
-      raises (WrongPolicy);
-
-    // Operations for the USE_DEFAULT_SERVANT policy.
-
-    Servant get_servant ()
-      raises (NoServant,
-              WrongPolicy);
-
-    void set_servant (in Servant p_servant)
-      raises (WrongPolicy);
-
-    // Object activation and deactivation.
-
-    ObjectId  activate_object (in Servant p_servant)
-      raises (ServantAlreadyActive,
-              WrongPolicy);
-
-    void activate_object_with_id (in ObjectId id,
-                                  in Servant p_servant)
-      raises (ServantAlreadyActive,
-              ObjectAlreadyActive,
-              WrongPolicy);
-
-    void deactivate_object (in ObjectId oid)
-      raises (ObjectNotActive, WrongPolicy);
-
-    // Reference creation operations.
-
-    Object create_reference (in CORBA::RepositoryId intf)
-      raises (WrongPolicy);
-
-    Object create_reference_with_id (in ObjectId oid,
-                                     in CORBA::RepositoryId intf);
-
-    // Identity mapping operations:.
-    ObjectId servant_to_id (in Servant p_servant)
-      raises (ServantNotActive,
-              WrongPolicy);
-
-    Object servant_to_reference (in Servant p_servant)
-      raises (ServantNotActive, WrongPolicy);
-
-    Servant reference_to_servant (in Object reference)
-      raises (ObjectNotActive,
-              WrongAdapter,
-              WrongPolicy);
-
-    ObjectId reference_to_id (in Object reference)
-      raises (WrongAdapter,
-              WrongPolicy);
-
-    Servant id_to_servant (in ObjectId oid)
-      raises (ObjectNotActive, WrongPolicy);
-
-    Object id_to_reference (in ObjectId oid)
-      raises (ObjectNotActive,
-              WrongPolicy);
-
-    readonly attribute CORBA::OctetSeq id;
-  };
-};
-
-#endif // _PORTABLE_SERVER_IDL_
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
deleted file mode 100644
index c3f693bb8e3..00000000000
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ /dev/null
@@ -1,1212 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace PortableServer
-{
-  extern ::CORBA::TypeCode_ptr const _tc_POA;
-}
-
-
-#ifndef _TAO_TYPECODE_PortableServer_POAList_GUARD
-#define _TAO_TYPECODE_PortableServer_POAList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      PortableServer_POAList_0 (
-        CORBA::tk_sequence,
-        &PortableServer::_tc_POA,
-        0U);
-
-    ::CORBA::TypeCode_ptr const tc_PortableServer_POAList_0 =
-      &PortableServer_POAList_0;
-
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_PortableServer_POAList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAList (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableServer/POAList:1.0",
-    "POAList",
-    &TAO::TypeCode::tc_PortableServer_POAList_0);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POAList =
-    &_tao_tc_PortableServer_POAList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_AdapterAlreadyExists = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_AdapterAlreadyExists (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3",
-    "AdapterAlreadyExists",
-    _tao_fields_PortableServer_POA_AdapterAlreadyExists,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists =
-  &_tao_tc_PortableServer_POA_AdapterAlreadyExists;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_AdapterNonExistent = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_AdapterNonExistent (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3",
-    "AdapterNonExistent",
-    _tao_fields_PortableServer_POA_AdapterNonExistent,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent =
-  &_tao_tc_PortableServer_POA_AdapterNonExistent;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableServer_POA_InvalidPolicy[] =
-  {
-    { "index", &CORBA::_tc_ushort }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_InvalidPolicy (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
-    "InvalidPolicy",
-    _tao_fields_PortableServer_POA_InvalidPolicy,
-    1);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy =
-  &_tao_tc_PortableServer_POA_InvalidPolicy;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_NoServant = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_NoServant (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-    "NoServant",
-    _tao_fields_PortableServer_POA_NoServant,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
-  &_tao_tc_PortableServer_POA_NoServant;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_ObjectAlreadyActive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_ObjectAlreadyActive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3",
-    "ObjectAlreadyActive",
-    _tao_fields_PortableServer_POA_ObjectAlreadyActive,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive =
-  &_tao_tc_PortableServer_POA_ObjectAlreadyActive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_ObjectNotActive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_ObjectNotActive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3",
-    "ObjectNotActive",
-    _tao_fields_PortableServer_POA_ObjectNotActive,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive =
-  &_tao_tc_PortableServer_POA_ObjectNotActive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_ServantAlreadyActive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_ServantAlreadyActive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3",
-    "ServantAlreadyActive",
-    _tao_fields_PortableServer_POA_ServantAlreadyActive,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive =
-  &_tao_tc_PortableServer_POA_ServantAlreadyActive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_ServantNotActive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_ServantNotActive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3",
-    "ServantNotActive",
-    _tao_fields_PortableServer_POA_ServantNotActive,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive =
-  &_tao_tc_PortableServer_POA_ServantNotActive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_WrongAdapter = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_WrongAdapter (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3",
-    "WrongAdapter",
-    _tao_fields_PortableServer_POA_WrongAdapter,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter =
-  &_tao_tc_PortableServer_POA_WrongAdapter;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_WrongPolicy = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA_WrongPolicy (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3",
-    "WrongPolicy",
-    _tao_fields_PortableServer_POA_WrongPolicy,
-    0);
-
-::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy =
-  &_tao_tc_PortableServer_POA_WrongPolicy;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POA (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/POA:2.3",
-    "POA");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POA =
-    &_tao_tc_PortableServer_POA;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POAList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert_copy (
-      _tao_any,
-      PortableServer::POAList::_tao_any_destructor,
-      TAO::TypeCode::tc_PortableServer_POAList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert (
-      _tao_any,
-      PortableServer::POAList::_tao_any_destructor,
-      TAO::TypeCode::tc_PortableServer_POAList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POAList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POAList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POAList>::extract (
-        _tao_any,
-        PortableServer::POAList::_tao_any_destructor,
-        TAO::TypeCode::tc_PortableServer_POAList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POA>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA_ptr _tao_elem
-  )
-{
-  PortableServer::POA_ptr _tao_objptr =
-    PortableServer::POA::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::POA>::insert (
-      _tao_any,
-      PortableServer::POA::_tao_any_destructor,
-      PortableServer::_tc_POA,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::POA>::extract (
-        _tao_any,
-        PortableServer::POA::_tao_any_destructor,
-        PortableServer::_tc_POA,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::AdapterAlreadyExists &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::insert_copy (
-      _tao_any,
-      PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor,
-      PortableServer::POA::_tc_AdapterAlreadyExists,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::AdapterAlreadyExists *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::insert (
-      _tao_any,
-      PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor,
-      PortableServer::POA::_tc_AdapterAlreadyExists,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::AdapterAlreadyExists *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::AdapterAlreadyExists *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::AdapterAlreadyExists *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::extract (
-        _tao_any,
-        PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor,
-        PortableServer::POA::_tc_AdapterAlreadyExists,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::AdapterNonExistent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::insert_copy (
-      _tao_any,
-      PortableServer::POA::AdapterNonExistent::_tao_any_destructor,
-      PortableServer::POA::_tc_AdapterNonExistent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::AdapterNonExistent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::insert (
-      _tao_any,
-      PortableServer::POA::AdapterNonExistent::_tao_any_destructor,
-      PortableServer::POA::_tc_AdapterNonExistent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::AdapterNonExistent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::AdapterNonExistent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::AdapterNonExistent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::extract (
-        _tao_any,
-        PortableServer::POA::AdapterNonExistent::_tao_any_destructor,
-        PortableServer::POA::_tc_AdapterNonExistent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::InvalidPolicy &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::insert_copy (
-      _tao_any,
-      PortableServer::POA::InvalidPolicy::_tao_any_destructor,
-      PortableServer::POA::_tc_InvalidPolicy,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::InvalidPolicy *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::insert (
-      _tao_any,
-      PortableServer::POA::InvalidPolicy::_tao_any_destructor,
-      PortableServer::POA::_tc_InvalidPolicy,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::InvalidPolicy *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::InvalidPolicy *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::InvalidPolicy *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::extract (
-        _tao_any,
-        PortableServer::POA::InvalidPolicy::_tao_any_destructor,
-        PortableServer::POA::_tc_InvalidPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::NoServant>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::NoServant &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::insert_copy (
-      _tao_any,
-      PortableServer::POA::NoServant::_tao_any_destructor,
-      PortableServer::POA::_tc_NoServant,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::NoServant *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::insert (
-      _tao_any,
-      PortableServer::POA::NoServant::_tao_any_destructor,
-      PortableServer::POA::_tc_NoServant,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::NoServant *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::NoServant *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::NoServant *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::extract (
-        _tao_any,
-        PortableServer::POA::NoServant::_tao_any_destructor,
-        PortableServer::POA::_tc_NoServant,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::ObjectAlreadyActive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::insert_copy (
-      _tao_any,
-      PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ObjectAlreadyActive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::ObjectAlreadyActive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::insert (
-      _tao_any,
-      PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ObjectAlreadyActive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::ObjectAlreadyActive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::ObjectAlreadyActive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::ObjectAlreadyActive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::extract (
-        _tao_any,
-        PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor,
-        PortableServer::POA::_tc_ObjectAlreadyActive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::ObjectNotActive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::insert_copy (
-      _tao_any,
-      PortableServer::POA::ObjectNotActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ObjectNotActive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::ObjectNotActive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::insert (
-      _tao_any,
-      PortableServer::POA::ObjectNotActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ObjectNotActive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::ObjectNotActive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::ObjectNotActive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::ObjectNotActive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::extract (
-        _tao_any,
-        PortableServer::POA::ObjectNotActive::_tao_any_destructor,
-        PortableServer::POA::_tc_ObjectNotActive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::ServantAlreadyActive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::insert_copy (
-      _tao_any,
-      PortableServer::POA::ServantAlreadyActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ServantAlreadyActive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::ServantAlreadyActive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::insert (
-      _tao_any,
-      PortableServer::POA::ServantAlreadyActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ServantAlreadyActive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::ServantAlreadyActive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::ServantAlreadyActive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::ServantAlreadyActive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::extract (
-        _tao_any,
-        PortableServer::POA::ServantAlreadyActive::_tao_any_destructor,
-        PortableServer::POA::_tc_ServantAlreadyActive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::ServantNotActive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::insert_copy (
-      _tao_any,
-      PortableServer::POA::ServantNotActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ServantNotActive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::ServantNotActive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::insert (
-      _tao_any,
-      PortableServer::POA::ServantNotActive::_tao_any_destructor,
-      PortableServer::POA::_tc_ServantNotActive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::ServantNotActive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::ServantNotActive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::ServantNotActive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::extract (
-        _tao_any,
-        PortableServer::POA::ServantNotActive::_tao_any_destructor,
-        PortableServer::POA::_tc_ServantNotActive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::WrongAdapter &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::insert_copy (
-      _tao_any,
-      PortableServer::POA::WrongAdapter::_tao_any_destructor,
-      PortableServer::POA::_tc_WrongAdapter,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::WrongAdapter *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::insert (
-      _tao_any,
-      PortableServer::POA::WrongAdapter::_tao_any_destructor,
-      PortableServer::POA::_tc_WrongAdapter,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::WrongAdapter *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::WrongAdapter *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::WrongAdapter *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::extract (
-        _tao_any,
-        PortableServer::POA::WrongAdapter::_tao_any_destructor,
-        PortableServer::POA::_tc_WrongAdapter,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POA::WrongPolicy &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::insert_copy (
-      _tao_any,
-      PortableServer::POA::WrongPolicy::_tao_any_destructor,
-      PortableServer::POA::_tc_WrongPolicy,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POA::WrongPolicy *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::insert (
-      _tao_any,
-      PortableServer::POA::WrongPolicy::_tao_any_destructor,
-      PortableServer::POA::_tc_WrongPolicy,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POA::WrongPolicy *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POA::WrongPolicy *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POA::WrongPolicy *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::extract (
-        _tao_any,
-        PortableServer::POA::WrongPolicy::_tao_any_destructor,
-        PortableServer::POA::_tc_WrongPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
deleted file mode 100644
index 3dadf552aba..00000000000
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ /dev/null
@@ -1,1233 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "PortableServer.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "tao/Object_Argument_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
-  
-  template<>
-  class  Arg_Traits<PortableServer::AdapterActivator>
-    : public
-        Object_Arg_Traits_T<
-            PortableServer::AdapterActivator_ptr,
-            PortableServer::AdapterActivator_var,
-            PortableServer::AdapterActivator_out,
-            TAO::Objref_Traits<PortableServer::AdapterActivator>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_PORTABLESERVER_POALIST_CS_)
-#define _PORTABLESERVER_POALIST_CS_
-
-PortableServer::POAList::POAList (void)
-{}
-
-PortableServer::POAList::POAList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Object_Sequence<
-        PortableServer::POA,
-        PortableServer::POA_var
-      >
-    (max)
-{}
-
-PortableServer::POAList::POAList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    PortableServer::POA_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Object_Sequence<
-        PortableServer::POA,
-        PortableServer::POA_var
-      >
-    (max, length, buffer, release)
-{}
-
-PortableServer::POAList::POAList (
-    const POAList &seq
-  )
-  : TAO_Unbounded_Object_Sequence<
-        PortableServer::POA,
-        PortableServer::POA_var
-      >
-    (seq)
-{}
-
-PortableServer::POAList::~POAList (void)
-{}
-
-void PortableServer::POAList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  POAList * _tao_tmp_pointer =
-    static_cast<POAList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::POA.
-
-PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::duplicate (
-    PortableServer::POA_ptr p
-  )
-{
-  return PortableServer::POA::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::POA>::release (
-    PortableServer::POA_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::nil (void)
-{
-  return PortableServer::POA::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POA>::marshal (
-    PortableServer::POA_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3",
-        "AdapterAlreadyExists"
-      )
-{
-}
-
-PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
-{
-}
-
-PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::AdapterAlreadyExists&
-PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterAlreadyExists *_tao_tmp_pointer =
-    static_cast<AdapterAlreadyExists *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::AdapterAlreadyExists *
-PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<AdapterAlreadyExists *> (_tao_excp);
-}
-
-const PortableServer::POA::AdapterAlreadyExists *
-PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const AdapterAlreadyExists *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterAlreadyExists, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::AdapterAlreadyExists (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::AdapterAlreadyExists::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::AdapterAlreadyExists::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_AdapterAlreadyExists;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3",
-        "AdapterNonExistent"
-      )
-{
-}
-
-PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
-{
-}
-
-PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::AdapterNonExistent&
-PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterNonExistent *_tao_tmp_pointer =
-    static_cast<AdapterNonExistent *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::AdapterNonExistent *
-PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<AdapterNonExistent *> (_tao_excp);
-}
-
-const PortableServer::POA::AdapterNonExistent *
-PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const AdapterNonExistent *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterNonExistent, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::AdapterNonExistent (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::AdapterNonExistent::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::AdapterNonExistent::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::AdapterNonExistent::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_AdapterNonExistent;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
-        "InvalidPolicy"
-      )
-{
-}
-
-PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
-{
-}
-
-PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->index = _tao_excp.index;
-}
-
-PortableServer::POA::InvalidPolicy&
-PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->index = _tao_excp.index;
-  return *this;
-}
-
-void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidPolicy *_tao_tmp_pointer =
-    static_cast<InvalidPolicy *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::InvalidPolicy *
-PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidPolicy *> (_tao_excp);
-}
-
-const PortableServer::POA::InvalidPolicy *
-PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidPolicy *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::InvalidPolicy, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::InvalidPolicy (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::InvalidPolicy::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::InvalidPolicy::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::InvalidPolicy::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-PortableServer::POA::InvalidPolicy::InvalidPolicy (
-    CORBA::UShort _tao_index
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
-        "InvalidPolicy"
-      )
-{
-  this->index = _tao_index;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_InvalidPolicy;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::POA::NoServant::NoServant (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-        "NoServant"
-      )
-{
-}
-
-PortableServer::POA::NoServant::~NoServant (void)
-{
-}
-
-PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::NoServant&
-PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NoServant *_tao_tmp_pointer =
-    static_cast<NoServant *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::NoServant *
-PortableServer::POA::NoServant::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<NoServant *> (_tao_excp);
-}
-
-const PortableServer::POA::NoServant *
-PortableServer::POA::NoServant::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const NoServant *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::NoServant, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::NoServant::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::NoServant (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::NoServant::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::NoServant::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::NoServant::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::NoServant::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_NoServant;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3",
-        "ObjectAlreadyActive"
-      )
-{
-}
-
-PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
-{
-}
-
-PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::ObjectAlreadyActive&
-PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectAlreadyActive *_tao_tmp_pointer =
-    static_cast<ObjectAlreadyActive *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::ObjectAlreadyActive *
-PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ObjectAlreadyActive *> (_tao_excp);
-}
-
-const PortableServer::POA::ObjectAlreadyActive *
-PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ObjectAlreadyActive *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectAlreadyActive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::ObjectAlreadyActive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::ObjectAlreadyActive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::ObjectAlreadyActive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_ObjectAlreadyActive;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3",
-        "ObjectNotActive"
-      )
-{
-}
-
-PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
-{
-}
-
-PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::ObjectNotActive&
-PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectNotActive *_tao_tmp_pointer =
-    static_cast<ObjectNotActive *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::ObjectNotActive *
-PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ObjectNotActive *> (_tao_excp);
-}
-
-const PortableServer::POA::ObjectNotActive *
-PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ObjectNotActive *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectNotActive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::ObjectNotActive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::ObjectNotActive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::ObjectNotActive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::ObjectNotActive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_ObjectNotActive;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3",
-        "ServantAlreadyActive"
-      )
-{
-}
-
-PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
-{
-}
-
-PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::ServantAlreadyActive&
-PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantAlreadyActive *_tao_tmp_pointer =
-    static_cast<ServantAlreadyActive *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::ServantAlreadyActive *
-PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ServantAlreadyActive *> (_tao_excp);
-}
-
-const PortableServer::POA::ServantAlreadyActive *
-PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ServantAlreadyActive *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantAlreadyActive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::ServantAlreadyActive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::ServantAlreadyActive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::ServantAlreadyActive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::ServantAlreadyActive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_ServantAlreadyActive;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::ServantNotActive::ServantNotActive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3",
-        "ServantNotActive"
-      )
-{
-}
-
-PortableServer::POA::ServantNotActive::~ServantNotActive (void)
-{
-}
-
-PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::ServantNotActive&
-PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantNotActive *_tao_tmp_pointer =
-    static_cast<ServantNotActive *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::ServantNotActive *
-PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ServantNotActive *> (_tao_excp);
-}
-
-const PortableServer::POA::ServantNotActive *
-PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ServantNotActive *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantNotActive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::ServantNotActive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::ServantNotActive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::ServantNotActive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::ServantNotActive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::ServantNotActive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_ServantNotActive;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::WrongAdapter::WrongAdapter (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3",
-        "WrongAdapter"
-      )
-{
-}
-
-PortableServer::POA::WrongAdapter::~WrongAdapter (void)
-{
-}
-
-PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::WrongAdapter&
-PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer)
-{
-  WrongAdapter *_tao_tmp_pointer =
-    static_cast<WrongAdapter *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::WrongAdapter *
-PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<WrongAdapter *> (_tao_excp);
-}
-
-const PortableServer::POA::WrongAdapter *
-PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const WrongAdapter *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongAdapter, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::WrongAdapter::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::WrongAdapter (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::WrongAdapter::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::WrongAdapter::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::WrongAdapter::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_WrongAdapter;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POA::WrongPolicy::WrongPolicy (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3",
-        "WrongPolicy"
-      )
-{
-}
-
-PortableServer::POA::WrongPolicy::~WrongPolicy (void)
-{
-}
-
-PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POA::WrongPolicy&
-PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  WrongPolicy *_tao_tmp_pointer =
-    static_cast<WrongPolicy *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POA::WrongPolicy *
-PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<WrongPolicy *> (_tao_excp);
-}
-
-const PortableServer::POA::WrongPolicy *
-PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const WrongPolicy *> (_tao_excp);
-}
-
-CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongPolicy, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POA::WrongPolicy::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POA::WrongPolicy (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POA::WrongPolicy::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POA::WrongPolicy::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POA::WrongPolicy::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_tao_type (void) const
-{
-  return ::PortableServer::POA::_tc_WrongPolicy;
-}
-
-PortableServer::POA::POA (void)
-{}
-
-PortableServer::POA::~POA (void)
-{}
-
-void 
-PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POA *_tao_tmp_pointer =
-    static_cast<POA *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::POA_ptr
-PortableServer::POA::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POA::_nil ();
-    }
-  
-  POA_ptr proxy =
-    dynamic_cast<POA_ptr> (_tao_objref);
-  
-  return POA::_duplicate (proxy);
-}
-
-PortableServer::POA_ptr
-PortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POA::_nil ();
-    }
-  
-  POA_ptr proxy =
-    dynamic_cast<POA_ptr> (_tao_objref);
-  
-  return POA::_duplicate (proxy);
-}
-
-PortableServer::POA_ptr
-PortableServer::POA::_duplicate (POA_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::POA::_tao_release (POA_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::POA::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/POA:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POA:2.3";
-}
-
-CORBA::Boolean
-PortableServer::POA::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
deleted file mode 100644
index 8e467e7b38b..00000000000
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ /dev/null
@@ -1,1397 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_
-#define _TAO_IDL_ORIG_PORTABLESERVERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#ifndef TAO_PORTABLESERVER_SAFE_INCLUDE
-#error "You should not include PortableServerC.h directly, use PortableServer.h"
-#endif /* !TAO_PORTABLESERVER_SAFE_INCLUDE */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/Policy_ForwardC.h"
-#include "tao/OctetSeqC.h"
-#include "tao/orb_typesC.h"
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
-#include "tao/PortableServer/ImplicitActivationPolicyC.h"
-#include "tao/PortableServer/LifespanPolicyC.h"
-#include "tao/PortableServer/RequestProcessingPolicyC.h"
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
-#include "tao/PortableServer/ThreadPolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_PORTABLESERVER_POALIST_CH_)
-#define _PORTABLESERVER_POALIST_CH_
-  
-  class POAList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        POAList,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
-      >
-    POAList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        POAList,
-        POAList_var,
-        TAO_Object_Manager<
-            POA,
-            POA_var
-          >
-      >
-    POAList_out;
-  
-  class TAO_PortableServer_Export POAList
-    : public
-        TAO_Unbounded_Object_Sequence<
-            POA,
-            POA_var
-          >
-  {
-  public:
-    POAList (void);
-    POAList (CORBA::ULong max);
-    POAList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        POA_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    POAList (const POAList &);
-    ~POAList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef POAList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType THREAD_POLICY_ID = 16U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
-  
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POAManager
-      >
-    POAManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POAManager
-      >
-    POAManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
-  
-  class AdapterActivator;
-  typedef AdapterActivator *AdapterActivator_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        AdapterActivator
-      >
-    AdapterActivator_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        AdapterActivator
-      >
-    AdapterActivator_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
-  
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServantManager
-      >
-    ServantManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServantManager
-      >
-    ServantManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
-#define _PORTABLESERVER_POA__VAR_OUT_CH_
-  
-  class POA;
-  typedef POA *POA_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POA
-      >
-    POA_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POA
-      >
-    POA_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_POA_CH_)
-#define _PORTABLESERVER_POA_CH_
-  
-  class TAO_PortableServer_Export POA
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef POA_ptr _ptr_type;
-    typedef POA_var _var_type;
-    
-    // The static operations.
-    static POA_ptr _duplicate (POA_ptr obj);
-    
-    static void _tao_release (POA_ptr obj);
-    
-    static POA_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POA_ptr _nil (void)
-    {
-      return static_cast<POA_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-    
-    class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
-    {
-    public:
-      
-      AdapterAlreadyExists (void);
-      AdapterAlreadyExists (const AdapterAlreadyExists &);
-      ~AdapterAlreadyExists (void);
-
-      AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static AdapterAlreadyExists *_downcast (CORBA::Exception *);
-      static const AdapterAlreadyExists *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_AdapterAlreadyExists;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-    
-    class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
-    {
-    public:
-      
-      AdapterNonExistent (void);
-      AdapterNonExistent (const AdapterNonExistent &);
-      ~AdapterNonExistent (void);
-
-      AdapterNonExistent &operator= (const AdapterNonExistent &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static AdapterNonExistent *_downcast (CORBA::Exception *);
-      static const AdapterNonExistent *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_AdapterNonExistent;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-    
-    class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
-    {
-    public:
-      
-      CORBA::UShort index;
-      InvalidPolicy (void);
-      InvalidPolicy (const InvalidPolicy &);
-      ~InvalidPolicy (void);
-
-      InvalidPolicy &operator= (const InvalidPolicy &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static InvalidPolicy *_downcast (CORBA::Exception *);
-      static const InvalidPolicy *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ctor.cpp:66
-      
-      InvalidPolicy (
-          CORBA::UShort _tao_index
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_InvalidPolicy;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT_CH_
-    
-    class TAO_PortableServer_Export NoServant : public CORBA::UserException
-    {
-    public:
-      
-      NoServant (void);
-      NoServant (const NoServant &);
-      ~NoServant (void);
-
-      NoServant &operator= (const NoServant &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static NoServant *_downcast (CORBA::Exception *);
-      static const NoServant *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_NoServant;
-
-#endif /* end #if !defined */
-    
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-    
-    class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
-    {
-    public:
-      
-      ObjectAlreadyActive (void);
-      ObjectAlreadyActive (const ObjectAlreadyActive &);
-      ~ObjectAlreadyActive (void);
-
-      ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static ObjectAlreadyActive *_downcast (CORBA::Exception *);
-      static const ObjectAlreadyActive *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ObjectAlreadyActive;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-    
-    class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
-    {
-    public:
-      
-      ObjectNotActive (void);
-      ObjectNotActive (const ObjectNotActive &);
-      ~ObjectNotActive (void);
-
-      ObjectNotActive &operator= (const ObjectNotActive &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static ObjectNotActive *_downcast (CORBA::Exception *);
-      static const ObjectNotActive *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ObjectNotActive;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-    
-    class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
-    {
-    public:
-      
-      ServantAlreadyActive (void);
-      ServantAlreadyActive (const ServantAlreadyActive &);
-      ~ServantAlreadyActive (void);
-
-      ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static ServantAlreadyActive *_downcast (CORBA::Exception *);
-      static const ServantAlreadyActive *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ServantAlreadyActive;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-    
-    class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
-    {
-    public:
-      
-      ServantNotActive (void);
-      ServantNotActive (const ServantNotActive &);
-      ~ServantNotActive (void);
-
-      ServantNotActive &operator= (const ServantNotActive &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static ServantNotActive *_downcast (CORBA::Exception *);
-      static const ServantNotActive *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ServantNotActive;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-    
-    class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
-    {
-    public:
-      
-      WrongAdapter (void);
-      WrongAdapter (const WrongAdapter &);
-      ~WrongAdapter (void);
-
-      WrongAdapter &operator= (const WrongAdapter &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static WrongAdapter *_downcast (CORBA::Exception *);
-      static const WrongAdapter *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_WrongAdapter;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-    
-    class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
-    {
-    public:
-      
-      WrongPolicy (void);
-      WrongPolicy (const WrongPolicy &);
-      ~WrongPolicy (void);
-
-      WrongPolicy &operator= (const WrongPolicy &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static WrongPolicy *_downcast (CORBA::Exception *);
-      static const WrongPolicy *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_WrongPolicy;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POA_ptr create_POA (
-        const char * adapter_name,
-        ::PortableServer::POAManager_ptr a_POAManager,
-        const ::CORBA::PolicyList & policies
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::AdapterAlreadyExists,
-        ::PortableServer::POA::InvalidPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POA_ptr find_POA (
-        const char * adapter_name,
-        ::CORBA::Boolean activate_it
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::AdapterNonExistent
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void destroy (
-        ::CORBA::Boolean etherealize_objects,
-        ::CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-        ::PortableServer::ThreadPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-        ::PortableServer::LifespanPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-        ::PortableServer::IdUniquenessPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-        ::PortableServer::IdAssignmentPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-        ::PortableServer::ImplicitActivationPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-        ::PortableServer::ServantRetentionPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-        ::PortableServer::RequestProcessingPolicyValue value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * the_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POA_ptr the_parent (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POAList * the_children (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POAManager_ptr the_POAManager (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    virtual ::PortableServer::AdapterActivator_ptr the_activator (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void the_activator (
-        ::PortableServer::AdapterActivator_ptr the_activator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-    virtual ::PortableServer::ServantManager_ptr get_servant_manager (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_servant_manager (
-        ::PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    virtual ::PortableServer::Servant get_servant (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::NoServant,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_servant (
-        ::PortableServer::Servant p_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::ObjectId * activate_object (
-        ::PortableServer::Servant p_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantAlreadyActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void activate_object_with_id (
-        const ::PortableServer::ObjectId & id,
-        ::PortableServer::Servant p_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantAlreadyActive,
-        ::PortableServer::POA::ObjectAlreadyActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void deactivate_object (
-        const ::PortableServer::ObjectId & oid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ObjectNotActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr create_reference (
-        const char * intf
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr create_reference_with_id (
-        const ::PortableServer::ObjectId & oid,
-        const char * intf
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::ObjectId * servant_to_id (
-        ::PortableServer::Servant p_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantNotActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr servant_to_reference (
-        ::PortableServer::Servant p_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantNotActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::Servant reference_to_servant (
-        ::CORBA::Object_ptr reference
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ObjectNotActive,
-        ::PortableServer::POA::WrongAdapter,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::ObjectId * reference_to_id (
-        ::CORBA::Object_ptr reference
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongAdapter,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::Servant id_to_servant (
-        const ::PortableServer::ObjectId & oid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ObjectNotActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr id_to_reference (
-        const ::PortableServer::ObjectId & oid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ObjectNotActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OctetSeq * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    POA (void);
-    
-    virtual ~POA (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POA (const POA &);
-    
-    void operator= (const POA &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_POA__TRAITS_CH_)
-#define _PORTABLESERVER_POA__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
-  {
-    static ::PortableServer::POA_ptr duplicate (
-        ::PortableServer::POA_ptr
-      );
-    static void release (
-        ::PortableServer::POA_ptr
-      );
-    static ::PortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::POA_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterNonExistent *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::InvalidPolicy *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectNotActive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantAlreadyActive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantNotActive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongAdapter *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h
deleted file mode 100644
index c52e7d0ecc5..00000000000
--- a/TAO/tao/PortableServer/PortableServerS.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*  @file PortableServerS.h
- *
- * $Id$
- *
- *  @author Matt Murphy <murphym@cs.uri.edu>
- *
- *  This file is here and is empty because code generated from pidl files with
- *  local interfaces incorrectly includes this file.  It is not needed but
- *  will caouse compile errors with local interface generated code.
- *
- */
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
deleted file mode 100644
index 23fb82cb0fd..00000000000
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "PortableServer_Functions.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer_Functions,
-           "$Id$")
-
-#include "ace/OS_NS_string.h"
-
-namespace PortableServer
-{
-  PortableServer::ObjectId *
-  string_to_ObjectId (const char *string)
-  {
-    // Size of string
-    //
-    // We DO NOT include the zero terminator, as this is simply an
-    // artifact of the way strings are stored in C.
-    //
-    CORBA::ULong buffer_size = static_cast <CORBA::ULong>
-                                           (ACE_OS::strlen (string));
-
-    // Create the buffer for the Id
-    CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-    // Copy the contents
-    ACE_OS::memcpy (buffer, string, buffer_size);
-
-    // Create and return a new ID
-    PortableServer::ObjectId *id = 0;
-    ACE_NEW_RETURN (id,
-                    PortableServer::ObjectId (buffer_size,
-                                              buffer_size,
-                                              buffer,
-                                              1),
-                    0);
-
-    return id;
-  }
-
-  char *
-  ObjectId_to_string (const PortableServer::ObjectId &id)
-  {
-    // Create space
-    char * string = CORBA::string_alloc (id.length ());
-
-    // Copy the data
-    ACE_OS::memcpy (string, id.get_buffer (), id.length ());
-
-    // Null terminate the string
-    string[id.length ()] = '\0';
-
-    // Return string
-    return string;
-  }
-}
-
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h
deleted file mode 100644
index e5de24e99f7..00000000000
--- a/TAO/tao/PortableServer/PortableServer_Functions.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    PortableServer_Functions.h
- *
- *  $Id$
- *
- *  PortableServer helper functions
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_FUNCTIONS_H
-#define TAO_PORTABLESERVER_FUNCTIONS_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "ace/OS_NS_wchar.h"
-
-namespace PortableServer
-{
-  /// Utility functions for the other
-  TAO_NAMESPACE_STORAGE_CLASS char* ObjectId_to_string (
-    const PortableServer::ObjectId &id);
-
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (
-    const char *id);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_FUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp b/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp
deleted file mode 100644
index d116a64af7a..00000000000
--- a/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-
-#include "PortableServer_ORBInitializer.h"
-#include "PortableServer_PolicyFactory.h"
-#include "PortableServer.h"
-#include "POA_Current.h"
-#include "tao/ORBInitInfo.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer_ORBInitializer,
-           "$Id$")
-
-void
-TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_poa_current (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_PortableServer_ORBInitializer::register_poa_current (PortableInterceptor::ORBInitInfo_ptr info
-                                                         ACE_ENV_ARG_DECL)
-{
-  // Narrow to a TAO_ORBInitInfo object to get access to the
-  // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (tao_info.in ()))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) PortableServer_ORBInitializer::post_init:\n"
-                    "(%P|%t)    Unable to narrow "
-                    "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
-                    "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Create Current.
-  CORBA::Object_var current =
-    new TAO::Portable_Server::POA_Current;
-
-  // Setup the POA_Current object in the ORB Core.
-  tao_info->orb_core ()->poa_current (current.in ());
-}
-
-void
-TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                                              ACE_ENV_ARG_DECL)
-{
-  // Register the PortableServer policy factories.
-  PortableInterceptor::PolicyFactory_ptr tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PortableServer_PolicyFactory,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableInterceptor::PolicyFactory_var policy_factory = tmp;
-
-  // Bind the same policy factory to all PortableServer related policy
-  // types since a single policy factory is used to create each of the
-  // different types of PortableServer policies.
-  CORBA::PolicyType type[] = {
-#if (TAO_HAS_MINIMUM_POA == 0)
-    PortableServer::THREAD_POLICY_ID,
-    PortableServer::IMPLICIT_ACTIVATION_POLICY_ID,
-    PortableServer::SERVANT_RETENTION_POLICY_ID,
-    PortableServer::REQUEST_PROCESSING_POLICY_ID,
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    PortableServer::LIFESPAN_POLICY_ID,
-    PortableServer::ID_UNIQUENESS_POLICY_ID,
-    PortableServer::ID_ASSIGNMENT_POLICY_ID
-  };
-
-  const CORBA::PolicyType *end =
-    type + sizeof (type) / sizeof (type[0]);
-
-  for (CORBA::PolicyType *i = type;
-       i != end;
-       ++i)
-    {
-      ACE_TRY
-        {
-          info->register_policy_factory (*i,
-                                         policy_factory.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-        {
-          if (ex.minor () == (CORBA::OMGVMCID | 16))
-            {
-              // The factory is already there, it happens because the
-              // magic initializer in PortableServer.cpp registers
-              // with the ORB multiple times.  This is an indication
-              // that we should do no more work in this
-              // ORBInitializer.
-              return;
-            }
-          ACE_RE_THROW;
-        }
-      ACE_CATCHANY
-        {
-          // Rethrow any other exceptions...
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
diff --git a/TAO/tao/PortableServer/PortableServer_ORBInitializer.h b/TAO/tao/PortableServer/PortableServer_ORBInitializer.h
deleted file mode 100644
index faa502a2468..00000000000
--- a/TAO/tao/PortableServer/PortableServer_ORBInitializer.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file PortableServer_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali <irfan@oomworks.com>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_ORB_INITIALIZER_H
-#define TAO_PORTABLESERVER_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORBInitializerC.h"
-#include "tao/LocalObject.h"
-
-/// Forward Declarations
-class TAO_PortableServer_PolicyFactory;
-
-/// PortableServer ORB initializer.
-class TAO_PortableServer_Export TAO_PortableServer_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /**
-   * @name PortableInterceptor::ORBInitializer methods
-   *
-   * The following methods are required by the
-   * PortableInterceptor::ORBInitializer interface.
-   */
-  //@{
-
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  //@}
-
-private:
-
-  /// Register PortableServer policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
-
-  /// Register POA Current.
-  void register_poa_current (PortableInterceptor::ORBInitInfo_ptr info
-                             ACE_ENV_ARG_DECL);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp b/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp
deleted file mode 100644
index b57602fbc30..00000000000
--- a/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-
-#include "PortableServer_PolicyFactory.h"
-
-#include "ThreadPolicy.h"
-#include "LifespanPolicy.h"
-#include "IdAssignmentPolicy.h"
-#include "IdUniquenessPolicy.h"
-#include "ImplicitActivationPolicy.h"
-#include "RequestProcessingPolicy.h"
-#include "ServantRetentionPolicy.h"
-#include "PortableServer.h"
-
-#include "Policy_Creator_T.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer_PolicyFactory,
-           "$Id$")
-
-CORBA::Policy_ptr
-TAO_PortableServer_PolicyFactory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-
-  if (type == ::PortableServer::THREAD_POLICY_ID)
-    {
-      TAO::Portable_Server::ThreadPolicy *thread_policy = 0;
-      PortableServer::ThreadPolicyValue thr_value;
-
-      TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return thread_policy;
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-  if (type == PortableServer::LIFESPAN_POLICY_ID)
-    {
-      TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0;
-      PortableServer::LifespanPolicyValue lifespan_value;
-
-      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return lifespan_policy;
-    }
-
-  if (type == PortableServer::ID_UNIQUENESS_POLICY_ID)
-    {
-      TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0;
-      PortableServer::IdUniquenessPolicyValue id_uniqueness_value;
-
-      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return id_uniqueness_policy;
-    }
-
-  if (type == PortableServer::ID_ASSIGNMENT_POLICY_ID)
-    {
-      TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0;
-      PortableServer::IdAssignmentPolicyValue id_assignment_value;
-
-      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return id_assignment_policy;
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  if (type == PortableServer::IMPLICIT_ACTIVATION_POLICY_ID)
-    {
-      TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0;
-      PortableServer::ImplicitActivationPolicyValue implicit_activation_value;
-
-      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return implicit_activatation_policy;
-    }
-
-  if (type == PortableServer::SERVANT_RETENTION_POLICY_ID)
-    {
-      TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0;
-      PortableServer::ServantRetentionPolicyValue servant_retention_value;
-
-      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return servant_retention_policy;
-    }
-
-  if (type == PortableServer::REQUEST_PROCESSING_POLICY_ID)
-    {
-      TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0;
-      PortableServer::RequestProcessingPolicyValue request_processing_value;
-
-      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return request_processing_policy;
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
diff --git a/TAO/tao/PortableServer/PortableServer_PolicyFactory.h b/TAO/tao/PortableServer/PortableServer_PolicyFactory.h
deleted file mode 100644
index c4b4da1f45d..00000000000
--- a/TAO/tao/PortableServer/PortableServer_PolicyFactory.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file PortableServer_PolicyFactory.h
- *
- * $Id$
- *
- * @author Irfan Pyarali <irfan@oomworks.com>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_POLICY_FACTORY_H
-#define TAO_PORTABLESERVER_POLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PolicyFactoryC.h"
-#include "tao/LocalObject.h"
-
-/// Policy factory for all PortableServer related policies.
-class TAO_PortableServer_Export TAO_PortableServer_PolicyFactory
-  : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_POLICY_FACTORY_H */
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
deleted file mode 100644
index 53a7cdbd4a0..00000000000
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "PortableServer_WFunctions.h"
-
-ACE_RCSID (PortableServer,
-           PortableServer_WFunctions,
-           "$Id$")
-
-#include "ace/OS_NS_string.h"
-
-namespace PortableServer
-{
-  PortableServer::ObjectId *
-  wstring_to_ObjectId (const CORBA::WChar *string)
-  {
-    // Size of Id
-    //
-    // We DO NOT include the zero terminator, as this is simply an
-    // artifact of the way strings are stored in C.
-    //
-    CORBA::ULong string_length = ACE_OS::wslen (string);
-
-    CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar);
-
-    // Create the buffer for the Id
-    CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-    // Copy contents
-    ACE_OS::memcpy (buffer, string, buffer_size);
-
-    // Create a new ID
-    PortableServer::ObjectId *id = 0;
-    ACE_NEW_RETURN (id,
-                    PortableServer::ObjectId (buffer_size,
-                                              buffer_size,
-                                              buffer,
-                                              1),
-                    0);
-
-    return id;
-  }
-
-  CORBA::WChar *
-  ObjectId_to_wstring (const PortableServer::ObjectId &id)
-  {
-    // Compute resulting wide string's length.
-    CORBA::ULong string_length =
-      id.length () / sizeof (CORBA::WChar);
-
-    // Allocate an extra slot if the id's length is not "aligned" on a
-    // CORBA::WChar.
-    if (id.length () % sizeof (CORBA::WChar))
-      string_length++;
-
-    // Create space - note that this method adds + 1 for the '\0'.
-    CORBA::WChar* string = CORBA::wstring_alloc (string_length);
-
-    // Copy the data
-    ACE_OS::memcpy (string,
-                    id.get_buffer (),
-                    id.length ());
-
-    // Null terminate the string
-    string[string_length] = '\0';
-
-    // Return string.
-    return string;
-  }
-}
-
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h
deleted file mode 100644
index b020106a939..00000000000
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    PortableServer_WFunctions.h
- *
- *  $Id$
- *
- *  PortableServer helper functions
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_WFUNCTIONS_H
-#define TAO_PORTABLESERVER_WFUNCTIONS_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "ace/OS_NS_wchar.h"
-
-namespace PortableServer
-{
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring (
-    const PortableServer::ObjectId &id);
-
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (
-    const CORBA::WChar *id);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PORTABLESERVER_WFUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl
deleted file mode 100644
index dd300389aa6..00000000000
--- a/TAO/tao/PortableServer/PortableServer_include.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file PortableServer_include.pidl
- *
- * $Id$
- *
- * @brief Include file for use in applications that need PortableServer.pidl.
- *
- * This file just includes PortableServer.pidl. The *C.h file generated from
- * this is hand-crafted to itself include PortableServer.h instead of
- * PortableServerC.h (which will produce a compiler error message if
- * included directly). The PortableServer_includeC.h file can then be
- * included directly and automatically by the IDL compiler when
- * building the application.
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *     this is:
- *
- *     tao_idl -o orig -St -Sc -Sp -Sci -SS
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          PortableServer_include.pidl
- *
- *   2. Then change this line in PortableServer_includeC.h:
- *
- *          #include "PortableServerC.h"
- *
- *      to
- *
- *          #include "PortableServer.h"
- */
-
-#ifndef _PORTABLESERVER_INCLUDE_IDL_
-#define _PORTABLESERVER_INCLUDE_IDL_
-
-///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PortableServer.pidl>
-
-#endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
deleted file mode 100644
index 38649c85687..00000000000
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/PortableServer/PortableServer.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/PortableServer_includeS.h b/TAO/tao/PortableServer/PortableServer_includeS.h
deleted file mode 100644
index ef06f9a4ce2..00000000000
--- a/TAO/tao/PortableServer/PortableServer_includeS.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableServerS.h"
-#include "PortableServer_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:997
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
deleted file mode 100644
index 1b8045b030d..00000000000
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "Regular_POA.h"
-
-ACE_RCSID (PortableServer,
-           POA,
-           "$Id$")
-
-//
-#if !defined (__ACE_INLINE__)
-# include "Regular_POA.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policy_Set &policies,
-                  TAO_Root_POA *parent,
-                  ACE_Lock &lock,
-                  TAO_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
-  : TAO_Root_POA (name,
-                  poa_manager,
-                  policies,
-                  parent,
-                  lock,
-                  thread_lock,
-                  orb_core,
-                  object_adapter
-                  ACE_ENV_ARG_PARAMETER),
-     parent_ (parent)
-{
-}
-
-TAO_Regular_POA::~TAO_Regular_POA (void)
-{
-}
-
-void
-TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Remove POA from the parent
-  if (this->parent_ != 0)
-    {
-      int result = this->parent_->delete_child (this->name_);
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-}
-
-CORBA::Boolean
-TAO_Regular_POA::root (void) const
-{
-  return (parent_ == 0);
-}
-
-char
-TAO_Regular_POA::root_key_type (void)
-{
-  if (this->parent_ != 0)
-    {
-      return TAO_Root_POA::non_root_key_char ();
-    }
-  else
-    {
-      return TAO_Root_POA::root_key_type ();
-    }
-}
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
deleted file mode 100644
index 516fa3b6f68..00000000000
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Regular_POA.h
- *
- *  $Id$
- *
- *  Header file for CORBA's ORB type.
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REGULAR_POA_H
-#define TAO_REGULAR_POA_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Root_POA.h"
-
-/**
- * @class TAO_Regular_POA
- *
- * @brief Implementation of the PortableServer::POA interface.
- *
- * Implementation of the PortableServer::POA interface.
- */
-class TAO_PortableServer_Export TAO_Regular_POA
-  : public TAO_Root_POA
-{
-public:
-  TAO_Regular_POA (const String &name,
-                   TAO_POA_Manager &poa_manager,
-                   const TAO_POA_Policy_Set &policies,
-                   TAO_Root_POA *parent,
-                   ACE_Lock &lock,
-                   TAO_SYNCH_MUTEX &thread_lock,
-                   TAO_ORB_Core &orb_core,
-                   TAO_Object_Adapter *object_adapter
-                   ACE_ENV_ARG_DECL);
-
-  virtual ~TAO_Regular_POA (void);
-
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  virtual CORBA::Boolean root (void) const;
-
-  virtual char root_key_type (void);
-
-  /// The parent of this POA, be aware that in case this pointer is nill,
-  /// we are a parent. This can be achieved by deriving from this Regular_POA
-  /// and pass a nill pointer as parent with the constructor.
-  TAO_Root_POA *parent_;
-};
-
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-# include "Regular_POA.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REGULAR_POA_H */
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
deleted file mode 100644
index fa533b4991e..00000000000
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->parent_ != 0)
-    return PortableServer::POA::_duplicate (this->parent_);
-  else
-    return PortableServer::POA::_nil ();
-}
-
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
deleted file mode 100644
index ca76ad11887..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "RequestProcessingPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingPolicy,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingPolicy::RequestProcessingPolicy (
-      ::PortableServer::RequestProcessingPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    RequestProcessingPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      RequestProcessingPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        RequestProcessingPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    RequestProcessingPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    RequestProcessingPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    RequestProcessingPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_REQUEST_PROCESSING;
-    }
-
-    TAO_Policy_Scope
-    RequestProcessingPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-
-
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
deleted file mode 100644
index 6e9b9703085..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingPolicy :
-      public virtual ::PortableServer::RequestProcessingPolicy,
-      public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      virtual TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::RequestProcessingPolicyValue value_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
deleted file mode 100644
index 7c8d7ac787b..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file RequestProcessingPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          RequestProcessingPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum RequestProcessingPolicyValue
-  {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-
-  local interface RequestProcessingPolicy : CORBA::Policy
-  {
-    readonly attribute RequestProcessingPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
deleted file mode 100644
index 49f3dc66cb4..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RequestProcessingPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_RequestProcessingPolicyValue[] =
-  {
-    "USE_ACTIVE_OBJECT_MAP_ONLY",
-    "USE_DEFAULT_SERVANT",
-    "USE_SERVANT_MANAGER"
-
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_RequestProcessingPolicyValue (
-    "IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3",
-    "RequestProcessingPolicyValue",
-    _tao_enumerators_PortableServer_RequestProcessingPolicyValue,
-    3);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue =
-    &_tao_tc_PortableServer_RequestProcessingPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_RequestProcessingPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3",
-    "RequestProcessingPolicy");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy =
-    &_tao_tc_PortableServer_RequestProcessingPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_RequestProcessingPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_RequestProcessingPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
-    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
-      _tao_any,
-      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-      PortableServer::_tc_RequestProcessingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
-        _tao_any,
-        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-        PortableServer::_tc_RequestProcessingPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
deleted file mode 100644
index 868b77bc8e8..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "RequestProcessingPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::RequestProcessingPolicy.
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
-    PortableServer::RequestProcessingPolicy_ptr p
-  )
-{
-  return PortableServer::RequestProcessingPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
-    PortableServer::RequestProcessingPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void)
-{
-  return PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal (
-    PortableServer::RequestProcessingPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
-{}
-
-PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
-{}
-
-void
-PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestProcessingPolicy *_tao_tmp_pointer =
-    static_cast<RequestProcessingPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestProcessingPolicy::_nil ();
-    }
-
-  RequestProcessingPolicy_ptr proxy =
-    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
-
-  return RequestProcessingPolicy::_duplicate (proxy);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestProcessingPolicy::_nil ();
-    }
-
-  RequestProcessingPolicy_ptr proxy =
-    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
-
-  return RequestProcessingPolicy::_duplicate (proxy);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::RequestProcessingPolicy::_tao_release (RequestProcessingPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::RequestProcessingPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::RequestProcessingPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessingPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
-    }
-
-  return _tao_success;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
deleted file mode 100644
index 33e368ad015..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ /dev/null
@@ -1,287 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
-#define _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum RequestProcessingPolicyValue
-  {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_
-
-  class RequestProcessingPolicy;
-  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        RequestProcessingPolicy
-      >
-    RequestProcessingPolicy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        RequestProcessingPolicy
-      >
-    RequestProcessingPolicy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
-  class TAO_PortableServer_Export RequestProcessingPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef RequestProcessingPolicy_ptr _ptr_type;
-    typedef RequestProcessingPolicy_var _var_type;
-
-    // The static operations.
-    static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-
-    static void _tao_release (RequestProcessingPolicy_ptr obj);
-
-    static RequestProcessingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static RequestProcessingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static RequestProcessingPolicy_ptr _nil (void)
-    {
-      return static_cast<RequestProcessingPolicy_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::RequestProcessingPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // 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
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    RequestProcessingPolicy (void);
-
-    virtual ~RequestProcessingPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestProcessingPolicy (const RequestProcessingPolicy &);
-
-    void operator= (const RequestProcessingPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
-
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy>
-  {
-    static ::PortableServer::RequestProcessingPolicy_ptr duplicate (
-        ::PortableServer::RequestProcessingPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::RequestProcessingPolicy_ptr
-      );
-    static ::PortableServer::RequestProcessingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::RequestProcessingPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
deleted file mode 100644
index e0874c451eb..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    RequestProcessingStrategy.cpp
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#include "RequestProcessingStrategy.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy::RequestProcessingStrategy()
-      : poa_ (0)
-    {
-    }
-
-    void
-    RequestProcessingStrategy::strategy_init(
-      TAO_Root_POA *poa,
-      ::PortableServer::ServantRetentionPolicyValue sr_value
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      poa_ = poa;
-      sr_value_ = sr_value;
-    }
-
-    void
-    RequestProcessingStrategy::strategy_init(
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      poa_ = poa;
-    }
-
-    void
-    RequestProcessingStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      poa_ = 0;
-    }
-
-    ::PortableServer::ServantRetentionPolicyValue
-    RequestProcessingStrategy::sr_type() const
-    {
-      return sr_value_;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
deleted file mode 100644
index 7e0e6df12c9..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUEST_PROCESSING_STRATEGY_H
-#define TAO_REQUEST_PROCESSING_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "PortableServer.h"
-#include "Servant_Location.h"
-
-namespace PortableServer
-{
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-}
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Servant_Upcall;
-    class POA_Current_Impl;
-  }
-}
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategy
-      : public Policy_Strategy
-    {
-    public:
-      RequestProcessingStrategy (void);
-
-      virtual void strategy_init(
-        TAO_Root_POA *poa
-        ACE_ENV_ARG_DECL);
-
-      virtual void strategy_init(
-        TAO_Root_POA *poa,
-        ::PortableServer::ServantRetentionPolicyValue
-        ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-      virtual PortableServer::ServantManager_ptr get_servant_manager (
-        ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-      virtual PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual TAO_SERVANT_LOCATION locate_servant (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::Servant locate_servant (
-        const char *operation,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual void cleanup_servant (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0;
-
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void post_invoke_servant_cleanup(
-        const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall) = 0;
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const = 0;
-
-      virtual ::PortableServer::ServantRetentionPolicyValue sr_type() const;
-
-    protected:
-      TAO_Root_POA* poa_;
-      ::PortableServer::ServantRetentionPolicyValue sr_value_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUEST_PROCESSING_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
deleted file mode 100644
index b77993ba572..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/ORB_Constants.h"
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "ServantManagerC.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Base.h"
-#include "Root_POA.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategyAOMOnly::RequestProcessingStrategyAOMOnly()
-    {
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    PortableServer::ServantManager_ptr
-    RequestProcessingStrategyAOMOnly::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
-    }
-
-    void
-    RequestProcessingStrategyAOMOnly::set_servant_manager (
-      PortableServer::ServantManager_ptr /*imgr*/
-                         ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-    void
-    RequestProcessingStrategyAOMOnly::set_servant (
-      PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::get_servant (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    TAO_SERVANT_LOCATION
-    RequestProcessingStrategyAOMOnly::locate_servant (
-      const PortableServer::ObjectId & system_id,
-      PortableServer::Servant & servant
-      ACE_ENV_ARG_DECL)
-    {
-      return this->poa_->servant_present (system_id,
-                                          servant
-                                          ACE_ENV_ARG_PARAMETER);
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::locate_servant (
-      const char * /*operation*/,
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      int & /*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = 0;
-
-      servant = this->poa_->find_servant (system_id,
-                                          servant_upcall,
-                                          poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2,
-                                                     CORBA::COMPLETED_NO),
-                            0);
-        }
-
-      return servant;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-    {
-      return this->poa_->find_servant (system_id
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::id_to_servant (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return this->poa_->user_id_to_servant_i (id
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-
-    void
-    RequestProcessingStrategyAOMOnly::cleanup_servant (
-      PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
-    {
-      if (servant)
-        {
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // This operation causes the association of the Object Id specified
-      // by the oid parameter and its servant to be removed from the
-      // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-    void
-    RequestProcessingStrategyAOMOnly::etherealize_objects (
-      CORBA::Boolean /*etherealize_objects*/)
-    {
-    }
-
-    PortableServer::ObjectId *
-    RequestProcessingStrategyAOMOnly::servant_to_id (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
-    }
-
-    void
-    RequestProcessingStrategyAOMOnly::post_invoke_servant_cleanup(
-      const PortableServer::ObjectId &/*system_id*/,
-      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
-    {
-    }
-
-    ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingStrategyAOMOnly::type() const
-    {
-      return ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY;
-    }
-
-  }
-}
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
deleted file mode 100644
index 22e1e48fab0..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyAOMOnly.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
-#define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingStrategy.h"
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyAOMOnly
-      : public RequestProcessingStrategy
-    {
-    public:
-      RequestProcessingStrategyAOMOnly (void);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-      PortableServer::ServantManager_ptr
-      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void
-      set_servant_manager (PortableServer::ServantManager_ptr imgr
-                           ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void
-      set_servant (PortableServer::Servant servant
-                   ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-      PortableServer::Servant
-      get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual
-      TAO_SERVANT_LOCATION
-      locate_servant (const PortableServer::ObjectId &system_id,
-                      PortableServer::Servant &servant
-                      ACE_ENV_ARG_DECL);
-
-      virtual
-      PortableServer::Servant
-      locate_servant (const char *operation,
-                      const PortableServer::ObjectId &system_id,
-                      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-                      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-                      int &wait_occurred_restart_call
-                      ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual void cleanup_servant (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
-
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
-
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual void post_invoke_servant_cleanup(
-        const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
deleted file mode 100644
index 97eb1c180df..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyAOMOnlyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy*
-    RequestProcessingStrategyAOMOnlyFactoryImpl::create (
-      ::PortableServer::RequestProcessingPolicyValue value,
-      ::PortableServer::ServantRetentionPolicyValue /*srvalue*/)
-    {
-      RequestProcessingStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
-        {
-          ACE_NEW_RETURN (strategy, RequestProcessingStrategyAOMOnly, 0);
-          break;
-        }
-        default :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    RequestProcessingStrategyAOMOnlyFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyAOMOnlyFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
deleted file mode 100644
index 81e10c20474..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyAOMOnlyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyAOMOnlyFactoryImpl
-       : public RequestProcessingStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue);
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
deleted file mode 100644
index 94bbe00fd34..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/ORB_Constants.h"
-#include "tao/TSS_Resources.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "Non_Servant_Upcall.h"
-#include "Root_POA.h"
-#include "ServantManagerC.h"
-#include "Servant_Base.h"
-#include "POA_Current_Impl.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void)
-      : default_servant_ (0)
-    {
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      this->default_servant_ = 0;
-    }
-
-    PortableServer::ServantManager_ptr
-    RequestProcessingStrategyDefaultServant::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::set_servant_manager (
-      PortableServer::ServantManager_ptr /*imgr*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::get_servant (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation returns the default servant associated with the
-      // POA.
-      return this->default_servant_.in ();
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::set_servant (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation registers the specified servant with the POA as
-      // the default servant. This servant will be used for all requests
-      // for which no servant is found in the Active Object Map.
-      this->default_servant_ = servant;
-
-      // The implementation of set_servant will invoke _add_ref at least
-      // once on the Servant argument before returning. When the POA no
-      // longer needs the Servant, it will invoke _remove_ref on it the
-      // same number of times.
-      if (servant != 0)
-        {
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring once
-          // the upcalls complete.  Even though we are releasing the lock,
-          // other threads will not be able to make progress since
-          // <Object_Adapter::non_servant_upcall_in_progress_> has been
-          // set.
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    TAO_SERVANT_LOCATION
-    RequestProcessingStrategyDefaultServant::locate_servant (
-      const PortableServer::ObjectId & system_id,
-      PortableServer::Servant & servant
-      ACE_ENV_ARG_DECL)
-    {
-      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
-
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-      if (location == TAO_SERVANT_NOT_FOUND)
-        {
-          if (this->default_servant_.in () != 0)
-            {
-              location = TAO_DEFAULT_SERVANT;
-            }
-        }
-
-      return location;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::locate_servant (
-      const char * /*operation*/,
-      const PortableServer::ObjectId & system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      int & /*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = 0;
-
-      servant = this->poa_->find_servant (system_id,
-                                          servant_upcall,
-                                          poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant == 0)
-        {
-          // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-          // has been associated with the POA so the POA will invoke the
-          // appropriate method on that servant. If no servant has been
-          // associated with the POA, the POA raises the OBJ_ADAPTER system
-          // exception.
-          PortableServer::Servant default_servant = this->default_servant_.in ();
-          if (default_servant == 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 3,
-                                                    CORBA::COMPLETED_NO),
-                                                    0);
-            }
-          else
-            {
-              // Success
-              servant = default_servant;
-            }
-        }
-
-        return servant;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = this->default_servant_.in ();
-
-      if (servant == 0)
-        {
-          servant = this->poa_->find_servant (system_id
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-        }
-
-      return servant;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyDefaultServant::id_to_servant (
-      const PortableServer::ObjectId & /*id*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      PortableServer::Servant servant = this->default_servant_.in ();
-
-      if (servant)
-        {
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // The POA invokes _add_ref once on the Servant before returning
-          // it. If the application uses reference counting, the caller of
-          // id_to_servant is responsible for invoking _remove_ref once on
-          // the returned Servant when it is finished with it. A
-          // conforming caller need not invoke _remove_ref on the returned
-          // Servant if the type of the Servant uses the default reference
-          // counting inherited from ServantBase.
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return servant;
-        }
-      else
-        {
-          /*
-           * If using default servant request processing strategy but
-           * no default servant is available, we will raise the
-           * ObjectNotActive system exception.
-           */
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::cleanup_servant (
-      PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
-    {
-      if (servant)
-        {
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // This operation causes the association of the Object Id specified
-      // by the oid parameter and its servant to be removed from the
-      // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::etherealize_objects (
-      CORBA::Boolean /*etherealize_objects*/)
-    {
-    }
-
-    PortableServer::ObjectId *
-    RequestProcessingStrategyDefaultServant::servant_to_id (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      PortableServer::Servant default_servant = this->default_servant_.in ();
-
-      if (default_servant != 0 &&
-          default_servant == servant)
-        {
-          // If they are the same servant, then check if we are in an
-          // upcall.
-          TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
-            static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-          // If we are in an upcall on the default servant, return the
-          // ObjectId associated with the current invocation.
-          if (poa_current_impl != 0 &&
-              servant == poa_current_impl->servant ())
-            {
-              return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-            }
-        }
-
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
-    }
-
-    void
-    RequestProcessingStrategyDefaultServant::post_invoke_servant_cleanup(
-      const PortableServer::ObjectId &/*system_id*/,
-      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
-    {
-    }
-
-    ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingStrategyDefaultServant::type() const
-    {
-      return ::PortableServer::USE_DEFAULT_SERVANT;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
deleted file mode 100644
index 6683086c1f0..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyDefaultServant.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
-#define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingStrategy.h"
-#include "Servant_Base.h"
-
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyDefaultServant
-      : public RequestProcessingStrategy
-    {
-    public:
-      RequestProcessingStrategyDefaultServant (void);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      PortableServer::ServantManager_ptr
-      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void set_servant (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual TAO_SERVANT_LOCATION locate_servant (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant locate_servant (
-        const char *operation,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual void cleanup_servant (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
-
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
-
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual void post_invoke_servant_cleanup(
-        const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
-
-    private:
-      PortableServer::ServantBase_var default_servant_;
-    };
-
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
deleted file mode 100644
index 814f7fed058..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-#include "RequestProcessingStrategyDefaultServantFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyDefaultServantFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy*
-    RequestProcessingStrategyDefaultServantFactoryImpl::create (
-      ::PortableServer::RequestProcessingPolicyValue value,
-      ::PortableServer::ServantRetentionPolicyValue /*srvalue*/)
-    {
-      RequestProcessingStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::USE_DEFAULT_SERVANT :
-        {
-          ACE_NEW_RETURN (strategy, RequestProcessingStrategyDefaultServant, 0);
-          break;
-        }
-        default :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    RequestProcessingStrategyDefaultServantFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyDefaultServantFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
deleted file mode 100644
index b02aba40dc3..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyDefaultServantFI.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyDefaultServantFactoryImpl
-       : public RequestProcessingStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue);
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
deleted file mode 100644
index 157321b4152..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/RequestProcessingPolicyC.h"
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class RequestProcessingStrategy;
-
-    class TAO_PortableServer_Export RequestProcessingStrategyFactory
-      : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue) = 0;
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
deleted file mode 100644
index 1b3ec697074..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// $Id$
-
-#include "RequestProcessingStrategyFactoryImpl.h"
-#include "RequestProcessingStrategyAOMOnly.h"
-#include "RequestProcessingStrategyDefaultServant.h"
-#include "RequestProcessingStrategyServantLocator.h"
-#include "RequestProcessingStrategyServantActivator.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy*
-    RequestProcessingStrategyFactoryImpl::create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue)
-    {
-      RequestProcessingStrategy* strategy = 0;
-      RequestProcessingStrategyFactory *strategy_factory = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
-        {
-          strategy_factory =
-            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyAOMOnlyFactory");
-
-          break;
-        }
-        case ::PortableServer::USE_DEFAULT_SERVANT :
-        {
-          strategy_factory =
-            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyDefaultServantFactory");
-
-          break;
-        }
-        case ::PortableServer::USE_SERVANT_MANAGER :
-        {
-#if (TAO_HAS_MINIMUM_POA == 0)
-          switch (srvalue)
-          {
-            case ::PortableServer::RETAIN :
-            {
-              strategy_factory =
-                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantActivatorFactory");
-
-              break;
-            }
-            case ::PortableServer::NON_RETAIN :
-            {
-              strategy_factory =
-                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantLocatorFactory");
-
-              break;
-            }
-          }
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-          break;
-        }
-      }
-
-      if (strategy_factory != 0)
-        strategy = strategy_factory->create (value, srvalue);
-      else
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) %p\n"),
-                    ACE_TEXT ("ERROR, Unable to get ")
-                    ACE_TEXT ("RequestProcessingStrategyFactory")));
-
-      return strategy;
-    }
-
-    void
-    RequestProcessingStrategyFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      RequestProcessingStrategyFactory *strategy_factory = 0;
-
-      switch (strategy->type ())
-      {
-        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
-        {
-          strategy_factory =
-            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyAOMOnlyFactory");
-
-          break;
-        }
-        case ::PortableServer::USE_DEFAULT_SERVANT :
-        {
-          strategy_factory =
-            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyDefaultServantFactory");
-
-          break;
-        }
-        case ::PortableServer::USE_SERVANT_MANAGER :
-        {
-#if (TAO_HAS_MINIMUM_POA == 0)
-          switch (strategy->sr_type ())
-          {
-            case ::PortableServer::RETAIN :
-            {
-              strategy_factory =
-                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantActivatorFactory");
-
-              break;
-            }
-            case ::PortableServer::NON_RETAIN :
-            {
-              strategy_factory =
-                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantLocatorFactory");
-              break;
-            }
-          }
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-          break;
-        }
-      }
-
-      if (strategy_factory != 0)
-        {
-          strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
deleted file mode 100644
index 007659174cd..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyFactoryImpl
-      : public RequestProcessingStrategyFactory
-    {
-    public:
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue);
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
deleted file mode 100644
index 82634050f25..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-// $Id$
-#include "tao/ORB_Constants.h"
-#include "ServantActivatorC.h"
-#include "RequestProcessingStrategyServantActivator.h"
-#include "Servant_Base.h"
-#include "Non_Servant_Upcall.h"
-#include "Root_POA.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) :
-      etherealize_objects_ (1)
-    {
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL)
-    {
-      {
-        Non_Servant_Upcall non_servant_upcall (*this->poa_);
-        ACE_UNUSED_ARG (non_servant_upcall);
-
-        this->servant_activator_ =
-          PortableServer::ServantActivator::_nil ();
-      }
-
-      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantActivator::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::set_servant_manager (
-      PortableServer::ServantManager_ptr imgr
-      ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::POA::WrongPolicy))
-    {
-      // This operation sets the default servant manager associated with the
-      // POA. This operation may only be invoked once after a POA has been
-      // created. Attempting to set the servant manager after one has already
-      // been set will result in the BAD_INV_ORDER system exception with
-      // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
-      if (!CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
-                                           CORBA::COMPLETED_NO));
-        }
-
-      this->servant_activator_ =
-        PortableServer::ServantActivator::_narrow (imgr
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    TAO_SERVANT_LOCATION
-    RequestProcessingStrategyServantActivator::locate_servant (
-      const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
-    {
-      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
-
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-      if (location == TAO_SERVANT_NOT_FOUND)
-        {
-          if (!CORBA::is_nil (this->servant_activator_.in ()))
-            {
-              location = TAO_SERVANT_MANAGER;
-            }
-        }
-
-      return location;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantActivator::locate_servant (
-      const char * /*operation*/,
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = 0;
-
-      servant = this->poa_->find_servant (system_id,
-                                          servant_upcall,
-                                          poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant != 0)
-        {
-          return servant;
-        }
-
-      // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-      // has been associated with the POA so the POA will invoke incarnate
-      // or preinvoke on it to find a servant that may handle the
-      // request. (The choice of method depends on the NON_RETAIN or
-      // RETAIN policy of the POA.) If no servant manager has been
-      // associated with the POA, the POA raises the OBJ_ADAPTER system
-      // exception.
-      //
-      // If a servant manager is located and invoked, but the servant
-      // manager is not directly capable of incarnating the object, it
-      // (the servant manager) may deal with the circumstance in a variety
-      // of ways, all of which are the application's responsibility.  Any
-      // system exception raised by the servant manager will be returned
-      // to the client in the reply. In addition to standard CORBA
-      // exceptions, a servant manager is capable of raising a
-      // ForwardRequest exception. This exception includes an object
-      // reference.
-      //
-
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      servant =
-        this->incarnate_servant (poa_current_impl.object_id ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If the incarnate operation returns a servant that is
-      // already active for a different Object Id and if the POA
-      // also has the UNIQUE_ID policy, the incarnate has violated
-      // the POA policy and is considered to be in error. The POA
-      // will raise an OBJ_ADAPTER system exception for the
-      // request.
-      bool may_activate =
-        this->poa_->is_servant_activation_allowed (servant,
-                                                   wait_occurred_restart_call);
-
-      if (!may_activate)
-        {
-          // If we are not allowed to activate the servant, throw an exception
-          // etherealize is not called because the servant is never added to
-          // the active object map
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      // The POA enters the returned Servant value into the Active
-      // Object Map so that subsequent requests with the same
-      // ObjectId value will be delivered directly to that servant
-      // without invoking the servant manager.  Only run if there
-      // are no errors or if a restart is not required.
-      if (!wait_occurred_restart_call)
-        {
-          int result =
-            this->poa_->
-              rebind_using_user_id_and_system_id (servant,
-                                                  poa_current_impl.object_id (),
-                                                  system_id,
-                                                  servant_upcall);
-          if (result != 0)
-            {
-              // Throw an exception, etherealize is not called because servant
-              // is not added to the active object map
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          // Increment the reference count on the servant upcall.
-          servant_upcall.increment_servant_refcount ();
-        }
-      else
-        {
-          CORBA::Boolean cleanup_in_progress = 0;
-          this->etherealize_servant (poa_current_impl.object_id (),
-                                     servant,
-                                     cleanup_in_progress
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          // We ended up waiting on a condition variable, the
-          // POA state may have changed while we are waiting.
-          // Therefore, we need to restart this call.
-          return 0;
-        }
-
-      // Success
-      return servant;
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::etherealize_servant (
-      const PortableServer::ObjectId& object_id,
-      PortableServer::Servant servant,
-      CORBA::Boolean cleanup_in_progress
-      ACE_ENV_ARG_DECL)
-    {
-      CORBA::Boolean remaining_activations =
-        this->poa_->servant_has_remaining_activations (servant);
-
-      // ATTENTION: Trick locking here, see class header for details
-      Non_Servant_Upcall non_servant_upcall (*this->poa_);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // @todo This is not according to the spec. According to 11.3.6.2 at the
-      // end when etherealize returns a system exception the POA ignores the
-      // exception
-      this->servant_activator_->etherealize (object_id,
-                                             this->poa_,
-                                             servant,
-                                             cleanup_in_progress,
-                                             remaining_activations
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantActivator::incarnate_servant (
-      const PortableServer::ObjectId& object_id
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = 0;
-
-      // ATTENTION: Trick locking here, see class header for details
-      Non_Servant_Upcall non_servant_upcall (*this->poa_);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // @@
-      // Invocations of incarnate on the servant manager are serialized.
-      // Invocations of etherealize on the servant manager are serialized.
-      // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-      servant = this->servant_activator_->incarnate (object_id,
-                                                     this->poa_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
-                                                CORBA::COMPLETED_NO),
-                                                0);
-        }
-      else
-        {
-          return servant;
-        }
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::cleanup_servant (
-      PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
-    {
-      // If a servant manager is associated with the POA,
-      // ServantLocator::etherealize will be invoked with the oid and the
-      // servant. (The deactivate_object operation does not wait for the
-      // etherealize operation to complete before deactivate_object
-      // returns.)
-      //
-      // Note: If the servant associated with the oid is serving multiple
-      // Object Ids, ServantLocator::etherealize may be invoked multiple
-      // times with the same servant when the other objects are
-      // deactivated. It is the responsibility of the object
-      // implementation to refrain from destroying the servant while it is
-      // active with any Id.
-
-      // If the POA has no ServantActivator associated with it, the POA
-      // implementation calls _remove_ref when all operation invocations
-      // have completed. If there is a ServantActivator, the Servant is
-      // consumed by the call to ServantActivator::etherealize instead.
-
-      // @bala, is this order correct, see 11.3.9.17 of the spec, it
-      // says first remove from the map, then etherealize. not the
-      // other way around
-      // @@ Johnny, you are right! This will not show up until a
-      // thread is trying to activate the object in another thread
-      // using activate_object_with_id (). A test case is a must for
-      // atleast this issue.
-      if (servant)
-        {
-          if (this->etherealize_objects_ &&
-              !CORBA::is_nil (this->servant_activator_.in ()))
-            {
-              this->etherealize_servant (user_id,
-                                         servant,
-                                         this->poa_->cleanup_in_progress ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-          else
-            {
-              // ATTENTION: Trick locking here, see class header for details
-              Non_Servant_Upcall non_servant_upcall (*this->poa_);
-              ACE_UNUSED_ARG (non_servant_upcall);
-
-              servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-        }
-
-      // This operation causes the association of the Object Id specified
-      // by the oid parameter and its servant to be removed from the
-      // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::etherealize_objects (
-      CORBA::Boolean etherealize_objects)
-    {
-      this->etherealize_objects_ = etherealize_objects;
-    }
-
-    void
-    RequestProcessingStrategyServantActivator::post_invoke_servant_cleanup(
-      const PortableServer::ObjectId &/*system_id*/,
-      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
-    {
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
deleted file mode 100644
index 7bd2f7f77d3..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyServantActivator.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
-#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingStrategyServantManager.h"
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  class ServantActivator;
-
-  typedef ServantActivator *ServantActivator_ptr;
-  typedef TAO_Objref_Var_T<ServantActivator> ServantActivator_var;
-}
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyServantActivator
-      : public RequestProcessingStrategyServantManager
-    {
-    public:
-      RequestProcessingStrategyServantActivator (void);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual TAO_SERVANT_LOCATION locate_servant (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant locate_servant (
-        const char *operation,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
-
-      virtual void cleanup_servant (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
-
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
-
-      virtual void post_invoke_servant_cleanup(
-        const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-    private:
-      PortableServer::Servant incarnate_servant (
-        const PortableServer::ObjectId& object_id
-        ACE_ENV_ARG_DECL);
-
-      void etherealize_servant (const PortableServer::ObjectId& object_id,
-        PortableServer::Servant servant,
-        CORBA::Boolean cleanup_in_progress
-        ACE_ENV_ARG_DECL);
-
-    private:
-      PortableServer::ServantActivator_var servant_activator_;
-      CORBA::Boolean etherealize_objects_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
deleted file mode 100644
index 3f7a3bd349e..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-
-#include "RequestProcessingStrategyServantActivatorFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyServantActivator.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyServantActivatorFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy*
-    RequestProcessingStrategyServantActivatorFactoryImpl::create (
-      ::PortableServer::RequestProcessingPolicyValue value,
-      ::PortableServer::ServantRetentionPolicyValue srvalue)
-    {
-      RequestProcessingStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::USE_SERVANT_MANAGER :
-        {
-          switch (srvalue)
-          {
-            case ::PortableServer::RETAIN :
-            {
-              ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantActivator, 0);
-              break;
-            }
-            case ::PortableServer::NON_RETAIN :
-            {
-              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
-              break;
-            }
-          }
-          break;
-        }
-        default :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    RequestProcessingStrategyServantActivatorFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyServantActivatorFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
deleted file mode 100644
index cdc19cff125..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyServantActivatorFI.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyServantActivatorFactoryImpl
-       : public RequestProcessingStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue);
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
deleted file mode 100644
index 84dbd2881cd..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/ORB_Constants.h"
-#include "ServantLocatorC.h"
-#include "RequestProcessingStrategyServantLocator.h"
-#include "Root_POA.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Base.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void)
-    {
-    }
-
-    void
-    RequestProcessingStrategyServantLocator::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL)
-    {
-      {
-        Non_Servant_Upcall non_servant_upcall (*this->poa_);
-        ACE_UNUSED_ARG (non_servant_upcall);
-
-        this->servant_locator_ = PortableServer::ServantLocator::_nil ();
-      }
-
-      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    PortableServer::ServantManager_ptr
-    RequestProcessingStrategyServantLocator::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
-    }
-
-    void
-    RequestProcessingStrategyServantLocator::set_servant_manager (
-      PortableServer::ServantManager_ptr imgr
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation sets the default servant manager associated with the
-      // POA. This operation may only be invoked once after a POA has been
-      // created. Attempting to set the servant manager after one has already
-      // been set will result in the BAD_INV_ORDER system exception with
-      // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
-      if (!CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
-                                           CORBA::COMPLETED_NO));
-        }
-
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
-                                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    TAO_SERVANT_LOCATION
-    RequestProcessingStrategyServantLocator::locate_servant (
-      const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
-    {
-      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
-
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
-
-      if (location == TAO_SERVANT_NOT_FOUND)
-        {
-          if (!CORBA::is_nil (this->servant_locator_.in ()))
-            {
-              location = TAO_SERVANT_MANAGER;
-            }
-        }
-
-      return location;
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantLocator::locate_servant (
-      const char *operation,
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      int &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::Servant servant = 0;
-
-      servant = this->poa_->find_servant (system_id,
-                                          servant_upcall,
-                                          poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant != 0)
-        {
-          return servant;
-        }
-
-      // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-      // has been associated with the POA so the POA will invoke incarnate
-      // or preinvoke on it to find a servant that may handle the
-      // request. (The choice of method depends on the NON_RETAIN or
-      // RETAIN policy of the POA.) If no servant manager has been
-      // associated with the POA, the POA raises the OBJ_ADAPTER system
-      // exception.
-      //
-      // If a servant manager is located and invoked, but the servant
-      // manager is not directly capable of incarnating the object, it
-      // (the servant manager) may deal with the circumstance in a variety
-      // of ways, all of which are the application's responsibility.  Any
-      // system exception raised by the servant manager will be returned
-      // to the client in the reply. In addition to standard CORBA
-      // exceptions, a servant manager is capable of raising a
-      // ForwardRequest exception. This exception includes an object
-      // reference.
-      //
-
-      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // No serialization of invocations of preinvoke or
-      // postinvoke may be assumed; there may be multiple
-      // concurrent invocations of preinvoke for the same
-      // ObjectId.
-      //
-      // The same thread will be used to preinvoke the object,
-      // process the request, and postinvoke the object.
-
-      // @@ Note that it is possible for some other thread to
-      // reset the servant locator once the lock is released.
-      // However, this possiblility also exists for postinvoke()
-      // which is also called outside the lock.
-
-      // Release the object adapter lock.
-      this->poa_->object_adapter().lock ().release ();
-
-      // We have released the object adapter lock.  Record this
-      // for later use.
-      servant_upcall.state (TAO::Portable_Server::Servant_Upcall::OBJECT_ADAPTER_LOCK_RELEASED);
-
-      PortableServer::ServantLocator::Cookie cookie = 0;
-      servant =
-        this->servant_locator_->preinvoke (poa_current_impl.object_id (),
-                                           this->poa_,
-                                           operation,
-                                           cookie
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (servant == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
-                                                CORBA::COMPLETED_NO),
-                                                0);
-        }
-
-      // Remember the cookie
-      servant_upcall.locator_cookie (cookie);
-
-      // Remember operation name.
-      servant_upcall.operation (operation);
-
-      // Success
-      return servant;
-    }
-
-    void
-    RequestProcessingStrategyServantLocator::cleanup_servant (
-      PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
-    {
-      if (servant)
-        {
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // This operation causes the association of the Object Id specified
-      // by the oid parameter and its servant to be removed from the
-      // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
-
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-    void
-    RequestProcessingStrategyServantLocator::etherealize_objects (
-      CORBA::Boolean /*etherealize_objects*/)
-    {
-    }
-
-    void
-    RequestProcessingStrategyServantLocator::post_invoke_servant_cleanup(
-      const PortableServer::ObjectId &system_id,
-      const TAO::Portable_Server::Servant_Upcall &servant_upcall)
-    {
-      // @todo This method seems to misbehave according to the corba spec, see
-      // section 11.3.7.2. It says that when postinvoke raises an system
-      // exception the methods normal return is overrriden, the request completes
-      // with the exception
-
-      if (!CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              servant_locator_->postinvoke (system_id,
-                                            this->poa_,
-                                            servant_upcall.operation (),
-                                            servant_upcall.locator_cookie (),
-                                            servant_upcall.servant ()
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // Ignore errors from servant locator ....
-            }
-          ACE_ENDTRY;
-        }
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
deleted file mode 100644
index 9084b7758bd..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyServantLocator.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
-#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingStrategyServantManager.h"
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  class ServantLocator;
-
-  typedef ServantLocator *ServantLocator_ptr;
-  typedef TAO_Objref_Var_T<ServantLocator> ServantLocator_var;
-}
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyServantLocator
-      : public RequestProcessingStrategyServantManager
-    {
-    public:
-      RequestProcessingStrategyServantLocator (void);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      PortableServer::ServantManager_ptr get_servant_manager (
-        ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual TAO_SERVANT_LOCATION locate_servant (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
-
-      virtual void post_invoke_servant_cleanup(
-        const PortableServer::ObjectId &system_id,
-        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual PortableServer::Servant locate_servant (
-        const char *operation,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
-
-      virtual void cleanup_servant (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
-
-      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
-
-    private:
-      PortableServer::ServantLocator_var servant_locator_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
deleted file mode 100644
index 187dc825aba..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "RequestProcessingStrategyServantLocatorFI.h"
-#include "RequestProcessingStrategy.h"
-#include "RequestProcessingStrategyServantLocator.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           RequestProcessingStrategyServantLocatorFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategy*
-    RequestProcessingStrategyServantLocatorFactoryImpl::create (
-      ::PortableServer::RequestProcessingPolicyValue value,
-      ::PortableServer::ServantRetentionPolicyValue srvalue)
-    {
-      RequestProcessingStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::USE_SERVANT_MANAGER :
-        {
-          switch (srvalue)
-          {
-            case ::PortableServer::RETAIN :
-            {
-              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
-              break;
-            }
-            case ::PortableServer::NON_RETAIN :
-            {
-              ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantLocator, 0);
-              break;
-            }
-          }
-          break;
-        }
-        default :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    RequestProcessingStrategyServantLocatorFactoryImpl::destroy (
-      RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        RequestProcessingStrategyServantLocatorFactoryImpl,
-        ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
deleted file mode 100644
index 795a7b9d5b6..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyServantLocatorFI.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H
-#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyServantLocatorFactoryImpl
-       : public RequestProcessingStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual RequestProcessingStrategy* create (
-        ::PortableServer::RequestProcessingPolicyValue value,
-        ::PortableServer::ServantRetentionPolicyValue srvalue);
-
-      virtual void destroy (
-        RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
deleted file mode 100644
index af78da4ca83..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-#include "RequestProcessingStrategyServantManager.h"
-#include "ServantManagerC.h"
-#include "Root_POA.h"
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID (PortableServer,
-           Request_Processing,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void)
-    {
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantManager::get_servant (
-      ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    void
-    RequestProcessingStrategyServantManager::set_servant (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_UNUSED_ARG (servant);
-
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-    void
-    RequestProcessingStrategyServantManager::validate_servant_manager (
-      PortableServer::ServantManager_ptr servant_manager
-      ACE_ENV_ARG_DECL)
-    {
-      // When no servant manager is set, give an exception with minor code 4,
-      // see 11.3.8.6 of the corba spec
-      if (CORBA::is_nil (servant_manager))
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4,
-                                         CORBA::COMPLETED_NO));
-        }
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantManager::system_id_to_servant (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-    {
-      return this->poa_->find_servant (system_id
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-
-    PortableServer::ObjectId *
-    RequestProcessingStrategyServantManager::servant_to_id (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
-    }
-
-    PortableServer::Servant
-    RequestProcessingStrategyServantManager::id_to_servant (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      return this->poa_->user_id_to_servant_i (id ACE_ENV_ARG_PARAMETER);
-    }
-
-    ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingStrategyServantManager::type() const
-    {
-      return ::PortableServer::USE_SERVANT_MANAGER;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
deleted file mode 100644
index fa7b01bd416..00000000000
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RequestProcessingStrategyServantManager.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
-#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RequestProcessingStrategy.h"
-#include "Servant_Location.h"
-#include "PortableServer.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export RequestProcessingStrategyServantManager
-      : public RequestProcessingStrategy
-    {
-    public:
-      RequestProcessingStrategyServantManager (void);
-
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      void validate_servant_manager (
-        PortableServer::ServantManager_ptr servant_manager
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant system_id_to_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual PortableServer::ObjectId *servant_to_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H */
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
deleted file mode 100644
index 4ef9c3e887d..00000000000
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ /dev/null
@@ -1,2918 +0,0 @@
-// $Id$
-
-#include "Root_POA.h"
-#include "Regular_POA.h"
-
-#include "ThreadPolicy.h"
-#include "LifespanPolicy.h"
-#include "IdAssignmentPolicy.h"
-#include "IdUniquenessPolicy.h"
-#include "ImplicitActivationPolicy.h"
-#include "RequestProcessingPolicy.h"
-#include "ServantRetentionPolicy.h"
-#include "Active_Object_Map.h"
-#include "Default_Acceptor_Filter.h"
-#include "ORT_Adapter.h"
-#include "ORT_Adapter_Factory.h"
-#include "Policy_Creator_T.h"
-#include "POA_Current_Impl.h"
-#include "Servant_Upcall.h"
-#include "AdapterActivatorC.h"
-#include "Non_Servant_Upcall.h"
-#include "POAManager.h"
-#include "ServantManagerC.h"
-#include "poa_macros.h"
-#include "POA_Guard.h"
-#include "Creation_Time.h"
-#include "RequestProcessingStrategy.h"
-#include "LifespanStrategy.h"
-#include "IdUniquenessStrategy.h"
-#include "IdAssignmentStrategy.h"
-#include "ServantRetentionStrategy.h"
-#include "ImplicitActivationStrategy.h"
-#include "ThreadStrategy.h"
-
-#include "tao/StringSeqC.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/PolicyC.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/TSS_Resources.h"
-#include "tao/IORInterceptor_Adapter.h"
-#include "tao/debug.h"
-
-// auto_ptr class
-#include "ace/Auto_Ptr.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_netdb.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Root_POA.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (PortableServer,
-           POA,
-             "$Id$")
-
-// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-// It's an array of octets representing ^t^a^o/0 in octal.
-CORBA::Octet const
-TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
-  024, // octal for ^t
-  001, // octal for ^a
-  017, // octal for ^o
-  000
-};
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ThreadPolicy_ptr
-TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::ThreadPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::ThreadPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  return policy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-PortableServer::LifespanPolicy_ptr
-TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::LifespanPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::LifespanPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  return policy;
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::IdUniquenessPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  return policy;
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::IdAssignmentPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  return policy;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::ImplicitActivationPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  return policy;
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::ServantRetentionPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  return policy;
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
-  ACE_NEW_THROW_EX (policy,
-                    TAO::Portable_Server::RequestProcessingPolicy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  return policy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-void
-TAO_Root_POA::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *current_factory
-  ACE_ENV_ARG_DECL)
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      // Activate a different factory
-      this->ort_adapter_->set_obj_ref_factory (current_factory
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
-                            TAO_POA_Manager &poa_manager,
-                            const TAO_POA_Policy_Set &policies,
-                            TAO_Root_POA *parent,
-                            ACE_Lock &lock,
-                            TAO_SYNCH_MUTEX &thread_lock,
-                            TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL)
-  : name_ (name),
-    poa_manager_ (poa_manager),
-    tagged_component_ (),
-    tagged_component_id_ (),
-    profile_id_array_ (0),
-    policies_ (policies),
-    ort_adapter_ (0),
-    adapter_state_ (PortableInterceptor::HOLDING),
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    adapter_activator_ (),
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    children_ (),
-    lock_ (lock),
-    orb_core_ (orb_core),
-    object_adapter_ (object_adapter),
-    cleanup_in_progress_ (0),
-    outstanding_requests_ (0),
-    outstanding_requests_condition_ (thread_lock),
-    wait_for_completion_pending_ (0),
-    waiting_destruction_ (0),
-    servant_deactivation_condition_ (thread_lock),
-    caller_key_to_object_ (0),
-    servant_for_key_to_object_ (0)
-{
-  // Parse the policies that are used in the critical path in
-  // a cache.
-  this->cached_policies_.update (this->policies_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-#if (TAO_HAS_MINIMUM_POA == 1)
-  // If this is the RootPOA, set the value of the ImplicitActivationPolicy
-  // to IMPLICIT_ACTIVATION since it is impossible to pass the policy
-  // as it is not compiled into the library.
-  //
-  // If the ImplicitActivationPolicy policy is ever compiled in the
-  // minimum POA builds, remove this code and remove the guards
-  // in Object_Adapter.cpp when changing the default policy for the
-  // RootPOA.
-  if (ACE_OS::strcmp (this->name_.c_str (),
-                      TAO_DEFAULT_ROOTPOA_NAME) == 0)
-    {
-      this->cached_policies_.implicit_activation
-        (PortableServer::IMPLICIT_ACTIVATION);
-    }
-#endif /* TAO_HAS_MINIMUM_POA == 1 */
-
-  // Set the active strategies to be used by this POA
-  this->active_policy_strategies_.update (this->cached_policies_,
-                                          this
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Set the folded name of this POA.
-  this->set_folded_name (parent);
-
-  // Register self with manager.
-  int result = this->poa_manager_.register_poa (this);
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Add self to Object Adapter class.
-  result =
-    this->object_adapter ().bind_poa (this->folded_name_,
-                                      this,
-                                      this->system_name_.out ());
-  if (result != 0)
-    {
-      // Remove from POA Manager in case of errors. No checks of
-      // further errors...
-      this->poa_manager_.remove_poa (this);
-
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Set the id for this POA.
-  this->set_id (parent);
-
-  // Notify the Lifespan strategy of our startup
-  ACE_TRY
-    {
-      this->active_policy_strategies_.lifespan_strategy()->notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      this->poa_manager_.remove_poa (this);
-      this->object_adapter ().unbind_poa (this,
-                                          this->folded_name_,
-                                          this->system_name_.in ());
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-TAO_Root_POA::~TAO_Root_POA (void)
-{
-}
-
-void
-TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // No longer awaiting destruction.
-  this->waiting_destruction_ = 0;
-
-  // Remove POA from the POAManager.
-  int result = this->poa_manager_.remove_poa (this);
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  // Remove POA from the Object Adapter.
-  result = this->object_adapter ().unbind_poa (this,
-                                               this->folded_name_,
-                                               this->system_name_.in ());
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  // Cleanup all strategies
-  this->active_policy_strategies_.cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Forced cleanup.  The new memory management scheme is evil and can
-  // lead to reference deadlock, i.e., POA holds object A, but POA
-  // cannot die because object A hold POA.
-  {
-    //
-    // If new things are added to this cleanup code, make sure to move
-    // the minimum CORBA #define after the declaration of
-    // <non_servant_upcall>.
-    //
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    // ATTENTION: Trick locking here, see class header for details
-    TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
-    ACE_UNUSED_ARG (non_servant_upcall);
-
-    this->adapter_activator_ = PortableServer::AdapterActivator::_nil ();
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  }
-
-  CORBA::release (this);
-}
-
-PortableServer::POA_ptr
-TAO_Root_POA::create_POA_i (const char *adapter_name,
-                            PortableServer::POAManager_ptr poa_manager,
-                            const CORBA::PolicyList &policies
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // Initialize a TAO_POA_Policy_Set instance so that it contains the
-  // default POA policies.
-  TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
-
-  // Merge policies from the ORB level.
-  this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Merge in any policies that the user may have specified.
-  tao_policies.merge_policies (policies
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // If any of the policy objects specified are not valid for the ORB
-  // implementation, if conflicting policy objects are specified, or
-  // if any of the specified policy objects require prior
-  // administrative action that has not been performed, an
-  // InvalidPolicy exception is raised containing the index in the
-  // policies parameter value of the first offending policy object.
-  tao_policies.validate_policies (this->object_adapter ().validator (),
-                                  this->orb_core_
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // If the poa_manager parameter is null, a new POAManager object is
-  // created and associated with the new POA. Otherwise, the specified
-  // POAManager object is associated with the new POA. The POAManager
-  // object can be obtained using the attribute name the_POAManager.
-  TAO_POA_Manager* tao_poa_manager = 0;
-  if (CORBA::is_nil (poa_manager))
-    {
-      ACE_NEW_THROW_EX (tao_poa_manager,
-                        TAO_POA_Manager (this->object_adapter ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-    }
-  else
-    {
-      tao_poa_manager = dynamic_cast<TAO_POA_Manager *> (poa_manager);
-    }
-
-  PortableServer::POAManager_var safe_poa_manager = tao_poa_manager;
-
-  PortableServer::POA_var poa = this->create_POA_i (adapter_name,
-                                                    *tao_poa_manager,
-                                                    tao_policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Release the POA_Manager_var since we got here without error.  The
-  // TAO_Regular_POA object takes ownership of the POA_Manager object
-  // (actually it shares the ownership with its peers).
-  (void) safe_poa_manager._retn ();
-
-  return poa._retn ();
-}
-
-TAO_Root_POA *
-TAO_Root_POA::new_POA (const String &name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policy_Set &policies,
-                       TAO_Root_POA *parent,
-                       ACE_Lock &lock,
-                       TAO_SYNCH_MUTEX &thread_lock,
-                       TAO_ORB_Core &orb_core,
-                       TAO_Object_Adapter *object_adapter
-                       ACE_ENV_ARG_DECL)
-{
-  TAO_Regular_POA *poa = 0;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_Regular_POA (name,
-                             poa_manager,
-                             policies,
-                             parent,
-                             lock,
-                             thread_lock,
-                             orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return poa;
-}
-
-PortableServer::POA_ptr
-TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
-                            TAO_POA_Manager &poa_manager,
-                            const TAO_POA_Policy_Set &policies
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // This operaton creates a new POA as a child of the target POA. The
-  // specified name identifies the new POA with respect to other POAs
-  // with the same parent POA. If the target POA already has a child
-  // POA with the specified name, the AdapterAlreadyExists exception
-  // is raised.
-  int result = this->children_.find (adapter_name);
-
-  // Child was found
-  if (result != -1)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
-                        PortableServer::POA::_nil ());
-    }
-
-  //
-  // Child was not found.  Create one.
-  //
-
-  // The specified policy objects are associated with the POA and used
-  // to control its behavior. The policy objects are effectively
-  // copied before this operation returns, so the application is free
-  // to destroy them while the POA is in use. Policies are not
-  // inherited from the parent POA.
-  TAO_Root_POA * poa = this->new_POA (adapter_name,
-                                      poa_manager,
-                                      policies,
-                                      this,
-                                      this->object_adapter ().lock (),
-                                      this->object_adapter ().thread_lock (),
-                                      this->orb_core_,
-                                      this->object_adapter_
-                                      ACE_ENV_ARG_PARAMETER);
-
-  // Give ownership of the new map to the POA_var.  Note, that it
-  // is important for the POA_var to take ownership before
-  // checking for exception since we may need to delete the new map.
-  PortableServer::POA_var new_poa = poa;
-
-  // Check for exception in construction of the POA.
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Add to children map
-  result = this->children_.bind (adapter_name,
-                                 poa);
-  if (result != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        PortableServer::POA::_nil ());
-    }
-
-  // Increment the reference count on the child POA since the children
-  // map must retain ownership.  Do so immediately before any other
-  // operations to prevent memory cleanup problems induced from
-  // errors below.
-  poa->_add_ref ();
-
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Note: Creating a POA using a POA manager that is in the active
-  // state can lead to race conditions if the POA supports preexisting
-  // objects, because the new POA may receive a request before its
-  // adapter activator, servant manager, or default servant have been
-  // initialized. These problems do not occur if the POA is created by
-  // an adapter activator registered with a parent of the new POA,
-  // because requests are queued until the adapter activator
-  // returns. To avoid these problems when a POA must be explicitly
-  // initialized, the application can initialize the POA by invoking
-  // find_POA with a TRUE activate parameter.
-
-  // Everything is fine. Don't let the POA_var release the
-  // implementation.
-  return new_poa._retn ();
-}
-
-PortableServer::POA_ptr
-TAO_Root_POA::find_POA (const char *adapter_name,
-                        CORBA::Boolean activate_it
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  TAO_Root_POA *poa = this->find_POA_i (adapter_name,
-                                   activate_it
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return PortableServer::POA::_duplicate (poa);
-}
-
-TAO_Root_POA *
-TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
-                     CORBA::Boolean activate_it
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  TAO_Root_POA *child = 0;
-  int result = this->children_.find (child_name,
-                                     child);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  if (result != 0)
-    {
-      if (activate_it)
-        {
-          if (!CORBA::is_nil (this->adapter_activator_.in ()))
-            {
-              // Check our state
-              this->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
-
-              CORBA::Boolean success = false;
-              ACE_TRY_EX (UnknownAdapter)
-                {
-                  // ATTENTION: Trick locking here, see class header for details
-                  TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (
-                    *this);
-                  ACE_UNUSED_ARG (non_servant_upcall);
-
-                  // When unknown_adapter gives a system exception, the POA
-                  // should raise OBJ_ADAPTER with standard minor code 1.
-                  // See 11.3.9.2 of the Corba spec
-                  success =
-                    this->adapter_activator_->unknown_adapter (
-                      this,
-                      child_name.c_str ()
-                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (UnknownAdapter);
-                }
-              ACE_CATCH (CORBA::SystemException, ex)
-                {
-                  ACE_TRY_THROW_EX (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO),
-                                    UnknownAdapter);
-                }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
-
-              if (success)
-                {
-                  result = this->children_.find (child_name,
-                                                 child);
-                }
-              else
-                {
-                  result = -1;
-                }
-            }
-          else
-            {
-              result = -1;
-            }
-        }
-      else
-        {
-          result = -1;
-        }
-    }
-#else
-  ACE_UNUSED_ARG (activate_it);
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  if (result == 0)
-    {
-      return child;
-    }
-  else
-    {
-      // Otherwise, the AdapterNonExistent exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
-                        0);
-    }
-}
-
-TAO_POA_Manager &
-TAO_Root_POA::tao_poa_manager ()
-{
-  return poa_manager_;
-}
-
-PortableServer::POA_ptr
-TAO_Root_POA::create_POA (const char *adapter_name,
-                          PortableServer::POAManager_ptr poa_manager,
-                          const CORBA::PolicyList &policies
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->create_POA_i (adapter_name,
-                             poa_manager,
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::servant_to_id (PortableServer::Servant servant
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // If we had upgradeable locks, this would initially be a read lock
-  //
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->servant_to_id_i (servant
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->reference_to_servant_i (reference
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::servant_to_reference (PortableServer::Servant servant
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->servant_to_reference_i (servant
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::POAList *
-TAO_Root_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-
-PortableServer::Servant
-TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->id_to_servant_i (oid
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->id_to_reference_i (oid, true ACE_ENV_ARG_PARAMETER);
-}
-
-
-CORBA::Object_ptr
-TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                        const char *intf
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->create_reference_with_id_i (id,
-                                           intf,
-                                           this->server_priority ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-
-void
-TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
-                       CORBA::Boolean wait_for_completion
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0);
-  ACE_CHECK;
-  ACE_UNUSED_ARG (poa_guard);
-
-  this->destroy_i (etherealize_objects,
-                   wait_for_completion
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Root_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  // The root poa has no parent, so this is a noop
-}
-
-void
-TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                         CORBA::Boolean wait_for_completion
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->cleanup_in_progress_)
-    return;
-
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                      wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->cleanup_in_progress_ = 1;
-
-  // This operation destroys the POA and all descendant POAs. The POA
-  // so destroyed (that is, the POA with its name) may be re-created
-  // later in the same process. (This differs from the
-  // POAManager::deactivate operation that does not allow a
-  // re-creation of its associated POA in the same process.)
-
-  // Remove POA from the parent
-  this->remove_from_parent_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO::ORT_Array array_obj_ref_template (1);
-
-  CORBA::ULong i = 0;
-
-  // Gather all ObjectReferenceTemplates and change all adapter states
-  // to INACTIVE.
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
-       ++iterator)
-    {
-      TAO_Root_POA * const child_poa = (*iterator).int_id_;
-
-      TAO::ORT_Adapter * const adapter = child_poa->ORT_adapter_i ();
-
-      // In case no ORT library is linked we get zero.
-      if (adapter != 0)
-        {
-          // Get the ObjectReferenceTemplate for the child POA.
-          PortableInterceptor::ObjectReferenceTemplate * const ort =
-            adapter->get_adapter_template ();
-
-          // Add it to the sequence of object reference templates that
-          // will be destroyed.
-          array_obj_ref_template.size (1);
-
-          array_obj_ref_template[0] = ort;
-        }
-
-      child_poa->adapter_state_ =
-        PortableInterceptor::INACTIVE;
-
-      // Notify the state changes to the IORInterceptors
-      this->adapter_state_changed (array_obj_ref_template,
-                                   PortableInterceptor::INACTIVE
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (adapter != 0)
-        adapter->release (array_obj_ref_template[0]);
-
-      ++i;
-    }
-
-  // Destroy all child POA's now.
-  for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
-       destroy_iterator != this->children_.end ();
-       ++destroy_iterator)
-    {
-      TAO_Root_POA *destroy_child_poa = (*destroy_iterator).int_id_;
-
-      destroy_child_poa->destroy_i (etherealize_objects,
-                                    wait_for_completion
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // Notify the lifespan strategy of our shutdown
-  this->active_policy_strategies_.lifespan_strategy()->notify_shutdown (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-// @todo, is the exception handling above correct, should we just fail when
-// the notify above fails
-
-  // When a POA is destroyed, any requests that have started execution
-  // continue to completion. Any requests that have not started
-  // execution are processed as if they were newly arrived, that is,
-  // the POA will attempt to cause recreation of the POA by invoking
-  // one or more adapter activators as described in Section 3.3.3.
-  // If the wait_for_completion parameter is TRUE, the destroy
-  // operation will return only after all requests in process have
-  // completed and all invocations of etherealize have
-  // completed. Otherwise, the destroy operation returns after
-  // destroying the POAs.
-
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  wait_for_completion
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If there are no outstanding requests and that we are not in a
-  // non-servant upcall or if we are in a non-servant upcall, make
-  // sure we are the POA related to the non-servant upcall.
-  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress =
-    this->object_adapter ().non_servant_upcall_in_progress ();
-  if (this->outstanding_requests_ == 0 &&
-      (non_servant_upcall_in_progress == 0 ||
-       &non_servant_upcall_in_progress->poa () != this))
-    {
-      TAO::ORT_Array my_array_obj_ref_template;
-
-      TAO::ORT_Adapter * const ort_adapter =
-        this->ORT_adapter_i ();
-
-      // In case no ORT library is linked we get zero.
-      if (ort_adapter != 0)
-        {
-          // Get the ObjectReferenceTemplate.
-          PortableInterceptor::ObjectReferenceTemplate * const ort =
-            ort_adapter->get_adapter_template ();
-
-          // Add it to the sequence of object reference templates, we
-          // just notify for ourselves that we are now non_existent,
-          // our childs will do it for themselves.
-          my_array_obj_ref_template.size (1);
-          my_array_obj_ref_template[0] = ort;
-        }
-
-      // According to the ORT spec, after a POA is destroyed, its state
-      // has to be changed to NON_EXISTENT and all the registered
-      // interceptors are to be informed. Since, the POA is destroyed
-      // and is released in the complete_destruction_i method, we are
-      // trying to keep the poa still around by doing a duplicate of
-      // it. (a hack).
-      PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
-
-      this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
-
-      this->adapter_state_changed (my_array_obj_ref_template,
-                                   this->adapter_state_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (ort_adapter != 0)
-        {
-          ort_adapter->release (my_array_obj_ref_template[0]);
-
-          TAO::ORT_Adapter_Factory *ort_factory =
-            this->ORT_adapter_factory ();
-
-          ort_factory->destroy (ort_adapter);
-
-          this->ort_adapter_ = 0;
-        }
-    }
-  else
-    {
-      // Mark that we are ready for destruction.
-      this->waiting_destruction_ = 1;
-    }
-}
-
-int
-TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
-{
-  int result = 0;
-
-  // If we are not closing down, we must remove this child from our
-  // collection.
-  if (!this->cleanup_in_progress_)
-    result = this->children_.unbind (child);
-
-  // Otherwise, if we are closing down, we are currently iterating
-  // over our children and there is not need to remove this child from
-  // our collection.
-
-  return result;
-}
-
-PortableServer::POAList *
-TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POAList_var children;
-  CORBA::ULong child_current = static_cast <CORBA::ULong>
-                                           (this->children_.current_size ());
-  ACE_NEW_THROW_EX (children,
-                    PortableServer::POAList (child_current),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  children->length (child_current);
-
-  CORBA::ULong index = 0;
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
-       ++iterator, ++index)
-    {
-      TAO_Root_POA *child_poa = (*iterator).int_id_;
-      children[index] = PortableServer::POA::_duplicate (child_poa);
-    }
-
-  return children._retn ();
-}
-
-PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The adapter name is the sequence of names starting from the
-  // RootPOA to the one whose name is requested.  The name of the
-  // RootPOA is "RootPOA".
-
-  PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
-
-  CORBA::ULong len = 0;
-
-  // Find the length of the adapter name sequence by traversing the
-  // POA hierarchy until the RootPOA is reached.  The RootPOA has no
-  // parent.
-  while (!CORBA::is_nil (poa.in ()))
-    {
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      ++len;
-    }
-
-  // Empty adapter name sequence.
-  PortableInterceptor::AdapterName *names = 0;
-  ACE_NEW_THROW_EX (names,
-                    PortableInterceptor::AdapterName (len),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  PortableInterceptor::AdapterName_var safe_names (names);
-
-  names->length (len);
-
-  poa = PortableServer::POA::_duplicate (this);
-
-  (*names)[0] = CORBA::string_dup ("RootPOA");
-
-  // Fill in the AdapterName sequence as the POA hierarchy is
-  // traversed.
-  CORBA::ULong ilen = len;
-  for (CORBA::ULong i = 1; i < len; ++i)
-    {
-      (*names)[--ilen] = poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If this condition asserts, the POA hierarchy was modified
-      // (i.e. reduced in size) by another thread!
-      ACE_ASSERT ((ilen > 0 ? !CORBA::is_nil (poa.in ()) : 1));
-    }
-
-  return safe_names._retn ();
-}
-
-void
-TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
-                                 const IOP::TaggedComponent &component
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Add the given tagged component to all profiles.
-  const CORBA::ULong profile_count = mprofile.profile_count ();
-
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      TAO_Profile *profile = mprofile.get_profile (i);
-
-      profile->add_tagged_component (component
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Root_POA::add_ior_component_to_profile (
-    TAO_MProfile & mprofile,
-    const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Add the given tagged component to all profiles matching the given
-  // ProfileId.
-  int found_profile = 0;
-
-  const CORBA::ULong profile_count = mprofile.profile_count ();
-
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      TAO_Profile *profile = mprofile.get_profile (i);
-
-      if (profile->tag () == profile_id)
-        {
-          profile->add_tagged_component (component
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          found_profile = 1;
-        }
-    }
-
-  // According to the Portable Interceptor specification, we're
-  // supposed to throw a CORBA::BAD_PARAM exception if no profile
-  // matched the given ProfileId.
-  if (found_profile == 0)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
-                                 CORBA::COMPLETED_NO));
-}
-
-void
-TAO_Root_POA::adapter_state_changed (
-   const TAO::ORT_Array &array_obj_ref_template,
-   PortableInterceptor::AdapterState state
-   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->adapter_state_changed (array_obj_ref_template,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
-                                 CORBA::Short priority,
-                                 int &wait_occurred_restart_call
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    activate_object (servant,
-                     priority,
-                     wait_occurred_restart_call
-                     ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::activate_object (PortableServer::Servant servant
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (0);
-
-      PortableServer::ObjectId *result =
-        this->activate_object_i (servant,
-                                 this->server_priority (),
-                                 wait_occurred_restart_call
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return result;
-    }
-}
-
-void
-TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                       PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD;
-
-      this->activate_object_with_id_i (id,
-                                       servant,
-                                       this->server_priority (),
-                                       wait_occurred_restart_call
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return;
-    }
-}
-
-void
-TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                         PortableServer::Servant servant,
-                                         CORBA::Short priority,
-                                         int &wait_occurred_restart_call
-                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->active_policy_strategies_.servant_retention_strategy()->
-    activate_object_with_id (id,
-                             servant,
-                             priority,
-                             wait_occurred_restart_call
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                        CORBA::Boolean wait_for_completion
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->deactivate_all_objects_i (etherealize_objects
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->wait_for_completions (wait_for_completion
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion
-                                    ACE_ENV_ARG_DECL)
-{
-  while (this->object_adapter ().enable_locking_ &&
-         wait_for_completion &&
-         this->outstanding_requests_ > 0)
-    {
-      this->wait_for_completion_pending_ = 1;
-
-      int result = this->outstanding_requests_condition_.wait ();
-      if (result == -1)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-}
-
-/* static */
-void
-TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                                    CORBA::Boolean wait_for_completion
-                                                    ACE_ENV_ARG_DECL)
-{
-  if (wait_for_completion)
-    {
-      TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
-        static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-
-      while (1)
-        {
-          // If wait_for_completion is TRUE and the current thread is
-          // in an invocation context dispatched from some POA
-          // belonging to the same ORB as this POA, the BAD_INV_ORDER
-          // system exception with standard minor code 3 is raised and
-          // POA destruction does not occur.
-          if (poa_current_impl != 0)
-            {
-              if (&orb_core == &poa_current_impl->orb_core ())
-                {
-                  // CORBA 2.3 specifies which minor code corresponds
-                  // to this particular problem.
-                  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3,
-                                                   CORBA::COMPLETED_NO));
-                }
-            }
-          else
-            break;
-
-          poa_current_impl =
-            poa_current_impl->previous_current_impl_;
-        }
-    }
-}
-
-void
-TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->active_policy_strategies_.request_processing_strategy ()->
-    etherealize_objects (etherealize_objects);
-
-  this->active_policy_strategies_.servant_retention_strategy ()->
-    deactivate_all_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->deactivate_object_i (oid
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->active_policy_strategies_.servant_retention_strategy()->
-    deactivate_object (id
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Boolean
-TAO_Root_POA::is_persistent (void) const
-{
-  return active_policy_strategies_.lifespan_strategy()->is_persistent ();
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::create_reference (const char *intf
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->create_reference_i (intf,
-                                   this->server_priority ()
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::create_reference_i (const char *intf,
-                                  CORBA::Short priority
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  if (!this->has_system_id ())
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    create_reference (intf, priority ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
-                                             const PortableServer::ObjectId & id
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const PortableInterceptor::ObjectId &user_oid =
-    reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
-
-  // Ask the ORT to create the object.
-  if (this->ORT_adapter_i ())
-    {
-      // Ask the ORT to create the object.
-      return this->ort_adapter_->make_object (repository_id,
-                                              user_oid
-                                              ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
-                                          const char *intf,
-                                          CORBA::Short priority
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the create_reference_with_id operation may raise the BAD_PARAM
-  // system exception. An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke this operation on a POA that has the SYSTEM_ID policy with
-  // an Object Id value that was not previously generated by the
-  // system for that POA, or, if the POA also has the PERSISTENT
-  // policy, for a previous instantiation of the same POA.
-  if (this->has_system_id () &&
-      !this->is_poa_generated_id (user_id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::Object::_nil ());
-    }
-
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    create_reference_with_id (user_id, intf, priority ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.request_processing_strategy()->
-    servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Make sure that the reference is valid.
-  if (CORBA::is_nil (reference))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
-    }
-
-  PortableServer::ObjectId system_id;
-  bool is_generated = this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!is_generated)
-    {
-      // In case this object reference is not generated by this POA throw
-      // an exception
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
-    }
-
-  PortableServer::Servant servant =
-    this->active_policy_strategies_.request_processing_strategy()->
-      system_id_to_servant (system_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (servant != 0)
-    {
-      // ATTENTION: Trick locking here, see class header for details
-      TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return servant;
-}
-
-bool
-TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
-                                PortableServer::ObjectId &system_id
-                                ACE_ENV_ARG_DECL)
-{
-  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
-
-  int result = this->parse_key (key.in (),
-                                poa_system_name,
-                                system_id,
-                                is_root,
-                                is_persistent,
-                                is_system_id,
-                                poa_creation_time);
-  if (result != 0 ||
-      !this->root () &&
-      poa_system_name != this->system_name () ||
-      is_root != this->root () ||
-      is_system_id != this->system_id () ||
-      !this->validate_lifespan (is_persistent, poa_creation_time))
-    {
-      // The passed reference is NOT generated by this POA
-      return false;
-    }
-  else
-    {
-      // The passed reference is generated by this POA
-      return true;
-    }
-}
-
-PortableServer::ObjectId *
-TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Make sure that the reference is valid.
-  if (CORBA::is_nil (reference))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
-    }
-
-  // The WrongPolicy exception is declared to allow future extensions.
-
-  // This operation is valid only if the reference was created by the
-  // POA on which the operation is being performed.  If the object
-  // reference was not created by this POA, the WrongAdapter exception
-  // is raised.
-  PortableServer::ObjectId system_id;
-  bool is_generated = this->is_poa_generated (reference,
-                                              system_id
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!is_generated)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
-    }
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    system_id_to_object_id (system_id ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::find_servant (const PortableServer::ObjectId &system_id
-                            ACE_ENV_ARG_DECL)
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    find_servant (system_id ACE_ENV_ARG_PARAMETER);
-}
-
-int
-TAO_Root_POA::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    unbind_using_user_id  (user_id);
-}
-
-void
-TAO_Root_POA::cleanup_servant (
-  PortableServer::Servant servant,
-  const PortableServer::ObjectId &user_id
-  ACE_ENV_ARG_DECL)
-{
-  this->active_policy_strategies_.request_processing_strategy()->
-    cleanup_servant (servant, user_id ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-
-  PortableServer::Servant servant =
-    this->active_policy_strategies_.request_processing_strategy()->
-      id_to_servant (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (servant != 0)
-    {
-      // ATTENTION: Trick locking here, see class header for details
-      TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return servant;
-}
-
-PortableServer::Servant
-TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    user_id_to_servant (id ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
-                                 bool indirect
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-    id_to_reference (id, indirect ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::OctetSeq *
-TAO_Root_POA::id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::OctetSeq *id = 0;
-  ACE_NEW_THROW_EX (id,
-                    CORBA::OctetSeq (this->id_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return id;
-}
-
-PortableServer::Servant
-TAO_Root_POA::locate_servant_i (const char *operation,
-                                const PortableServer::ObjectId &system_id,
-                                TAO::Portable_Server::Servant_Upcall &servant_upcall,
-                                TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-                                int &wait_occurred_restart_call
-                                ACE_ENV_ARG_DECL)
-{
-  return this->active_policy_strategies_.request_processing_strategy()->
-    locate_servant (operation,
-                    system_id,
-                    servant_upcall,
-                    poa_current_impl,
-                    wait_occurred_restart_call
-                    ACE_ENV_ARG_PARAMETER);
-}
-
-/* static */
-int
-TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
-                         TAO_Object_Adapter::poa_name &poa_system_name,
-                         PortableServer::ObjectId &system_id,
-                         CORBA::Boolean &is_root,
-                         CORBA::Boolean &is_persistent,
-                         CORBA::Boolean &is_system_id,
-                         TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time)
-{
-  // Start at zero.
-  CORBA::ULong starting_at = 0;
-
-  // Get the object key octets.
-  const CORBA::Octet *key_data = key.get_buffer ();
-
-  // Skip the object key prefix since we have already checked for this.
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // Check the root indicator.
-  char root_key_type = key_data[starting_at];
-  if (root_key_type == TAO_Root_POA::root_key_char ())
-    {
-      is_root = 1;
-    }
-  else if (root_key_type == TAO_Root_POA::non_root_key_char ())
-    {
-      is_root = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_Root_POA::root_key_type_length ();
-
-  // Check the system id indicator.
-  char system_id_key_type = key_data[starting_at];
-  if (system_id_key_type == TAO_Root_POA::system_id_key_char ())
-    {
-      is_system_id = 1;
-    }
-  else if (system_id_key_type == TAO_Root_POA::user_id_key_char ())
-    {
-      is_system_id = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_Root_POA::system_id_key_type_length ();
-
-  // Check the persistence indicator
-  char persistent_key_type = key_data[starting_at];
-  if (persistent_key_type == TAO_Root_POA::persistent_key_char ())
-    {
-      is_persistent = 1;
-    }
-  else if (persistent_key_type == TAO_Root_POA::transient_key_char ())
-    {
-      is_persistent = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the persistent indicator
-  starting_at += TAO_Root_POA::persistent_key_type_length ();
-
-#if (POA_NO_TIMESTAMP == 0)
-  // Grab the timestamp for transient POAs.
-  if (!is_persistent)
-    {
-      // Take the creation time for the timestamp
-      poa_creation_time.creation_time (key_data + starting_at);
-
-      // Skip past the timestamp
-      starting_at += TAO::Portable_Server::Creation_Time::creation_time_length ();
-    }
-#else
-  ACE_UNUSED_ARG (poa_creation_time);
-#endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the size of the POA name.
-  CORBA::ULong poa_name_size = 0;
-  if (!is_persistent)
-    {
-      // Transient POAs have fixed size.
-      poa_name_size = TAO_Object_Adapter::transient_poa_name_size ();
-    }
-  else if (is_system_id)
-    {
-      // System ids have fixed size.
-      poa_name_size = static_cast <CORBA::ULong>
-                                  (key.length () - starting_at -
-                                   TAO_Active_Object_Map::system_id_size ());
-    }
-  else
-    {
-      // Get the size from the object key.
-      ACE_OS::memcpy (&poa_name_size,
-                      key_data + starting_at,
-                      sizeof (poa_name_size));
-      poa_name_size = ACE_NTOHL (poa_name_size);
-
-      starting_at += sizeof (poa_name_size);
-    }
-
-  // Grep the name if there is aname
-  if (!is_root)
-    {
-      poa_system_name.replace (poa_name_size,
-                               poa_name_size,
-                               (CORBA::Octet *) key_data + starting_at,
-                               0);
-
-      starting_at += poa_name_size;
-    }
-
-  // The rest is the system id.
-  CORBA::ULong system_id_size = key.length () - starting_at;
-
-  // Reset <system_id>.
-  system_id.length (system_id_size);
-  CORBA::Octet * buf = system_id.get_buffer ();
-  ACE_OS::memcpy (buf, key_data + starting_at, system_id_size);
-
-  // Success
-  return 0;
-}
-
-TAO::ObjectKey *
-TAO_Root_POA::create_object_key (const PortableServer::ObjectId &id)
-{
-  // Calculate the space required for the key.
-  CORBA::ULong buffer_size =
-    this->id_.length () +
-    id.length ();
-
-  // Create the buffer for the key.
-  CORBA::Octet *buffer = TAO::ObjectKey::allocbuf (buffer_size);
-
-  // First copy the POA id into the key.
-  ACE_OS::memcpy (&buffer[0],
-                  this->id_.get_buffer (),
-                  this->id_.length ());
-
-  // Then copy the object id into the key.
-  ACE_OS::memcpy (&buffer[this->id_.length ()],
-                  id.get_buffer (),
-                  id.length ());
-
-  // Create the key, giving the ownership of the buffer to the
-  // sequence.
-  TAO::ObjectKey *key = 0;
-  ACE_NEW_RETURN (key,
-                  TAO::ObjectKey (buffer_size,
-                                 buffer_size,
-                                 buffer,
-                                 1),
-                  0);
-
-  return key;
-}
-
-void
-TAO_Root_POA::set_id (TAO_Root_POA *parent)
-{
-  // Calculate the prefix size.
-  CORBA::ULong prefix_size = 0;
-  prefix_size += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // If we are dealing with a persistent POA and user ids are being
-  // used, then we need to add the POA name length field to the object
-  // key. Otherwise, the POA name length can be calculated by looking
-  // at the remainder after extracting other parts of the key.
-  int add_poa_name_length =
-    this->is_persistent () &&
-    !this->system_id ();
-
-  // Size required by the POA name.
-  CORBA::ULong poa_name = 0;
-
-  // Calculate the space required for the POA name.
-  CORBA::ULong poa_name_length = this->system_name_->length ();
-  if (parent != 0)
-    {
-      poa_name += poa_name_length;
-    }
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name += sizeof (poa_name_length);
-    }
-
-  // Get the space needed for the lifespan length
-  // byte.
-  CORBA::ULong lifespan_key_length =
-    this->active_policy_strategies_.lifespan_strategy()->key_length ();
-
-  CORBA::ULong id_assignment_key_length =
-    this->active_policy_strategies_.id_assignment_strategy()->key_type_length ();
-
-  // Calculate the space required for the POA id.
-  CORBA::ULong buffer_size =
-    prefix_size +
-    this->root_key_type_length () +
-    id_assignment_key_length +
-    lifespan_key_length +
-    poa_name;
-
-  // Create the buffer for the POA id.
-  this->id_.length (buffer_size);
-  CORBA::Octet *buffer = &this->id_[0];
-
-  // Keeps track of where the next infomation goes; start at 0 byte.
-  CORBA::ULong starting_at = 0;
-
-  // Add the object key prefix.
-  ACE_OS::memcpy (&buffer[starting_at],
-                  &objectkey_prefix[0],
-                  TAO_OBJECTKEY_PREFIX_SIZE);
-
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // Copy the root byte.
-  if (parent != 0)
-    {
-      buffer[starting_at] = (CORBA::Octet) TAO_Root_POA::non_root_key_char ();
-    }
-  else
-    {
-      buffer[starting_at] = (CORBA::Octet) TAO_Root_POA::root_key_char ();
-    }
-  starting_at += this->root_key_type_length ();
-
-  // Add the id_assignment part
-  this->active_policy_strategies_.id_assignment_strategy()->create_key (buffer, starting_at);
-
-  // Add the lifespan part
-  this->active_policy_strategies_.lifespan_strategy()->create_key (buffer, starting_at);
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name_length = ACE_HTONL (poa_name_length);
-      ACE_OS::memcpy (&buffer[starting_at],
-                      &poa_name_length,
-                      sizeof (poa_name_length));
-      starting_at += sizeof (poa_name_length);
-    }
-
-  // Put the POA name into the key (for non-root POAs).
-  if (parent != 0)
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->system_name_->get_buffer (),
-                      this->system_name_->length ());
-      starting_at += this->system_name_->length ();
-    }
-}
-
-int
-TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
-{
-
-#if defined (POA_NAME_IN_POA_GENERATED_ID)
-
-  // Grab the buffer
-  const char *id_buffer = (const char *) id.get_buffer ();
-
-  // Check to see if the POA name is the first part of the id
-  return
-    this->name_.length () < id.length () &&
-    ACE_OS::strncmp (id_buffer,
-                     this->name_.c_str (),
-                     this->name_.length ()) == 0;
-
-#else /* POA_NAME_IN_POA_GENERATED_ID */
-
-  ACE_UNUSED_ARG (id);
-  return 1;
-
-#endif /* POA_NAME_IN_POA_GENERATED_ID */
-}
-
-void
-TAO_Root_POA::set_folded_name (TAO_Root_POA *parent)
-{
-  size_t length = 0;
-  size_t parent_length = 0;
-
-  if (parent != 0)
-    {
-      parent_length = parent->folded_name ().length ();
-      length += parent_length;
-    }
-
-  length += this->name_.length ();
-  length += TAO_Root_POA::name_separator_length ();
-
-  this->folded_name_.length (static_cast <CORBA::ULong> (length));
-  CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
-
-  if (parent != 0)
-    {
-      ACE_OS::memcpy (folded_name_buffer,
-                      parent->folded_name ().get_buffer (),
-                      parent_length);
-    }
-
-  ACE_OS::memcpy (&folded_name_buffer[parent_length],
-                  this->name_.c_str (),
-                  this->name_.length ());
-
-  folded_name_buffer[length - TAO_Root_POA::name_separator_length ()] = TAO_Root_POA::name_separator ();
-}
-
-int
-TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
-                                   PortableServer::ObjectId &user_id)
-{
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
-
-  return TAO_Root_POA::parse_key (object_key,
-                                  poa_system_name,
-                                  user_id,
-                                  is_root,
-                                  is_persistent,
-                                  is_system_id,
-                                  poa_creation_time);
-}
-
-TAO_Object_Adapter &
-TAO_Root_POA::object_adapter (void)
-{
-  return *this->object_adapter_;
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::ObjectId_var &system_id =
-    *this->key_to_object_params_.system_id_;
-
-  // Create object key.
-  TAO::ObjectKey_var key =
-    this->create_object_key (system_id.in ());
-
-  return this->key_to_object (key.in (),
-                              this->key_to_object_params_.type_id_,
-                              this->key_to_object_params_.servant_,
-                              this->key_to_object_params_.collocated_,
-                              this->key_to_object_params_.priority_,
-                              this->key_to_object_params_.indirect_
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
-                             const char *type_id,
-                             TAO_ServantBase *servant,
-                             CORBA::Boolean collocated,
-                             CORBA::Short priority,
-                             bool indirect
-                             ACE_ENV_ARG_DECL)
-{
-  // Check if the ORB is still running, otherwise throw an exception.
-  // @@ What if the ORB was destroyed?  In that case we shouldn't even
-  //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  //
-  // ImplRepo related.
-  //
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  if (indirect && this->active_policy_strategies_.lifespan_strategy()->use_imr ()
-         && this->orb_core ().imr_endpoints_in_ior ())
-    {
-      // Check to see if we alter the IOR.
-      CORBA::Object_var imr =
-        this->orb_core ().implrepo_service ();
-
-      if (CORBA::is_nil (imr.in ())
-          || !imr->_stubobj ()
-          || !imr->_stubobj ()->profile_in_use ())
-        {
-          if (TAO_debug_level > 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Missing ImR IOR, will not use the ImR\n"));
-            }
-          goto orbkey;
-        }
-
-      CORBA::String_var imr_str =
-        imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "IMR IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ())));
-
-      // Search for "corbaloc:" alone, without the protocol.  This code
-      // should be protocol neutral.
-      const char corbaloc[] = "corbaloc:";
-      char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
-      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-
-      pos = ACE_OS::strchr (pos + 1,
-                            imr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-      if (pos)
-        pos[1] = 0;  // Crop the string.
-      else
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "Could not parse ImR IOR, skipping ImRification\n"));
-          goto orbkey;
-        }
-
-      ACE_CString ior (imr_str.in ());
-
-      // Add the key.
-
-      CORBA::String_var key_str;
-      TAO::ObjectKey::encode_sequence_to_string (key_str.inout (), key);
-
-      ior += key_str.in ();
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "ImR-ified IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
-
-      obj =
-        this->orb_core_.orb ()->string_to_object (ior.c_str ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
-
-      return obj;
-    }
-
-orbkey:
-
-#else
-  ACE_UNUSED_ARG (indirect);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  TAO_Stub_Auto_Ptr safe_data (data);
-
-  CORBA::Object_ptr tmp;
-
-  if (this->orb_core_.optimize_collocation_objects ())
-    {
-      ACE_NEW_THROW_EX (tmp, CORBA::Object (data,
-                                            collocated,
-                                            servant),
-                        CORBA::INTERNAL ());
-
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (tmp,
-                        CORBA::Object (data,
-                                       collocated),
-                        CORBA::INTERNAL ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-
-  data->servant_orb (this->orb_core_.orb ());
-
-  // Transfer ownership to the Object.
-  (void) safe_data.release ();
-
-  return tmp;
-}
-
-TAO_Stub *
-TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key,
-                           const char *type_id,
-                           CORBA::Short priority
-                           ACE_ENV_ARG_DECL)
-{
-  // Check if the ORB is still running, otherwise throw an exception.
-  // @@ What if the ORB was destroyed?  In that case we shouldn't even
-  //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_Stub *
-TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
-                             const char *type_id,
-                             CORBA::Short priority
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_Default_Acceptor_Filter filter;
-  TAO_Stub *data =
-    this->create_stub_object (
-      key,
-      type_id,
-      client_exposed_policies._retn (),
-      &filter,
-      this->orb_core_.lane_resources ().acceptor_registry ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return data;
-}
-
-void
-TAO_Root_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info
-                                      ACE_ENV_ARG_DECL)
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  const CORBA::ULong old_len = this->tagged_component_.length ();
-
-  this->tagged_component_.length (old_len + 1);
-  this->tagged_component_[old_len] = component;
-}
-
-void
-TAO_Root_POA::
-save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
-                                   IOP::ProfileId profile_id
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // The length of this->tagged_component_id_ is the same as the
-  // length of the profile_id_array_ since we are trying to make a
-  // one-to-one link between these two arrays. So, whenever
-  // this->tagged_component_id_ is increased, we need to increase the
-  // size of this->profile_id_array_ also.
-
-  const CORBA::ULong old_len = this->tagged_component_id_.length ();
-
-  const CORBA::ULong new_len = old_len + 1;
-
-  this->tagged_component_id_.length (new_len);
-  this->tagged_component_id_[old_len] = component;
-
-  this->profile_id_array_.size (new_len);
-  this->profile_id_array_[old_len] = profile_id;
-}
-
-TAO_Stub *
-TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
-                                  const char *type_id,
-                                  CORBA::PolicyList *policy_list,
-                                  TAO_Acceptor_Filter *filter,
-                                  TAO_Acceptor_Registry &acceptor_registry
-                                  ACE_ENV_ARG_DECL)
-{
-  int error = 0;
-
-  // Count the number of endpoints.
-  size_t profile_count =
-    acceptor_registry.endpoint_count ();
-
-  // Create a profile container and have acceptor registries populate
-  // it with profiles as appropriate.
-  TAO_MProfile mprofile (0);
-
-  // Allocate space for storing the profiles.  There can never be more
-  // profiles than there are endpoints.  In some cases, there can be
-  // less profiles than endpoints.
-  int result =
-    mprofile.set (static_cast <CORBA::ULong> (profile_count));
-  if (result == -1)
-    error = 1;
-
-  if (!error)
-    {
-      result =
-        filter->fill_profile (object_key,
-                              mprofile,
-                              acceptor_registry.begin (),
-                              acceptor_registry.end ());
-      if (result == -1)
-        error = 1;
-    }
-
-  if (!error)
-    result = filter->encode_endpoints (mprofile);
-  if (result == -1)
-    error = 1;
-
-  if (error)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  // Make sure we have at least one profile.  <mp> may end up being
-  // empty if none of the acceptor endpoints have the right priority
-  // for this object, for example.
-  if (mprofile.profile_count () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  TAO_Stub *stub =
-    this->orb_core_.create_stub_object (mprofile,
-                                        type_id,
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Add the saved tagged components methods to the profiles.
-  CORBA::ULong len = this->tagged_component_.length ();
-  for (CORBA::ULong i = 0; i != len; ++i)
-    {
-      this->add_ior_component (mprofile,
-                               this->tagged_component_[i]
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      }
-
-  len = this->tagged_component_id_.length ();
-
-  for (CORBA::ULong k = 0; k != len; ++k)
-    {
-      this->add_ior_component_to_profile (mprofile,
-                                          this->tagged_component_id_[k],
-                                          this->profile_id_array_[k]
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return stub;
-}
-
-CORBA::PolicyList *
-TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
-                                       ACE_ENV_ARG_DECL)
-{
-  CORBA::PolicyList *client_exposed_policies = 0;
-  ACE_NEW_THROW_EX (client_exposed_policies,
-                    CORBA::PolicyList (),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::PolicyList_var policies = client_exposed_policies;
-
-  // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return policies._retn ();
-}
-
-TAO_SERVANT_LOCATION
-TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
-                                PortableServer::Servant &servant
-                                ACE_ENV_ARG_DECL)
-{
-  return this->active_policy_strategies_.request_processing_strategy()->
-          locate_servant (system_id, servant ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_SERVANT_LOCATION
-TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id,
-                               PortableServer::Servant &servant
-                               ACE_ENV_ARG_DECL)
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-          servant_present (system_id, servant ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::find_servant (
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL)
-{
-  return this->active_policy_strategies_.servant_retention_strategy()->
-          find_servant (system_id,
-                        servant_upcall,
-                        poa_current_impl
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::ORT_Adapter_Factory *
-TAO_Root_POA::ORT_adapter_factory (void)
-{
-  return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance (
-           TAO_Root_POA::ort_adapter_factory_name ());
-}
-
-TAO::ORT_Adapter *
-TAO_Root_POA::ORT_adapter_i (void)
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO::ORT_Adapter_Factory * ort_ap_factory =
-        this->ORT_adapter_factory ();
-
-      if (!ort_ap_factory)
-        return 0;
-
-      // Get the full adapter name of this POA, do this before we
-      // create the adapter so that in case this fails, we just
-      // return 0 and not a not activated adapter
-      PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->ort_adapter_ =
-          ort_ap_factory->create ();
-
-      if (!this->ort_adapter_)
-        return 0;
-
-      // @todo We have to look at this, we activate it but hold the POA lock,
-      // in case we are called by ORT_adapter, we shouldn't keep the lock
-      // here, but then the ort_adapter should be guarded against multiple
-      // activations.
-      this->ort_adapter_->activate (this->orb_core_.server_id (),
-                                    this->orb_core_.orbid (),
-                                    adapter_name,
-                                    this
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return this->ort_adapter_;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::AdapterActivator_ptr
-TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
-
-  return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
-}
-
-void
-TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ServantManager_ptr
-TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
-
-  return this->active_policy_strategies_.request_processing_strategy()->
-    get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->active_policy_strategies_.request_processing_strategy()->
-    set_servant_manager (imgr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-PortableServer::Servant
-TAO_Root_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  return this->active_policy_strategies_.request_processing_strategy()->
-    get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  PortableServer::Servant servant =
-    this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (servant != 0)
-    {
-      // ATTENTION: Trick locking here, see class header for details
-      TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // get_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return servant;
-    }
-  else
-    {
-      // If no servant has been associated with the POA, the NoServant
-      // exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
-                        0);
-    }
-}
-
-void
-TAO_Root_POA::set_servant (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->active_policy_strategies_.request_processing_strategy()->
-    set_servant (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-bool
-TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant,
-                                             int &wait_occurred_restart_call)
-{
-  return this->active_policy_strategies_.id_uniqueness_strategy ()->
-    is_servant_activation_allowed (servant, wait_occurred_restart_call);
-}
-
-bool
-TAO_Root_POA::has_system_id (void) const
-{
-  return this->active_policy_strategies_.id_assignment_strategy ()->
-    has_system_id ();
-}
-
-int
-TAO_Root_POA::rebind_using_user_id_and_system_id (
-  PortableServer::Servant servant,
-  const PortableServer::ObjectId &user_id,
-  const PortableServer::ObjectId &system_id,
-  TAO::Portable_Server::Servant_Upcall &servant_upcall)
-{
-  return this->active_policy_strategies_.servant_retention_strategy ()->
-    rebind_using_user_id_and_system_id (servant,
-                                        user_id,
-                                        system_id,
-                                        servant_upcall);
-}
-
-CORBA::Boolean
-TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant)
-{
-  return this->active_policy_strategies_.servant_retention_strategy ()->
-    servant_has_remaining_activations (servant);
-}
-
-bool
-TAO_Root_POA::allow_implicit_activation (void) const
-{
-  return this->active_policy_strategies_.implicit_activation_strategy ()->
-    allow_implicit_activation ();
-}
-
-bool
-TAO_Root_POA::allow_multiple_activations (void) const
-{
-  return this->active_policy_strategies_.id_uniqueness_strategy ()->
-    allow_multiple_activations ();
-}
-
-void
-TAO_Root_POA::post_invoke_servant_cleanup(
-  const PortableServer::ObjectId &system_id,
-  const TAO::Portable_Server::Servant_Upcall &servant_upcall)
-{
-  this->active_policy_strategies_.request_processing_strategy ()->
-    post_invoke_servant_cleanup (system_id, servant_upcall);
-}
-
-CORBA::Short
-TAO_Root_POA::server_priority (void) const
-{
-  return this->cached_policies_.server_priority ();
-}
-
-int
-TAO_Root_POA::is_servant_active (
-  PortableServer::Servant servant,
-  int &wait_occurred_restart_call)
-{
-  return this->active_policy_strategies_.servant_retention_strategy ()->
-    is_servant_in_map (servant, wait_occurred_restart_call);
-}
-
-TAO::Portable_Server::Cached_Policies::PriorityModel
-TAO_Root_POA::priority_model (void) const
-{
-  return cached_policies_.priority_model ();
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-int
-TAO_Root_POA::enter ()
-{
-  return this->active_policy_strategies_.thread_strategy ()->enter();
-}
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-int
-TAO_Root_POA::exit ()
-{
-  return this->active_policy_strategies_.thread_strategy ()->exit();
-}
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-bool
-TAO_Root_POA::validate_lifespan (
-  CORBA::Boolean is_persistent,
-  const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const
-{
-  return this->active_policy_strategies_.lifespan_strategy()->
-    validate (is_persistent, creation_time);
-}
-
-CORBA::Boolean
-TAO_Root_POA::root (void) const
-{
-  return true;
-}
-
-TAO::ORT_Adapter *
-TAO_Root_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  // DCL ..
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  return this->ORT_adapter_i ();
-}
-
-CORBA::Policy *
-TAO_Root_POA::server_protocol (void)
-{
-  return 0;
-}
-
-void
-TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id,
-                                         const char *type_id,
-                                         TAO_ServantBase *servant,
-                                         CORBA::Boolean collocated,
-                                         CORBA::Short priority,
-                                         bool indirect)
-{
-  this->system_id_ = &system_id;
-  this->type_id_ = type_id;
-  this->servant_ = servant;
-  this->collocated_ = collocated;
-  this->priority_ = priority;
-  this->indirect_ = indirect;
-}
-
-CORBA::ULong
-TAO_Root_POA::waiting_servant_deactivation (void) const
-{
-  return this->active_policy_strategies_.servant_retention_strategy ()->
-          waiting_servant_deactivation ();
-}
-
-void
-TAO_Root_POA::ort_adapter_factory_name (const char *name)
-{
-  TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ =
-    name;
-}
-
-CORBA::Policy_ptr
-TAO_Root_POA::get_policy (CORBA::PolicyType policy
-                          ACE_ENV_ARG_DECL)
-{
-  return this->policies_.get_policy (policy ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Root_POA::check_state (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->active_policy_strategies_.lifespan_strategy ()->
-    check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-const char *
-TAO_Root_POA::ort_adapter_factory_name (void)
-{
-  return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
-}
-
-void
-TAO_Root_POA::imr_client_adapter_name (const char *name)
-{
-  TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_ = name;
-}
-
-const char *
-TAO_Root_POA::imr_client_adapter_name (void)
-{
-  return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str();
-}
-
-PortableServer::POAManager_ptr
-TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::POAManager::_duplicate (&this->poa_manager_);
-}
-
-PortableInterceptor::AdapterManagerId
-TAO_Root_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->poa_manager_.get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-
-// Initialize instance_ to 0, since this is what we test for in the call
-// to instance ().  Note that this does not require a constructor call, so
-// it is always initialized by the time that instance () can be called.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0;
-
-// Force an instance to be created at module initialization time,
-// since we do not want to worry about double checked locking and
-// the race condition to initialize the lock.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
-  TAO_POA_Static_Resources::instance ();
-
-TAO_POA_Static_Resources*
-TAO_POA_Static_Resources::instance (void)
-{
-  if (TAO_POA_Static_Resources::instance_ == 0)
-    {
-      // This new is never freed on purpose.  The data specified by
-      // it needs to be around for the last shared library that references
-      // this class.  This could occur in a destructor in a shared library
-      // that is unloaded after this one.  One solution to avoid this
-      // harmless memory leak would be to use reference counting.
-      ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_,
-                      TAO_POA_Static_Resources (),
-                      0);
-    }
-
-  return TAO_POA_Static_Resources::instance_;
-}
-
-TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
-  : ort_adapter_factory_name_ ("ORT_Adapter_Factory"),
-    imr_client_adapter_name_ ("ImR_Client_Adapter")
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
-
-template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *>;
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Write_Guard<ACE_Lock>;
-template class ACE_Read_Guard<ACE_Lock>;
-template class ACE_Array_Base <IOP::ProfileId>;
-template class ACE_Node<TAO_Root_POA *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>
-
-#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Lock>
-#pragma instantiate ACE_Read_Guard<ACE_Lock>
-#pragma instantiate ACE_Array_Base <IOP::ProfileId>
-#pragma instantiate ACE_Node<TAO_Root_POA *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
deleted file mode 100644
index a5860f0b184..00000000000
--- a/TAO/tao/PortableServer/Root_POA.h
+++ /dev/null
@@ -1,1000 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Root_POA.h
- *
- *  $Id$
- *
- *  Header file for CORBA's ORB type.
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ROOT_POA_H
-#define TAO_ROOT_POA_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Array_Base.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-// Object Adapter
-#include "Object_Adapter.h"
-
-// POA Policy Set
-#include "POA_Policy_Set.h"
-
-// Cached POA Policies
-#include "POA_Cached_Policies.h"
-#include "Active_Policy_Strategies.h"
-
-#include "ORT_Adapter.h"
-
-#include "PortableServer.h"
-
-// Object_Key
-#include "tao/Object_KeyC.h"
-
-// Local Object
-#include "tao/LocalObject.h"
-
-// Portable Interceptor
-#include "tao/PI_ForwardC.h"
-
-// OctetSeq
-#include "tao/OctetSeqC.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// Forward Declaration
-class TAO_Acceptor_Filter;
-class TAO_Acceptor_Registry;
-class TAO_IORInfo;
-class TAO_Regular_POA;
-
-namespace PortableInterceptor
-{
-  class IORInfo;
-  typedef IORInfo *IORInfo_ptr;
-}
-
-namespace TAO
-{
-  class ORT_Adapter;
-  class ORT_Adapter_Factory;
-
-  namespace Portable_Server
-  {
-    class Servant_Upcall;
-    class POA_Current_Impl;
-    class Temporary_Creation_Time;
-  }
-}
-
-namespace PortableServer
-{
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-}
-
-/**
- * @class TAO_Root_POA
- *
- * @brief Implementation of the PortableServer::POA interface.
- *
- * Implementation of the PortableServer::POA interface.
- */
-class TAO_PortableServer_Export TAO_Root_POA
-  : public virtual PortableServer::POA,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  friend class TAO_Object_Adapter;
-  friend class TAO::Portable_Server::Servant_Upcall;
-  friend class TAO::Portable_Server::Non_Servant_Upcall;
-  friend class TAO_POA_Manager;
-  friend class TAO_RT_Collocation_Resolver;
-  friend class TAO_IORInfo;
-
-  typedef ACE_CString String;
-
-  PortableServer::POA_ptr create_POA (
-      const char *adapter_name,
-      PortableServer::POAManager_ptr poa_manager,
-      const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
-
-  PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
-
-  void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::ThreadPolicy_ptr create_thread_policy (
-      PortableServer::ThreadPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-      PortableServer::LifespanPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-      PortableServer::IdUniquenessPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-      PortableServer::IdAssignmentPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::ImplicitActivationPolicy_ptr
-  create_implicit_activation_policy (
-      PortableServer::ImplicitActivationPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ServantRetentionPolicy_ptr
-  create_servant_retention_policy (
-      PortableServer::ServantRetentionPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::RequestProcessingPolicy_ptr
-  create_request_processing_policy (
-      PortableServer::RequestProcessingPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POAList *the_children (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POAManager_ptr the_POAManager (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// @todo At the moment to POAManagerFactory is implemented and the
-  /// POAManager has the get_id method this can be zapped, IORInfo can
-  /// then just call get_id
-  PortableInterceptor::AdapterManagerId get_manager_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method returns the adapter_name as a sequence of strings of
-  /// length one or more or just a fixed name depending on the Object
-  /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Store the given TaggedComponent for eventual insertion into all
-  /// object reference profiles.
-  void save_ior_component (const IOP::TaggedComponent &component
-                           ACE_ENV_ARG_DECL);
-
-  /// Store the given TaggedComponent for eventual insertion into all
-  /// object reference profiles with the given ProfileId.
-  void save_ior_component_and_profile_id (
-    const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::AdapterActivator_ptr the_activator (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ServantManager_ptr get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference_with_id (
-      const PortableServer::ObjectId &oid,
-      const char *intf
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant reference_to_servant (
-      CORBA::Object_ptr reference
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Accessor for POA policies.
-  TAO_POA_Policy_Set &policies (void);
-
-  /// Get the set policy of the given type.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy ACE_ENV_ARG_DECL);
-
-  /// This method gives the policies that are exposed to the client.
-  /// These policies are shipped within the IOR.
-  virtual CORBA::PolicyList *client_exposed_policies (
-      CORBA::Short object_priority
-      ACE_ENV_ARG_DECL
-    );
-
-  TAO_Root_POA (const String &name,
-                TAO_POA_Manager &poa_manager,
-                const TAO_POA_Policy_Set &policies,
-                TAO_Root_POA *parent,
-                ACE_Lock &lock,
-                TAO_SYNCH_MUTEX &thread_lock,
-                TAO_ORB_Core &orb_core,
-                TAO_Object_Adapter *object_adapter
-                ACE_ENV_ARG_DECL);
-
-  virtual ~TAO_Root_POA (void);
-
-  static char name_separator (void);
-
-  static CORBA::ULong name_separator_length (void);
-
-  enum
-  {
-    TAO_OBJECTKEY_PREFIX_SIZE = 4
-  };
-
-  static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
-
-  const TAO_Object_Adapter::poa_name &folded_name (void) const;
-
-  const TAO_Object_Adapter::poa_name &system_name (void) const;
-
-  static void check_for_valid_wait_for_completions (
-      const TAO_ORB_Core &orb_core,
-      CORBA::Boolean wait_for_completion
-      ACE_ENV_ARG_DECL
-    );
-
-  /// ORB Core for POA.
-  TAO_ORB_Core &orb_core (void) const;
-
-  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const;
-
-  CORBA::Boolean cleanup_in_progress (void);
-
-  /// Calls protected static method used when POACurrent is not appropriate.
-  static int parse_ir_object_key (const TAO::ObjectKey &object_key,
-                                  PortableServer::ObjectId &user_id);
-
-  TAO_Object_Adapter &object_adapter (void);
-
-  ACE_Lock &lock (void);
-
-  /// Create the correct stub, properly initialized with the
-  /// attributes and policies attached to the current POA.
-  TAO_Stub* key_to_stub (const TAO::ObjectKey &key,
-                         const char *type_id,
-                         CORBA::Short priority
-                         ACE_ENV_ARG_DECL);
-
-  /// Accessor methods to POA state.
-  /**
-   * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE
-   * and NON_EXISTENT states.
-   */
-  PortableInterceptor::AdapterState get_adapter_state (
-    ACE_ENV_SINGLE_ARG_DECL);
-
-  virtual void *thread_pool (void) const;
-
-  virtual CORBA::Policy *server_protocol (void);
-
-  CORBA::ULong outstanding_requests (void) const;
-
-  const ACE_CString &name (void) const;
-
-  CORBA::Boolean waiting_destruction (void) const;
-
-  static void ort_adapter_factory_name (const char *name);
-
-  static const char *ort_adapter_factory_name (void);
-
-  /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
-  static void imr_client_adapter_name (const char *name);
-
-  /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
-  static const char *imr_client_adapter_name (void);
-
-  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
-
-  CORBA::Boolean system_id (void);
-
-  CORBA::ULong waiting_servant_deactivation (void) const;
-
-  /// Return the POA Manager related to this POA
-  TAO_POA_Manager &tao_poa_manager ();
-
-  bool is_poa_generated (CORBA::Object_ptr reference,
-                         PortableServer::ObjectId &system_id
-                         ACE_ENV_ARG_DECL);
-
-  /*
-   * Validate if the servant may be activated
-   * @retval true This servant may be activated
-   * @retval false This servant may not be activated
-   */
-  bool is_servant_activation_allowed (
-    PortableServer::Servant servant,
-    int &wait_occurred_restart_call);
-
-  int rebind_using_user_id_and_system_id (
-    PortableServer::Servant servant,
-    const PortableServer::ObjectId &user_id,
-    const PortableServer::ObjectId &system_id,
-    TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-  CORBA::Boolean servant_has_remaining_activations (
-    PortableServer::Servant servant);
-
-  bool allow_implicit_activation (void) const;
-
-  bool allow_multiple_activations (void) const;
-
-  int is_servant_active (
-    PortableServer::Servant servant,
-    int &wait_occurred_restart_call);
-
-  void deactivate_object_i (const PortableServer::ObjectId &oid
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy));
-
-  CORBA::Boolean is_persistent (void) const;
-
-  CORBA::Short server_priority (void) const;
-
-  bool has_system_id (void) const;
-
-  PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id
-                                        ACE_ENV_ARG_DECL);
-
-  TAO_SERVANT_LOCATION servant_present (
-    const PortableServer::ObjectId &system_id,
-    PortableServer::Servant &servant
-    ACE_ENV_ARG_DECL);
-
-  PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
-
-  int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-
-  void cleanup_servant (
-    PortableServer::Servant servant,
-    const PortableServer::ObjectId &user_id
-    ACE_ENV_ARG_DECL);
-
-  void post_invoke_servant_cleanup(
-    const PortableServer::ObjectId &system_id,
-    const TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-   bool validate_lifespan (
-    CORBA::Boolean is_persistent,
-    const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
-
-  PortableServer::ObjectId *activate_object_i (
-      PortableServer::Servant p_servant,
-      CORBA::Short priority,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, 
-                                       bool indirect
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  TAO_SYNCH_CONDITION &servant_deactivation_condition (void);
-
-  int is_poa_generated_id (const PortableServer::ObjectId &id);
-
-  /// Check the state of this POA
-  void check_state (ACE_ENV_SINGLE_ARG_DECL);
-
-  int delete_child (const String &child);
-
-  PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid
-                                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-protected:
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  int enter (void);
-
-  int exit (void);
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  /// Template method for creating new POA's of this type.
-  virtual TAO_Root_POA *new_POA (const String &name,
-                            TAO_POA_Manager &poa_manager,
-                            const TAO_POA_Policy_Set &policies,
-                            TAO_Root_POA *parent,
-                            ACE_Lock &lock,
-                            TAO_SYNCH_MUTEX &thread_lock,
-                            TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
-
-  PortableServer::POA_ptr create_POA_i (
-      const char *adapter_name,
-      PortableServer::POAManager_ptr poa_manager,
-      const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
-
-  PortableServer::POA_ptr create_POA_i (const String &adapter_name,
-                                        TAO_POA_Manager &poa_manager,
-                                        const TAO_POA_Policy_Set &policies
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
-
-  TAO_Root_POA *find_POA_i (const ACE_CString &child_name,
-                       CORBA::Boolean activate_it
-                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
-
-  void destroy_i (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion
-                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method returns the adapter_name as a sequence of strings of
-  /// length one or more or just a fixed name depending on the Object
-  /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Method to notify the IOR Interceptors when there is a state
-  /// changed not related to POAManager.
-  void adapter_state_changed (
-      const TAO::ORT_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the given tagged component to all profiles.
-  void add_ior_component (TAO_MProfile & mprofile,
-                          const IOP::TaggedComponent & component
-                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Add the given tagged component to all profiles matching the given
-  /// ProfileId.
-  void add_ior_component_to_profile (TAO_MProfile & mprofile,
-                                     const IOP::TaggedComponent & component,
-                                     IOP::ProfileId profile_id
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Wrapper for the ORB's key_to_object that will alter the object pointer
-  /// if the ImplRepo is used.
-  CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
-                                   const char *type_id,
-                                   TAO_ServantBase *servant,
-                                   CORBA::Boolean collocated,
-                                   CORBA::Short priority,
-                                   bool indirect
-                                   ACE_ENV_ARG_DECL);
-
-  /// Like key_to_stub() but assume that the ORB is not shutting down.
-  virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
-                                   const char *type_id,
-                                   CORBA::Short priority
-                                   ACE_ENV_ARG_DECL);
-
-  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
-                                const char *type_id,
-                                CORBA::PolicyList *policy_list,
-                                TAO_Acceptor_Filter *filter,
-                                TAO_Acceptor_Registry &acceptor_registry
-                                ACE_ENV_ARG_DECL);
-
-  PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-protected:
-  void activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant p_servant,
-                                  CORBA::Short priority,
-                                  int &wait_occurred_restart_call
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
-
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Boolean wait_for_completion
-                                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  void wait_for_completions (CORBA::Boolean wait_for_completion
-                             ACE_ENV_ARG_DECL);
-
-  CORBA::Object_ptr create_reference_i (const char *intf,
-                                        CORBA::Short priority
-                                        ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference_with_id_i (
-      const PortableServer::ObjectId &oid,
-      const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::Servant reference_to_servant_i (
-      CORBA::Object_ptr reference
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
-                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  /// Call the IORInterceptor::establish_components() method on all
-  /// registered IORInterceptors.
-  /**
-   * This method calls IORInterceptor::establish_components() method
-   * on all registered IORInterceptors, and
-   * IORInterceptor::components_established() once the former is
-   * completed.
-   */
-  void establish_components (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Call the IORInterceptor::components_established() method on all
-  /// registered IORInterceptors.
-  void components_established (PortableInterceptor::IORInfo_ptr info
-                               ACE_ENV_ARG_DECL);
-
-  void set_folded_name (TAO_Root_POA *parent);
-
-  void set_id (TAO_Root_POA *parent);
-
-  TAO::ObjectKey *create_object_key (const PortableServer::ObjectId &id);
-
-  static int parse_key (const TAO::ObjectKey &key,
-                        TAO_Object_Adapter::poa_name &poa_system_name,
-                        PortableServer::ObjectId &system_id,
-                        CORBA::Boolean &is_root,
-                        CORBA::Boolean &is_persistent,
-                        CORBA::Boolean &is_system_id,
-                        TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time);
-
-protected:
-  /// Accessor methods to ObjectReferenceTemplate
-  PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Accessor methods to ObjectReferenceTemplate, non locked version
-  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
-
-  /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Set the object reference factory
-  void set_obj_ref_factory (
-    PortableInterceptor::ObjectReferenceFactory *current_factory
-    ACE_ENV_ARG_DECL);
-
-
-  TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
-                                         PortableServer::Servant &servant
-                                         ACE_ENV_ARG_DECL);
-
-  PortableServer::Servant locate_servant_i (
-      const char *operation,
-      const PortableServer::ObjectId &id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL
-    );
-
-public:
-    // @todo Temporarily for servant retention
-  CORBA::Object_ptr
-  invoke_key_to_object_helper_i (const char * repository_id,
-                                 const PortableServer::ObjectId & id
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-protected:
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one but assumes the POA lock is already hold
-  TAO::ORT_Adapter *ORT_adapter_i (void);
-
-  TAO::ORT_Adapter_Factory *ORT_adapter_factory (void);
-
-  CORBA::Boolean persistent (void);
-
-  static char persistent_key_char (void);
-
-  static char transient_key_char (void);
-
-  static CORBA::ULong persistent_key_type_length (void);
-
-  static char system_id_key_char (void);
-
-  static char user_id_key_char (void);
-
-  static CORBA::ULong system_id_key_type_length (void);
-
-  virtual CORBA::Boolean root (void) const;
-
-  virtual char root_key_type (void);
-
-  static char root_key_char (void);
-
-  static char non_root_key_char (void);
-
-  static CORBA::ULong root_key_type_length (void);
-
-  void outstanding_requests (CORBA::ULong new_outstanding_requests);
-
-  CORBA::ULong increment_outstanding_requests (void);
-
-  CORBA::ULong decrement_outstanding_requests (void);
-
-  String name_;
-
-  /// The POA Manager belonging to this POA
-  TAO_POA_Manager &poa_manager_;
-
-  IOP::TaggedComponentList tagged_component_;
-
-  IOP::TaggedComponentList tagged_component_id_;
-
-  ACE_Array_Base <IOP::ProfileId> profile_id_array_;
-
-  TAO_POA_Policy_Set policies_;
-
-  TAO_Object_Adapter::poa_name folded_name_;
-
-  TAO_Object_Adapter::poa_name_var system_name_;
-
-  CORBA::OctetSeq id_;
-
-  /// Pointer to the object reference template adapter.
-  TAO::ORT_Adapter *ort_adapter_;
-
-  /// Adapter can be accepting, rejecting etc.
-  PortableInterceptor::AdapterState adapter_state_;
-
-  TAO::Portable_Server::Cached_Policies cached_policies_;
-
-  TAO::Portable_Server::Active_Policy_Strategies active_policy_strategies_;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::AdapterActivator_var adapter_activator_;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  typedef
-    ACE_Hash_Map_Manager_Ex<
-        ACE_CString, TAO_Root_POA *,
-        ACE_Hash<ACE_CString>,
-        ACE_Equal_To<ACE_CString>,
-        ACE_Null_Mutex
-      >
-    CHILDREN;
-
-  CHILDREN children_;
-
-  ACE_Lock &lock_;
-
-  TAO_ORB_Core &orb_core_;
-
-  /// The object adapter we belong to
-  TAO_Object_Adapter *object_adapter_;
-
-  CORBA::Boolean cleanup_in_progress_;
-
-  CORBA::ULong outstanding_requests_;
-
-  TAO_SYNCH_CONDITION outstanding_requests_condition_;
-
-  CORBA::Boolean wait_for_completion_pending_;
-
-  CORBA::Boolean waiting_destruction_;
-
-  TAO_SYNCH_CONDITION servant_deactivation_condition_;
-
-public:
-    // @todo Temporarily for servant retention
-  CORBA::ULong caller_key_to_object_;
-
-  PortableServer::Servant servant_for_key_to_object_;
-
-  struct Key_To_Object_Params
-  {
-    PortableServer::ObjectId_var *system_id_;
-    const char *type_id_;
-    TAO_ServantBase *servant_;
-    CORBA::Boolean collocated_;
-    CORBA::Short priority_;
-    bool indirect_;
-
-    void set (PortableServer::ObjectId_var &system_id_,
-              const char *type_id_,
-              TAO_ServantBase *servant_,
-              CORBA::Boolean collocated_,
-              CORBA::Short priority_,
-              bool indirect);
-  };
-
-  Key_To_Object_Params key_to_object_params_;
-};
-
-/**
- * @class TAO_POA_Static_Resources
- *
- * @brief The static (global) resoures of all POA's.
- *
- * This class is used by the POA to store the resources global to
- * all POA's.  All instance variables that would have been
- * declared "static" in TAO_Regular_POA, should be declared in this class
- * to avoid the "static initialization order fiasco" as described in
- * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11.
- * Briefly, this is the problem that occurs if any static initializers
- * in any other code call into set static members of TAO_Regular_POA.
- * Since the order in which these initializers execute is unspecified,
- * uninitialized members can be accessed.
- */
-class TAO_PortableServer_Export TAO_POA_Static_Resources
-{
-public:
-
-  /// Return the singleton instance.
-  static TAO_POA_Static_Resources* instance (void);
-
-public:
-
-  /**
-   * Name of the factory object used to adapt function calls on the
-   * PortableInterceptor interfaces ORT. The default value is
-   * "ObjectReferenceTemplate_Adapter_Factory". If the ORT library is linked,
-   * the corresponding accessor function
-   * objectreferencefactory_adapter_factory_name() will be called to set
-   * the value to "Concrete_ObjectReferenceTemplate_Adapter_Factory".
-   */
-  ACE_CString ort_adapter_factory_name_;
-
-  /**
-   * Name of the service object for functions that make calls on
-   * the Implementation Repository. The default value is "ImR_Client_Adapter".
-   * If TAO_IMR_CLient is linked, imr_client_adapter_name() will be
-   * called to set the value to "Concrete_ImR_Client_Adapter".
-   */
-  ACE_CString imr_client_adapter_name_;
-private:
-  /// Constructor.
-  TAO_POA_Static_Resources (void);
-
-private:
-  /// The singleton instance.
-  static TAO_POA_Static_Resources* instance_;
-
-  /// Mostly unused variable whose sole purpose is to enforce
-  /// the instantiation of a TAO_POA_Static_Resources instance
-  /// at initialization time.
-  static TAO_POA_Static_Resources* initialization_reference_;
-};
-
-// ****************************************************************
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "Root_POA.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ROOT_POA_H */
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
deleted file mode 100644
index a3abcf9341e..00000000000
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ /dev/null
@@ -1,236 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// Exception macros
-#include "tao/Environment.h"
-
-ACE_INLINE CORBA::Boolean
-TAO_Root_POA::cleanup_in_progress (void)
-{
-  return this->cleanup_in_progress_;
-}
-
-ACE_INLINE ACE_Lock &
-TAO_Root_POA::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE TAO_POA_Policy_Set &
-TAO_Root_POA::policies (void)
-{
-  return this->policies_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_Root_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::POA::_nil ();
-}
-
-ACE_INLINE PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_Root_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_adapter_template();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_Root_POA::get_adapter_template_i ()
-{
-  if (this->ORT_adapter_i ())
-    {
-      return this->ort_adapter_->get_adapter_template ();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_Root_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_obj_ref_factory();
-    }
-
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Root_POA::system_id (void)
-{
-  return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Root_POA::persistent (void)
-{
-  return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT);
-}
-
-ACE_INLINE const ACE_CString &
-TAO_Root_POA::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE char *
-TAO_Root_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->name_.c_str ());
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_Root_POA::folded_name (void) const
-{
-  return this->folded_name_;
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_Root_POA::system_name (void) const
-{
-  return this->system_name_.in ();
-}
-
-ACE_INLINE char
-TAO_Root_POA::name_separator (void)
-{
-  return '\0';
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::name_separator_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_Root_POA::persistent_key_char (void)
-{
-  return 'P';
-}
-
-ACE_INLINE char
-TAO_Root_POA::transient_key_char (void)
-{
-  return 'T';
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::persistent_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_Root_POA::system_id_key_char (void)
-{
-  return 'S';
-}
-
-ACE_INLINE char
-TAO_Root_POA::user_id_key_char (void)
-{
-  return 'U';
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::system_id_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_Root_POA::root_key_char (void)
-{
-  return 'R';
-}
-
-ACE_INLINE char
-TAO_Root_POA::non_root_key_char (void)
-{
-  return 'N';
-}
-
-ACE_INLINE char
-TAO_Root_POA::root_key_type (void)
-{
-  return TAO_Root_POA::root_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::root_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::outstanding_requests (void) const
-{
-  return this->outstanding_requests_;
-}
-
-ACE_INLINE void
-TAO_Root_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
-{
-  this->outstanding_requests_ = new_outstanding_requests;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::increment_outstanding_requests (void)
-{
-  return ++this->outstanding_requests_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Root_POA::decrement_outstanding_requests (void)
-{
-  return --this->outstanding_requests_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Root_POA::waiting_destruction (void) const
-{
-  return this->waiting_destruction_;
-}
-
-ACE_INLINE TAO_ORB_Core &
-TAO_Root_POA::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE PortableInterceptor::AdapterState
-TAO_Root_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->adapter_state_;
-}
-
-ACE_INLINE void *
-TAO_Root_POA::thread_pool (void) const
-{
-  return 0;
-}
-
-ACE_INLINE TAO_SYNCH_CONDITION &
-TAO_Root_POA::servant_deactivation_condition (void)
-{
-  return servant_deactivation_condition_;
-}
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
deleted file mode 100644
index b51f5be5e2e..00000000000
--- a/TAO/tao/PortableServer/ServantActivator.pidl
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file ServantActivator.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * ServantActivatorC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantActivator.pidl
- */
-
-#ifndef _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
-#define _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
-
-///FUZZ: disable check_for_include/
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  local interface ServantActivator : ServantManager
-  {
-#   pragma version ServantActivator 2.3
-
-    Servant incarnate (in ObjectId oid,
-                       in POA adapter)
-      raises (ForwardRequest);
-
-    void etherealize (in ObjectId oid,
-                      in POA adapter,
-                      in Servant serv,
-                      in boolean cleanup_in_progress,
-                      in boolean remaining_activations);
-  };
-};
-
-#endif // _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
deleted file mode 100644
index 11e8c3c4438..00000000000
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServantActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ServantActivator (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ServantActivator:2.3",
-    "ServantActivator");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ServantActivator =
-    &_tao_tc_PortableServer_ServantActivator;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantActivator_ptr _tao_objptr =
-    PortableServer::ServantActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
-      _tao_any,
-      PortableServer::ServantActivator::_tao_any_destructor,
-      PortableServer::_tc_ServantActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
-        _tao_any,
-        PortableServer::ServantActivator::_tao_any_destructor,
-        PortableServer::_tc_ServantActivator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
deleted file mode 100644
index 8decf45fb33..00000000000
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServantActivatorC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantActivator.
-
-PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
-    PortableServer::ServantActivator_ptr p
-  )
-{
-  return PortableServer::ServantActivator::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ServantActivator>::release (
-    PortableServer::ServantActivator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void)
-{
-  return PortableServer::ServantActivator::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantActivator>::marshal (
-    PortableServer::ServantActivator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ServantActivator::ServantActivator (void)
-{}
-
-PortableServer::ServantActivator::~ServantActivator (void)
-{}
-
-void
-PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantActivator *_tao_tmp_pointer =
-    static_cast<ServantActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantActivator::_nil ();
-    }
-
-  ServantActivator_ptr proxy =
-    dynamic_cast<ServantActivator_ptr> (_tao_objref);
-
-  return ServantActivator::_duplicate (proxy);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantActivator::_nil ();
-    }
-
-  ServantActivator_ptr proxy =
-    dynamic_cast<ServantActivator_ptr> (_tao_objref);
-
-  return ServantActivator::_duplicate (proxy);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ServantActivator::_tao_release (ServantActivator_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ServantActivator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantActivator:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantActivator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
deleted file mode 100644
index 64de4071d28..00000000000
--- a/TAO/tao/PortableServer/ServantActivatorC.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
-#define _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "tao/PortableServer/ServantManagerC.h"
-#include "tao/PortableServer/ForwardRequestC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_
-  
-  class ServantActivator;
-  typedef ServantActivator *ServantActivator_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServantActivator
-      >
-    ServantActivator_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServantActivator
-      >
-    ServantActivator_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-  
-  class TAO_PortableServer_Export ServantActivator
-    : public virtual ::PortableServer::ServantManager
-  {
-  public:
-    typedef ServantActivator_ptr _ptr_type;
-    typedef ServantActivator_var _var_type;
-    
-    // The static operations.
-    static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    
-    static void _tao_release (ServantActivator_ptr obj);
-    
-    static ServantActivator_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantActivator_ptr _nil (void)
-    {
-      return static_cast<ServantActivator_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::Servant incarnate (
-        const ::PortableServer::ObjectId & oid,
-        ::PortableServer::POA_ptr adapter
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void etherealize (
-        const ::PortableServer::ObjectId & oid,
-        ::PortableServer::POA_ptr adapter,
-        ::PortableServer::Servant serv,
-        ::CORBA::Boolean cleanup_in_progress,
-        ::CORBA::Boolean remaining_activations
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ServantActivator (void);
-    
-    virtual ~ServantActivator (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantActivator (const ServantActivator &);
-    
-    void operator= (const ServantActivator &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantActivator>
-  {
-    static ::PortableServer::ServantActivator_ptr duplicate (
-        ::PortableServer::ServantActivator_ptr
-      );
-    static void release (
-        ::PortableServer::ServantActivator_ptr
-      );
-    static ::PortableServer::ServantActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ServantActivator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
deleted file mode 100644
index 333fea55271..00000000000
--- a/TAO/tao/PortableServer/ServantLocator.pidl
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * @file ServantLocator.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * ServantLocatorC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantLocator.pidl
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/PS_Forward.diff
- */
-
-#ifndef _PORTABLESERVER_SERVANTLOCATOR_IDL_
-#define _PORTABLESERVER_SERVANTLOCATOR_IDL_
-
-///FUZZ: disable check_for_include/
-#include <orb_types.pidl>
-#include <tao/PortableServer/PS_Forward.pidl>
-#include <tao/PortableServer/ServantManager.pidl>
-#include <tao/PortableServer/ForwardRequest.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  local interface ServantLocator : ServantManager
-  {
-#   pragma version ServantLocator 2.3
-
-    native Cookie;
-
-    Servant preinvoke (in ObjectId oid,
-                       in POA adapter,
-                       in CORBA::Identifier operation,
-                       out Cookie the_cookie)
-      raises (ForwardRequest);
-
-    void postinvoke (in ObjectId oid,
-                     in POA adapter,
-                     in CORBA::Identifier operation,
-                     in Cookie  the_cookie,
-                     in Servant the_servant);
-  };
-
-};
-
-#endif // _PORTABLESERVER_SERVANTLOCATOR_IDL_
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
deleted file mode 100644
index 7b75855118d..00000000000
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServantLocatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ServantLocator (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ServantLocator:2.3",
-    "ServantLocator");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ServantLocator =
-    &_tao_tc_PortableServer_ServantLocator;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantLocator_ptr _tao_objptr =
-    PortableServer::ServantLocator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
-      _tao_any,
-      PortableServer::ServantLocator::_tao_any_destructor,
-      PortableServer::_tc_ServantLocator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
-        _tao_any,
-        PortableServer::ServantLocator::_tao_any_destructor,
-        PortableServer::_tc_ServantLocator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
deleted file mode 100644
index 6db6c39edda..00000000000
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServantLocatorC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantLocator.
-
-PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
-    PortableServer::ServantLocator_ptr p
-  )
-{
-  return PortableServer::ServantLocator::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ServantLocator>::release (
-    PortableServer::ServantLocator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void)
-{
-  return PortableServer::ServantLocator::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantLocator>::marshal (
-    PortableServer::ServantLocator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ServantLocator::ServantLocator (void)
-{}
-
-PortableServer::ServantLocator::~ServantLocator (void)
-{}
-
-void
-PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantLocator *_tao_tmp_pointer =
-    static_cast<ServantLocator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantLocator::_nil ();
-    }
-
-  ServantLocator_ptr proxy =
-    dynamic_cast<ServantLocator_ptr> (_tao_objref);
-
-  return ServantLocator::_duplicate (proxy);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantLocator::_nil ();
-    }
-
-  ServantLocator_ptr proxy =
-    dynamic_cast<ServantLocator_ptr> (_tao_objref);
-
-  return ServantLocator::_duplicate (proxy);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ServantLocator::_tao_release (ServantLocator_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ServantLocator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantLocator:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantLocator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
deleted file mode 100644
index be2020ff060..00000000000
--- a/TAO/tao/PortableServer/ServantLocatorC.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVANTLOCATORC_H_
-#define _TAO_IDL_ORIG_SERVANTLOCATORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/orb_typesC.h"
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "tao/PortableServer/ServantManagerC.h"
-#include "tao/PortableServer/ForwardRequestC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_
-  
-  class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServantLocator
-      >
-    ServantLocator_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServantLocator
-      >
-    ServantLocator_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR_CH_
-  
-  class TAO_PortableServer_Export ServantLocator
-    : public virtual ::PortableServer::ServantManager
-  {
-  public:
-    typedef void *Cookie;
-
-    typedef ServantLocator_ptr _ptr_type;
-    typedef ServantLocator_var _var_type;
-    
-    // The static operations.
-    static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    
-    static void _tao_release (ServantLocator_ptr obj);
-    
-    static ServantLocator_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantLocator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantLocator_ptr _nil (void)
-    {
-      return static_cast<ServantLocator_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::Servant preinvoke (
-        const ::PortableServer::ObjectId & oid,
-        ::PortableServer::POA_ptr adapter,
-        const char * operation,
-        ::PortableServer::ServantLocator::Cookie & the_cookie
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void postinvoke (
-        const ::PortableServer::ObjectId & oid,
-        ::PortableServer::POA_ptr adapter,
-        const char * operation,
-        ::PortableServer::ServantLocator::Cookie the_cookie,
-        ::PortableServer::Servant the_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ServantLocator (void);
-    
-    virtual ~ServantLocator (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantLocator (const ServantLocator &);
-    
-    void operator= (const ServantLocator &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator>
-  {
-    static ::PortableServer::ServantLocator_ptr duplicate (
-        ::PortableServer::ServantLocator_ptr
-      );
-    static void release (
-        ::PortableServer::ServantLocator_ptr
-      );
-    static ::PortableServer::ServantLocator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ServantLocator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl
deleted file mode 100644
index dd2495559e0..00000000000
--- a/TAO/tao/PortableServer/ServantManager.pidl
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file ServantManager.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * This file was used to generate the code in
- * ServantManagerC.{h,inl,cpp}, using the following command:
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantManager.pidl
- */
-
-#ifndef _PORTABLESERVER_SERVANT_MANAGER_IDL_
-#define _PORTABLESERVER_SERVANT_MANAGER_IDL_
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  // ServantManager interface.
-  local interface ServantManager {};
-};
-
-#endif // _PORTABLESERVER_SERVANT_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp
deleted file mode 100644
index fab81c39676..00000000000
--- a/TAO/tao/PortableServer/ServantManagerA.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServantManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ServantManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ServantManager:2.3",
-    "ServantManager");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ServantManager =
-    &_tao_tc_PortableServer_ServantManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr _tao_elem
-  )
-{
-  PortableServer::ServantManager_ptr _tao_objptr =
-    PortableServer::ServantManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
-      _tao_any,
-      PortableServer::ServantManager::_tao_any_destructor,
-      PortableServer::_tc_ServantManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
-        _tao_any,
-        PortableServer::ServantManager::_tao_any_destructor,
-        PortableServer::_tc_ServantManager,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
deleted file mode 100644
index faddb9b6a0a..00000000000
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServantManagerC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantManager.
-
-PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
-    PortableServer::ServantManager_ptr p
-  )
-{
-  return PortableServer::ServantManager::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ServantManager>::release (
-    PortableServer::ServantManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::nil (void)
-{
-  return PortableServer::ServantManager::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantManager>::marshal (
-    PortableServer::ServantManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ServantManager::ServantManager (void)
-{}
-
-PortableServer::ServantManager::~ServantManager (void)
-{}
-
-void
-PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantManager *_tao_tmp_pointer =
-    static_cast<ServantManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantManager::_nil ();
-    }
-
-  ServantManager_ptr proxy =
-    dynamic_cast<ServantManager_ptr> (_tao_objref);
-
-  return ServantManager::_duplicate (proxy);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantManager::_nil ();
-    }
-
-  ServantManager_ptr proxy =
-    dynamic_cast<ServantManager_ptr> (_tao_objref);
-
-  return ServantManager::_duplicate (proxy);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ServantManager::_tao_release (ServantManager_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ServantManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantManager:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantManager:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantManager::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
deleted file mode 100644
index 564ed3ac737..00000000000
--- a/TAO/tao/PortableServer/ServantManagerC.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVANTMANAGERC_H_
-#define _TAO_IDL_ORIG_SERVANTMANAGERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
-  
-  class ServantManager;
-  typedef ServantManager *ServantManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServantManager
-      >
-    ServantManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServantManager
-      >
-    ServantManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER_CH_
-  
-  class TAO_PortableServer_Export ServantManager
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef ServantManager_ptr _ptr_type;
-    typedef ServantManager_var _var_type;
-    
-    // The static operations.
-    static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    
-    static void _tao_release (ServantManager_ptr obj);
-    
-    static ServantManager_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServantManager_ptr _nil (void)
-    {
-      return static_cast<ServantManager_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ServantManager (void);
-    
-    virtual ~ServantManager (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantManager (const ServantManager &);
-    
-    void operator= (const ServantManager &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
-  {
-    static ::PortableServer::ServantManager_ptr duplicate (
-        ::PortableServer::ServantManager_ptr
-      );
-    static void release (
-        ::PortableServer::ServantManager_ptr
-      );
-    static ::PortableServer::ServantManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ServantManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
deleted file mode 100644
index 9ae6180bbb2..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "ServantRetentionPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionPolicy,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionPolicy::ServantRetentionPolicy (
-      ::PortableServer::ServantRetentionPolicyValue value) :
-        value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    ServantRetentionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ServantRetentionPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        ServantRetentionPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    ServantRetentionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    ServantRetentionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    ServantRetentionPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_SERVANT_RETENTION;
-    }
-
-    TAO_Policy_Scope
-    ServantRetentionPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
deleted file mode 100644
index 9495d660701..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H
-#define TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ServantRetentionPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionPolicy :
-      public virtual ::PortableServer::ServantRetentionPolicy,
-      public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::ServantRetentionPolicyValue value_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
deleted file mode 100644
index fefc5b0efb5..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file ServantRetentionPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ServantRetentionPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum ServantRetentionPolicyValue
-  {
-    RETAIN,
-    NON_RETAIN
-  };
-
-  local interface ServantRetentionPolicy : CORBA::Policy
-  {
-    readonly attribute ServantRetentionPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
deleted file mode 100644
index d40c6251426..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServantRetentionPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_ServantRetentionPolicyValue[] =
-  {
-    "RETAIN",
-    "NON_RETAIN"
-
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ServantRetentionPolicyValue (
-    "IDL:omg.org/PortableServer/ServantRetentionPolicyValue:2.3",
-    "ServantRetentionPolicyValue",
-    _tao_enumerators_PortableServer_ServantRetentionPolicyValue,
-    2);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue =
-    &_tao_tc_PortableServer_ServantRetentionPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ServantRetentionPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3",
-    "ServantRetentionPolicy");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy =
-    &_tao_tc_PortableServer_ServantRetentionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ServantRetentionPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ServantRetentionPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
-    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
-      _tao_any,
-      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-      PortableServer::_tc_ServantRetentionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
-        _tao_any,
-        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-        PortableServer::_tc_ServantRetentionPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
deleted file mode 100644
index 42c74a9c2b5..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServantRetentionPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantRetentionPolicy.
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
-    PortableServer::ServantRetentionPolicy_ptr p
-  )
-{
-  return PortableServer::ServantRetentionPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
-    PortableServer::ServantRetentionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void)
-{
-  return PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal (
-    PortableServer::ServantRetentionPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
-{}
-
-PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
-{}
-
-void
-PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantRetentionPolicy *_tao_tmp_pointer =
-    static_cast<ServantRetentionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantRetentionPolicy::_nil ();
-    }
-
-  ServantRetentionPolicy_ptr proxy =
-    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
-
-  return ServantRetentionPolicy::_duplicate (proxy);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantRetentionPolicy::_nil ();
-    }
-
-  ServantRetentionPolicy_ptr proxy =
-    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
-
-  return ServantRetentionPolicy::_duplicate (proxy);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ServantRetentionPolicy::_tao_release (ServantRetentionPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ServantRetentionPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::ServantRetentionPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetentionPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp);
-    }
-
-  return _tao_success;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
deleted file mode 100644
index 04267dc9708..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
-#define _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum ServantRetentionPolicyValue
-  {
-    RETAIN,
-    NON_RETAIN
-  };
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_
-
-  class ServantRetentionPolicy;
-  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ServantRetentionPolicy
-      >
-    ServantRetentionPolicy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ServantRetentionPolicy
-      >
-    ServantRetentionPolicy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
-  class TAO_PortableServer_Export ServantRetentionPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ServantRetentionPolicy_ptr _ptr_type;
-    typedef ServantRetentionPolicy_var _var_type;
-
-    // The static operations.
-    static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-
-    static void _tao_release (ServantRetentionPolicy_ptr obj);
-
-    static ServantRetentionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ServantRetentionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ServantRetentionPolicy_ptr _nil (void)
-    {
-      return static_cast<ServantRetentionPolicy_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::ServantRetentionPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // 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
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    ServantRetentionPolicy (void);
-
-    virtual ~ServantRetentionPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantRetentionPolicy (const ServantRetentionPolicy &);
-
-    void operator= (const ServantRetentionPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
-
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy>
-  {
-    static ::PortableServer::ServantRetentionPolicy_ptr duplicate (
-        ::PortableServer::ServantRetentionPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::ServantRetentionPolicy_ptr
-      );
-    static ::PortableServer::ServantRetentionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ServantRetentionPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
deleted file mode 100644
index 96128f3d920..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANTRETENTIONSTRATEGY_H
-#define TAO_SERVANTRETENTIONSTRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "Servant_Location.h"
-#include "Servant_Upcall.h"
-#include "ServantRetentionPolicyC.h"
-#include "PortableServer.h"
-
-class TAO_Root_POA;
-class TAO_Active_Object_Map;
-struct TAO_Active_Object_Map_Entry;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategy
-      : public Policy_Strategy
-    {
-    public:
-      virtual CORBA::ULong waiting_servant_deactivation (void) const = 0;
-
-      virtual int is_servant_in_map (PortableServer::Servant servant,
-                                     int &wait_occurred_restart_call) = 0;
-
-      virtual TAO_SERVANT_LOCATION servant_present (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::ObjectId *activate_object (
-        PortableServer::Servant servant,
-        CORBA::Short priority,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void activate_object_with_id (
-        const PortableServer::ObjectId &id,
-        PortableServer::Servant servant,
-        CORBA::Short priority,
-        int &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantAlreadyActive,
-                           PortableServer::POA::ObjectAlreadyActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void deactivate_object (const PortableServer::ObjectId &id
-                                      ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL) = 0;
-
-      virtual PortableServer::ObjectId *system_id_to_object_id (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual PortableServer::Servant user_id_to_servant (
-        const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual CORBA::Object_ptr id_to_reference (
-        const PortableServer::ObjectId &id,
-        bool indirect
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ObjectNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual CORBA::Object_ptr create_reference (
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy)) = 0;
-
-      virtual CORBA::Object_ptr create_reference_with_id (
-        const PortableServer::ObjectId &oid,
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-      virtual int rebind_using_user_id_and_system_id (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall) = 0;
-
-      virtual int unbind_using_user_id (
-        const PortableServer::ObjectId &user_id) = 0;
-
-      virtual CORBA::Boolean servant_has_remaining_activations (
-        PortableServer::Servant servant) = 0;
-
-      virtual ::PortableServer::ServantRetentionPolicyValue type() const = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SERVANTRETENTIONSTRATEGY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
deleted file mode 100644
index d2331dbd421..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class ServantRetentionStrategy;
-
-    class TAO_PortableServer_Export ServantRetentionStrategyFactory
-       : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ServantRetentionStrategy* create (
-        ::PortableServer::ServantRetentionPolicyValue value) = 0;
-
-      virtual void destroy (
-        ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
deleted file mode 100644
index e00faa806cd..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id$
-
-#include "ServantRetentionStrategyFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategy*
-    ServantRetentionStrategyFactoryImpl::create (
-      ::PortableServer::ServantRetentionPolicyValue value)
-    {
-      ServantRetentionStrategyFactory *strategy_factory = 0;
-      const char *strategy_factory_name = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::RETAIN :
-        {
-          strategy_factory_name = "ServantRetentionStrategyRetainFactory";
-          break;
-        }
-        case ::PortableServer::NON_RETAIN :
-        {
-          strategy_factory_name = "ServantRetentionStrategyNonRetainFactory";
-          break;
-        }
-      }
-
-      strategy_factory =
-        ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance (strategy_factory_name);
-
-      if (strategy_factory == 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_factory_name));
-
-      return strategy_factory->create (value);
-    }
-
-    void
-    ServantRetentionStrategyFactoryImpl::destroy (
-      ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      const char *strategy_factory_name = 0;
-
-      switch (strategy->type ())
-      {
-        case ::PortableServer::RETAIN :
-        {
-          strategy_factory_name = "ServantRetentionStrategyRetainFactory";
-          break;
-        }
-        case ::PortableServer::NON_RETAIN :
-        {
-          strategy_factory_name = "ServantRetentionStrategyNonRetainFactory";
-          break;
-        }
-      }
-
-      ServantRetentionStrategyFactory *servantretention_strategy_factory =
-        ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance (strategy_factory_name);
-
-      if (servantretention_strategy_factory != 0)
-        {
-          servantretention_strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
deleted file mode 100644
index 637569c1c87..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategyFactoryImpl
-       : public ServantRetentionStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ServantRetentionStrategy* create (
-        ::PortableServer::ServantRetentionPolicyValue value);
-
-      virtual void destroy (
-        ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
deleted file mode 100644
index fb1cce33769..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServantRetentionStrategyNonRetain.cpp
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#include "ServantRetentionStrategyNonRetain.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
-#include "Servant_Base.h"
-#include "tao/debug.h"
-
-ACE_RCSID (PortableServer,
-           Servant_Retention_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) :
-      poa_ (0)
-    {
-    }
-
-    void
-    ServantRetentionStrategyNonRetain::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      poa_ = poa;
-    }
-
-    void
-    ServantRetentionStrategyNonRetain::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      poa_ = 0;
-    }
-
-    void
-    ServantRetentionStrategyNonRetain::deactivate_object (
-      const PortableServer::ObjectId &/*id*/
-      ACE_ENV_ARG_DECL)
-    {
-      // When using Non_Retain we don't have an active object map and we just
-      // can't deactivate any object
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyNonRetain::find_servant (
-      const PortableServer::ObjectId &/*system_id*/
-      ACE_ENV_ARG_DECL)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyNonRetain::system_id_to_object_id (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // The system id is the id (and no conversion/transformation is
-      // needed).
-      PortableServer::ObjectId *id = 0;
-      ACE_NEW_THROW_EX (id,
-                        PortableServer::ObjectId (system_id),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      return id;
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyNonRetain::user_id_to_servant (
-      const PortableServer::ObjectId &/*id*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyNonRetain::id_to_reference (
-      const PortableServer::ObjectId &/*id*/,
-      bool /*indirect*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-    TAO_SERVANT_LOCATION
-    ServantRetentionStrategyNonRetain::servant_present (
-      const PortableServer::ObjectId &/*system_id*/,
-      PortableServer::Servant &/*servant*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      return TAO_SERVANT_NOT_FOUND;
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyNonRetain::find_servant (
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-      ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      // We have the NON_RETAIN policy, user id is the system id.
-
-      // Smartly copy all the data; <poa_current_impl.object_id_> does
-      // not own the data.
-      poa_current_impl.replace_object_id (system_id);
-
-      servant_upcall.user_id (&system_id);
-
-      return 0;
-    }
-
-    int
-    ServantRetentionStrategyNonRetain::is_servant_in_map (
-      PortableServer::Servant /*servant*/,
-      int &/*wait_occurred_restart_call*/)
-    {
-      return 0;
-    }
-
-    CORBA::ULong
-    ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const
-    {
-      return 0;
-    }
-
-    void
-    ServantRetentionStrategyNonRetain::deactivate_all_objects (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyNonRetain::servant_to_user_id (
-      PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyNonRetain::servant_to_reference (
-      PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyNonRetain::activate_object (
-      PortableServer::Servant /*servant*/,
-      CORBA::Short /*priority*/,
-      int &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-    void
-    ServantRetentionStrategyNonRetain::activate_object_with_id (
-      const PortableServer::ObjectId &/*id*/,
-      PortableServer::Servant /*servant*/,
-      CORBA::Short /*priority*/,
-      int &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::ObjectAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyNonRetain::create_reference (
-      const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation creates an object reference that encapsulates a
-      // POA-generated Object Id value and the specified interface
-      // repository id. This operation does not cause an activation to
-      // take place. The resulting reference may be passed to clients, so
-      // that subsequent requests on those references will cause the
-      // appropriate servant manager to be invoked, if one is
-      // available. The generated Object Id value may be obtained by
-      // invoking POA::reference_to_id with the created reference.
-
-      PortableServer::ObjectId_var system_id;
-      PortableServer::ObjectId user_id;
-
-      // Otherwise, it is the NON_RETAIN policy.  Therefore, any ol'
-      // object id will do (even an empty one).
-      PortableServer::ObjectId *sys_id = 0;
-      ACE_NEW_THROW_EX (sys_id,
-                        PortableServer::ObjectId,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      system_id = sys_id;
-
-      // User id is the same as system id.
-      user_id = system_id.in ();
-
-      // Remember params for potentially invoking <key_to_object> later.
-      this->poa_->key_to_object_params_.set (system_id,
-                                             intf,
-                                             0,
-                                             1,
-                                             priority,
-                                             true);
-
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        user_id
-                                                        ACE_ENV_ARG_PARAMETER);
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyNonRetain::create_reference_with_id (
-      const PortableServer::ObjectId &oid,
-      const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      // This operation creates an object reference that encapsulates the
-      // specified Object Id and interface repository Id values. This
-      // operation does not cause an activation to take place.  The
-      // resulting reference may be passed to clients, so that subsequent
-      // requests on those references will cause the object to be
-      // activated if necessary, or the default servant used, depending on
-      // the applicable policies.
-
-      PortableServer::Servant servant = 0;
-      PortableServer::ObjectId_var system_id;
-
-      // Otherwise, it is the NON_RETAIN policy.  Therefore, user id
-      // is the same as system id.
-      PortableServer::ObjectId *sys_id;
-      ACE_NEW_THROW_EX (sys_id,
-                        PortableServer::ObjectId (oid),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      system_id = sys_id;
-
-      // Remember params for potentially invoking <key_to_object> later.
-      this->poa_->key_to_object_params_.set (system_id,
-                                             intf,
-                                             servant,
-                                             1,
-                                             priority,
-                                             true);
-
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        oid
-                                                        ACE_ENV_ARG_PARAMETER);
-    }
-
-    int
-    ServantRetentionStrategyNonRetain::rebind_using_user_id_and_system_id (
-      PortableServer::Servant /*servant*/,
-      const PortableServer::ObjectId &/*user_id*/,
-      const PortableServer::ObjectId &/*system_id*/,
-      TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
-    {
-      return -1;
-    }
-
-    CORBA::Boolean
-    ServantRetentionStrategyNonRetain::servant_has_remaining_activations (
-      PortableServer::Servant /*servant*/)
-    {
-      return false;
-    }
-
-    int
-    ServantRetentionStrategyNonRetain::unbind_using_user_id (
-      const PortableServer::ObjectId &/*user_id*/)
-    {
-      return 0;
-    }
-
-    ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionStrategyNonRetain::type() const
-    {
-      return ::PortableServer::NON_RETAIN;
-    }
-
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
deleted file mode 100644
index 7262b3d8a90..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyNonRetain.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
-#define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Servant_Location.h"
-#include "ServantRetentionStrategy.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategyNonRetain
-       : public ServantRetentionStrategy
-    {
-    public:
-      ServantRetentionStrategyNonRetain (void);
-
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      CORBA::ULong waiting_servant_deactivation (void) const;
-
-      virtual
-      PortableServer::ObjectId *
-      activate_object (PortableServer::Servant servant,
-                       CORBA::Short priority,
-                       int &wait_occurred_restart_call
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual
-      void
-      activate_object_with_id (const PortableServer::ObjectId &id,
-                               PortableServer::Servant servant,
-                               CORBA::Short priority,
-                               int &wait_occurred_restart_call
-                               ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
-
-      virtual void deactivate_object (const PortableServer::ObjectId &id
-                                      ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
-
-      virtual int is_servant_in_map (PortableServer::Servant servant,
-                                      int &wait_occurred_restart_call);
-
-      virtual PortableServer::ObjectId *system_id_to_object_id (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual
-      PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id
-                          ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
-
-      CORBA::Object_ptr
-      id_to_reference (const PortableServer::ObjectId &id,
-                       bool indirect
-                       ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual TAO_SERVANT_LOCATION servant_present (
-        const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
-
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual CORBA::Object_ptr create_reference (
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual CORBA::Object_ptr create_reference_with_id (
-        const PortableServer::ObjectId &oid,
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual int rebind_using_user_id_and_system_id (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual CORBA::Boolean servant_has_remaining_activations (
-        PortableServer::Servant servant);
-
-      virtual int unbind_using_user_id (
-        const PortableServer::ObjectId &user_id);
-
-        virtual ::PortableServer::ServantRetentionPolicyValue type() const;
-
-    protected:
-      TAO_Root_POA *poa_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
deleted file mode 100644
index 892a724c01d..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyNonRetain.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyNonRetainFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategy*
-    ServantRetentionStrategyNonRetainFactoryImpl::create (
-      ::PortableServer::ServantRetentionPolicyValue value)
-    {
-      ServantRetentionStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::NON_RETAIN :
-        {
-          ACE_NEW_RETURN (strategy, ServantRetentionStrategyNonRetain, 0);
-          break;
-        }
-        case ::PortableServer::RETAIN :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    ServantRetentionStrategyNonRetainFactoryImpl::destroy (
-      ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyNonRetainFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
deleted file mode 100644
index 04594be87f6..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyNonRetainFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H
-#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategyNonRetainFactoryImpl
-       : public ServantRetentionStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ServantRetentionStrategy* create (
-        ::PortableServer::ServantRetentionPolicyValue value);
-
-      virtual void destroy (
-        ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
deleted file mode 100644
index e1aa28c38ef..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ /dev/null
@@ -1,1033 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServantRetentionStrategyRetain.cpp
- *
- *  $Id$
- *
- */
-//=============================================================================
-
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "ServantRetentionStrategyRetain.h"
-#include "Non_Servant_Upcall.h"
-#include "Servant_Upcall.h"
-#include "POA_Current_Impl.h"
-#include "Root_POA.h"
-#include "Active_Object_Map.h"
-#include "Active_Object_Map_Entry.h"
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID (PortableServer,
-           Servant_Retention_Strategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) :
-      ServantRetentionStrategyNonRetain (),
-      active_object_map_ (0),
-      waiting_servant_deactivation_ (0)
-    {
-    }
-
-    void
-    ServantRetentionStrategyRetain::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL)
-    {
-      poa_ = poa;
-
-      // Create the active object map to be used
-      TAO_Active_Object_Map *active_object_map = 0;
-      ACE_NEW_THROW_EX (active_object_map,
-                        TAO_Active_Object_Map (!poa->system_id (),
-                                               !poa->allow_multiple_activations (),
-                                               poa->is_persistent (),
-                                               poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
-                                               ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-
-      // Give ownership of the new map to the auto pointer.  Note, that it
-      // is important for the auto pointer to take ownership before
-      // checking for exception since we may need to delete the new map.
-      auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
-
-      // Check for exception in construction of the active object map.
-      ACE_CHECK;
-
-      // Finally everything is fine.  Make sure to take ownership away
-      // from the auto pointer.
-      this->active_object_map_ = new_active_object_map.release ();
-    }
-
-    void
-    ServantRetentionStrategyRetain::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-      // Delete the active object map.
-      delete this->active_object_map_;
-      active_object_map_ = 0;
-    }
-
-    void
-    ServantRetentionStrategyRetain::deactivate_object (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
-    {
-
-      TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
-      int result = this->active_object_map_->
-        find_servant_and_system_id_using_user_id (id,
-                                                  active_object_map_entry);
-
-      // If there is no active object associated with the specified Object
-      // Id, the operation raises an ObjectNotActive exception.
-      if (result != 0)
-        {
-          ACE_THROW (PortableServer::POA::ObjectNotActive ());
-        }
-
-      this->deactivate_map_entry (active_object_map_entry
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    void
-    ServantRetentionStrategyRetain::deactivate_map_entry (
-      TAO_Active_Object_Map_Entry *active_object_map_entry
-      ACE_ENV_ARG_DECL)
-    {
-      // Decrement the reference count.
-      CORBA::UShort new_count = --active_object_map_entry->reference_count_;
-
-      if (new_count == 0)
-        {
-          this->poa_->cleanup_servant (active_object_map_entry->servant_,
-                                       active_object_map_entry->user_id_
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          // It should be noted that there may be a period of time between
-          // an object's deactivation and the etherealization (during
-          // which outstanding requests are being processed) in which
-          // arriving requests on that object should not be passed to its
-          // servant. During this period, requests targeted for such an
-          // object act as if the POA were in holding state until
-          // etherealize completes. If etherealize is called as a
-          // consequence of a deactivate call with a etherealize_objects
-          // parameter of TRUE, incoming requests are rejected.
-
-          // Else mark entry as closed...
-          active_object_map_entry->deactivated_ = 1;
-        }
-    }
-
-    int
-    ServantRetentionStrategyRetain::unbind_using_user_id (
-      const PortableServer::ObjectId &user_id)
-    {
-      return this->active_object_map_->
-        unbind_using_user_id (user_id);
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyRetain::find_servant (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-    {
-      // Find user id from system id.
-      PortableServer::ObjectId_var user_id;
-      if (active_object_map_->
-          find_user_id_using_system_id (system_id,
-                                        user_id.out()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      // This operation returns the active servant associated with the
-      // specified system Object Id value.  If the Object Id value is
-      // not active in the POA, an ObjectNotActive exception is
-      // raised.
-      TAO_Active_Object_Map_Entry *entry = 0;
-      PortableServer::Servant servant = 0;
-
-      int result =
-        active_object_map_->
-          find_servant_using_system_id_and_user_id (system_id,
-                                                    user_id.in(),
-                                                    servant,
-                                                    entry);
-
-      if (result == -1)
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
-
-      return servant;
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyRetain::system_id_to_object_id (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongAdapter,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // The object denoted by the reference does not have to be
-      // active for this operation to succeed.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map_->
-          find_user_id_using_system_id (system_id,
-                                        user_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      return user_id._retn ();
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyRetain::user_id_to_servant (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // If the POA has the RETAIN policy and the specified ObjectId is in
-      // the Active Object Map, this operation returns the servant
-      // associated with that object in the Active Object Map.
-      PortableServer::Servant servant = 0;
-
-      int result =
-        this->active_object_map_->find_servant_using_user_id (id,
-                                                              servant);
-
-      if (result == -1)
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
-
-      return servant;
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyRetain::id_to_reference (
-      const PortableServer::ObjectId &id,
-      bool indirect
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // If an object with the specified Object Id value is currently
-      // active, a reference encapsulating the information used to
-      // activate the object is returned.
-      PortableServer::ObjectId_var system_id;
-      PortableServer::Servant servant;
-      CORBA::Short priority;
-
-      if (this->active_object_map_->
-          find_servant_and_system_id_using_user_id (id,
-                                                    servant,
-                                                    system_id.out (),
-                                                    priority) == 0)
-        {
-          // Remember params for potentially invoking <key_to_object> later.
-          this->poa_->key_to_object_params_.set (system_id,
-                                                 servant->_interface_repository_id (),
-                                                 servant,
-                                                 1,
-                                                 priority,
-                                                 indirect);
-
-          return this->poa_->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                                            id
-                                                            ACE_ENV_ARG_PARAMETER);
-        }
-      else
-        {
-          // If the Object Id value is not active in the POA, an
-          // ObjectNotActive exception is raised.
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            CORBA::Object::_nil ());
-        }
-    }
-
-    TAO_SERVANT_LOCATION
-    ServantRetentionStrategyRetain::servant_present (
-      const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
-    {
-      // Find user id from system id.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map_->
-          find_user_id_using_system_id (system_id,
-                                        user_id.out()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_SERVANT_NOT_FOUND);
-        }
-
-      TAO_Active_Object_Map_Entry *entry = 0;
-      int result = this->active_object_map_->
-        find_servant_using_system_id_and_user_id (system_id,
-                                                  user_id.in(),
-                                                  servant,
-                                                  entry);
-      if (result == 0)
-        {
-          // Success
-          return TAO_SERVANT_FOUND;
-        }
-      else
-        {
-          return TAO_SERVANT_NOT_FOUND;
-        }
-    }
-
-    PortableServer::Servant
-    ServantRetentionStrategyRetain::find_servant (
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-      ACE_ENV_ARG_DECL)
-    {
-      PortableServer::ObjectId user_id;
-      // If we have the RETAIN policy, convert/transform from system id to
-      // user id.
-      if (this->active_object_map_->
-          find_user_id_using_system_id (system_id,
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      poa_current_impl.object_id(user_id);
-      servant_upcall.user_id (&poa_current_impl.object_id());
-
-      // If the POA has the RETAIN policy, the POA looks in the Active
-      // Object Map to find if there is a servant associated with the
-      // Object Id value from the request. If such a servant exists, the
-      // POA invokes the appropriate method on the servant.
-      PortableServer::Servant servant = 0;
-      TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
-      int result = this->active_object_map_->
-        find_servant_using_system_id_and_user_id (system_id,
-                                                  user_id,
-                                                  servant,
-                                                  active_object_map_entry);
-
-
-      if (result == 0)
-        {
-          servant_upcall.active_object_map_entry (active_object_map_entry);
-
-          // Increment the reference count.
-          servant_upcall.increment_servant_refcount ();
-        }
-
-      return servant;
-    }
-
-    int
-    ServantRetentionStrategyRetain::is_servant_in_map (
-      PortableServer::Servant servant,
-      int &wait_occurred_restart_call)
-    {
-      int deactivated = 0;
-      int servant_in_map =
-        this->active_object_map_->is_servant_in_map (servant,
-                                                      deactivated);
-
-      if (!servant_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("(%t) TAO_Root_POA::is_servant_in_map: waiting for servant to deactivate\n")));
-
-              // We are going to wait on this condition variable; the POA
-              // state may change by the time we get the lock again.
-              // Therefore, indicate to the caller that all conditions
-              // need to be checked again.
-              wait_occurred_restart_call = 1;
-
-              ++this->waiting_servant_deactivation_;
-
-              if (this->poa_->object_adapter ().enable_locking ())
-                this->poa_->servant_deactivation_condition ().wait ();
-
-              --this->waiting_servant_deactivation_;
-
-              return 0;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-
-    int
-    ServantRetentionStrategyRetain::is_user_id_in_map (
-      const PortableServer::ObjectId &id,
-      CORBA::Short priority,
-      int &priorities_match,
-      int &wait_occurred_restart_call)
-    {
-      int deactivated = 0;
-      int user_id_in_map =
-        this->active_object_map_->is_user_id_in_map (id,
-                                                      priority,
-                                                      priorities_match,
-                                                      deactivated);
-
-      if (!user_id_in_map)
-        {
-          return 0;
-        }
-      else
-        {
-          if (deactivated)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("(%t) TAO_Root_POA::is_user_id_in_map: waiting for servant to deactivate\n")));
-
-              // We are going to wait on this condition variable; the POA
-              // state may change by the time we get the lock again.
-              // Therefore, indicate to the caller that all conditions
-              // need to be checked again.
-              wait_occurred_restart_call = 1;
-
-              ++this->waiting_servant_deactivation_;
-
-              if (this->poa_->object_adapter ().enable_locking ())
-                this->poa_->servant_deactivation_condition ().wait ();
-
-              --this->waiting_servant_deactivation_;
-
-              return 0;
-            }
-          else
-            {
-              return 1;
-            }
-        }
-    }
-
-    CORBA::ULong
-    ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const
-    {
-      return waiting_servant_deactivation_;
-    }
-
-    void
-    ServantRetentionStrategyRetain::deactivate_all_objects (
-      ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // If the etherealize_objects parameter is TRUE, the POA has the
-      // RETAIN policy, and a servant manager is registered with the POA,
-      // the etherealize operation on the servant manager will be called
-      // for each active object in the Active Object Map. The apparent
-      // destruction of the POA occurs before any calls to etherealize are
-      // made.  Thus, for example, an etherealize method that attempts to
-      // invoke operations on the POA will receive the OBJECT_NOT_EXIST
-      // exception.
-
-      // We must copy the map entries into a separate place since we
-      // cannot remove entries while iterating through the map.
-      ACE_Array_Base<TAO_Active_Object_Map_Entry *> map_entries
-        (this->active_object_map_->current_size ());
-
-      size_t counter = 0;
-      TAO_Active_Object_Map::user_id_map::iterator end
-        = this->active_object_map_->user_id_map_->end ();
-
-      for (TAO_Active_Object_Map::user_id_map::iterator iter
-             = this->active_object_map_->user_id_map_->begin ();
-           iter != end;
-           ++iter)
-        {
-          TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-          TAO_Active_Object_Map_Entry *active_object_map_entry = map_pair.second ();
-
-          if (!active_object_map_entry->deactivated_)
-            {
-              map_entries[counter] = active_object_map_entry;
-              ++counter;
-            }
-        }
-
-      for (size_t i = 0;
-           i < counter;
-           ++i)
-        {
-          this->deactivate_map_entry (map_entries[i]
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyRetain::servant_to_user_id (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation requires the RETAIN and either the UNIQUE_ID or
-      // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-      // exception is raised.
-      if (!((!this->poa_->allow_multiple_activations ()
-                || this->poa_->allow_implicit_activation ())))
-        {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
-        }
-
-      /**
-       * If the POA has both the RETAIN and the UNIQUE_ID policy and the
-       * specified servant is active, the Object Id associated with that
-       * servant is returned.
-       *
-       * If the POA has both the RETAIN and the IMPLICIT_ACTIVATION policy and
-       * either the POA has the MULTIPLE_ID policy or the specified servant is
-       * not active, the servant is activated using a POA-generated Object Id
-       * and the Interface Id associated with the servant, and that Object Id
-       * is returned.
-       *
-       */
-
-      // If the POA has the UNIQUE_ID policy and the specified servant is
-      // active, the Object Id associated with that servant is returned.
-      PortableServer::ObjectId_var user_id;
-      if (!this->poa_->allow_multiple_activations () &&
-          this->active_object_map_->
-          find_user_id_using_servant (servant,
-                                      user_id.out ()) != -1)
-        {
-          return user_id._retn ();
-        }
-
-      // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-      // has the MULTIPLE_ID policy or the specified servant is not
-      // active, the servant is activated using a POA-generated Object Id
-      // and the Interface Id associated with the servant, and that Object
-      // Id is returned.
-      if (this->poa_->allow_implicit_activation ())
-        {
-          // If we reach here, then we either have the MULTIPLE_ID policy
-          // or we have the UNIQUE_ID policy and we are not in the active
-          // object map.
-          PortableServer::ObjectId_var user_id;
-          if (this->active_object_map_->
-              bind_using_system_id_returning_user_id (servant,
-                                                      this->poa_->server_priority (),
-                                                      user_id.out ()) != 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          //
-          // Everything is finally ok
-          //
-
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // If this operation causes the object to be activated, _add_ref
-          // is invoked at least once on the Servant argument before
-          // returning. Otherwise, the POA does not increment or decrement
-          // the reference count of the Servant passed to this function.
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return user_id._retn ();
-        }
-
-      /*
-       * Otherwise, the ServantNotActive exception is raised.
-       */
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                        0);
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyRetain::servant_to_system_id_i (
-      PortableServer::Servant servant,
-      CORBA::Short &priority
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation requires the RETAIN and either the UNIQUE_ID or
-      // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-      // exception is raised.
-      if (!((!this->poa_->allow_multiple_activations ()
-                || this->poa_->allow_implicit_activation ())))
-        {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
-        }
-
-      // This operation has three possible behaviors.
-
-      // If the POA has the UNIQUE_ID policy and the specified servant is
-      // active, the Object Id associated with that servant is returned.
-      PortableServer::ObjectId_var system_id;
-      if (!this->poa_->allow_multiple_activations () &&
-          this->active_object_map_->
-          find_system_id_using_servant (servant,
-                                        system_id.out (),
-                                        priority) != -1)
-        {
-          return system_id._retn ();
-        }
-
-      // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-      // has the MULTIPLE_ID policy or the specified servant is not
-      // active, the servant is activated using a POA-generated Object Id
-      // and the Interface Id associated with the servant, and that Object
-      // Id is returned.
-      if (this->poa_->allow_implicit_activation ())
-        {
-          // If we reach here, then we either have the MULTIPLE_ID policy
-          // or we have the UNIQUE_ID policy and we are not in the active
-          // object map.
-          PortableServer::ObjectId_var system_id;
-          if (this->active_object_map_->
-              bind_using_system_id_returning_system_id (servant,
-                                                        priority,
-                                                        system_id.out ()) != 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          //
-          // Everything is finally ok
-          //
-
-          // ATTENTION: Trick locking here, see class header for details
-          Non_Servant_Upcall non_servant_upcall (*this->poa_);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // If this operation causes the object to be activated, _add_ref
-          // is invoked at least once on the Servant argument before
-          // returning. Otherwise, the POA does not increment or decrement
-          // the reference count of the Servant passed to this function.
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          return system_id._retn ();
-        }
-
-      // Otherwise, the ServantNotActive exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                        0);
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyRetain::servant_to_reference (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy))
-    {
-      // Note: The allocation of an Object Id value and installation in
-      // the Active Object Map caused by implicit activation may actually
-      // be deferred until an attempt is made to externalize the
-      // reference. The real requirement here is that a reference is
-      // produced that will behave appropriately (that is, yield a
-      // consistent Object Id value when asked politely).
-      CORBA::Short priority =
-        this->poa_->server_priority ();
-
-      PortableServer::ObjectId_var system_id =
-        this->servant_to_system_id_i (servant,
-                                      priority
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      PortableServer::ObjectId user_id;
-
-      // This operation requires the RETAIN, therefore don't worry about
-      // the NON_RETAIN case.
-      if (this->active_object_map_->
-          find_user_id_using_system_id (system_id.in (),
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-
-      // Remember params for potentially invoking <key_to_object> later.
-      this->poa_->key_to_object_params_.set (
-        system_id,
-        servant->_interface_repository_id (),
-        servant,
-        1,
-        priority,
-        true);
-
-      // Ask the ORT to create the object.
-      // @@NOTE:There is a possible deadlock lurking here. We held the
-      // lock, and we are possibly trying to make a call into the
-      // application code. Think what would happen if the app calls us
-      // back. We need to get to this at some point.
-      return this->poa_->invoke_key_to_object_helper_i (
-              servant->_interface_repository_id (),
-              user_id
-              ACE_ENV_ARG_PARAMETER);
-    }
-
-    PortableServer::ObjectId *
-    ServantRetentionStrategyRetain::activate_object (
-      PortableServer::Servant servant,
-      CORBA::Short priority,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy))
-    {
-      if (!this->poa_->has_system_id ())
-        {
-          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                            0);
-        }
-
-      bool may_activate =
-        this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call);
-
-      if (!may_activate)
-        {
-          if (wait_occurred_restart_call)
-            {
-              return 0;
-            }
-          else
-            {
-              ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
-                                0);
-            }
-        }
-
-      // Otherwise, the activate_object operation generates an Object Id
-      // and enters the Object Id and the specified servant in the Active
-      // Object Map. The Object Id is returned.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map_->
-          bind_using_system_id_returning_user_id (servant,
-                                                  priority,
-                                                  user_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // ATTENTION: Trick locking here, see class header for details
-      Non_Servant_Upcall non_servant_upcall (*this->poa_);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The implementation of activate_object will invoke _add_ref at
-      // least once on the Servant argument before returning. When the POA
-      // no longer needs the Servant, it will invoke _remove_ref on it the
-      // same number of times.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return user_id._retn ();
-    }
-
-    void
-    ServantRetentionStrategyRetain::activate_object_with_id (
-      const PortableServer::ObjectId &id,
-      PortableServer::Servant servant,
-      CORBA::Short priority,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-    {
-      // If the POA has the SYSTEM_ID policy and it detects that the
-      // Object Id value was not generated by the system or for this POA,
-      // the activate_object_with_id operation may raise the BAD_PARAM
-      // system exception.  An ORB is not required to detect all such
-      // invalid Object Id values, but a portable application must not
-      // invoke activate_object_with_id on a POA that has the SYSTEM_ID
-      // policy with an Object Id value that was not previously generated
-      // by the system for that POA, or, if the POA also has the
-      // PERSISTENT policy, for a previous instantiation of the same POA.
-      if (this->poa_->has_system_id () &&
-          !this->poa_->is_poa_generated_id (id))
-        {
-          ACE_THROW (CORBA::BAD_PARAM ());
-        }
-
-      // If the CORBA object denoted by the Object Id value is already
-      // active in this POA (there is a servant bound to it in the Active
-      // Object Map), the ObjectAlreadyActive exception is raised.
-      int priorities_match = 1;
-      int result =
-        this->is_user_id_in_map (id,
-                                 priority,
-                                 priorities_match,
-                                 wait_occurred_restart_call);
-
-    // @johnny the implementation is not complete, this does the spec also say
-    // If the POA has the UNIQUE_ID policy and the servant is already
-    // in the Active Object Map, the ServantAlreadyActive exception is raised.
-      if (result)
-        {
-          ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
-        }
-      else if (wait_occurred_restart_call)
-        {
-          // We ended up waiting on a condition variable, the POA state
-          // may have changed while we are waiting.  Therefore, we need to
-          // restart this call.
-          return;
-        }
-
-      // If the activate_object_with_id_and_priority operation is invoked
-      // with a different priority to an earlier invocation of one of the
-      // create reference with priority operations, for the same object,
-      // then the ORB shall raise a BAD_INV_ORDER system exception (with a
-      // Standard Minor Exception Code of 1). If the priority value is the
-      // same then the ORB shall return SUCCESS.
-      if (!priorities_match)
-        {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
-                                           CORBA::COMPLETED_NO));
-        }
-
-      bool may_activate =
-        this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call);
-
-      if (!may_activate)
-        {
-          if (wait_occurred_restart_call)
-            {
-              return;
-            }
-          else
-            {
-              ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
-            }
-        }
-
-      // Otherwise, the activate_object_with_id operation enters an
-      // association between the specified Object Id and the specified
-      // servant in the Active Object Map.
-      if (this->active_object_map_->bind_using_user_id (servant,
-                                                         id,
-                                                         priority) != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // ATTENTION: Trick locking here, see class header for details
-      Non_Servant_Upcall non_servant_upcall (*this->poa_);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The implementation of activate_object_with_id will invoke
-      // _add_ref at least once on the Servant argument before
-      // returning. When the POA no longer needs the Servant, it will
-      // invoke _remove_ref on it the same number of times.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyRetain::create_reference (
-      const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy))
-    {
-      // This operation creates an object reference that encapsulates a
-      // POA-generated Object Id value and the specified interface
-      // repository id. This operation does not cause an activation to
-      // take place. The resulting reference may be passed to clients, so
-      // that subsequent requests on those references will cause the
-      // appropriate servant manager to be invoked, if one is
-      // available. The generated Object Id value may be obtained by
-      // invoking POA::reference_to_id with the created reference.
-
-      PortableServer::ObjectId_var system_id;
-      PortableServer::ObjectId user_id;
-
-      if (this->active_object_map_->
-          bind_using_system_id_returning_system_id (0,
-                                                    priority,
-                                                    system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-
-      // Find user id from system id.
-      if (this->active_object_map_->
-          find_user_id_using_system_id (system_id.in (),
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-
-      // Remember params for potentially invoking <key_to_object> later.
-      this->poa_->key_to_object_params_.set (system_id,
-                                       intf,
-                                       0,
-                                       1,
-                                       priority,
-                                       true);
-
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        user_id
-                                                        ACE_ENV_ARG_PARAMETER);
-
-    }
-
-    CORBA::Object_ptr
-    ServantRetentionStrategyRetain::create_reference_with_id (
-      const PortableServer::ObjectId &oid,
-      const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      // This operation creates an object reference that encapsulates the
-      // specified Object Id and interface repository Id values. This
-      // operation does not cause an activation to take place.  The
-      // resulting reference may be passed to clients, so that subsequent
-      // requests on those references will cause the object to be
-      // activated if necessary, or the default servant used, depending on
-      // the applicable policies.
-
-      PortableServer::Servant servant = 0;
-      PortableServer::ObjectId_var system_id;
-
-      // @@ We need something that can find the system id using
-      // appropriate strategy, at the same time, return the servant if
-      // one is available.  Before we have that function,
-      // <create_reference_with_id_i> basically generates broken
-      // collocated object when DIRECT collocation strategy is used.
-
-      if (this->active_object_map_->
-          find_system_id_using_user_id (oid,
-                                        priority,
-                                        system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-
-      // Remember params for potentially invoking <key_to_object> later.
-      this->poa_->key_to_object_params_.set (system_id,
-                                       intf,
-                                       servant,
-                                       1,
-                                       priority,
-                                       true);
-
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                  oid
-                                                  ACE_ENV_ARG_PARAMETER);
-    }
-
-    int
-    ServantRetentionStrategyRetain::rebind_using_user_id_and_system_id (
-      PortableServer::Servant servant,
-      const PortableServer::ObjectId &user_id,
-      const PortableServer::ObjectId &system_id,
-      TAO::Portable_Server::Servant_Upcall &servant_upcall)
-    {
-      TAO_Active_Object_Map_Entry *entry = 0;
-      int result = this->active_object_map_->
-        rebind_using_user_id_and_system_id (servant,
-                                            user_id,
-                                            system_id,
-                                            entry);
-      servant_upcall.active_object_map_entry(entry);
-
-      return result;
-    }
-
-    CORBA::Boolean
-    ServantRetentionStrategyRetain::servant_has_remaining_activations (
-      PortableServer::Servant servant)
-    {
-      return this->active_object_map_->remaining_activations (servant);
-    }
-
-    ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionStrategyRetain::type() const
-    {
-      return ::PortableServer::RETAIN;
-    }
-
-  }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Active_Object_Map>;
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Active_Object_Map>
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
deleted file mode 100644
index 738f58fdd3c..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyRetain.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
-#define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ServantRetentionStrategyNonRetain.h"
-
-class TAO_Root_POA;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategyRetain
-       : public ServantRetentionStrategyNonRetain
-    {
-    public:
-      ServantRetentionStrategyRetain (void);
-
-      CORBA::ULong waiting_servant_deactivation (void) const;
-
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual int is_servant_in_map (PortableServer::Servant servant,
-                                     int &wait_occurred_restart_call);
-
-      virtual
-      PortableServer::ObjectId *
-      activate_object (PortableServer::Servant servant,
-                       CORBA::Short priority,
-                       int &wait_occurred_restart_call
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantAlreadyActive,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual
-      void
-      activate_object_with_id (const PortableServer::ObjectId &id,
-                               PortableServer::Servant servant,
-                               CORBA::Short priority,
-                               int &wait_occurred_restart_call
-                               ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy));
-
-      void deactivate_object (const PortableServer::ObjectId &id
-                              ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::ObjectId * system_id_to_object_id (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongAdapter,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual
-      PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id
-                     ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
-
-      CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id,
-                                         bool indirect ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ObjectNotActive,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual
-      TAO_SERVANT_LOCATION
-      servant_present (const PortableServer::ObjectId &system_id,
-                       PortableServer::Servant &servant
-                       ACE_ENV_ARG_DECL);
-
-      virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
-
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::ServantNotActive,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual
-      CORBA::Object_ptr
-      servant_to_reference (PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableServer::POA::ServantNotActive,
-                      PortableServer::POA::WrongPolicy));
-
-      virtual
-      CORBA::Object_ptr create_reference (
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException,
-                           PortableServer::POA::WrongPolicy));
-
-      virtual
-      CORBA::Object_ptr create_reference_with_id (
-        const PortableServer::ObjectId &oid,
-        const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
-          ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::PortableServer::ServantRetentionPolicyValue type() const;
-
-    protected:
-      int
-      is_user_id_in_map (const PortableServer::ObjectId &id,
-                         CORBA::Short priority,
-                         int &priorities_match,
-                         int &wait_occurred_restart_call);
-
-      void
-      deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry
-                            ACE_ENV_ARG_DECL);
-
-      PortableServer::ObjectId *servant_to_system_id_i (
-          PortableServer::Servant p_servant,
-          CORBA::Short &priority
-          ACE_ENV_ARG_DECL
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         PortableServer::POA::ServantNotActive,
-                         PortableServer::POA::WrongPolicy));
-
-      virtual
-      int rebind_using_user_id_and_system_id (
-        PortableServer::Servant servant,
-        const PortableServer::ObjectId &user_id,
-        const PortableServer::ObjectId &system_id,
-        TAO::Portable_Server::Servant_Upcall &servant_upcall);
-
-      virtual
-      CORBA::Boolean servant_has_remaining_activations (
-        PortableServer::Servant servant);
-
-      virtual int unbind_using_user_id (
-        const PortableServer::ObjectId &user_id);
-
-    private:
-      TAO_Active_Object_Map *active_object_map_;
-      CORBA::ULong waiting_servant_deactivation_;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
deleted file mode 100644
index 61d8167a294..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-
-#include "ServantRetentionStrategyRetainFactoryImpl.h"
-#include "ServantRetentionStrategy.h"
-#include "ServantRetentionStrategyRetain.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ServantRetentionStrategyRetainFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ServantRetentionStrategy*
-    ServantRetentionStrategyRetainFactoryImpl::create (
-      ::PortableServer::ServantRetentionPolicyValue value)
-    {
-      ServantRetentionStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::RETAIN :
-        {
-          ACE_NEW_RETURN (strategy, ServantRetentionStrategyRetain, 0);
-          break;
-        }
-        case ::PortableServer::NON_RETAIN :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    ServantRetentionStrategyRetainFactoryImpl::destroy (
-      ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ServantRetentionStrategyRetainFactoryImpl,
-        ACE_TEXT ("ServantRetentionStrategyRetainFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
deleted file mode 100644
index 9fd7a80ee08..00000000000
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ServantRetentionStrategyRetainFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H
-#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ServantRetentionStrategyRetainFactoryImpl
-       : public ServantRetentionStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ServantRetentionStrategy* create (
-        ::PortableServer::ServantRetentionPolicyValue value);
-
-      virtual void destroy (
-        ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
deleted file mode 100644
index 05aabdf43de..00000000000
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-// $Id$
-
-#include "Servant_Base.h"
-#include "Root_POA.h"
-#include "Operation_Table.h"
-#include "POA_Current_Impl.h"
-
-#include "tao/Timeprobe.h"
-#include "tao/ORB_Core.h"
-#include "tao/TSS_Resources.h"
-#include "tao/Stub.h"
-#include "tao/Environment.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/IFR_Client_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (PortableServer,
-           Servant_Base,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "Servant_Base.i"
-#endif /* ! __ACE_INLINE__ */
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Servant_Base_Timeprobe_Description[] =
-{
-  "Servant_Base::_find - start",
-  "Servant_Base::_find - end"
-};
-
-enum
-  {
-    TAO_SERVANT_BASE_FIND_START = 700,
-    TAO_SERVANT_BASE_FIND_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
-                                  TAO_SERVANT_BASE_FIND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_ServantBase::TAO_ServantBase (void)
-  : TAO_Abstract_ServantBase ()
-  , ref_count_ (1)
-  , optable_ (0)
-{
-}
-
-TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs)
-  : TAO_Abstract_ServantBase ()
-  , ref_count_ (1)
-  , optable_ (rhs.optable_)
-{
-}
-
-TAO_ServantBase &
-TAO_ServantBase::operator= (const TAO_ServantBase &rhs)
-{
-  this->optable_ = rhs.optable_;
-  return *this;
-}
-
-TAO_ServantBase::~TAO_ServantBase (void)
-{
-}
-
-PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::Object_var object =
-    TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return PortableServer::POA::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_ServantBase::_is_a (const char *logical_type_id
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  static char const id[] = "IDL:omg.org/CORBA/Object:1.0";
-  return ACE_OS::strcmp (logical_type_id, id) == 0;
-}
-
-CORBA::Boolean
-TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return 0;
-}
-
-CORBA::InterfaceDef_ptr
-TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_IFR_Client_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
-    }
-
-  // This doesn't take multiple ORBs into account, but it's being
-  // used only to resolve the IFR, so we should be ok.
-  return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
-                                 this->_interface_repository_id ()
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_ServantBase::_get_component (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return CORBA::Object::_nil ();
-}
-
-int
-TAO_ServantBase::_find (const char *opname,
-                        TAO_Skeleton& skelfunc,
-                        const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START);
-  return this->optable_->find (opname, skelfunc, length);
-}
-
-int
-TAO_ServantBase::_find (const char *opname,
-                        TAO_Collocated_Skeleton& skelfunc,
-                        TAO::Collocation_Strategy st,
-                        const unsigned int length)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START);
-  return this->optable_->find (opname, skelfunc, st, length);
-}
-
-TAO_Stub *
-TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Stub *stub = 0;
-
-  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
-    static_cast<TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-
-  CORBA::ORB_ptr servant_orb = 0;
-
-  if (poa_current_impl != 0
-      && this == poa_current_impl->servant ())
-    {
-      servant_orb = poa_current_impl->orb_core ().orb () ;
-
-      stub =
-        poa_current_impl->poa ()->key_to_stub (
-            poa_current_impl->object_key (),
-            this->_interface_repository_id (),
-            poa_current_impl->priority ()
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Object_var object =
-        poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Get the stub object
-      stub = object->_stubobj ();
-
-      // Increment the reference count since <object> will zap its
-      // stub object on deletion.
-      stub->_incr_refcnt ();
-
-      servant_orb = stub->orb_core ()->orb ();
-    }
-
-  stub->servant_orb (servant_orb);
-  return stub;
-}
-
-void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                                   void * servant_upcall,
-                                                   void * derived_this
-                                                   ACE_ENV_ARG_DECL)
-{
-  TAO_Skeleton skel;
-  char const * const opname = req.operation ();
-
-  // It seems that I might have missed s/g here.  What if
-  // it is a one way that is SYNC_WITH_SERVER.
-  // Add the following line to handle this reply send as well.
-
-  // Handle the one ways that are SYNC_WITH_SERVER
-  if (req.sync_with_server ())
-    {
-      req.send_no_exception_reply ();
-    }
-
-  // Fetch the skeleton for this operation
-  if (this->_find (opname,
-                   skel,
-                   static_cast <unsigned int> (req.operation_length())) == -1)
-    {
-      ACE_THROW (CORBA::BAD_OPERATION ());
-    }
-
-  CORBA::Boolean const send_reply =
-    !req.sync_with_server ()
-    && req.response_expected ()
-    && !req.deferred_reply ();
-
-  ACE_TRY
-    {
-      // Invoke the skeleton, it will demarshal the arguments, invoke
-      // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
-      // case.
-      skel (req,
-            servant_upcall,
-            derived_this
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // It is our job to send the already marshaled reply, but only
-      // send if it is expected and it has not already been sent
-
-      // We send the reply only if it is NOT a SYNC_WITH_SERVER, a
-      // response is expected and if the reply is not deferred.
-      if (send_reply)
-        {
-          req.tao_send_reply ();
-        }
-    }
-  ACE_CATCHANY
-    {
-      // If an exception was raised we should marshal it and send
-      // the appropriate reply to the client
-      if (send_reply)
-        {
-          if (req.collocated ())
-            {
-              // Report the exception to the collocated client.
-              ACE_RE_THROW;
-            }
-          else
-            req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
-        }
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  return;
-}
-
-void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                                    void * servant_upcall,
-                                                    void * derived_this
-                                                    ACE_ENV_ARG_DECL)
-{
-  TAO_Skeleton skel;
-  const char *opname = req.operation ();
-
-  // It seems that I might have missed s/g here.  What if
-  // it is a one way that is SYNC_WITH_SERVER.
-  // Add the following line to handle this reply send as well.
-
-  // Handle the one ways that are SYNC_WITH_SERVER
-  if (req.sync_with_server ())
-    {
-      req.send_no_exception_reply ();
-    }
-
-  // Fetch the skeleton for this operation
-  if (this->_find (opname,
-                   skel,
-                   static_cast <unsigned int> (req.operation_length())) == -1)
-    {
-      ACE_THROW (CORBA::BAD_OPERATION ());
-    }
-
-  ACE_TRY
-    {
-      // Invoke the skeleton, it will demarshal the arguments, invoke
-      // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
-      // case.
-      skel (req,
-            servant_upcall,
-            derived_this
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // It is our job to send the already marshaled reply, but only
-      // send if it is expected and it has not already been sent
-
-      // Return immediately. Do not send a reply; this is an
-      // asynchronous upcall. (unless, of course there is a system
-      // exception.
-
-    }
-  ACE_CATCHANY
-    {
-      // If an exception was raised we should marshal it and send
-      // the appropriate reply to the client
-      req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  return;
-}
-
-void
-TAO_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  ++this->ref_count_;
-}
-
-void
-TAO_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  const CORBA::ULong new_count = --this->ref_count_;
-
-  if (new_count == 0)
-    delete this;
-}
-
-CORBA::ULong
-TAO_ServantBase::_refcount_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ref_count_.value ();
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (void)
-  : ptr_ (0)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (TAO_ServantBase *p)
-  : ptr_ (p)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (const TAO_ServantBase_var &b)
-  : ptr_ (b.ptr_)
-{
-  if (this->ptr_ != 0)
-    {
-      ACE_TRY_NEW_ENV
-        {
-          this->ptr_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHALL
-        {
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-    }
-}
-
-TAO_ServantBase_var::~TAO_ServantBase_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      // We should not allow exceptions to pass through
-      ACE_TRY_NEW_ENV
-        {
-          this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHALL
-        {
-        }
-      ACE_ENDTRY;
-    }
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (TAO_ServantBase *p)
-{
-  if (this->ptr_ == p)
-    return *this;
-
-  ACE_TRY_NEW_ENV
-    {
-      if (this->ptr_ != 0)
-        {
-          this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-
-  this->ptr_ = p;
-
-  return *this;
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (const TAO_ServantBase_var &b)
-{
-  if (this->ptr_ != b.ptr_)
-    {
-      ACE_TRY_NEW_ENV
-        {
-          if (this->ptr_ != 0)
-            {
-              this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-
-          if ((this->ptr_ = b.ptr_) != 0)
-            {
-              this->ptr_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-        }
-      ACE_CATCHALL
-        {
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-    }
-
-  return *this;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::operator->() const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::out (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (this->ptr_ != 0)
-        {
-          this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-
-  this->ptr_ = 0;
-
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::_retn (void)
-{
-  TAO_ServantBase *retval = this->ptr_;
-  this->ptr_ = 0;
-  return retval;
-}
-
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
deleted file mode 100644
index 3b1366ee9a4..00000000000
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Servant_Base.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_BASE_H
-#define TAO_SERVANT_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PS_ForwardC.h"
-#include "ace/Atomic_Op.h"
-#include "tao/Abstract_Servant_Base.h"
-
-class TAO_Operation_Table;
-
-/**
- * @class TAO_ServantBase
- *
- * @brief Base class for skeletons and servants.
- *
- * The POA spec requires that all servants inherit from this class'
- * base class.
- *
- * An instance of a servant class derived from
- * ServantBase initially has a reference count of
- * one. Invoking _add_ref on the servant instance increases its
- * reference count by one. Invoking _remove_ref on the servant
- * instance decreases its reference count by one; if the
- * resulting reference count equals zero, _remove_ref invokes
- * delete on its this pointer in order to destroy the
- * servant. For ORBs that operate in multi-threaded
- * environments, the implementations of _add_ref and _remove_ref
- * that the ServantBase class provides shall be
- * thread-safe.
- *
- * Like ServantBase supports copy
- * construction and the default assignment operation. Copy
- * construction always sets the reference count of the new
- * servant instance to one. The default assignment
- * implementation merely returns *this and does not affect the
- * reference count.
- *
- */
-class TAO_PortableServer_Export TAO_ServantBase
-  : public virtual TAO_Abstract_ServantBase
-{
-public:
-
-  /// Destructor.
-  virtual ~TAO_ServantBase (void);
-
-  /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-  /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Default _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-  /// Query the Interface Repository for the interface definition.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-  /// Default _get_component: always returns CORBA::Object::_nil().
-  virtual CORBA::Object_ptr _get_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
-
-  /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL);
-
-  /**
-   * Dispatches a request to the object: find the operation, cast the
-   * type to the most derived type, demarshall all the parameters from
-   * the request and finally invokes the operation, storing the
-   * results and out parameters (if any) or the exceptions thrown into
-   * @a request.
-   */
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall
-                          ACE_ENV_ARG_DECL) = 0;
-
-  /// Please see documentation in tao/Abstract_Servant_Base.h for
-  /// details.
-  virtual int _find (const char *opname,
-                     TAO_Skeleton &skelfunc,
-                     const unsigned int length = 0);
-
-  virtual int _find (const char *opname,
-                     TAO_Collocated_Skeleton &skelfunc,
-                     TAO::Collocation_Strategy st,
-                     const unsigned int length = 0);
-
-  /// Get this interface's repository id (TAO specific).
-  virtual const char *_interface_repository_id (void) const = 0;
-
-  //@{
-  /**
-   * @name Reference Counting Operations
-   */
-  /// Increase reference count by one.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-
-  /**
-   * Decreases reference count by one; if the resulting reference
-   * count equals zero, _remove_ref invokes delete on its this pointer
-   * in order to destroy the servant.
-   */
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
-
-  /**
-   * Returns the current reference count value.
-   */
-  virtual CORBA::ULong _refcount_value (ACE_ENV_SINGLE_ARG_DECL) const;
-  //@}
-
-protected:
-
-  /// Default constructor, only derived classes can be created.
-  TAO_ServantBase (void);
-
-  /// Copy constructor, protected so no instances can be created.
-  TAO_ServantBase (const TAO_ServantBase &);
-
-  /// Assignment operator.
-  TAO_ServantBase &operator= (const TAO_ServantBase &);
-
-  virtual void synchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                            void * servant_upcall,
-                                            void * derived_this
-                                            ACE_ENV_ARG_DECL);
-
-  virtual void asynchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                             void * servant_upcall,
-                                             void * derived_this
-                                             ACE_ENV_ARG_DECL);
-
-protected:
-  /// Reference counter.
-  ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-
-  /// The operation table for this servant.  It is initialized by the
-  /// most derived class.
-  TAO_Operation_Table * optable_;
-};
-
-class TAO_PortableServer_Export TAO_Servant_Hash
-{
-public:
-  /// Returns hash value.
-  u_long operator () (PortableServer::Servant servant) const;
-};
-
-/**
- * @class TAO_ServantBase_var
- *
- * @brief Auto pointer for reference counting servants.
- *
- * For the convenience of automatically managing servant
- * reference counts, the PortableServer namespace also provides
- * the ServantBase_var class. This class behaves similarly to
- * _var classes for object references (see Section 20.3.1).
- */
-class TAO_PortableServer_Export TAO_ServantBase_var
-{
-public:
-  TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var (TAO_ServantBase *p);
-
-  TAO_ServantBase_var (const TAO_ServantBase_var &b);
-
-  ~TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var &operator= (TAO_ServantBase *p);
-
-  TAO_ServantBase_var &operator= (const TAO_ServantBase_var &b);
-
-  TAO_ServantBase *operator-> () const;
-
-  TAO_ServantBase *in (void) const;
-
-  TAO_ServantBase *&inout (void);
-
-  TAO_ServantBase *&out (void);
-
-  TAO_ServantBase *_retn (void);
-
-private:
-
-  TAO_ServantBase *ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Servant_Base.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVANT_BASE_H */
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
deleted file mode 100644
index b48403a8e3c..00000000000
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE u_long
-TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
-{
-  return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (servant));
-}
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
deleted file mode 100644
index f90cb97c96a..00000000000
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// @(#) $Id$
-
-#include "Servant_Dispatcher.h"
-
-ACE_RCSID(PortableServer,
-          Servant_Dispatcher,
-          "$Id$")
-
-TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void)
-{
-}
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
deleted file mode 100644
index a71b949d84e..00000000000
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Servant_Dispatcher.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_DISPATCHER_H
-#define TAO_SERVANT_DISPATCHER_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SStringfwd.h"
-#include "Servant_Upcall.h"
-
-// Forward references.
-class TAO_POA_Manager;
-class TAO_POA_Policy_Set;
-class TAO_Root_POA;
-class ACE_Lock;
-class TAO_ORB_Core;
-class TAO_ServerRequest;
-
-/**
- * @class TAO_Servant_Dispatcher
- *
- * @brief Interface for POA servant dispatching strategies.
- */
-class TAO_PortableServer_Export TAO_Servant_Dispatcher
-{
-public:
-  virtual ~TAO_Servant_Dispatcher (void);
-
-  /// Pre_invoke remote request.
-  virtual void pre_invoke_remote_request (
-      TAO_Root_POA &poa,
-      CORBA::Short servant_priority,
-			TAO_ServerRequest &req,
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-      ACE_ENV_ARG_DECL
-    ) = 0;
-
-  /// Pre_invoke collocated request.
-  virtual void pre_invoke_collocated_request (
-      TAO_Root_POA &poa,
-      CORBA::Short servant_priority,
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-      ACE_ENV_ARG_DECL) = 0;
-
-  /// Post_invoke request.
-  virtual void post_invoke (
-      TAO_Root_POA &poa,
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) = 0;
-
-  /// Factory method for creating new POA's.
-  virtual TAO_Root_POA *create_Root_POA (
-      const ACE_CString &name,
-      TAO_POA_Manager &poa_manager,
-      const TAO_POA_Policy_Set &policies,
-      ACE_Lock &lock,
-      TAO_SYNCH_MUTEX &thread_lock,
-      TAO_ORB_Core &orb_core,
-      TAO_Object_Adapter *object_adapter
-      ACE_ENV_ARG_DECL) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h
deleted file mode 100644
index 2e533e63a6b..00000000000
--- a/TAO/tao/PortableServer/Servant_Location.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Servant_Location.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_LOCATION_H
-#define TAO_SERVANT_LOCATION_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-enum TAO_SERVANT_LOCATION
-{
-  TAO_SERVANT_FOUND,
-  TAO_DEFAULT_SERVANT,
-  TAO_SERVANT_MANAGER,
-  TAO_SERVANT_NOT_FOUND
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVANT_LOCATION_H */
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
deleted file mode 100644
index 5529135be6c..00000000000
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-// $Id$
-
-#include "Object_Adapter.h"
-#include "Servant_Upcall.h"
-#include "Root_POA.h"
-#include "Default_Servant_Dispatcher.h"
-#include "Collocated_Object_Proxy_Broker.h"
-#include "Active_Object_Map_Entry.h"
-#include "ForwardRequestC.h"
-
-// -- TAO Include --
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Servant_Upcall.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (PortableServer,
-           Servant_Upcall,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
-      : object_adapter_ (0),
-        poa_ (0),
-        servant_ (0),
-        state_ (INITIAL_STAGE),
-        system_id_ (),
-        user_id_ (0),
-        current_context_ (),
-#if (TAO_HAS_MINIMUM_POA == 0)
-        cookie_ (0),
-        operation_ (0),
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-        active_object_map_entry_ (0)
-    {
-      TAO_Adapter *adapter = oc->poa_adapter ();
-      TAO_Object_Adapter *object_adapter =
-        dynamic_cast<TAO_Object_Adapter *>(adapter);
-      this->object_adapter_ = object_adapter;
-    }
-
-    int
-    Servant_Upcall::prepare_for_upcall (
-      const TAO::ObjectKey &key,
-      const char *operation,
-      CORBA::Object_out forward_to
-      ACE_ENV_ARG_DECL)
-    {
-      while (1)
-        {
-          int wait_occurred_restart_call = 0;
-
-          int result =
-            this->prepare_for_upcall_i (key,
-                                        operation,
-                                        forward_to,
-                                        wait_occurred_restart_call
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-          if (result == TAO_Adapter::DS_FAILED &&
-              wait_occurred_restart_call)
-            {
-              // We ended up waiting on a condition variable.  The POA
-              // state may have changed while we are waiting.  Therefore,
-              // we need to call prepare_for_upcall_i() again.  We also
-              // need to cleanup the state of the upcall object before
-              // continuing.
-              this->upcall_cleanup ();
-              continue;
-            }
-          else
-            {
-              return result;
-            }
-        }
-    }
-
-    int
-    Servant_Upcall::prepare_for_upcall_i (
-      const TAO::ObjectKey &key,
-      const char *operation,
-      CORBA::Object_out forward_to,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
-    {
-      // Acquire the object adapter lock first.
-      int result = this->object_adapter_->lock ().acquire ();
-      if (result == -1)
-        // Locking error.
-        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                          TAO_Adapter::DS_FAILED);
-
-      // We have acquired the object adapater lock.  Record this for later
-      // use.
-      this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
-
-      // Check if a non-servant upcall is in progress.  If a non-servant
-      // upcall is in progress, wait for it to complete.  Unless of
-      // course, the thread making the non-servant upcall is this thread.
-      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-      // Locate the POA.
-      this->object_adapter_->locate_poa (key,
-                                         this->system_id_,
-                                         this->poa_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-      // Check the state of the POA.
-      this->poa_->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-      // Setup current for this request.
-      this->current_context_.setup (this->poa_,
-                                    key);
-
-      // Increase <poa->outstanding_requests_> for the duration of finding
-      // the POA, finding the servant, and making the upcall.
-      this->poa_->increment_outstanding_requests ();
-
-      // We have setup the POA Current.  Record this for later use.
-      this->state_ = POA_CURRENT_SETUP;
-
-      ACE_TRY
-        {
-          // Lookup the servant.
-          this->servant_ =
-            this->poa_->locate_servant_i (operation,
-                                          this->system_id_,
-                                          *this,
-                                          this->current_context_,
-                                          wait_occurred_restart_call
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (wait_occurred_restart_call)
-            return TAO_Adapter::DS_FAILED;
-        }
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-      ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-        {
-          forward_to =
-            CORBA::Object::_duplicate (forward_request.forward_reference.in ());
-          return TAO_Adapter::DS_FORWARD;
-        }
-#else
-      ACE_CATCHANY
-        {
-          ACE_UNUSED_ARG (forward_to);
-          ACE_RE_THROW;
-        }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      ACE_ENDTRY;
-
-      // Now that we know the servant.
-      this->current_context_.servant (this->servant_);
-
-      // For servants from Servant Locators, there is no active object map
-      // entry.
-      if (this->active_object_map_entry ())
-        this->current_context_.priority (this->active_object_map_entry ()->priority_);
-
-      if (this->state_ != OBJECT_ADAPTER_LOCK_RELEASED)
-        {
-          // Release the object adapter lock.
-          this->object_adapter_->lock ().release ();
-
-          // We have release the object adapter lock.  Record this for
-          // later use.
-          this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
-        }
-
-      // Serialize servants (if appropriate).
-      this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-      // We have acquired the servant lock.  Record this for later use.
-      this->state_ = SERVANT_LOCK_ACQUIRED;
-
-      // After this point, <this->servant_> is ready for dispatching.
-      return TAO_Adapter::DS_OK;
-    }
-
-    void
-    Servant_Upcall::pre_invoke_remote_request (
-      TAO_ServerRequest &req
-      ACE_ENV_ARG_DECL)
-    {
-      this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request (
-        this->poa (),
-        this->priority (),
-        req,
-        this->pre_invoke_state_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    void
-    Servant_Upcall::pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_DECL)
-    {
-      this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
-        this->poa (),
-        this->priority (),
-        this->pre_invoke_state_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-    void
-    Servant_Upcall::post_invoke (void)
-    {
-      this->object_adapter_->servant_dispatcher_->post_invoke (
-        this->poa (),
-        this->pre_invoke_state_);
-    }
-
-    Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
-      : state_ (NO_ACTION_REQUIRED),
-        original_native_priority_ (0),
-        original_CORBA_priority_ (0)
-    {
-    }
-
-    ::TAO_Root_POA *
-    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
-                                ACE_ENV_ARG_DECL)
-    {
-      // Acquire the object adapter lock first.
-      int result = this->object_adapter_->lock ().acquire ();
-      if (result == -1)
-        // Locking error.
-        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                          0);
-
-      // We have acquired the object adapater lock.  Record this for later
-      // use.
-      this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
-
-      // Check if a non-servant upcall is in progress.  If a non-servant
-      // upcall is in progress, wait for it to complete.  Unless of
-      // course, the thread making the non-servant upcall is this thread.
-      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // Locate the POA.
-      this->object_adapter_->locate_poa (key,
-                                         this->system_id_,
-                                         this->poa_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return this->poa_;
-    }
-
-    Servant_Upcall::~Servant_Upcall (void)
-    {
-      this->upcall_cleanup ();
-    }
-
-    void
-    Servant_Upcall::upcall_cleanup (void)
-    {
-      this->post_invoke ();
-
-      switch (this->state_)
-        {
-        case SERVANT_LOCK_ACQUIRED:
-          // Unlock servant (if appropriate).
-          this->single_threaded_poa_cleanup ();
-
-          /* FALLTHRU */
-
-        case OBJECT_ADAPTER_LOCK_RELEASED:
-          // Cleanup servant locator related state.  Note that because
-          // this operation does not change any Object Adapter related
-          // state, it is ok to call it outside the lock.
-          this->post_invoke_servant_cleanup ();
-
-          // Since the object adapter lock was released, we must acquire
-          // it.
-          //
-          // Note that errors are ignored here since we cannot do much
-          // with it.
-          this->object_adapter_->lock ().acquire ();
-
-          // Check if a non-servant upcall is in progress.  If a
-          // non-servant upcall is in progress, wait for it to complete.
-          // Unless of course, the thread making the non-servant upcall is
-          // this thread.
-          this->object_adapter_->wait_for_non_servant_upcalls_to_complete ();
-
-          // Cleanup servant related state.
-          this->servant_cleanup ();
-
-          /* FALLTHRU */
-
-        case POA_CURRENT_SETUP:
-          // Cleanup POA related state.
-          this->poa_cleanup ();
-
-          // Teardown current for this request.
-          this->current_context_.teardown ();
-
-          /* FALLTHRU */
-
-        case OBJECT_ADAPTER_LOCK_ACQUIRED:
-          // Finally, since the object adapter lock was acquired, we must
-          // release it.
-          this->object_adapter_->lock ().release ();
-
-          /* FALLTHRU */
-
-        case INITIAL_STAGE:
-        default:
-          // @@ Keep compiler happy, the states above are the only
-          //    possible ones.
-          break;
-        }
-    }
-
-    void
-    Servant_Upcall::post_invoke_servant_cleanup (void)
-    {
-      this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (),
-                                               *this);
-    }
-
-    void
-    Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL)
-    {
-#if (TAO_HAS_MINIMUM_POA == 0)
-      // Serialize servants (if necessary).
-      //
-      // Note that this lock must be acquired *after* the object adapter
-      // lock has been released.  This is necessary since we cannot block
-      // waiting for the servant lock while holding the object adapter
-      // lock.  Otherwise, the thread that wants to release this lock will
-      // not be able to do so since it can't acquire the object adapterx
-      // lock.
-        int result = this->poa_->enter();
-
-        if (result == -1)
-          // Locking error.
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-#else
-        ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-#endif /* !TAO_HAS_MINIMUM_POA == 0 */
-    }
-
-    void
-    Servant_Upcall::single_threaded_poa_cleanup (void)
-    {
-#if (TAO_HAS_MINIMUM_POA == 0)
-      int result = 0;
-
-      // Since the servant lock was acquired, we must release it.
-      result = this->poa_->exit ();
-
-      ACE_UNUSED_ARG (result);
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    }
-
-    void
-    Servant_Upcall::increment_servant_refcount (void)
-    {
-      // Cleanup servant related stuff.
-      if (this->active_object_map_entry_ != 0)
-        ++this->active_object_map_entry_->reference_count_;
-    }
-
-    void
-    Servant_Upcall::servant_cleanup (void)
-    {
-      // Cleanup servant related stuff.
-      if (this->active_object_map_entry_ != 0)
-        {
-          // Decrement the reference count.
-          CORBA::UShort new_count =
-            --this->active_object_map_entry_->reference_count_;
-
-          if (new_count == 0)
-            {
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY
-                {
-                  this->poa_->cleanup_servant (
-                    this->active_object_map_entry_->servant_,
-                    this->active_object_map_entry_->user_id_
-                    ACE_ENV_ARG_PARAMETER);
-
-                  ACE_TRY_CHECK;
-                }
-              ACE_CATCHALL
-                {
-                  // Ignore errors from servant cleanup ....
-                }
-              ACE_ENDTRY;
-
-              if (this->poa_->waiting_servant_deactivation() > 0 &&
-                  this->object_adapter_->enable_locking_)
-                {
-                  // Wakeup all waiting threads.
-                  this->poa_->servant_deactivation_condition_.broadcast ();
-                }
-            }
-        }
-    }
-
-    void
-    Servant_Upcall::poa_cleanup (void)
-    {
-      // Decrease <poa->outstanding_requests_> now that the upcall
-      // is complete.
-      //
-      // Note that the object adapter lock is acquired before
-      // <POA::outstanding_requests_> is decreased.
-      CORBA::ULong outstanding_requests =
-        this->poa_->decrement_outstanding_requests ();
-
-      // Check if all pending requests are over.
-      if (outstanding_requests == 0)
-        {
-          // If locking is enabled and some thread is waiting in POA::destroy.
-          if (this->object_adapter_->enable_locking_ &&
-              this->poa_->wait_for_completion_pending_)
-            {
-              // Wakeup all waiting threads.
-              this->poa_->outstanding_requests_condition_.broadcast ();
-            }
-
-          // Note that there is no need to check for
-          // <non_servant_upcall_in_progress> since it is not possible for
-          // non-servant upcalls to be in progress at this point.
-          if (this->poa_->waiting_destruction_)
-            {
-              ACE_DECLARE_NEW_CORBA_ENV;
-
-              ACE_TRY
-                {
-                  this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                }
-              ACE_CATCHANY
-                {
-                  // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "TAO_POA::~complete_destruction_i");
-                }
-              ACE_ENDTRY;
-              ACE_CHECK;
-
-              this->poa_ = 0;
-            }
-        }
-    }
-  }
-}
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
deleted file mode 100644
index 11f7c07421c..00000000000
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Servant_Upcall.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_UPCALL_H
-#define TAO_SERVANT_UPCALL_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/POA_Current_Impl.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// Forward declaration
-class TAO_Root_POA;
-class TAO_ServerRequest;
-class TAO_Object_Adapter;
-class TAO_RT_Collocation_Resolver;
-struct TAO_Active_Object_Map_Entry;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    /**
-     * @class Servant_Upcall
-     *
-     * @brief This class finds out the POA and the servant to perform an
-     * upcall.  It can only be instantiated without the object
-     * adapter's lock held.
-     */
-    class TAO_PortableServer_Export Servant_Upcall
-    {
-    public:
-      friend class ::TAO_RT_Collocation_Resolver;
-
-      /**
-       * @class Pre_Invoke_State
-       *
-       * @brief This struct keeps track of state related to pre- and
-       * post-invoke operations.
-       */
-      class Pre_Invoke_State
-      {
-      public:
-        /// Constructor.
-        Pre_Invoke_State (void);
-
-        enum State
-        {
-          NO_ACTION_REQUIRED,
-          PRIORITY_RESET_REQUIRED
-        };
-
-        /// Indicates whether the priority of the thread needs to be
-        /// reset back to its original value.
-        State state_;
-
-        /// Original native priority of the thread.
-        CORBA::Short original_native_priority_;
-
-        /// Original CORBA priority of the thread.
-        CORBA::Short original_CORBA_priority_;
-      };
-
-      /// Constructor.
-      Servant_Upcall (TAO_ORB_Core *orb_core);
-
-      /// Destructor.
-      ~Servant_Upcall (void);
-
-      /// Locate POA and servant.
-      int prepare_for_upcall (const TAO::ObjectKey &key,
-                              const char *operation,
-                              CORBA::Object_out forward_to
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-      /// Helper.
-      int prepare_for_upcall_i (const TAO::ObjectKey &key,
-                                const char *operation,
-                                CORBA::Object_out forward_to,
-                                int &wait_occurred_restart_call
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-      /// Run pre_invoke for a remote request.
-      void pre_invoke_remote_request (TAO_ServerRequest &req
-                                      ACE_ENV_ARG_DECL);
-
-      /// Run pre_invoke for a collocated request.
-      void pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_DECL);
-
-      /// Run post_invoke for a request.
-      void post_invoke (void);
-
-      /// Locate POA.
-      ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key
-                                  ACE_ENV_ARG_DECL);
-
-      /// POA accessor.
-      ::TAO_Root_POA &poa (void) const;
-
-      /// Object Adapter accessor.
-      TAO_Object_Adapter &object_adapter (void) const;
-
-      /// System ID accessor.
-      const PortableServer::ObjectId &id (void) const;
-
-      /// User ID accessors.  This is the same value returned by
-      /// PortableServer::Current::get_object_id().
-      void user_id (const PortableServer::ObjectId *);
-      const PortableServer::ObjectId &user_id (void) const;
-
-      /// Servant accessor.
-      PortableServer::Servant servant (void) const;
-
-  #if (TAO_HAS_MINIMUM_POA == 0)
-
-      /// Get the Servant Locator's cookie
-      void* locator_cookie (void) const;
-
-      /// Set the Servant Locator's cookie
-      void locator_cookie (void* cookie);
-
-      /// Get the operation name.
-      const char *operation (void) const;
-
-      /// Set the operation name.
-      void operation (const char *);
-
-  #endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-      /// Set the active_object_map_entry.
-      void active_object_map_entry (TAO_Active_Object_Map_Entry *entry);
-
-      /// Get the active_object_map_entry.
-      TAO_Active_Object_Map_Entry *active_object_map_entry (void) const;
-
-      /// Get the priority for the current upcall.
-      CORBA::Short priority (void) const;
-
-      enum State
-      {
-        INITIAL_STAGE,
-        OBJECT_ADAPTER_LOCK_ACQUIRED,
-        POA_CURRENT_SETUP,
-        OBJECT_ADAPTER_LOCK_RELEASED,
-        SERVANT_LOCK_ACQUIRED
-      };
-
-      /// Get the state.
-      State state (void) const;
-
-      /// Set the state.
-      void state (State);
-
-      /// Increment the refcount
-      void increment_servant_refcount (void);
-
-    protected:
-
-      void post_invoke_servant_cleanup (void);
-      void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL);
-      void single_threaded_poa_cleanup (void);
-      void servant_cleanup (void);
-      void poa_cleanup (void);
-
-      /// Clean-up / reset state of this Servant_Upcall object.
-      void upcall_cleanup (void);
-
-    protected:
-
-      TAO_Object_Adapter *object_adapter_;
-
-      ::TAO_Root_POA *poa_;
-
-      PortableServer::Servant servant_;
-
-      State state_;
-
-      PortableServer::ObjectId system_id_;
-
-      const PortableServer::ObjectId *user_id_;
-
-      POA_Current_Impl current_context_;
-
-  #if (TAO_HAS_MINIMUM_POA == 0)
-
-      /// Servant Locator's cookie
-      void* cookie_;
-
-      /// Operation name for this current.
-      const char *operation_;
-
-  #endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-      /// Pointer to the entry in the TAO_Active_Object_Map corresponding
-      /// to the servant for this request.
-      TAO_Active_Object_Map_Entry *active_object_map_entry_;
-
-      /// Preinvoke data for the upcall.
-      Pre_Invoke_State pre_invoke_state_;
-
-    private:
-      Servant_Upcall (const Servant_Upcall &);
-      void operator= (const Servant_Upcall &);
-    };
-  }
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "Servant_Upcall.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVANT_UPCALL_H */
diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl
deleted file mode 100644
index 36c4739f457..00000000000
--- a/TAO/tao/PortableServer/Servant_Upcall.inl
+++ /dev/null
@@ -1,105 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ACE_INLINE ::TAO_Root_POA &
-    Servant_Upcall::poa (void) const
-    {
-      return *this->poa_;
-    }
-
-    ACE_INLINE PortableServer::Servant
-    Servant_Upcall::servant (void) const
-    {
-      return this->servant_;
-    }
-
-    ACE_INLINE TAO_Object_Adapter &
-    Servant_Upcall::object_adapter (void) const
-    {
-      return *this->object_adapter_;
-    }
-
-    ACE_INLINE const PortableServer::ObjectId &
-    Servant_Upcall::id (void) const
-    {
-      return this->system_id_;
-    }
-
-    ACE_INLINE void
-    Servant_Upcall::user_id (
-      const PortableServer::ObjectId *id)
-    {
-      this->user_id_ = id;
-    }
-
-    ACE_INLINE const PortableServer::ObjectId &
-    Servant_Upcall::user_id (void) const
-    {
-      return *(this->user_id_);
-    }
-
-    #if (TAO_HAS_MINIMUM_POA == 0)
-
-    ACE_INLINE void*
-    Servant_Upcall::locator_cookie (void) const
-    {
-      return this->cookie_;
-    }
-
-    ACE_INLINE void
-    Servant_Upcall::locator_cookie (void* cookie)
-    {
-      this->cookie_ = cookie;
-    }
-
-    ACE_INLINE const char *
-    Servant_Upcall::operation (void) const
-    {
-      return this->operation_;
-    }
-
-    ACE_INLINE void
-    Servant_Upcall::operation (const char *name)
-    {
-      this->operation_ = name;
-    }
-
-    #endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    ACE_INLINE void
-    Servant_Upcall::active_object_map_entry (TAO_Active_Object_Map_Entry *entry)
-    {
-      this->active_object_map_entry_ = entry;
-    }
-
-    ACE_INLINE TAO_Active_Object_Map_Entry *
-    Servant_Upcall::active_object_map_entry (void) const
-    {
-      return this->active_object_map_entry_;
-    }
-
-    ACE_INLINE CORBA::Short
-    Servant_Upcall::priority (void) const
-    {
-      return this->current_context_.priority ();
-    }
-
-    ACE_INLINE Servant_Upcall::State
-    Servant_Upcall::state (void) const
-    {
-      return this->state_;
-    }
-
-    ACE_INLINE void
-    Servant_Upcall::state (Servant_Upcall::State state)
-    {
-      this->state_ = state;
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
deleted file mode 100644
index 47ba3705d7e..00000000000
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// $Id$
-
-#include "ServerInterceptorAdapter.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-ACE_RCSID (PortableServer,
-           ServerInterceptorAdapter,
-           "$Id$")
-
-#ifndef __ACE_INLINE__
-# include "ServerInterceptorAdapter.inl"
-#endif /* !__ACE_INLINE__ */
-
-#include "ServerRequestInfo.h"
-#include "PICurrent_Guard.h"
-
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-
-
-TAO::ServerRequestInterceptor_Adapter::ServerRequestInterceptor_Adapter (
-  TAO_ServerRequest & server_request)
-  : interceptors_ (server_request.orb_core ()->server_request_interceptors ())
-  , len_ (interceptors_.size ())
-  , stack_size_ (server_request.interceptor_count ())
-  , location_forwarded_ (false)
-{
-}
-
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-void
-TAO::ServerRequestInterceptor_Adapter::tao_ft_interception_point (
-  TAO::ServerRequestInfo * ri,
-  CORBA::OctetSeq_out oc
-  ACE_ENV_ARG_DECL)
-{
-  // This method implements one of the "starting" server side
-  // interception point.
-
-  ACE_TRY
-    {
-      // Copy the request scope current (RSC) to the thread scope
-      // current (TSC) upon leaving this scope, i.e. just after the
-      // receive_request_service_contexts() completes.  A "guard" is
-      // used to make the copy also occur if an exception is thrown.
-      TAO::PICurrent_Guard const pi_guard (ri->server_request (),
-                                           false /* Copy RSC to TSC */);
-
-      oc = 0;
-
-      for (size_t i = 0 ; i < this->len_; ++i)
-        {
-          this->interceptors_[i]->tao_ft_interception_point (
-            ri,
-            oc
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (oc != 0)
-            {
-              (void) this->send_other (ri
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              return;
-            }
-
-          // The starting interception point completed successfully.
-          // Push the interceptor on to the flow stack.
-          ++this->stack_size_;
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-TAO::ServerRequestInterceptor_Adapter::receive_request_service_contexts (
-  TAO::ServerRequestInfo * ri
-  ACE_ENV_ARG_DECL)
-{
-  // This method implements one of the "intermediate" server side
-  // interception point.
-  if (this->len_ != this->stack_size_)
-    {
-      // This method (i.e. the receive_request() interception point)
-      // should only be invoked if all of the interceptors registered
-      // with the ORB were pushed on to the flow stack by one of the
-      // starting endpoints (such as
-      // receive_request_service_contexts()).  If the above condition
-      // evaluates to "true," then it is likely that a starting
-      // interception point was never invoked.  This is of course, an
-      // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  ACE_TRY
-    {
-      for (size_t i = 0 ; i < this->stack_size_; ++i)
-        {
-          this->interceptors_[i]->receive_request_service_contexts (
-            ri
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-#elif TAO_HAS_EXTENDED_FT_INTERCEPTORS == 0
-
-/// NOTE: Yes, we have two versions of this. This is easier than
-/// messing around things in the same function, which is harder to
-/// read and could make the code buggier.
-void
-TAO::ServerRequestInterceptor_Adapter::receive_request_service_contexts (
-  TAO::ServerRequestInfo * ri
-  ACE_ENV_ARG_DECL)
-{
-
-  // This method implements one of the "starting" server side
-  // interception point if extended interceptors are not in place.
-
-  ACE_TRY
-    {
-      // Copy the request scope current (RSC) to the thread scope
-      // current (TSC) upon leaving this scope, i.e. just after the
-      // receive_request_service_contexts() completes.  A "guard" is
-      // used to make the copy also occur if an exception is thrown.
-      TAO::PICurrent_Guard const pi_guard (ri->server_request (),
-                                           false /* Copy RSC to TSC */);
-
-      for (size_t i = 0 ; i < this->len_; ++i)
-        {
-          this->interceptors_[i]->receive_request_service_contexts (
-            ri
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // The starting interception point completed successfully.
-          // Push the interceptor on to the flow stack.
-          ++this->stack_size_;
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-void
-TAO::ServerRequestInterceptor_Adapter::receive_request (
-  TAO::ServerRequestInfo * ri
-  ACE_ENV_ARG_DECL)
-{
-  // This method implements an "intermediate" server side interception
-  // point.  Interceptors are invoked in the same order they were
-  // pushed on to the flow stack.
-
-  if (this->len_ != this->stack_size_)
-    {
-      // This method (i.e. the receive_request() interception point)
-      // should only be invoked if all of the interceptors registered
-      // with the ORB were pushed on to the flow stack by one of the
-      // starting endpoints (such as
-      // receive_request_service_contexts()).  If the above condition
-      // evaluates to "true," then it is likely that a starting
-      // interception point was never invoked.  This is of course, an
-      // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  ACE_TRY
-    {
-      for (size_t i = 0; i < this->stack_size_; ++i)
-        {
-          this->interceptors_[i]->receive_request (ri
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Note that no interceptors are pushed on to or popped off
-          // of the flow stack in this interception point since it is
-          // an intermediate interception point.
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-}
-
-void
-TAO::ServerRequestInterceptor_Adapter::send_reply (
-  TAO::ServerRequestInfo * ri
-  ACE_ENV_ARG_DECL)
-{
-  // This is an "ending" interception point so we only process the
-  // interceptors pushed on to the flow stack.
-
-  // Notice that the interceptors are processed in the opposite order
-  // they were pushed onto the stack since this is an "ending"
-  // interception point.
-
-  // Unwind the stack.
-  size_t const len = this->stack_size_;
-  for (size_t i = 0; i < len; ++i)
-    {
-      // Pop the interceptor off of the flow stack before it is
-      // invoked.  This is necessary to prevent an interceptor already
-      // invoked in this "ending" interception point from being
-      // invoked in another "ending" interception point.
-      --this->stack_size_;
-
-      this->interceptors_[this->stack_size_]->send_reply (
-        ri
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // The send_reply() interception point does not raise a
-  // PortableInterceptor::ForwardRequest exception so there is no need
-  // to attempt to catch it here.
-}
-
-void
-TAO::ServerRequestInterceptor_Adapter::send_exception (
-  TAO::ServerRequestInfo *ri
-  ACE_ENV_ARG_DECL)
-{
-  // This is an "ending" server side interception point so we only
-  // process the interceptors pushed on to the flow stack.
-
-  // Notice that the interceptors are processed in the opposite order
-  // they were pushed onto the stack since this is an "ending" server
-  // side interception point.
-
-  ACE_TRY
-    {
-      // Unwind the flow stack.
-      size_t const len = this->stack_size_;
-      for (size_t i = 0; i < len; ++i)
-        {
-          // Pop the interceptor off of the flow stack before it is
-          // invoked.  This is necessary to prevent an interceptor
-          // already invoked in this "ending" interception point from
-          // being invoked in another "ending" interception point.
-          --this->stack_size_;
-
-          this->interceptors_[this->stack_size_]->send_exception (
-            ri
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_CATCHANY
-    {
-      // The send_exception() interception point in the remaining
-      // interceptors must be called so call this method (not the
-      // interceptor's corresponding method) recursively.  The call is
-      // made recursively since the caught exception must survive
-      // until the remaining interceptors have been called.
-      //
-      // Note that the recursion will stop once the flow stack size
-      // drops to zero, i.e., once each interceptor has been invoked.
-      // This prevents infinite recursion from occuring.
-
-      ri->exception (&ACE_ANY_EXCEPTION);
-
-      this->send_exception (ri ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ReplyStatus status =
-        ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Only re-throw the exception if it hasn't been transformed by
-      // the send_exception() interception point (e.g. to a
-      // LOCATION_FORWARD).
-      if (status == PortableInterceptor::SYSTEM_EXCEPTION
-          || status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-TAO::ServerRequestInterceptor_Adapter::send_other (
-  TAO::ServerRequestInfo * ri
-  ACE_ENV_ARG_DECL)
-{
-  // This is an "ending" server side interception point so we only
-  // process the interceptors pushed on to the flow stack.
-
-  // Notice that the interceptors are processed in the opposite order
-  // they were pushed onto the stack since this is an "ending" server
-  // side interception point.
-
-  ACE_TRY
-    {
-      // Unwind the flow stack.
-      size_t const len = this->stack_size_;
-      for (size_t i = 0; i < len; ++i)
-        {
-          // Pop the interceptor off of the flow stack before it is
-          // invoked.  This is necessary to prevent an interceptor
-          // already invoked in this "ending" interception point from
-          // being invoked in another "ending" interception point.
-          --this->stack_size_;
-
-          this->interceptors_[this->stack_size_]->send_other (
-            ri
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri->forward_reference (exc);
-      this->send_other (ri
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->location_forwarded_ = true;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
deleted file mode 100644
index 1c7b053ad0a..00000000000
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServerInterceptorAdapter.h
- *
- *  $Id$
- *
- *   This file contains a helper class to simplify the support of
- *   interceptors in TAO_IDL generated skeletons.
- *
- *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- *  @author  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SERVER_INTERCEPTOR_ADAPTER_H
-#define TAO_SERVER_INTERCEPTOR_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "portableserver_export.h"
-
-#include "tao/Basic_Types.h"
-#include "tao/Interceptor_List.h"
-#include "tao/ServerRequestInterceptorC.h"
-
-namespace TAO
-{
-  typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor>
-    ServerRequestInterceptor_List;
-}
-
-class TAO_ServerRequest;
-
-namespace TAO
-{
-  class ServerRequestInfo;
-
-  /**
-   * @class ServerRequestInterceptor_Adapter
-   *
-   * @brief ServerRequestInterceptor_Adapter
-   *
-   * A convenient helper class to invoke registered server request
-   * interceptor(s).
-   */
-  class ServerRequestInterceptor_Adapter
-  {
-  public:
-
-    /// Constructor.
-    ServerRequestInterceptor_Adapter (TAO_ServerRequest & server_request);
-
-    /**
-     * @name PortableInterceptor Client Side Interception Points
-     *
-     * Each of these methods corresponds to a client side interception
-     * point.
-     */
-    //@{
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-    /// This method implements the "starting" server side interception
-    /// point. It will be used as the first interception point and it is
-    /// proprietary to TAO.
-    /// @@ Will go away once Bug 1369 is fixed
-    void tao_ft_interception_point (TAO::ServerRequestInfo * ri ,
-                                    CORBA::OctetSeq_out oc
-                                    ACE_ENV_ARG_DECL);
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-    /// This method implements the "intermediate" server side
-    /// interception point if the above #ifdef is set to 1 and a
-    /// starting intercetion point if it is not set to 1.
-    ///
-    /// @note This method should have been the "starting" interception
-    ///       point according to the interceptor spec. This will be
-    ///       fixed once Bug 1369 is completely done.
-    void receive_request_service_contexts (TAO::ServerRequestInfo * ri
-                                           ACE_ENV_ARG_DECL);
-
-    /// This method an "intermediate" server side interception point.
-    void receive_request (TAO::ServerRequestInfo * ri
-                          ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" server side
-    /// interception points.
-    void send_reply (TAO::ServerRequestInfo * ri
-                     ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" server side
-    /// interception points.
-    void send_exception (TAO::ServerRequestInfo * ri
-                         ACE_ENV_ARG_DECL);
-
-    /// This method implements one of the "ending" server side
-    /// interception points.
-    void send_other (TAO::ServerRequestInfo * ri
-                     ACE_ENV_ARG_DECL);
-    //@}
-
-    /// Returns true if a LOCATION_FORWARD was generated, and false
-    /// otherwise.
-    bool location_forwarded (void) const;
-
-  private:
-
-    /// Reference to the list of registered interceptors.
-    TAO::ServerRequestInterceptor_List::TYPE & interceptors_;
-
-    /// Cache the length of the interceptor list so that we don't have
-    /// to compute it at each stage of the current interception.
-    size_t const len_;
-
-    /// The number of interceptors "pushed" onto the logical flow
-    /// stack.  This is used when unwinding the flow stack.
-    size_t & stack_size_;
-
-    /// True if a PortableInterceptor::ForwardRequest exception was
-    /// thrown.
-    bool location_forwarded_;
-
-  };
-
-}  // End namespace TAO
-
-
-#if defined (__ACE_INLINE__)
-# include "ServerInterceptorAdapter.inl"
-#endif  /* __ACE_INLINE__ */
-
-#endif  /* TAO_HAS_INTERCEPTORS */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVER_INTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.inl b/TAO/tao/PortableServer/ServerInterceptorAdapter.inl
deleted file mode 100644
index 30e0c4508ce..00000000000
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE bool
-TAO::ServerRequestInterceptor_Adapter::location_forwarded (void) const
-{
-  return this->location_forwarded_;
-}
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
deleted file mode 100644
index f9de6afb8eb..00000000000
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ /dev/null
@@ -1,583 +0,0 @@
-// $Id$
-
-#include "ServerRequestInfo.h"
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-ACE_RCSID (PortableServer,
-           ServerRequestInfo,
-           "$Id$")
-
-#include "Root_POA.h"
-#include "Servant_Upcall.h"
-#include "Servant_Base.h"
-
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/PolicyC.h"
-#include "tao/DynamicC.h"
-#include "tao/ORB_Core.h"
-#include "tao/Service_Context.h"
-#include "tao/RequestInfo_Util.h"
-
-#include "ace/OS_NS_string.h"
-
-# if !defined (__ACE_INLINE__)
-#   include "ServerRequestInfo.inl"
-# endif /* !__ACE_INLINE__ */
-
-
-CORBA::ULong
-TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The request ID returned by this method need not correspond to the
-  // GIOP request ID sent with the client request.  The request ID
-  // must be unique across all outstanding requests.  To avoid locking
-  // overhead, the address of the TAO_ServerRequest object is used as
-  // the request ID.  This guarantees that the request ID is unique.
-  //
-  // For 64-bit platforms, only the lower 32 bits are used.  Hopefully
-  // that will be enough to ensure uniqueness.
-
-  // This is basically the same trick used in
-  // TAO_GIOP_Invocation::generate_request_id().  However, no right
-  // shifting of 64 bit addresses is performed since the
-  // TAO_ServerRequest object is not large enough to allow that trick.
-
-  CORBA::ULong id = 0;
-
-  // Note that we reinterpret_cast to an "unsigned long" instead of
-  // CORBA::ULong since we need to first cast to an integer large
-  // enough to hold an address to avoid compile-time warnings on some
-  // 64-bit platforms.
-
-  if (sizeof (this) == 4)       // 32 bit address
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                                      (&(this->server_request_)));
-
-  else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                               (&(this->server_request_)) & 0xFFFFFFFFu);
-
-  else
-    // @@ Rather than fallback on the GIOP request ID, we should use
-    //    an atomically incremented variable specific to the ORB, or
-    //    perhaps specific to the process.
-    id = this->server_request_.request_id ();  // Fallback
-
-  return id;
-}
-
-char *
-TAO::ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->server_request_.operation ());
-}
-
-Dynamic::ParameterList *
-TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->args_ == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  // Generate the argument list on demand.
-  Dynamic::ParameterList * const 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;
-
-  // Return value is always generated as first TAO::Argument in
-  // skeleton.  It shouldn't be included in the parameter list.
-  // Skip it.
-
-  TAO::Argument * const * const begin = this->args_ + 1;
-  TAO::Argument * const * const end   = this->args_ + this->nargs_;
-
-  ACE_ASSERT (end - begin >= 0);
-
-  parameter_list->length (static_cast<CORBA::ULong> (end - begin));
-
-  CORBA::ULong p = 0;
-  for (TAO::Argument * const * i = begin; i != end; ++i, ++p)
-    {
-      // Insert the operation parameters into the
-      // Dynamic::ParameterList.
-      (*i)->interceptor_param ((*parameter_list)[p]);
-    }
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->args_ == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList * const 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;
-
-  exception_list->length (this->nexceptions_);
-
-  CORBA::TypeCode_ptr const * const begin = this->exceptions_;
-  CORBA::TypeCode_ptr const * const end   =
-    this->exceptions_ + this->nexceptions_;
-
-  CORBA::ULong e = 0;
-  for (CORBA::TypeCode_ptr const * i = begin; i != end; ++i, ++e)
-    {
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (
-        const_cast<CORBA::TypeCode_ptr *> (i), 1);
-      (*exception_list)[e] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-Dynamic::ContextList *
-TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-Dynamic::RequestContext *
-TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::Any *
-TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->args_ == 0)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  // Generate the result on demand.
-
-  static CORBA::Boolean const tk_void_any = 1;
-
-  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 is always first element in TAO::Argument array.
-  TAO::Argument * const r = this->args_[0];
-
-  r->interceptor_result (result_any);
-
-  return safe_result_any._retn ();
-}
-
-CORBA::Boolean
-TAO::ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->server_request_.response_expected ();
-}
-
-Messaging::SyncScope
-TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->server_request_.sync_with_server ())
-    return Messaging::SYNC_WITH_SERVER;
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    -1);
-}
-
-PortableInterceptor::ReplyStatus
-TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ == -1)
-    // A reply hasn't been received yet.
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                            CORBA::COMPLETED_NO),
-                      -1);
-
-  return this->reply_status_;
-}
-
-CORBA::Object_ptr
-TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                            CORBA::COMPLETED_NO),
-                      CORBA::Object::_nil ());
-
-  // TAO_ServerRequest::forward_location() already duplicates the
-  // object reference.  There is no need to duplicate it here.
-  return this->server_request_.forward_location ();
-}
-
-CORBA::Any *
-TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  // Retrieve the total number of assigned slots from the PICurrent.
-  // No TSS access is incurred.
-  TAO::PICurrent * pi_current =
-    this->server_request_.orb_core ()->pi_current ();
-
-  if (pi_current == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Retrieve the request scope PICurrent object.
-  TAO::PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
-
-  return rsc.get_slot (id ACE_ENV_ARG_PARAMETER);
-
-}
-
-IOP::ServiceContext *
-TAO::ServerRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Service_Context &service_context_list =
-    this->server_request_.request_service_context ();
-
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO::ServerRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Service_Context & service_context_list =
-    this->server_request_.reply_service_context ();
-
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-IOP::ServiceContext *
-TAO::ServerRequestInfo::get_service_context_i (
-    TAO_Service_Context & service_context_list,
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  IOP::ServiceContext_var service_context;
-
-  if (service_context_list.get_context (id, service_context.out ()) != 0)
-    {
-      // Found.
-      return service_context._retn ();
-    }
-  else
-    {
-      // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 26,
-                                          CORBA::COMPLETED_NO),
-                        0);
-    }
-}
-
-// Use at own risk. There is no way currently of extracting an
-// exception from an Any. This method is in place just to be compliant
-// with the spec.
-CORBA::Any *
-TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
-      && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                              CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  // The spec says that if it is a user exception which cannot be
-  // inserted then the UNKNOWN exception should be thrown with minor
-  // code 1.
-
-  CORBA::Any * temp = 0;
-
-  ACE_NEW_THROW_EX (temp,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var caught_exception = temp;
-
-  if (this->caught_exception_ != 0)
-    (*temp) <<= *(this->caught_exception_);
-
-  return caught_exception._retn ();
-}
-
-char *
-TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->servant_upcall_ != 0)
-    return
-      CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
-
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-char *
-TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->servant_upcall_ != 0)
-    return
-      CORBA::string_dup (this->server_request_.orb_core ()->orbid ());
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-PortableInterceptor::AdapterName *
-TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The adapter_name attribute defines a name for the object adapter
-  // that services requests for the invoked object. In the case of the
-  // POA, the adapter_name is the sequence of names from the root POA
-  // to the POA that services the request. The root POA is not named
-  // in this sequence.
-  if (this->servant_upcall_ != 0)
-    return
-      this->servant_upcall_->poa ().adapter_name (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-PortableInterceptor::ObjectId *
-TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->servant_upcall_ != 0)
-    {
-      const PortableServer::ObjectId &id =
-        this->servant_upcall_->user_id ();
-
-      PortableInterceptor::ObjectId *tmp = 0;
-
-      ACE_NEW_THROW_EX (tmp,
-                        PortableInterceptor::ObjectId,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      PortableInterceptor::ObjectId_var obj_id = tmp;
-
-      // @@ It would be nice to avoid this copy.  However, we can't be
-      //    sure if the octet sequence will out live the POA from
-      //    which the object ID is ultimately obtained.  In the event
-      //    the octet sequence does out live the POA, a copy is indeed
-      //    necessary.  Do a copy to be on the safe side.  In any
-      //    case, this is still faster than the
-      //    PortableServer::Current::object_id() method since no TSS
-      //    access is involved.
-      const CORBA::ULong len = id.length ();
-      obj_id->length (len);
-      CORBA::Octet *buffer = obj_id->get_buffer ();
-      ACE_OS::memcpy (buffer, id.get_buffer (), len);
-
-      return obj_id._retn ();
-    }
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA::OctetSeq *
-TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->servant_upcall_ != 0)
-    return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    0);
-}
-
-char *
-TAO::ServerRequestInfo::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::Servant const servant =
-    (this->servant_upcall_ == 0
-     ? 0
-     : this->servant_upcall_->servant ());
-
-  if (servant == 0)
-    {
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return CORBA::string_dup (servant->_interface_repository_id ());
-}
-
-CORBA::Policy_ptr
-TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->servant_upcall_ != 0)
-    {
-      CORBA::Policy_var policy =
-        this->servant_upcall_->poa ().get_policy (type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      if (!CORBA::is_nil (policy.in ()))
-        {
-          return policy._retn ();
-        }
-      else
-        {
-          // No policy matching the given PolicyType was found.
-          ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
-                                               CORBA::COMPLETED_NO),
-                            CORBA::Policy::_nil ());
-        }
-    }
-
-  // @@ Technically, we shouldn't be throwing this exception since
-  //    this method should be valid in all server side request
-  //    interception points.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                          CORBA::COMPLETED_NO),
-                    CORBA::Policy::_nil ());
-}
-
-void
-TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
-                                  const CORBA::Any &data
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::InvalidSlot))
-{
-  // Retrieve the total number of assigned slots from the PICurrent
-  // object.  No TSS access is incurred.
-  TAO::PICurrent * pi_current =
-    this->server_request_.orb_core ()->pi_current ();
-
-  if (pi_current == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Retrieve the "request scope current" (RSC).
-  TAO::PICurrent_Impl & rsc = this->server_request_.rs_pi_current ();
-
-  rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Boolean
-TAO::ServerRequestInfo::target_is_a (const char * id
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Implemented in the generated skeleton.
-
-  PortableServer::Servant const servant =
-    (this->servant_upcall_ == 0
-     ? 0
-     : this->servant_upcall_->servant ());
-
-
-  if (servant == 0)
-    {
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return servant->_is_a (id
-                         ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO::ServerRequestInfo::add_reply_service_context (
-    const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->server_request_.reply_service_context ();
-
-  if (service_context_list.set_context (service_context, replace) == 0)
-    {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
-                                       CORBA::COMPLETED_NO));
-    }
-}
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
deleted file mode 100644
index 813a1487689..00000000000
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ /dev/null
@@ -1,324 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file ServerRequestInfo.h
- *
- * $Id$
- *
- * This is the implementation of the
- * @c PortableInterceptor::ServerRequestInfo interface.
- *
- * @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
- * @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_SERVER_REQUEST_INFO_H
-#define TAO_SERVER_REQUEST_INFO_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-#include "tao/ServerRequestInfoC.h"
-#include "tao/LocalObject.h"
-#include "tao/OctetSeqC.h"
-#include "tao/TAO_Server_Request.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ServerRequest;
-class TAO_Service_Context;
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class Servant_Upcall;
-  }
-}
-
-namespace TAO
-{
-  /**
-   * @class ServerRequestInfo
-   *
-   * @brief Implementation of the
-   *        @c PortableInterceptor::ServerRequestInfo IDL interface.
-   *
-   * Implementation of the @c PortableInterceptor::ServerRequestInfo
-   * IDL interface.
-   *
-   * @note This class is currently not meant to be reference counted
-   *       since it is instantiated on the stack.
-   */
-  class ServerRequestInfo
-    : public virtual PortableInterceptor::ServerRequestInfo,
-      public virtual CORBA::LocalObject
-  {
-  public:
-
-    /// Constructor.
-    ServerRequestInfo (TAO_ServerRequest & server_request,
-                       TAO::Argument * const * args,
-                       size_t nargs,
-                       void * servant_upcall,
-                       CORBA::TypeCode_ptr const * exceptions,
-                       size_t nexceptions);
-
-    /// Return an ID unique to the current request.  This request ID may
-    /// or may not be the same as the GIOP request ID.
-    virtual CORBA::ULong request_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the operation name for the current request.
-    virtual char * operation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the list of arguments passed to the current operation.
-    virtual Dynamic::ParameterList * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the list of exceptions the current operation is capable
-    /// of throwing.
-    virtual Dynamic::ExceptionList * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ContextList * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::RequestContext * operation_context (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the result of the current request.  If there is no
-    /// return value then an @c Any with @c tk_void @c TypeCode is
-    /// returned.  This method is not valid for oneway operations.
-    virtual CORBA::Any * result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Returns @c true for a two-way operation, and @c false otherwise.
-    virtual CORBA::Boolean response_expected (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the @c sync_scope policy value for the current one-way
-    /// operation.  If the operation is not a one-way, a
-    /// @c CORBA::BAD_INV_ORDER exception is thrown.
-    virtual Messaging::SyncScope sync_scope (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the reply status for the current request.
-    /**
-     * Statuses can be @c PortableInterceptor::SUCCESSFUL,
-     * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD,
-     * @c TRANSPORT_RETRY, @c UNKNOWN..
-     */
-    virtual PortableInterceptor::ReplyStatus reply_status (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// If the reply status is
-    /// @c PortableInterceptor::LOCATION_FORWARD return the
-    /// object reference to which the request was forwarded.
-    virtual CORBA::Object_ptr forward_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
-
-    /// Retrieve data from the "request scope" @c PICurrent object.
-    virtual CORBA::Any * get_slot (
-                                   PortableInterceptor::SlotId id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-
-    /// Return the @c IOP::ServiceContext with the given
-    /// @c IOP::ServiceId from the request service context list.
-    virtual IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the @c IOP::ServiceContext with the given
-    /// @c IOP::ServiceId from the reply service context list.
-    virtual IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return an @c Any containing the exception being sent, if any.
-    /// Otherwise, throw a @c CORBA::BAD_INV_ORDER exception.
-    /**
-     * @note There is no trivial way to extract the exception from an
-     *       @c Any.
-     */
-    virtual CORBA::Any * sending_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the @c ObjectId for the target object.
-    virtual PortableInterceptor::ObjectId * object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the @c AdapterId for the POA handling the current
-    /// request.
-    virtual CORBA::OctetSeq * adapter_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the server_id of the server. The value is passed to
-    /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the ORBId value that is passed to the @c ORB_init
-    /// call.
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the name of the object adapter that services requests
-    /// for the invoked object.
-    virtual PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the most derived interface of the target object.
-    virtual char * target_most_derived_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the policy of the given type in effect for the current
-    /// request.
-    virtual CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Insert data into the "request scope" @c PICurrent object.
-    virtual void set_slot (PortableInterceptor::SlotId id,
-                           const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
-
-    /// Returns true if the target's type corresponds to the given
-    /// @c RepositoryId.
-    virtual CORBA::Boolean target_is_a (const char * id
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Add the @c IOP::ServiceContext to the reply (outgoing)
-    /// @c IOP::ServiceContextList.
-    virtual void add_reply_service_context (
-        const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  public:
-
-    /**
-     * @name Helper methods specific to TAO.
-     */
-    //@{
-
-    /// Change the exception status.
-    void exception (CORBA::Exception *exception);
-
-    /// Set the status of the received reply.
-    void reply_status (PortableInterceptor::ReplyStatus s);
-
-    /// Extract the forward object reference from the
-    /// @c PortableInterceptor::ForwardRequest exception, and set the
-    /// reply status flag accordingly.
-    void forward_reference (PortableInterceptor::ForwardRequest &exc);
-
-    /// Set the forward reference associated with the current
-    /// LOCATION_FORWARD reply.
-    /**
-     * @note This method is only invoked when a
-     * @c PortableServer::ForwardRequest exception is thrown by a
-     * servant manager.
-     */
-    void forward_reference (CORBA::Object_ptr obj);
-
-    //@}
-
-    /// Return a reference to the underlying @c TAO_ServerRequest
-    /// object.
-    TAO_ServerRequest &server_request (void);
-
-  protected:
-
-    /// Helper method to get the request and response service
-    /// contexts.
-    IOP::ServiceContext * get_service_context_i (
-        TAO_Service_Context & service_context_list,
-        IOP::ServiceId id
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  protected:
-
-    /// Underlying request object that contains much of the
-    /// information encapsulated by this @c ServerRequestInfo
-    /// implementation.
-    TAO_ServerRequest & server_request_;
-
-    /// Operation argument list.
-    TAO::Argument * const * const args_;
-
-    /// Number of element in the operation argument list.
-    size_t const nargs_;
-
-    /// Pointer to the @c Servant_Upcall object that contains the
-    /// object ID, among other things.
-    TAO::Portable_Server::Servant_Upcall * const servant_upcall_;
-
-    /// Array of @c TypeCodes for user exceptions the operation is
-    /// capable of raising.
-    CORBA::TypeCode_ptr const * const exceptions_;
-
-    /// The number of elements in the @c exceptions_ array.
-    size_t const nexceptions_;
-
-    /// Pointer to the caught exception.
-    CORBA::Exception * caught_exception_;
-
-    /// Reply status for the current request.
-    PortableInterceptor::ReplyStatus reply_status_;
-
-  };
-
-}  // End namespace TAO
-
-
-# if defined (__ACE_INLINE__)
-#  include "ServerRequestInfo.inl"
-# endif  /* __ACE_INLINE__ */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVER_REQUEST_INFO_H */
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.inl b/TAO/tao/PortableServer/ServerRequestInfo.inl
deleted file mode 100644
index 4277347ffba..00000000000
--- a/TAO/tao/PortableServer/ServerRequestInfo.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/PortableServer/Servant_Upcall.h"
-
-
-ACE_INLINE
-TAO::ServerRequestInfo::ServerRequestInfo (
-  TAO_ServerRequest & server_request,
-  TAO::Argument * const * args,
-  size_t nargs,
-  void * servant_upcall,
-  CORBA::TypeCode_ptr const * exceptions,
-  size_t nexceptions)
-  : server_request_ (server_request)
-  , args_ (args)
-  , nargs_ (nargs)
-  , servant_upcall_ (
-      static_cast<TAO::Portable_Server::Servant_Upcall *> (servant_upcall))
-  , exceptions_ (exceptions)
-  , nexceptions_ (nexceptions)
-  , caught_exception_ (0)
-  , reply_status_ (-1)
-{
-}
-
-ACE_INLINE void
-TAO::ServerRequestInfo::exception (CORBA::Exception * exception)
-{
-  if (CORBA::SystemException::_downcast (exception) != 0)
-    this->reply_status_ = PortableInterceptor::SYSTEM_EXCEPTION;
-  else if (CORBA::UserException::_downcast (exception) != 0)
-    this->reply_status_ = PortableInterceptor::USER_EXCEPTION;
-
-  // @@ Is it possible for both of the above downcasts to fail?
-
-  this->caught_exception_ = exception;
-}
-
-ACE_INLINE void
-TAO::ServerRequestInfo::reply_status (PortableInterceptor::ReplyStatus s)
-{
-  this->reply_status_ = s;
-}
-
-ACE_INLINE void
-TAO::ServerRequestInfo::forward_reference (
-  PortableInterceptor::ForwardRequest &exc)
-{
-  // Note that we're converting the ForwardRequest exception in to a
-  // LOCATION_FORWARD reply, so we do not set the exception status.
-
-  this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
-
-  // Store the forward reference in the TAO_ServerRequest object.
-  this->server_request_.forward_location (exc.forward.in ());
-}
-
-ACE_INLINE void
-TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
-{
-  // We only get here if a servant manager threw a
-  // PortableServer::ForwardRequest exception.
-
-  this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
-
-  // Store the forward reference in the TAO_ServerRequest object.
-  this->server_request_.forward_location (obj);
-}
-
-ACE_INLINE TAO_ServerRequest &
-TAO::ServerRequestInfo::server_request (void)
-{
-  return this->server_request_;
-}
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
deleted file mode 100644
index 956563d9ce3..00000000000
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-
-#ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
-#define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Special_Basic_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-// ============================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_);
-}
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= from_S (this->x_);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
deleted file mode 100644
index 3e3499ced40..00000000000
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Special_Basic_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-
-#ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_H
-#define TAO_SPECIAL_BASIC_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Special_Basic_SArgument_T
-   *
-   * @brief Template class for IN skeleton argument of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_SArgument_T : public Argument
-  {
-  public:
-    In_Special_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Inout_Special_Basic_SArgument_T
-   *
-   * @brief Template class for INOUT (w)char/boolean/octet skeleton argument.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_SArgument_T : public Argument
-  {
-  public:
-    Inout_Special_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Out_Special_Basic_SArgument_T
-   *
-   * @brief Template class for OUT skeleton argument of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_SArgument_T : public Argument
-  {
-  public:
-    Out_Special_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Ret_Basic_SArgument_T
-   *
-   * @brief Template class for return skeleton value of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_SArgument_T : public Argument
-  {
-  public:
-    Ret_Special_Basic_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @struct Special_Basic_Traits_T
-   *
-   * @brief Template class for skeleton argument traits
-   *  of (w)char/boolean/octet.
-   *
-   */
-  template<typename T, typename to_T, typename from_T>
-  struct Special_Basic_SArg_Traits_T
-  {
-    typedef T                                               ret_type;
-    typedef T                                               in_type;
-    typedef T &                                             inout_type;
-    typedef T &                                             out_type;
-
-    typedef In_Special_Basic_SArgument_T<T,to_T,from_T>     in_arg_val;
-    typedef Inout_Special_Basic_SArgument_T<T,to_T,from_T>  inout_arg_val;
-    typedef Out_Special_Basic_SArgument_T<T,to_T,from_T>    out_arg_val;
-    typedef Ret_Special_Basic_SArgument_T<T,to_T,from_T>    ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef T const &                                       in_arg_type;
-    typedef inout_type                                      inout_arg_type;
-    typedef out_type                                        out_arg_type;
-    typedef out_type                                        ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Special_Basic_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Special_Basic_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Special_Basic_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
deleted file mode 100644
index a0fd902d4fd..00000000000
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::
-In_Special_Basic_SArgument_T (void)
-{}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S const &
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::
-Inout_Special_Basic_SArgument_T (void)
-{}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S &
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::
-Out_Special_Basic_SArgument_T (void)
-{}
-
-template<typename S, typename to_S, typename from_S>
-S &
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::
-Ret_Special_Basic_SArgument_T (void)
-{
-}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S &
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.cpp b/TAO/tao/PortableServer/Special_Basic_SArguments.cpp
deleted file mode 100644
index 70f5f0c0eb6..00000000000
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// $Id$
-
-#include "Special_Basic_SArguments.h"
-
-ACE_RCSID (PortableServer,
-           Special_Basic_SArguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::SArg_Traits<ACE_InputCDR::to_char>;
-template class TAO::SArg_Traits<ACE_InputCDR::to_wchar>;
-template class TAO::SArg_Traits<ACE_InputCDR::to_octet>;
-template class TAO::SArg_Traits<ACE_InputCDR::to_boolean>;
-
-template class TAO::Special_Basic_SArg_Traits_T<CORBA::Char,
-                                               ACE_InputCDR::to_char,
-                                               ACE_OutputCDR::from_char>;
-
-template class TAO::Special_Basic_SArg_Traits_T<CORBA::WChar,
-                                               ACE_InputCDR::to_wchar,
-                                               ACE_OutputCDR::from_wchar>;
-
-template class TAO::Special_Basic_SArg_Traits_T<CORBA::Octet,
-                                               ACE_InputCDR::to_octet,
-                                               ACE_OutputCDR::from_octet>;
-
-template class TAO::Special_Basic_SArg_Traits_T<CORBA::Boolean,
-                                               ACE_InputCDR::to_boolean,
-                                               ACE_OutputCDR::from_boolean>;
-
-template class TAO::In_Special_Basic_SArgument_T<CORBA::Char,
-                                                 ACE_InputCDR::to_char,
-                                                 ACE_OutputCDR::from_char;
-template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Char,
-                                                    ACE_InputCDR::to_char,
-                                                    ACE_OutputCDR::from_char>;
-template class TAO::Out_Special_Basic_SArgument_T<CORBA::Char,
-                                                  ACE_InputCDR::to_char,
-                                                  ACE_OutputCDR::from_char>;
-template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Char,
-                                                  ACE_InputCDR::to_char,
-                                                  ACE_OutputCDR::from_char>;
-
-template class TAO::In_Special_Basic_SArgument_T<CORBA::WChar,
-                                                 ACE_InputCDR::to_wchar,
-                                                 ACE_OutputCDR::from_wchar;
-template class TAO::Inout_Special_Basic_SArgument_T<CORBA::WChar,
-                                                    ACE_InputCDR::to_wchar,
-                                                    ACE_OutputCDR::from_wchar>;
-template class TAO::Out_Special_Basic_SArgument_T<CORBA::WChar,
-                                                  ACE_InputCDR::to_wchar,
-                                                  ACE_OutputCDR::from_wchar>;
-template class TAO::Ret_Special_Basic_SArgument_T<CORBA::WChar,
-                                                  ACE_InputCDR::to_wchar,
-                                                  ACE_OutputCDR::from_wchar>;
-
-template class TAO::In_Special_Basic_SArgument_T<CORBA::Octet,
-                                                 ACE_InputCDR::to_octet,
-                                                 ACE_OutputCDR::from_octet;
-template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Octet,
-                                                    ACE_InputCDR::to_octet,
-                                                    ACE_OutputCDR::from_octet>;
-template class TAO::Out_Special_Basic_SArgument_T<CORBA::Octet,
-                                                  ACE_InputCDR::to_octet,
-                                                  ACE_OutputCDR::from_octet>;
-template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Octet,
-                                                  ACE_InputCDR::to_octet,
-                                                  ACE_OutputCDR::from_octet>;
-
-template class TAO::In_Special_Basic_SArgument_T<CORBA::Boolean,
-                                                 ACE_InputCDR::to_boolean,
-                                                 ACE_OutputCDR::from_boolean;
-template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Boolean,
-                                                    ACE_InputCDR::to_boolean,
-                                                    ACE_OutputCDR::from_boolean>;
-template class TAO::Out_Special_Basic_SArgument_T<CORBA::Boolean,
-                                                  ACE_InputCDR::to_boolean,
-                                                  ACE_OutputCDR::from_boolean>;
-template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Boolean,
-                                                  ACE_InputCDR::to_boolean,
-                                                  ACE_OutputCDR::from_boolean>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::SArg_Traits<ACE_InputCDR::to_char>
-#pragma instantiate TAO::SArg_Traits<ACE_InputCDR::to_wchar>
-#pragma instantiate TAO::SArg_Traits<ACE_InputCDR::to_octet>
-#pragma instantiate TAO::SArg_Traits<ACE_InputCDR::to_boolean>
-
-#pragma instantiate TAO::Special_Basic_SArg_Traits_T< \
-                              CORBA::Char, \
-                              ACE_InputCDR::to_char, \
-                              ACE_OutputCDR::from_char \
-                            >
-
-#pragma instantiate TAO::Special_Basic_SArg_Traits_T< \
-                              CORBA::WChar, \
-                              ACE_InputCDR::to_wchar, \
-                              ACE_OutputCDR::from_wchar \
-                            >
-
-#pragma instantiate TAO::Special_Basic_SArg_Traits_T< \
-                              CORBA::Octet, \
-                              ACE_InputCDR::to_octet, \
-                              ACE_OutputCDR::from_octet \
-                            >
-
-#pragma instantiate TAO::Special_Basic_SArg_Traits_T< \
-                              CORBA::Boolean, \
-                              ACE_InputCDR::to_boolean, \
-                              ACE_OutputCDR::from_boolean \
-                            >
-
-#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Char, \
-                                                 ACE_InputCDR::to_char, \
-                                                 ACE_OutputCDR::from_char
-#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Char, \
-                                                    ACE_InputCDR::to_char, \
-                                                    ACE_OutputCDR::from_char>
-#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Char, \
-                                                  ACE_InputCDR::to_char, \
-                                                  ACE_OutputCDR::from_char>
-#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Char, \
-                                                  ACE_InputCDR::to_char, \
-                                                  ACE_OutputCDR::from_char>
-
-#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::WChar, \
-                                                 ACE_InputCDR::to_wchar, \
-                                                 ACE_OutputCDR::from_wchar
-#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::WChar, \
-                                                    ACE_InputCDR::to_wchar, \
-                                                    ACE_OutputCDR::from_wchar>
-#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::WChar, \
-                                                  ACE_InputCDR::to_wchar, \
-                                                  ACE_OutputCDR::from_wchar>
-#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::WChar, \
-                                                  ACE_InputCDR::to_wchar, \
-                                                  ACE_OutputCDR::from_wchar>
-
-#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Octet, \
-                                                 ACE_InputCDR::to_octet, \
-                                                 ACE_OutputCDR::from_octet
-#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Octet, \
-                                                    ACE_InputCDR::to_octet, \
-                                                    ACE_OutputCDR::from_octet>
-#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Octet, \
-                                                  ACE_InputCDR::to_octet, \
-                                                  ACE_OutputCDR::from_octet>
-#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Octet, \
-                                                  ACE_InputCDR::to_octet, \
-                                                  ACE_OutputCDR::from_octet>
-
-#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Boolean, \
-                                                 ACE_InputCDR::to_boolean, \
-                                                 ACE_OutputCDR::from_boolean
-#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Boolean, \
-                                                    ACE_InputCDR::to_boolean, \
-                                                    ACE_OutputCDR::from_boolean>
-#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Boolean, \
-                                                  ACE_InputCDR::to_boolean, \
-                                                  ACE_OutputCDR::from_boolean>
-#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Boolean, \
-                                                  ACE_InputCDR::to_boolean, \
-                                                  ACE_OutputCDR::from_boolean>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h
deleted file mode 100644
index 80ff01a5331..00000000000
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Special_Basic_SArguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_SPECIAL_BASIC_SARGUMENTS_H
-#define TAO_SPECIAL_BASIC_SARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#include "ace/CDR_Stream.h"
-
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specializations for (w)char, octet and boolean.
-   *
-   */
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_char>
-    : public Special_Basic_SArg_Traits_T<CORBA::Char,
-                                         ACE_InputCDR::to_char,
-                                         ACE_OutputCDR::from_char>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_wchar>
-    : public Special_Basic_SArg_Traits_T<CORBA::WChar,
-                                         ACE_InputCDR::to_wchar,
-                                         ACE_OutputCDR::from_wchar>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_octet>
-    : public Special_Basic_SArg_Traits_T<CORBA::Octet,
-                                         ACE_InputCDR::to_octet,
-                                         ACE_OutputCDR::from_octet>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_boolean>
-    : public Special_Basic_SArg_Traits_T<CORBA::Boolean,
-                                         ACE_InputCDR::to_boolean,
-                                         ACE_OutputCDR::from_boolean>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SPECIAL_BASIC_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
deleted file mode 100644
index 3f1fd83a956..00000000000
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#include "StrategyFactory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (PortableServer,
-           StrategyFactory,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    StrategyFactory::~StrategyFactory (void)
-    {
-    }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<StrategyFactory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<StrategyFactory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-  } /* namespace Portable_Server */
-} /* namespace TAO */
diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h
deleted file mode 100644
index 25627b8a603..00000000000
--- a/TAO/tao/PortableServer/StrategyFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file StrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_STRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export StrategyFactory :
-      public ACE_Service_Object
-    {
-    public:
-      virtual ~StrategyFactory (void);
-    };
-  } /* namespace Portable_Server */
-} /* namespace TAO */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_STRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.pc.in b/TAO/tao/PortableServer/TAO_PortableServer.pc.in
deleted file mode 100644
index ed0d01423d0..00000000000
--- a/TAO/tao/PortableServer/TAO_PortableServer.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_PortableServer
-Description: TAO PortableServer Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_PortableServer
-Cflags: -I${includedir}
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.rc b/TAO/tao/PortableServer/TAO_PortableServer.rc
deleted file mode 100644
index f16419968f5..00000000000
--- a/TAO/tao/PortableServer/TAO_PortableServer.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "PortableServer\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_PortableServerDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_PortableServer.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
deleted file mode 100644
index a314bcb436d..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "ThreadPolicy.h"
-#include "PortableServer.h"
-
-ACE_RCSID (PortableServer,
-           ThreadPolicy,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ThreadPolicy::ThreadPolicy (::PortableServer::ThreadPolicyValue value)
-      : value_ (value)
-    {
-    }
-
-    CORBA::Policy_ptr
-    ThreadPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ThreadPolicy *copy = 0;
-      ACE_NEW_THROW_EX (copy,
-                        ThreadPolicy (this->value_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return copy;
-    }
-
-    void
-    ThreadPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-    ::PortableServer::ThreadPolicyValue
-    ThreadPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return value_;
-    }
-
-    CORBA::PolicyType
-    ThreadPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::PortableServer::THREAD_POLICY_ID;
-    }
-
-    TAO_Cached_Policy_Type
-    ThreadPolicy::_tao_cached_type (void) const
-    {
-      return TAO_CACHED_POLICY_THREAD;
-    }
-
-    TAO_Policy_Scope
-    ThreadPolicy::_tao_scope (void) const
-    {
-      return TAO_POLICY_POA_SCOPE;
-    }
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
deleted file mode 100644
index dc9673f59a7..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadPolicy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_THREADPOLICY_H
-#define TAO_PORTABLESERVER_THREADPOLICY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ThreadPolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadPolicy
-      : public virtual ::PortableServer::ThreadPolicy,
-        public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      ThreadPolicy (::PortableServer::ThreadPolicyValue value);
-
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      ::PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      /// Return the cached policy type for this policy.
-      TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-      /// Returns the scope at which this policy can be applied. See orbconf.h.
-      TAO_Policy_Scope _tao_scope (void) const;
-
-    private:
-      ::PortableServer::ThreadPolicyValue value_;
-    };
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_THREADPOLICY_H */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl
deleted file mode 100644
index a86084a88b5..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicy.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file ThreadPolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
- * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1 -Sc -Sci -GA -I$(TAO_ROOT)
- *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="portableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ThreadPolicy.pidl
- */
-
-#ifndef _PORTABLESERVER_THREAD_POLICY_IDL_
-#define _PORTABLESERVER_THREAD_POLICY_IDL_
-
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  enum ThreadPolicyValue
-  {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-/*    ,MAIN_THREAD_MODEL*/
-  };
-
-  local interface ThreadPolicy : CORBA::Policy
-  {
-    readonly attribute ThreadPolicyValue value;
-  };
-};
-
-#endif // _PORTABLESERVER_THREAD_POLICY_IDL_
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
deleted file mode 100644
index ac6e78c84d8..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ThreadPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
- #if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_ThreadPolicyValue[] =
-  {
-    "ORB_CTRL_MODEL",
-    "SINGLE_THREAD_MODEL"
-
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ThreadPolicyValue (
-    "IDL:omg.org/PortableServer/ThreadPolicyValue:2.3",
-    "ThreadPolicyValue",
-    _tao_enumerators_PortableServer_ThreadPolicyValue,
-    2);
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue =
-    &_tao_tc_PortableServer_ThreadPolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_ThreadPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/ThreadPolicy:2.3",
-    "ThreadPolicy");
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadPolicy =
-    &_tao_tc_PortableServer_ThreadPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ThreadPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ThreadPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ThreadPolicy_ptr _tao_objptr =
-    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
-      _tao_any,
-      PortableServer::ThreadPolicy::_tao_any_destructor,
-      PortableServer::_tc_ThreadPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
-        _tao_any,
-        PortableServer::ThreadPolicy::_tao_any_destructor,
-        PortableServer::_tc_ThreadPolicy,
-        _tao_elem
-      );
-}
-
- #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
deleted file mode 100644
index 5c89371a015..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ThreadPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ThreadPolicy.
-
-PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
-    PortableServer::ThreadPolicy_ptr p
-  )
-{
-  return PortableServer::ThreadPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
-    PortableServer::ThreadPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void)
-{
-  return PortableServer::ThreadPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal (
-    PortableServer::ThreadPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableServer::ThreadPolicy::ThreadPolicy (void)
-{}
-
-PortableServer::ThreadPolicy::~ThreadPolicy (void)
-{}
-
-void
-PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ThreadPolicy *_tao_tmp_pointer =
-    static_cast<ThreadPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadPolicy::_nil ();
-    }
-
-  ThreadPolicy_ptr proxy =
-    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
-
-  return ThreadPolicy::_duplicate (proxy);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadPolicy::_nil ();
-    }
-
-  ThreadPolicy_ptr proxy =
-    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
-
-  return ThreadPolicy::_duplicate (proxy);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-PortableServer::ThreadPolicy::_tao_release (ThreadPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableServer::ThreadPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/ThreadPolicy:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, PortableServer::ThreadPolicyValue _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValue & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<PortableServer::ThreadPolicyValue> (_tao_temp);
-    }
-
-  return _tao_success;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
deleted file mode 100644
index 083c0a53a19..00000000000
--- a/TAO/tao/PortableServer/ThreadPolicyC.h
+++ /dev/null
@@ -1,287 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_THREADPOLICYC_H_
-#define _TAO_IDL_ORIG_THREADPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableServer
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum ThreadPolicyValue
-  {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  typedef ThreadPolicyValue &ThreadPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_)
-#define _PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_
-
-  class ThreadPolicy;
-  typedef ThreadPolicy *ThreadPolicy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ThreadPolicy
-      >
-    ThreadPolicy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ThreadPolicy
-      >
-    ThreadPolicy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
-#define _PORTABLESERVER_THREADPOLICY_CH_
-
-  class TAO_PortableServer_Export ThreadPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ThreadPolicy_ptr _ptr_type;
-    typedef ThreadPolicy_var _var_type;
-
-    // The static operations.
-    static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-
-    static void _tao_release (ThreadPolicy_ptr obj);
-
-    static ThreadPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ThreadPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ThreadPolicy_ptr _nil (void)
-    {
-      return static_cast<ThreadPolicy_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::ThreadPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // 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
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    ThreadPolicy (void);
-
-    virtual ~ThreadPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ThreadPolicy (const ThreadPolicy &);
-
-    void operator= (const ThreadPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
-
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy>
-  {
-    static ::PortableServer::ThreadPolicy_ptr duplicate (
-        ::PortableServer::ThreadPolicy_ptr
-      );
-    static void release (
-        ::PortableServer::ThreadPolicy_ptr
-      );
-    static ::PortableServer::ThreadPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::ThreadPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
deleted file mode 100644
index 6f1d80b5c36..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#include "ThreadStrategy.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategy,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    void
-    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
-    {
-    }
-
-    void
-    ThreadStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    {
-    }
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
deleted file mode 100644
index bb46642f7f8..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategy.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_THREAD_STRATEGY_H
-#define TAO_THREAD_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Policy_Strategy.h"
-#include "ThreadPolicyC.h"
-
-#include "tao/orbconf.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadStrategy :
-       public Policy_Strategy
-    {
-    public:
-      virtual int enter () = 0;
-
-      virtual int exit () = 0;
-
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
-
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
-
-      virtual ::PortableServer::ThreadPolicyValue type() const = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_THREAD_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h
deleted file mode 100644
index 120ca7e115a..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategyFactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategyFactory.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
-#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/ThreadPolicyC.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class ThreadStrategy;
-
-    class TAO_PortableServer_Export ThreadStrategyFactory
-       : public StrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ThreadStrategy *create (
-        ::PortableServer::ThreadPolicyValue value) = 0;
-
-      /// Cleanup the given strategy instance
-      virtual void destroy (
-        ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
deleted file mode 100644
index 4f0c738e4ee..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "ThreadStrategyFactoryImpl.h"
-#include "ThreadStrategy.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategyFactoryImpl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ThreadStrategy*
-    ThreadStrategyFactoryImpl::create (
-      ::PortableServer::ThreadPolicyValue value)
-    {
-      ThreadStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::SINGLE_THREAD_MODEL :
-        {
-          ThreadStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
-
-          if (strategy_factory != 0)
-            strategy = strategy_factory->create (value);
-          else
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("ERROR, Unable to get ")
-                        ACE_TEXT ("ThreadStrategySingleFactory")));
-
-          break;
-        }
-        case ::PortableServer::ORB_CTRL_MODEL :
-        {
-          strategy =
-            ACE_Dynamic_Service<ThreadStrategy>::instance ("ThreadStrategyORBControl");
-
-          if (strategy == 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) %p\n"),
-                        ACE_TEXT ("ERROR, Unable to get ")
-                        ACE_TEXT ("ThreadStrategyORBControl")));
-
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    ThreadStrategyFactoryImpl::destroy (
-      ThreadStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      switch (strategy->type ())
-      {
-        case ::PortableServer::SINGLE_THREAD_MODEL :
-        {
-          ThreadStrategyFactory *strategy_factory =
-            ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
-
-          if (strategy_factory != 0)
-            {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-            }
-          break;
-        }
-        case ::PortableServer::ORB_CTRL_MODEL :
-        {
-          // Noop
-          break;
-        }
-      }
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategyFactoryImpl,
-        ACE_TEXT ("ThreadStrategyFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategyFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategyFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<ThreadStrategyFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<ThreadStrategyFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
deleted file mode 100644
index 9ffb364e529..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategyFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/ThreadStrategyFactory.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadStrategyFactoryImpl
-       : public ThreadStrategyFactory
-    {
-    public:
-      /// Create a new servant retention strategy
-      virtual ThreadStrategy* create (
-        ::PortableServer::ThreadPolicyValue value);
-
-      virtual void destroy (
-        ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
deleted file mode 100644
index 067223f7f61..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#include "ThreadStrategyORBControl.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategyORBControl,
-           "$Id$")
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    int
-    ThreadStrategyORBControl::enter ()
-    {
-      return 0;
-    }
-
-    int
-    ThreadStrategyORBControl::exit ()
-    {
-      return 0;
-    }
-
-    ::PortableServer::ThreadPolicyValue
-    ThreadStrategyORBControl::type() const
-    {
-      return ::PortableServer::ORB_CTRL_MODEL;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategyORBControl)
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategyORBControl,
-        ACE_TEXT ("ThreadStrategyORBControl"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategyORBControl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ThreadStrategyORBControl>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ThreadStrategyORBControl>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
deleted file mode 100644
index 7197bc8a242..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategyORBControl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_THREADSTRATEGYORBCONTROL_H
-#define TAO_THREADSTRATEGYORBCONTROL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ThreadStrategy.h"
-#include "ace/Service_Config.h"
-#include "tao/orbconf.h"
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadStrategyORBControl
-       : public ThreadStrategy
-    {
-    public:
-      virtual int enter ();
-
-      virtual int exit ();
-
-      virtual ::PortableServer::ThreadPolicyValue type() const;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl)
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_THREADSTRATEGYORBCONTROL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
deleted file mode 100644
index ea9e9e68bdb..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-#include "ThreadStrategySingle.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategySingle,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    int
-    ThreadStrategySingle::enter ()
-    {
-      return lock_.acquire();
-    }
-
-    int
-    ThreadStrategySingle::exit ()
-    {
-      return lock_.release();
-    }
-
-    ::PortableServer::ThreadPolicyValue
-    ThreadStrategySingle::type() const
-    {
-      return ::PortableServer::SINGLE_THREAD_MODEL;
-    }
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingle)
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategySingle,
-        ACE_TEXT ("ThreadStrategySingle"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategySingle),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Dynamic_Service<ThreadStrategySingle>;
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-    #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingle>
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
deleted file mode 100644
index b10a56f0bb4..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategySingle.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_THREADSTRATEGYSINGLE_H
-#define TAO_THREADSTRATEGYSINGLE_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ThreadStrategy.h"
-#include "ace/Service_Config.h"
-
-// Locking
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadStrategySingle :
-       public ThreadStrategy
-    {
-    public:
-      virtual int enter ();
-
-      virtual int exit ();
-
-      virtual ::PortableServer::ThreadPolicyValue type() const;
-    private:
-      TAO_SYNCH_RECURSIVE_MUTEX lock_;
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_THREADSTRATEGYSINGLE_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
deleted file mode 100644
index e8c79fe7676..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#include "ThreadStrategySingleFactoryImpl.h"
-#include "ThreadStrategy.h"
-#include "ThreadStrategySingle.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ThreadStrategyFactoryImpl,
-           "$Id$")
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    ThreadStrategy*
-    ThreadStrategySingleFactoryImpl::create (
-      ::PortableServer::ThreadPolicyValue value)
-    {
-      ThreadStrategy* strategy = 0;
-
-      switch (value)
-      {
-        case ::PortableServer::SINGLE_THREAD_MODEL :
-        {
-          ACE_NEW_RETURN (strategy, ThreadStrategySingle, 0);
-          break;
-        }
-        case ::PortableServer::ORB_CTRL_MODEL :
-        {
-          ACE_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl"));
-          break;
-        }
-      }
-
-      return strategy;
-    }
-
-    void
-    ThreadStrategySingleFactoryImpl::destroy (
-      ThreadStrategy *strategy
-      ACE_ENV_ARG_DECL)
-    {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      delete strategy;
-    }
-
-    ACE_STATIC_SVC_DEFINE (
-        ThreadStrategySingleFactoryImpl,
-        ACE_TEXT ("ThreadStrategySingleFactory"),
-        ACE_SVC_OBJ_T,
-        &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl),
-        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-        0
-      )
-
-    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
-
-    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-    template class ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl>;
-
-    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-    #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl>
-
-    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
deleted file mode 100644
index 050ed5a6c71..00000000000
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file ThreadStrategySingleFactoryImpl.h
- *
- *  $Id$
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H
-#define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "tao/PortableServer/ThreadStrategyFactory.h"
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-    class TAO_PortableServer_Export ThreadStrategySingleFactoryImpl
-       : public ThreadStrategyFactory
-    {
-    public:
-      /// Create a new thread strategy
-      virtual ThreadStrategy* create (
-        ::PortableServer::ThreadPolicyValue value);
-
-      virtual void destroy (
-        ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL);
-    };
-
-    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
-    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
-  }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
deleted file mode 100644
index 1960033a44a..00000000000
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_SArg_Traits.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_SARG_TRAITS_H
-#define TAO_TYPECODE_SARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-}
-
-// --------------------------------------------------------------
-
-namespace TAO
-{
-  template <typename T> class SArg_Traits;
-
-  /// Used in generated code if CORBA::TypeCode is an argument or
-  /// return type.
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::TypeCode>
-    : public Object_SArg_Traits_T<CORBA::TypeCode_ptr,
-                                  CORBA::TypeCode_var,
-                                  CORBA::TypeCode_out>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_SARG_TRAITS_H */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
deleted file mode 100644
index d73fa550b34..00000000000
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-#ifndef TAO_UB_STRING_SARGUMENT_T_CPP
-#define TAO_UB_STRING_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/UB_String_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Inout_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_UB_STRING_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
deleted file mode 100644
index d79a4728266..00000000000
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UB_String_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UB_STRING_SARGUMENT_T_H
-#define TAO_UB_STRING_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_UB_String_SArgument_T
-   *
-   * @brief Template class for IN skeleton UB (w)string argument.
-   *
-   */
-  template<typename S, typename S_var>
-  class In_UB_String_SArgument_T : public Argument
-  {
-  public:
-    In_UB_String_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const * arg (void) const;
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Inout_UB_String_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton UB (w)string argument.
-   *
-   */
-  template<typename S, typename S_var>
-  class Inout_UB_String_SArgument_T : public Argument
-  {
-  public:
-    Inout_UB_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Out_UB_String_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton UB (w)string argument.
-   *
-   */
-  template<typename S, typename S_var>
-  class Out_UB_String_SArgument_T : public Argument
-  {
-  public:
-    Out_UB_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Ret_UB_String_SArgument_T
-   *
-   * @brief Template class for return skeleton value of UB (w)string.
-   *
-   */
-  template<typename S, typename S_var>
-  class Ret_UB_String_SArgument_T : public Argument
-  {
-  public:
-    Ret_UB_String_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct UB_String_SArg_Traits_T
-   *
-   * @brief Template class for argument traits of unbounded (w)strings.
-   *
-   */
-  template<typename T, typename T_var, typename T_out>
-  struct UB_String_SArg_Traits_T
-  {
-    typedef T *                                         ret_type;
-    typedef const T *                                   in_type;
-    typedef T *&                                        inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_UB_String_SArgument_T<T,T_var>           in_arg_val;
-    typedef Inout_UB_String_SArgument_T<T,T_var>        inout_arg_val;
-    typedef Out_UB_String_SArgument_T<T,T_var>          out_arg_val;
-    typedef Ret_UB_String_SArgument_T<T,T_var>          ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                                     in_arg_type;
-    typedef inout_type                                  inout_arg_type;
-    typedef inout_type                                  out_arg_type;
-    typedef inout_type                                  ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/UB_String_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/UB_String_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("UB_String_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UB_STRING_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
deleted file mode 100644
index daf8637012c..00000000000
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void)
-{}
-
-template<typename S, typename S_var>
-const S *
-TAO::In_UB_String_SArgument_T<S,S_var>::arg (void) const
-{
-  return this->x_.in ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T (void)
-{}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *&
-TAO::Inout_UB_String_SArgument_T<S,S_var>::arg (void)
-{
-  return this->x_.inout ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Out_UB_String_SArgument_T<S,S_var>::Out_UB_String_SArgument_T (
-    void
-  )
-{}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *&
-TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T (void)
-{}
-
-template<typename S, typename S_var>
-S *&
-TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.cpp b/TAO/tao/PortableServer/UB_String_SArguments.cpp
deleted file mode 100644
index ccc5b449a7e..00000000000
--- a/TAO/tao/PortableServer/UB_String_SArguments.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-
-#include "UB_String_SArguments.h"
-
-ACE_RCSID (PortableServer,
-           Special_Basic_SArguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::SArg_Traits<CORBA::String>;
-template class TAO::SArg_Traits<CORBA::WString>;
-
-template class TAO::UB_String_SArg_Traits_T<CORBA::Char,
-                                            CORBA::String_var,
-                                            CORBA::String_out>;
-template class TAO::UB_String_SArg_Traits_T<CORBA::WChar,
-                                            CORBA::WString_var,
-                                            CORBA::WString_out>;
-
-template class TAO::In_UB_String_SArgument_T<CORBA::Char,
-                                             CORBA::String_var>;
-template class TAO::Inout_UB_String_SArgument_T<CORBA::Char,
-                                                CORBA::String_var>;
-template class TAO::Out_UB_String_SArgument_T<CORBA::Char,
-                                              CORBA::String_var>;
-template class TAO::Ret_UB_String_SArgument_T<CORBA::Char,
-                                              CORBA::String_var>;
-
-template class TAO::In_UB_String_SArgument_T<CORBA::WChar,
-                                             CORBA::WString_var>;
-template class TAO::Inout_UB_String_SArgument_T<CORBA::WChar,
-                                                CORBA::WString_var>;
-template class TAO::Out_UB_String_SArgument_T<CORBA::WChar,
-                                              CORBA::WString_var>;
-template class TAO::Ret_UB_String_SArgument_T<CORBA::WChar,
-                                              CORBA::WString_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::SArg_Traits<CORBA::String>
-#pragma instantiate TAO::SArg_Traits<CORBA::WString>
-
-#pragma instantiate TAO::UB_String_SArg_Traits_T<CORBA::Char, \
-                                                 CORBA::String_var, \
-                                                 CORBA::String_out>
-#pragma instantiate TAO::UB_String_SArg_Traits_T<CORBA::WChar, \
-                                                 CORBA::WString_var, \
-                                                 CORBA::WString_out>
-
-#pragma instantiate TAO::In_UB_String_SArgument_T<CORBA::Char, \
-                                                  CORBA::String_var>
-#pragma instantiate TAO::Inout_UB_String_SArgument_T<CORBA::Char, \
-                                                      CORBA::String_var>
-#pragma instantiate TAO::Out_UB_String_SArgument_T<CORBA::Char, \
-                                                    CORBA::String_var>
-#pragma instantiate TAO::Ret_UB_String_SArgument_T<CORBA::Char, \
-                                                    CORBA::String_var>
-
-#pragma instantiate TAO::In_UB_String_SArgument_T<CORBA::WChar, \
-                                                  CORBA::WString_var>
-#pragma instantiate TAO::Inout_UB_String_SArgument_T<CORBA::WChar, \
-                                                     CORBA::WString_var>
-#pragma instantiate TAO::Out_UB_String_SArgument_T<CORBA::WChar, \
-                                                   CORBA::WString_var>
-#pragma instantiate TAO::Ret_UB_String_SArgument_T<CORBA::WChar, \
-                                                   CORBA::WString_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h
deleted file mode 100644
index 4f4194fe8cf..00000000000
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UB_String_SArguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_UB_STRING_SARGUMENTS_H
-#define TAO_UB_STRING_SARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specializatons for unbounded (w)strings.
-   *
-   */
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Char *>
-    : public UB_String_SArg_Traits_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::String_out>
-  {
-  };
-
-  template<>
-  class TAO_PortableServer_Export SArg_Traits<CORBA::WChar *>
-    : public UB_String_SArg_Traits_T<CORBA::WChar,
-                                     CORBA::WString_var,
-                                     CORBA::WString_out>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UB_STRING_SARGUMENTS_H */
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
deleted file mode 100644
index 5e3690e1344..00000000000
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Upcall_Command.h
- *
- *  $Id$
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UPCALL_COMMAND_H
-#define TAO_UPCALL_COMMAND_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/CORBA_macros.h"
-
-#ifndef ACE_LACKS_PRAGMA_ONCE
-# pragma once
-#endif /* !ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Environment;
-}
-
-namespace TAO
-{
-
-  /**
-   * @class Upcall_Command
-   *
-   * @brief "ABC" that all operation-specific command objects must
-   *        subclass.
-   *
-   * The actual upcall into a servant is executed through a concrete
-   * @c Upcall_Command object.  This is necessary to simplify upcall
-   * interactions in the presence of interceptors, such as when the
-   * @c send_exception() interception point must be invoked when the
-   * servant operation throws an exception.
-   */
-  class Upcall_Command
-  {
-  public:
-
-    /// Destructor.
-    virtual ~Upcall_Command (void) {}
-
-    /// Execute the upcall.
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  };
-
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UPCALL_COMMAND_H */
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
deleted file mode 100644
index 16c2f53e12d..00000000000
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-// $Id$
-
-#include "Upcall_Wrapper.h"
-#include "Upcall_Command.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_Guard.h"
-
-# include "tao/PortableServer/ServerRequestInfo.h"
-# include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "tao/PortableInterceptor.h"
-
-#include "tao/TAO_Server_Request.h"
-#include "tao/CDR.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           Upcall_Wrapper,
-           "$Id$")
-
-
-void
-TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
-                             TAO::Argument * const args[],
-                             size_t nargs,
-                             TAO::Upcall_Command & command
-
-#if TAO_HAS_INTERCEPTORS == 1
-                             , void * servant_upcall
-                             , CORBA::TypeCode_ptr const * exceptions
-                             , size_t nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-                             ACE_ENV_ARG_DECL
-                             )
-{
-  if (server_request.incoming ())
-    {
-      this->pre_upcall (*server_request.incoming (),
-                        args,
-                        nargs
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-  TAO::ServerRequestInfo request_info (server_request,
-                                       args,
-                                       nargs,
-                                       servant_upcall,
-                                       exceptions,
-                                       nexceptions);
-
-  TAO::ServerRequestInterceptor_Adapter interceptor_adapter (server_request);
-
-  ACE_TRY
-    {
-      {
-        TAO::PICurrent_Guard pi_guard (server_request,
-                                       true  /* Copy TSC to RSC */);
-
-        // Invoke intermediate server side interception points.
-        interceptor_adapter.receive_request (&request_info
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // Don't bother performing the upcall if an interceptor caused a
-        // location forward.
-        if (!interceptor_adapter.location_forwarded ())
-          {
-#endif /* TAO_HAS_INTERCEPTORS */
-
-            // The actual upcall.
-            command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-            TAO_INTERCEPTOR_CHECK;
-
-#if TAO_HAS_INTERCEPTORS == 1
-          }
-      }
-
-      // Do not execute the send_reply() interception point if an
-      // interceptor caused a location forward.  The send_other()
-      // interception point should already have been executed by the
-      // ServerRequestInterceptor_Adapter object.
-      //
-      // It should actually be safe to call this interception point,
-      // regardless, since the interceptor flow stack should have been
-      // emptied by the send_other() interception point.  Note that
-      // we'd still need to avoid resetting the reply status to
-      // SUCCESSFUL, however.
-      if (!interceptor_adapter.location_forwarded ())
-        {
-          // No location forward by interceptors and successful upcall.
-
-          request_info.reply_status (PortableInterceptor::SUCCESSFUL);
-          interceptor_adapter.send_reply (&request_info
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      request_info.exception (&ACE_ANY_EXCEPTION);
-      interceptor_adapter.send_exception (&request_info
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ReplyStatus status =
-        request_info.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (status == PortableInterceptor::SYSTEM_EXCEPTION
-          || status == PortableInterceptor::USER_EXCEPTION)
-        {
-          ACE_RE_THROW;
-        }
-    }
-# if defined (ACE_HAS_EXCEPTIONS) \
-  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      CORBA::UNKNOWN ex;
-
-      request_info.exception (&ex);
-      interceptor_adapter.send_exception (&request_info
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ReplyStatus status =
-        request_info.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (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 == 1 */
-
-  if (server_request.response_expected ()
-      && !server_request.sync_with_server ())
-    {
-      server_request.init_reply ();
-    }
-
-#if TAO_HAS_INTERCEPTORS == 1
-  // Don't bother marshaling inout/out/return values if an interceptor
-  // caused a location forward.
-  if (!interceptor_adapter.location_forwarded ())
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-    {
-      if (server_request.outgoing ())
-        {
-          this->post_upcall (*server_request.outgoing (),
-                             args,
-                             nargs
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-}
-
-void
-TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
-                                 TAO::Argument * const * args,
-                                 size_t nargs
-                                 ACE_ENV_ARG_DECL)
-{
-  // Demarshal the operation "in" and "inout" arguments, if any.
-
-  // NOTE:  The TAO::Argument corresponding to the return value is
-  //        always the first element in the array, regardless of
-  //        whether or not the return type is void.
-
-  ACE_ASSERT (nargs != 0);
-
-  TAO::Argument * const * const begin = args + 1;  // Skip the return value.
-  TAO::Argument * const * const end   = args + nargs;
-
-  for (TAO::Argument * const * i = begin; i != end; ++i)
-    {
-      if (!(*i)->demarshal (cdr))
-        {
-          TAO_InputCDR::throw_skel_exception (errno
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-}
-
-void
-TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
-                                  TAO::Argument * const * args,
-                                  size_t nargs
-                                  ACE_ENV_ARG_DECL)
-{
-  // Marshal the operation "inout" and "out" arguments and return
-  // value, if any.
-
-  TAO::Argument * const * const begin = args;
-  TAO::Argument * const * const end   = args + nargs;
-
-  for (TAO::Argument * const * i = begin; i != end; ++i)
-    {
-      if (!(*i)->marshal (cdr))
-        {
-          TAO_OutputCDR::throw_skel_exception (errno
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-}
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
deleted file mode 100644
index a6c197b9383..00000000000
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Upcall_Wrapper.h
- *
- *  $Id$
- *
- *  @author Ossama Othman
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_UPCALL_WRAPPER_H
-#define TAO_UPCALL_WRAPPER_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#ifndef ACE_LACKS_PRAGMA_ONCE
-# pragma once
-#endif /* !ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-#include "ace/CORBA_macros.h"
-
-
-class TAO_ServantBase;
-class TAO_ServerRequest;
-class TAO_InputCDR;
-class TAO_OutputCDR;
-
-namespace PortableServer
-{
-  typedef ::TAO_ServantBase ServantBase;
-}
-
-namespace CORBA
-{
-  class Environment;
-}
-
-namespace TAO
-{
-  class Argument;
-  class Upcall_Command;
-
-  /**
-   * @class Upcall_Wrapper
-   *
-   * @brief Wraps the activities of the _skel operations.
-   *
-   */
-  class TAO_PortableServer_Export Upcall_Wrapper
-  {
-  public:
-
-    /**
-     * @note The TAO::Argument corresponding to the return value is
-     *       always the first element in the array, regardless of
-     *       whether or not the return type is void.
-     */
-
-    /// Perform the upcall.
-    /**
-     * @param server_request Object containing server side messaging
-     *                       operations (e.g. CDR reply construction, etc).
-     * @param args           Operation argument list.
-     * @param nargs          Number of arguments in the operation
-     *                       argument list.
-     * @param command        @c Command object that performs the
-     *                       actual upcall into the servant.
-     *
-     * @param servant_upcall Object containing information for POA
-     *                       that dispatched the servant.
-     * @param servant        The servant handling the upcall.
-     * @param exceptions     Array of user exceptions the operation
-     *                       may raise.
-     * @param nexceptions    The number of exceptions in the operation
-     *                       user exception array.
-     */
-    void upcall (TAO_ServerRequest & server_request,
-                 TAO::Argument * const args[],
-                 size_t nargs,
-                 TAO::Upcall_Command & command
-
-#if TAO_HAS_INTERCEPTORS == 1
-                 , void * servant_upcall
-                 , CORBA::TypeCode_ptr const * exceptions
-                 , size_t nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-                 ACE_ENV_ARG_DECL);
-
-  private:
-
-
-    /// Perform pre-upcall operations.
-    /**
-     * Perform pre-upcall operations, including operation @c IN and
-     * @c INOUT argument demarshaling.
-     */
-    void pre_upcall (TAO_InputCDR & cdr,
-                     TAO::Argument * const * args,
-                     size_t nargs
-                     ACE_ENV_ARG_DECL);
-
-    /// Perform post-upcall operations.
-    /**
-     * Perform post-upcall operations, including operation @c INOUT
-     * and @c OUT argument marshaling.
-     */
-    void post_upcall (TAO_OutputCDR & cdr,
-                      TAO::Argument * const * args,
-                      size_t nargs
-                      ACE_ENV_ARG_DECL);
-
-  };
-
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UPCALL_WRAPPER_H */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
deleted file mode 100644
index 8197c3fb819..00000000000
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-// $Id$
-
-#ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP
-#define TAO_VAR_ARRAY_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Var_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Var_Array_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Var_Array_SArgument_T<S,
-                              S_slice,
-                              S_forany>::demarshal (TAO_InputCDR & cdr)
-{
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::In_Var_Array_SArgument_T<S,
-                              S_slice,
-                              S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
-{
-
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::demarshal (TAO_InputCDR & cdr)
-{
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Inout_Var_Array_SArgument_T<S, S_slice, S_forany>::interceptor_param (
-  Dynamic::Parameter & p)
-{
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  S_forany tmp (this->x_.ptr ());
-  return cdr << tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_slice, typename S_var, typename S_forany>
-void
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= S_forany (this->x_.ptr ());
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-CORBA::Boolean
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << S_forany (this->x_.ptr ());
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S_slice, typename S_var, typename S_forany>
-void
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= S_forany (this->x_.ptr ());
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_VAR_ARRAY_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
deleted file mode 100644
index a3eb5572772..00000000000
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Var_Array_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_VAR_ARRAY_SARGUMENT_T_H
-#define TAO_VAR_ARRAY_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Var_Array_SArgument_T
-   *
-   * @brief IN skeleton argument of variable size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_SArgument_T : public Argument
-  {
-  public:
-
-    In_Var_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice const * arg (void) const;
-
-  private:
-    mutable S x_;
-  };
-
-  /**
-   * @class Inout_Var_Array_SArgument_T
-   *
-   * @brief INOUT skeleton argument of variable size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_SArgument_T : public Argument
-  {
-  public:
-    Inout_Var_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Out_Var_Array_SArgument_T
-   *
-   * @brief OUT skeleton argument of variable size element array.
-   *
-   */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Out_Var_Array_SArgument_T : public Argument
-  {
-  public:
-    Out_Var_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Ret_Var_Array_SArgument_T
-   *
-   * @brief Skeleton value of variable size element array.
-   *
-   */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Var_Array_SArgument_T : public Argument
-  {
-  public:
-    Ret_Var_Array_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Var_Array_SArg_Traits_T
-   *
-   * @brief Argument traits of variable size element array.
-   *
-   */
-  template<typename T,
-           typename T_slice,
-           typename T_var,
-           typename T_out,
-           typename T_forany>
-  struct Var_Array_SArg_Traits_T
-  {
-    typedef T_slice *                                   ret_type;
-    typedef const T                                     in_type;
-    typedef T                                           inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_Var_Array_SArgument_T<T,
-                                     T_slice,
-                                     T_forany>          in_arg_val;
-    typedef Inout_Var_Array_SArgument_T<T,
-                                        T_slice,
-                                        T_forany>       inout_arg_val;
-    typedef Out_Var_Array_SArgument_T<T_slice,
-                                      T_var,
-                                      T_forany>         out_arg_val;
-    typedef Ret_Var_Array_SArgument_T<T_slice,
-                                      T_var,
-                                      T_forany>         ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef T_slice const *                             in_arg_type;
-    typedef ret_type                                    inout_arg_type;
-    typedef ret_type &                                  out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Var_Array_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Var_Array_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Array_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VAR_ARRAY_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
deleted file mode 100644
index fe3a700ffa5..00000000000
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::In_Var_Array_SArgument_T<S,
-                              S_slice,
-                              S_forany>::In_Var_Array_SArgument_T (void)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice const *
-TAO::In_Var_Array_SArgument_T<S,
-                              S_slice,
-                              S_forany>::arg (void) const
-{
-  S_forany tmp (this->x_);
-  return tmp.in ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::Inout_Var_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::Inout_Var_Array_SArgument_T (void)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-S_slice *
-TAO::Inout_Var_Array_SArgument_T<S,
-                                 S_slice,
-                                 S_forany>::arg (void)
-{
-  S_forany tmp (this->x_);
-  return tmp.inout ();
-}
-
-// ==========================================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-ACE_INLINE
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
-Out_Var_Array_SArgument_T (void)
-{}
-
-template<typename S_slice, typename S_var, typename S_forany>
-S_slice *&
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ==========================================================================
-
-template<typename S_slice, typename S_var, typename S_forany>
-ACE_INLINE
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
-Ret_Var_Array_SArgument_T (void)
-{}
-
-template<typename S_slice, typename S_var, typename S_forany>
-ACE_INLINE
-S_slice *&
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
-{
-  return this->x_.out ();
-}
-
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
deleted file mode 100644
index 43209797b21..00000000000
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP
-#define TAO_VAR_SIZE_SARGUMENT_T_CPP
-
-#include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/Var_Size_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
-{
-  return cdr << this->x_.in ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_.in ();
-}
-#if TAO_HAS_INTERCEPTORS == 1
-
-
-template<typename S, typename S_var>
-void
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_VAR_SIZE_SARGUMENT_T_CPP */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
deleted file mode 100644
index 29c5ef58dd5..00000000000
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Var_Size_SArgument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons, Carlos O'Ryan and Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_VAR_SIZE_SARGUMENT_T_H
-#define TAO_VAR_SIZE_SARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Var_Size_SArgument_T
-   *
-   * @brief Template class for IN skeleton argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class In_Var_Size_SArgument_T : public Argument
-  {
-  public:
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Inout_Var_Size_SArgument_T
-   *
-   * @brief Template class for INOUT skeleton arg of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Var_Size_SArgument_T : public Argument
-  {
-  public:
-    Inout_Var_Size_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @class Out_Var_Size_SArgument_T
-   *
-   * @brief Template class for OUT skeleton argument of fixed size IDL types.
-   *
-   */
-  template<typename S, typename S_var>
-  class Out_Var_Size_SArgument_T : public Argument
-  {
-  public:
-    Out_Var_Size_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @class Ret_Var_Size_SArgument_T
-   *
-   * @brief Template class for return skeleton value of fixed size IDL types.
-   *
-   */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_SArgument_T : public Argument
-  {
-  public:
-    Ret_Var_Size_SArgument_T (void);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Basic_SArg_Traits_T
-   *
-   * @brief Template class for skeleton argument traits of
-   *  variable size IDL types.
-   *
-   */
-  template<typename T, typename T_var, typename T_out>
-  struct Var_Size_SArg_Traits_T
-  {
-    typedef T *                                         ret_type;
-    typedef const T &                                   in_type;
-    typedef T &                                         inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_Var_Size_SArgument_T<T>                  in_arg_val;
-    typedef Inout_Var_Size_SArgument_T<T>               inout_arg_val;
-    typedef Out_Var_Size_SArgument_T<T,T_var>           out_arg_val;
-    typedef Ret_Var_Size_SArgument_T<T,T_var>           ret_val;
-
-    // Typedefs corresponding to return value of arg() method in both
-    // the client and server side argument class templates.
-    typedef in_type                                     in_arg_type;
-    typedef inout_type                                  inout_arg_type;
-    typedef ret_type &                                  out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
-
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/Var_Size_SArgument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/Var_Size_SArgument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Size_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VAR_SIZE_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
deleted file mode 100644
index ba15bec73ac..00000000000
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename S>
-S const &
-TAO::In_Var_Size_SArgument_T<S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Var_Size_SArgument_T<S>::Inout_Var_Size_SArgument_T (void)
-{}
-
-template<typename S>
-S &
-TAO::Inout_Var_Size_SArgument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Out_Var_Size_SArgument_T<S,S_var>::Out_Var_Size_SArgument_T (void)
-{}
-
-template<typename S, typename S_var>
-S *&
-TAO::Out_Var_Size_SArgument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::Ret_Var_Size_SArgument_T (void)
-{}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *&
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
deleted file mode 100644
index cb97401f33c..00000000000
--- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- orig/AdapterActivatorC.h	2005-04-11 16:43:59.830620800 +0200
-+++ AdapterActivatorC.h	2005-04-11 16:44:03.676150400 +0200
-@@ -66,9 +66,10 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
--  
-   // TAO_IDL - Generated from
-   // be\be_interface.cpp:598
- 
-@@ -211,6 +212,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/AdapterActivatorC.cpp	2005-04-11 16:43:59.830620800 +0200
-+++ AdapterActivatorC.cpp	2005-04-11 16:44:31.986859200 +0200
-@@ -40,6 +40,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -186,3 +188,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/AdapterActivatorA.cpp	2005-04-11 16:43:59.830620800 +0200
-+++ AdapterActivatorA.cpp	2005-04-11 16:44:25.647744000 +0200
-@@ -35,6 +35,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -121,3 +123,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
deleted file mode 100644
index cd868c7cea6..00000000000
--- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- orig/ForwardRequestC.h	2005-04-11 16:44:02.454393600 +0200
-+++ ForwardRequestC.h	2005-04-11 16:44:04.937964800 +0200
-@@ -59,6 +59,8 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-@@ -153,6 +155,8 @@
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- #if defined(_MSC_VER)
- #pragma warning(pop)
- #endif /* _MSC_VER */
---- orig/ForwardRequestC.cpp	2005-04-11 16:44:02.454393600 +0200
-+++ ForwardRequestC.cpp	2005-04-11 16:44:51.324665600 +0200
-@@ -38,6 +38,8 @@
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-@@ -202,3 +204,5 @@
-     (strm >> _tao_aggregate.forward_reference.out ())
-   );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ForwardRequestA.cpp	2005-04-11 16:44:02.454393600 +0200
-+++ ForwardRequestA.cpp	2005-04-11 16:44:44.885406400 +0200
-@@ -62,6 +62,8 @@
- 
- 
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
- 
-@@ -146,3 +148,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
deleted file mode 100644
index 595c5d167aa..00000000000
--- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- orig/ImplicitActivationPolicyC.h	2005-04-11 16:44:00.311312000 +0200
-+++ ImplicitActivationPolicyC.h	2005-04-11 16:46:31.779112000 +0200
-@@ -78,6 +78,7 @@
-     NO_IMPLICIT_ACTIVATION
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -207,6 +208,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:66
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- } // module PortableServer
- 
- // TAO_IDL - Generated from
-@@ -215,6 +218,7 @@
- // Traits specializations.
- namespace TAO
- {
-+#if (TAO_HAS_MINIMUM_POA == 0)
- 
- #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
- #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
-@@ -236,11 +240,15 @@
-   };
- 
- #endif /* end #if !defined */
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
- }
- 
- // TAO_IDL - Generated from
- // be\be_visitor_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
- 
-@@ -257,6 +265,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ImplicitActivationPolicyC.cpp	2005-04-11 16:44:00.311312000 +0200
-+++ ImplicitActivationPolicyC.cpp	2005-04-11 16:45:07.347705600 +0200
-@@ -40,6 +40,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ImplicitActivationPolicyA.cpp	2005-04-11 16:44:00.311312000 +0200
-+++ ImplicitActivationPolicyA.cpp	2005-04-11 16:45:02.230347200 +0200
-@@ -36,6 +36,8 @@
- #include "tao/Any_Impl_T.h"
- #include "tao/Any_Basic_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -177,3 +179,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
deleted file mode 100644
index 8802c550a4c..00000000000
--- a/TAO/tao/PortableServer/diffs/POAManager.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- orig/POAManagerC.h	2005-04-11 16:44:00.771974400 +0200
-+++ POAManagerC.h	2005-04-11 16:44:04.216928000 +0200
-@@ -207,6 +207,8 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual void hold_requests (
-         ::CORBA::Boolean wait_for_completion
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -241,6 +243,8 @@
-         ::PortableServer::POAManager::AdapterInactive
-       )) = 0;
-     
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
deleted file mode 100644
index db64ebb520b..00000000000
--- a/TAO/tao/PortableServer/diffs/PS_Forward.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- orig/PS_ForwardC.h	2005-04-29 12:01:04.396555200 +0200
-+++ PS_ForwardC.h	2005-05-25 15:19:21.321457600 +0200
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -61,11 +61,24 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
-+class TAO_ServantBase;
-+class TAO_ServantBase_var;
-+class TAO_Local_ServantBase;
-+class TAO_Root_POA;
-+class TAO_DynamicImplementation;
-+
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
- namespace PortableServer
- {
-+    typedef TAO_ServantBase ServantBase;
-+    struct RefCountServantBase {};
-+    typedef TAO_ServantBase_var ServantBase_var;
-+    typedef ServantBase *Servant;
-+
-+    typedef TAO_Local_ServantBase LocalServantBase;
-+    typedef TAO_DynamicImplementation DynamicImplementation;
-   
-   // TAO_IDL - Generated from
-   // be\be_visitor_typedef/typedef_ch.cpp:472
-@@ -113,27 +126,6 @@
- // Traits specializations.
- namespace TAO
- {
--
--#if !defined (_PORTABLESERVER_POA__TRAITS_CH_)
--#define _PORTABLESERVER_POA__TRAITS_CH_
--  
--  template<>
--  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
--  {
--    static ::PortableServer::POA_ptr duplicate (
--        ::PortableServer::POA_ptr
--      );
--    static void release (
--        ::PortableServer::POA_ptr
--      );
--    static ::PortableServer::POA_ptr nil (void);
--    static CORBA::Boolean marshal (
--        ::PortableServer::POA_ptr p,
--        TAO_OutputCDR & cdr
--      );
--  };
--
--#endif /* end #if !defined */
- }
- 
- // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff
deleted file mode 100644
index f79f1875c64..00000000000
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ /dev/null
@@ -1,247 +0,0 @@
---- orig/PortableServerC.h	2005-04-11 16:44:01.152521600 +0200
-+++ PortableServerC.h	2005-04-11 16:44:04.287028800 +0200
-@@ -36,6 +36,10 @@
- 
- #include "ace/config-all.h"
- 
-+#ifndef TAO_PORTABLESERVER_SAFE_INCLUDE
-+#error "You should not include PortableServerC.h directly, use PortableServer.h"
-+#endif /* !TAO_PORTABLESERVER_SAFE_INCLUDE */
-+
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
-@@ -465,6 +469,8 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_exception/exception_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
- #define _PORTABLESERVER_POA_NOSERVANT_CH_
-     
-@@ -512,6 +518,8 @@
- 
- #endif /* end #if !defined */
-     
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-     // TAO_IDL - Generated from
-     // be\be_visitor_exception/exception_ch.cpp:51
- 
-@@ -855,6 +863,7 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-         ::PortableServer::ThreadPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -862,6 +871,7 @@
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-@@ -899,6 +909,7 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-         ::PortableServer::ImplicitActivationPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -906,10 +917,12 @@
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-         ::PortableServer::ServantRetentionPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -917,10 +930,12 @@
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-         ::PortableServer::RequestProcessingPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -928,6 +943,7 @@
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-@@ -972,6 +988,8 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::AdapterActivator_ptr the_activator (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -989,10 +1007,12 @@
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1012,10 +1032,13 @@
-         CORBA::SystemException,
-         ::PortableServer::POA::WrongPolicy
-       )) = 0;
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::Servant get_servant (
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-@@ -1037,6 +1060,8 @@
-         ::PortableServer::POA::WrongPolicy
-       )) = 0;
-     
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-@@ -1298,11 +1323,15 @@
- // TAO_IDL - Generated from
- // be\be_visitor_exception/any_op_ch.cpp:52
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_exception/any_op_ch.cpp:52
- 
-@@ -1366,4 +1395,3 @@
- 
- #endif /* ifndef */
- 
--
---- orig/PortableServerC.cpp	2005-04-11 16:44:01.152521600 +0200
-+++ PortableServerC.cpp	2005-04-11 16:44:04.317072000 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:291
- 
- 
--#include "PortableServerC.h"
-+#include "PortableServer.h"
- #include "tao/CDR.h"
- #include "tao/ORB_Core.h"
- #include "tao/Object_Argument_T.h"
-@@ -45,7 +45,6 @@
- // Arg traits specializations.
- namespace TAO
- {
--
- #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
- #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
-   
-@@ -64,7 +63,6 @@
- #endif /* end #if !defined */
- }
- 
--
- // TAO_IDL - Generated from 
- // be\be_visitor_sequence/sequence_cs.cpp:65
- 
-@@ -463,6 +461,8 @@
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/exception_cs.cpp:63
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- PortableServer::POA::NoServant::NoServant (void)
-   : CORBA::UserException (
-         "IDL:omg.org/PortableServer/POA/NoServant:2.3",
-@@ -555,6 +555,8 @@
-   return ::PortableServer::POA::_tc_NoServant;
- }
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/exception_cs.cpp:63
- 
---- orig/PortableServerA.cpp	2005-04-11 16:44:01.152521600 +0200
-+++ PortableServerA.cpp	2005-04-11 16:44:04.337100800 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "PortableServerC.h"
-+#include "PortableServer.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
-@@ -154,6 +154,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/struct_typecode.cpp:70
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_NoServant = 0;
- static TAO::TypeCode::Struct<char const *,
-                              CORBA::TypeCode_ptr const *,
-@@ -170,6 +172,8 @@
- ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
-   &_tao_tc_PortableServer_POA_NoServant;
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/struct_typecode.cpp:70
- 
-@@ -662,6 +666,8 @@
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- template<>
- CORBA::Boolean
- TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
-@@ -731,6 +737,8 @@
-       );
- }
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from 
- // be\be_visitor_exception/any_op_cs.cpp:50
- 
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
deleted file mode 100644
index d6638858330..00000000000
--- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/PortableServer_includeC.h	2005-04-11 16:44:03.175430400 +0200
-+++ PortableServer_includeC.h	2005-04-11 16:44:05.098195200 +0200
-@@ -45,7 +45,7 @@
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
- 
--#include "tao/PortableServer/PortableServerC.h"
-+#include "tao/PortableServer/PortableServer.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
deleted file mode 100644
index 63779dbbcda..00000000000
--- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- orig/RequestProcessingPolicyC.h	2005-04-11 16:44:01.633212800 +0200
-+++ RequestProcessingPolicyC.h	2005-04-11 16:49:35.953942400 +0200
-@@ -79,6 +79,7 @@
-     USE_SERVANT_MANAGER
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -205,6 +206,7 @@
-   
-   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:66
- 
-@@ -217,6 +219,8 @@
- namespace TAO
- {
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
- #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
-   
-@@ -237,11 +241,16 @@
-   };
- 
- #endif /* end #if !defined */
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- }
- 
- // TAO_IDL - Generated from
- // be\be_visitor_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
- 
-@@ -258,6 +267,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/RequestProcessingPolicyC.cpp	2005-04-11 16:44:01.633212800 +0200
-+++ RequestProcessingPolicyC.cpp	2005-04-11 16:48:45.451323200 +0200
-@@ -40,6 +40,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/RequestProcessingPolicyA.cpp	2005-04-11 16:44:01.633212800 +0200
-+++ RequestProcessingPolicyA.cpp	2005-04-11 16:48:41.295347200 +0200
-@@ -36,6 +36,8 @@
- #include "tao/Any_Impl_T.h"
- #include "tao/Any_Basic_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -178,3 +180,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
deleted file mode 100644
index e3ba4e633a1..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantActivator.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- orig/ServantActivatorC.h	2005-04-11 16:44:01.853529600 +0200
-+++ ServantActivatorC.h	2005-04-11 16:44:04.597475200 +0200
-@@ -68,6 +68,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -229,6 +231,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ServantActivatorC.cpp	2005-04-11 16:44:01.853529600 +0200
-+++ ServantActivatorC.cpp	2005-04-11 16:49:49.753785600 +0200
-@@ -41,6 +41,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -191,3 +193,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantActivatorA.cpp	2005-04-11 16:44:01.853529600 +0200
-+++ ServantActivatorA.cpp	2005-04-11 16:49:46.378932800 +0200
-@@ -34,6 +34,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -120,3 +122,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
deleted file mode 100644
index 99d7a7e6dda..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantLocator.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- orig/ServantLocatorC.h	2005-04-11 16:44:02.053817600 +0200
-+++ ServantLocatorC.h	2005-04-11 16:44:04.727662400 +0200
-@@ -69,6 +69,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -105,6 +107,8 @@
-     : public virtual ::PortableServer::ServantManager
-   {
-   public:
-+    typedef void *Cookie;
-+
-     typedef ServantLocator_ptr _ptr_type;
-     typedef ServantLocator_var _var_type;
-     
-@@ -232,6 +236,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ServantLocatorC.cpp	2005-04-11 16:44:02.053817600 +0200
-+++ ServantLocatorC.cpp	2005-04-11 16:50:01.380504000 +0200
-@@ -41,6 +41,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -191,3 +193,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantLocatorA.cpp	2005-04-11 16:44:02.053817600 +0200
-+++ ServantLocatorA.cpp	2005-04-11 16:49:56.843980800 +0200
-@@ -35,6 +35,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -121,3 +123,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
deleted file mode 100644
index 9e875a07ee1..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantManager.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- orig/ServantManagerC.h	2005-04-11 16:44:02.234076800 +0200
-+++ ServantManagerC.h	2005-04-11 16:44:04.827806400 +0200
-@@ -63,6 +63,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- namespace PortableServer
- {
-   
-@@ -196,6 +198,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ServantManagerC.cpp	2005-04-11 16:44:02.234076800 +0200
-+++ ServantManagerC.cpp	2005-04-11 16:50:18.164638400 +0200
-@@ -45,6 +45,7 @@
- {
- }
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
- 
- // TAO_IDL - Generated from
- // be\be_visitor_interface/interface_cs.cpp:60
-@@ -186,3 +187,5 @@
- {
-   return false;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantManagerA.cpp	2005-04-11 16:44:02.234076800 +0200
-+++ ServantManagerA.cpp	2005-04-11 16:50:12.206070400 +0200
-@@ -34,6 +34,8 @@
- #include "tao/Any.h"
- #include "tao/Any_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/objref_typecode.cpp:76
- 
-@@ -120,3 +122,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
deleted file mode 100644
index 79e33f12951..00000000000
--- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- orig/ServantRetentionPolicyC.h	2005-04-11 16:44:02.694739200 +0200
-+++ ServantRetentionPolicyC.h	2005-04-11 16:50:59.964744000 +0200
-@@ -78,6 +78,7 @@
-     NON_RETAIN
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -207,6 +208,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:66
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- } // module PortableServer
- 
- // TAO_IDL - Generated from
-@@ -216,6 +219,8 @@
- namespace TAO
- {
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
- #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
-   
-@@ -236,11 +241,15 @@
-   };
- 
- #endif /* end #if !defined */
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
- }
- 
- // TAO_IDL - Generated from
- // be\be_visitor_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
- 
-@@ -257,6 +266,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ServantRetentionPolicyC.cpp	2005-04-11 16:44:02.694739200 +0200
-+++ ServantRetentionPolicyC.cpp	2005-04-11 16:50:33.026008000 +0200
-@@ -40,6 +40,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
---- orig/ServantRetentionPolicyA.cpp	2005-04-11 16:44:02.694739200 +0200
-+++ ServantRetentionPolicyA.cpp	2005-04-11 16:50:28.539556800 +0200
-@@ -36,6 +36,8 @@
- #include "tao/Any_Impl_T.h"
- #include "tao/Any_Basic_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -177,3 +179,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
deleted file mode 100644
index 2d9874e9c91..00000000000
--- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- orig/ThreadPolicyC.h	2005-04-11 16:44:02.895027200 +0200
-+++ ThreadPolicyC.h	2005-04-11 16:51:37.889276800 +0200
-@@ -78,6 +78,7 @@
-     SINGLE_THREAD_MODEL
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-   
-   // TAO_IDL - Generated from
-@@ -204,6 +205,8 @@
-   
-   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:66
- 
-@@ -216,6 +219,8 @@
- namespace TAO
- {
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
- #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
-   
-@@ -236,11 +241,16 @@
-   };
- 
- #endif /* end #if !defined */
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- }
- 
- // TAO_IDL - Generated from
- // be\be_visitor_enum/any_op_ch.cpp:51
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
- 
-@@ -257,6 +267,8 @@
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
- // TAO_IDL - Generated from
- // be\be_codegen.cpp:955
- 
---- orig/ThreadPolicyC.cpp	2005-04-11 16:44:02.895027200 +0200
-+++ ThreadPolicyC.cpp	2005-04-11 16:51:11.561419200 +0200
-@@ -40,6 +40,8 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Arg traits specializations.
- namespace TAO
- {
-@@ -211,3 +213,5 @@
-   
-   return _tao_success;
- }
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
---- orig/ThreadPolicyA.cpp	2005-04-11 16:44:02.895027200 +0200
-+++ ThreadPolicyA.cpp	2005-04-11 16:51:08.827488000 +0200
-@@ -36,6 +36,8 @@
- #include "tao/Any_Impl_T.h"
- #include "tao/Any_Basic_Impl_T.h"
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // TAO_IDL - Generated from
- // be\be_visitor_typecode/enum_typecode.cpp:34
- 
-@@ -177,3 +179,5 @@
-         _tao_elem
-       );
- }
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h
deleted file mode 100644
index bf7a2fc892f..00000000000
--- a/TAO/tao/PortableServer/get_arg.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file get_arg.h
- *
- *  $Id$
- *
- *  Thru-POA/skeleton argument selection function templates.
- *  @par
- *  These function templates are used to choose between arguments
- *  supplied in thru-POA collocated invocations and arguments in
- *  uncollocated invocations.
- *
- *  @note A function template approach is used to avoid complicated
- *        argument conversions between stub supplied arguments and
- *        skeleton supplied ones.  For example, it is possible to make
- *        argument selection more transparent by taking advantage of
- *        run-time polymorphism.  However, that approach would incur
- *        additional footprint overhead on the client side due to the
- *        introduction of virtual tables, etc.
- *
- *  @author  Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_GET_ARG_H
-#define TAO_GET_ARG_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/operation_details.h"
-
-
-namespace TAO
-{
-  namespace Portable_Server
-  {
-
-    /// Get return value/argument.
-    /**
-     * @note It is possible to determine the return argument type
-     *       using typedef traits found in the TAO::SArg_Traits<>
-     *       template.  However, MSVC++ 6 does not support them
-     *       properly.  Until we drop MSVC++ 6 support, we'll have to
-     *       pass the return argument type in an additional template
-     *       parameter.
-     *
-     * @todo Drop second template parameter, and replace
-     *       " @c RET_ARG_TYPE " return type with
-     *       " @c typename TAO::SArg_Traits<T>::ret_arg_type ".
-     */
-    template<typename T, typename RET_ARG_TYPE>
-    RET_ARG_TYPE
-    get_ret_arg (TAO_Operation_Details const * details,
-                 TAO::Argument * const * skel_args)
-    {
-      return
-        details
-        ? static_cast<typename TAO::Arg_Traits<T>::ret_val *> (
-            details->args ()[0])->arg ()
-        : static_cast<typename TAO::SArg_Traits<T>::ret_val *> (
-            skel_args[0])->arg ();
-    }
-
-    /// Get "in" argument.
-    /**
-     * @see @c get_ret_arg note to understand why we currently use a
-     *      second template parameter.
-     *
-     * @todo Drop second template parameter, and replace
-     *       " @c IN_ARG_TYPE " return type with
-     *       " @c typename TAO::SArg_Traits<T>::in_arg_type ".
-     */
-    template<typename T, typename IN_ARG_TYPE>
-    IN_ARG_TYPE
-    get_in_arg (TAO_Operation_Details const * details,
-                TAO::Argument * const * skel_args,
-                size_t i)
-    {
-      return
-        details
-        ? static_cast<typename TAO::Arg_Traits<T>::in_arg_val *> (
-            details->args ()[i])->arg ()
-        : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
-            skel_args[i])->arg ();
-    }
-
-    /// Get "inout" argument.
-    /**
-     * @see @c get_ret_arg note to understand why we currently use a
-     *      second template parameter.
-     *
-     * @todo Drop second template parameter, and replace
-     *       " @c INOUT_ARG_TYPE " return type with
-     *       " @c typename TAO::SArg_Traits<T>::inout_arg_type ".
-     */
-    template<typename T, typename INOUT_ARG_TYPE>
-    INOUT_ARG_TYPE
-    get_inout_arg (TAO_Operation_Details const * details,
-                   TAO::Argument * const * skel_args,
-                   size_t i)
-    {
-      return
-        details
-        ? static_cast<typename TAO::Arg_Traits<T>::inout_arg_val *> (
-            details->args ()[i])->arg ()
-        : static_cast<typename TAO::SArg_Traits<T>::inout_arg_val *> (
-            skel_args[i])->arg ();
-    }
-
-    /// Get "out" argument.
-    /**
-     * @see @c get_ret_arg note to understand why we currently use a
-     *      second template parameter.
-     *
-     * @todo Drop second template parameter, and replace
-     *       " @c OUT_ARG_TYPE " return type with
-     *       " @c typename TAO::SArg_Traits<T>::out_arg_type ".
-     */
-    template<typename T, typename OUT_ARG_TYPE>
-    OUT_ARG_TYPE
-    get_out_arg (TAO_Operation_Details const * details,
-                 TAO::Argument * const * skel_args,
-                 size_t i)
-    {
-      return
-        details
-        ? static_cast<typename TAO::Arg_Traits<T>::out_arg_val *> (
-            details->args ()[i])->arg ()
-        : static_cast<typename TAO::SArg_Traits<T>::out_arg_val *> (
-            skel_args[i])->arg ();
-    }
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_GET_ARG_H*/
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
deleted file mode 100644
index ca9e01b11d8..00000000000
--- a/TAO/tao/PortableServer/poa_macros.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#ifndef TAO_POA_MACROS_H
-#define TAO_POA_MACROS_H
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_OBJECT_ADAPTER_GUARD \
-  ACE_GUARD_THROW_EX (ACE_Lock, \
-                      monitor, \
-                      this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK
-
-#define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \
-  ACE_GUARD_THROW_EX (ACE_Lock, \
-                      monitor, \
-                      this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
-
-#define TAO_POA_GUARD \
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK
-
-#define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK_RETURN (RETURN)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
deleted file mode 100644
index 81c9200c157..00000000000
--- a/TAO/tao/PortableServer/portableserver_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_PORTABLESERVER_EXPORT_H
-#define TAO_PORTABLESERVER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_PORTABLESERVER_HAS_DLL)
-#    define TAO_PORTABLESERVER_HAS_DLL 0
-#  endif /* ! TAO_PORTABLESERVER_HAS_DLL */
-#else
-#  if !defined (TAO_PORTABLESERVER_HAS_DLL)
-#    define TAO_PORTABLESERVER_HAS_DLL 1
-#  endif /* ! TAO_PORTABLESERVER_HAS_DLL */
-#endif
-
-#if defined (TAO_PORTABLESERVER_HAS_DLL) && (TAO_PORTABLESERVER_HAS_DLL == 1)
-#  if defined (TAO_PORTABLESERVER_BUILD_DLL)
-#    define TAO_PortableServer_Export ACE_Proper_Export_Flag
-#    define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_PORTABLESERVER_BUILD_DLL */
-#    define TAO_PortableServer_Export ACE_Proper_Import_Flag
-#    define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_PORTABLESERVER_BUILD_DLL */
-#else /* TAO_PORTABLESERVER_HAS_DLL == 1 */
-#  define TAO_PortableServer_Export
-#  define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T)
-#  define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_PORTABLESERVER_HAS_DLL == 1 */
-
-#endif /* TAO_PORTABLESERVER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/PredefinedType_Seq_Tmplinst.cpp b/TAO/tao/PredefinedType_Seq_Tmplinst.cpp
deleted file mode 100644
index d9a421dc56f..00000000000
--- a/TAO/tao/PredefinedType_Seq_Tmplinst.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    PredefinedType_Seq_Tmplinst.cpp
-//
-// = DESCRIPTION
-//   Explicit instantiation of the TAO sequence template classes for all
-//   the IDL basic types. These instantiations free us from having to
-//   generate them over and over with the IDL compiler.
-//
-// = AUTHOR
-//     Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
-
-#include "ace/config-all.h"
-
-ACE_RCSID (tao, 
-           PredefinedType_Seq_Tmplinst, 
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-    || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# include "Sequence_T.h"
-# include "Any.h"
-# include "Object.h"
-# include "TypeCode.h"
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION 
-          || ACE_HAS_TEMPLATE_INSTANTIATION_PRAGM */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<CORBA::Char>;
-template class TAO_Unbounded_Sequence<CORBA::WChar>;
-template class TAO_Unbounded_Sequence<CORBA::Short>;
-template class TAO_Unbounded_Sequence<CORBA::UShort>;
-template class TAO_Unbounded_Sequence<CORBA::Long>;
-template class TAO_Unbounded_Sequence<CORBA::ULong>;
-template class TAO_Unbounded_Sequence<CORBA::LongLong>;
-template class TAO_Unbounded_Sequence<CORBA::ULongLong>;
-template class TAO_Unbounded_Sequence<CORBA::Float>;
-template class TAO_Unbounded_Sequence<CORBA::Double>;
-template class TAO_Unbounded_Sequence<CORBA::LongDouble>;
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::Object>;
-template class TAO_Unbounded_Sequence<CORBA::Any>;
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Char>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::WChar>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Short>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::UShort>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::ULong>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::LongLong>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::ULongLong>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Float>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Double>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::LongDouble>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::Object, \
-                                                  CORBA::Object_var>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::Any>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode, \
-                                                  CORBA::TypeCode_var>
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
deleted file mode 100644
index 9115a79f5f4..00000000000
--- a/TAO/tao/Principal.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-// ORB:		Principal identifier pseudo-objref
-
-#include "Principal.h"
-#include "CDR.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Principal.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Principal,
-           "$Id$")
-
-CORBA::Principal::Principal (void)
-  : refcount_ (1)
-{
-}
-
-CORBA::Principal::~Principal (void)
-{
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR & cdr, CORBA::Principal * x)
-{
-  if (x != 0)
-    {
-      CORBA::ULong length  = x->id.length ();
-      cdr.write_long (length);
-      cdr.write_octet_array (x->id.get_buffer (), length);
-    }
-  else
-    {
-      cdr.write_ulong (0);
-    }
-
-  return (CORBA::Boolean) cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x)
-{
-  CORBA::ULong length;
-  cdr.read_ulong (length);
-
-  if (length == 0 || !cdr.good_bit ())
-    {
-      x = 0;
-    }
-  else
-    {
-      ACE_NEW_RETURN (x, CORBA::Principal, 0);
-      x->id.length (length);
-      cdr.read_octet_array (x->id.get_buffer (), length);
-    }
-
-  return (CORBA::Boolean) cdr.good_bit ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::Principal>;
-  template class TAO_Pseudo_Out_T<CORBA::Principal, CORBA::Principal_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::Principal>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::Principal, CORBA::Principal_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
deleted file mode 100644
index c64bf36b3e9..00000000000
--- a/TAO/tao/Principal.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Principal.h
- *
- *  $Id$
- *
- *  The CORBA::Principal pseudo-object implementation.
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  DOC group at Wash U and UCI.
- */
-//=============================================================================
-
-
-#ifndef TAO_PRINCIPAL_H
-#define TAO_PRINCIPAL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Thread_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "OctetSeqC.h"
-#include "Pseudo_VarOut_T.h"
-#include "CORBA_methods.h"
-
-namespace CORBA
-{
-  class Principal;
-  typedef Principal *Principal_ptr;
-
-  typedef TAO_Pseudo_Var_T<Principal> Principal_var;
-  typedef TAO_Pseudo_Out_T<Principal, Principal_var> Principal_out;
-
-  /**
-   * @class Principal
-   *
-   * @brief A "Principal" identifies an authenticated entity in the
-   * network administration framework.
-   *
-   * Identities are used to control acccess (authorization) as well as
-   * in audit trails (accountability).
-   *
-   * @note This CORBA feature has been deprecated by the OMG.  Use the
-   *       CORBA Security Service instead.
-   */
-  class TAO_Export Principal
-  {
-  public:
-    // To applications, the identifier is an opaque ID.
-
-    //  CORBA::SEQUENCE <CORBA::Octet> id;
-    CORBA::OctetSeq id;
-
-    // @@ add "==", "<", ">" operators
-
-    // The pseudo object operations.
-    static Principal * _duplicate (Principal *);
-    static Principal * _nil (void);
-
-    // = Stuff required for memory management.
-    CORBA::ULong _incr_refcnt (void);
-    CORBA::ULong _decr_refcnt (void);
-
-    Principal (void);
-
-    // Useful for template programming.
-    typedef Principal_ptr _ptr_type;
-    typedef Principal_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~Principal (void);
-
-  private:
-
-    // = Prevent copying
-    Principal &operator = (const CORBA::Principal_ptr &);
-    Principal (const CORBA::Principal_ptr &);
-
-  private:
-    /// Number of outstanding references to this object.
-    CORBA::ULong refcount_;
-
-    /// Protect the reference count, this is OK because we do no
-    /// duplicates or releases on the critical path.
-    TAO_SYNCH_MUTEX refcount_mutex_;
-  };
-}  // End CORBA namespace
-
-TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, CORBA::Principal *);
-
-TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::Principal *&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Principal.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PRINCIPAL_H */
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
deleted file mode 100644
index 5b9f0a8865d..00000000000
--- a/TAO/tao/Principal.i
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE 
-CORBA::Boolean
-CORBA::is_nil (CORBA::Principal_ptr principal)
-{
-  return (CORBA::Boolean) (principal == 0);
-}
-
-ACE_INLINE 
-CORBA::ULong
-CORBA::Principal::_decr_refcnt (void)
-{
-  {
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  delete this;
-  return 0;
-}
-
-ACE_INLINE 
-void
-CORBA::release (CORBA::Principal_ptr principal)
-{
-  if (principal)
-    {
-      principal->_decr_refcnt ();
-    }
-}
-
-ACE_INLINE 
-CORBA::ULong
-CORBA::Principal::_incr_refcnt (void)
-{
-  return this->refcount_++;
-}
-
-
-ACE_INLINE 
-CORBA::Principal *
-CORBA::Principal::_duplicate (CORBA::Principal * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-
-ACE_INLINE 
-CORBA::Principal *
-CORBA::Principal::_nil (void)
-{
-  return 0;
-}
-
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
deleted file mode 100644
index b092c5c5c54..00000000000
--- a/TAO/tao/Profile.cpp
+++ /dev/null
@@ -1,912 +0,0 @@
-// $Id$
-
-#include "tao/Profile.h"
-#include "tao/Messaging_PolicyValueC.h"
-#include "tao/Stub.h"
-#include "tao/debug.h"
-#include "tao/target_specification.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "tao/PolicyC.h"
-
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Profile.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Profile,
-           "$Id$")
-
-
-// ****************************************************************
-TAO_Profile::TAO_Profile (CORBA::ULong tag,
-                          TAO_ORB_Core *orb_core,
-                          const TAO::ObjectKey &obj_key,
-                          const TAO_GIOP_Message_Version &version)
-  : version_ (version)
-    , are_policies_parsed_ (false)
-    , addressing_mode_ (0)
-    , tagged_profile_ (0)
-    , ref_object_key_ (0)
-    , tag_ (tag)
-    , orb_core_ (orb_core)
-    , forward_to_ (0)
-    , refcount_lock_ (0)
-    , refcount_ (1)
-{
-  // @@ NOTE: Need to probably use a different type of lock.
-  this->refcount_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-
-  (void) this->orb_core_->object_key_table ().bind (obj_key,
-                                                    this->ref_object_key_);
-}
-
-TAO_Profile::TAO_Profile (CORBA::ULong tag,
-                          TAO_ORB_Core *orb_core,
-                          const TAO_GIOP_Message_Version &version)
-  : version_ (version)
-    , are_policies_parsed_ (false)
-    , addressing_mode_ (0)
-    , tagged_profile_ (0)
-    , ref_object_key_ (0)
-    , tag_ (tag)
-    , orb_core_ (orb_core)
-    , forward_to_ (0)
-    , refcount_lock_ (0)
-    , refcount_ (1)
-{
-  // @@ NOTE: Need to probably use a different type of lock.
-  this->refcount_lock_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-}
-
-TAO_Profile::~TAO_Profile (void)
-{
-  if (this->tagged_profile_)
-    {
-      delete this->tagged_profile_;
-    }
-
-  this->orb_core_->object_key_table ().unbind (this->ref_object_key_);
-  delete this->refcount_lock_;
-}
-
-CORBA::ULong
-TAO_Profile::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, guard, *this->refcount_lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_Profile::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_Lock, mon, *this->refcount_lock_, 0);
-    this->refcount_--;
-
-    if (this->refcount_ != 0)
-      {
-        return this->refcount_;
-      }
-  }
-
-  // refcount is 0, so delete us!
-  // delete will call our ~ destructor which in turn deletes stuff.
-  delete this;
-  return 0;
-}
-
-void
-TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
-                                   ACE_ENV_ARG_DECL)
-{
-  // Sanity checks.
-  this->verify_orb_configuration (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->verify_profile_version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // ----------------------------------------------------------------
-
-  // Add the given tagged component to this profile.
-  //
-  // Note that multiple tagged profiles with the same tag value may be
-  // added, unless the tagged component is known to be unique by TAO.
-  this->tagged_components_.set_component (component);
-}
-
-TAO::ObjectKey *
-TAO_Profile::_key (void) const
-{
-  TAO::ObjectKey *key = 0;
-
-  if (this->ref_object_key_)
-    {
-      ACE_NEW_RETURN (key,
-                      TAO::ObjectKey (this->ref_object_key_->object_key ()),
-                      0);
-    }
-  return key;
-}
-
-
-int
-TAO_Profile::encode (TAO_OutputCDR &stream) const
-{
-  // UNSIGNED LONG, protocol tag
-  stream.write_ulong (this->tag_);
-
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       TAO_ENCAP_BYTE_ORDER,
-                       this->orb_core ()->output_cdr_buffer_allocator (),
-                       this->orb_core ()->output_cdr_dblock_allocator (),
-                       this->orb_core ()->output_cdr_msgblock_allocator (),
-                       this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
-                       TAO_DEF_GIOP_MAJOR,
-                       TAO_DEF_GIOP_MINOR);
-
-  // Create the profile body
-  this->create_profile_body (encap);
-
-  // write the encapsulation as an octet sequence...
-
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
-
-  return 1;
-}
-
-int
-TAO_Profile::decode (TAO_InputCDR& cdr)
-{
-  CORBA::ULong encap_len = cdr.length ();
-
-  // Read and verify major, minor versions, ignoring profiles
-  // whose versions we don't understand.
-  if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_DEF_GIOP_MAJOR
-        && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Profile::decode - v%d.%d\n"),
-                      this->version_.major,
-                      this->version_.minor));
-        }
-
-      return -1;
-    }
-
-  // Transport specific details
-  if (this->decode_profile (cdr) < 0)
-    {
-      return -1;
-    }
-
-  // @@NOTE: This place *may* need strategizing. Here are the
-  // issues. Placing the ObjectKey in the table adds an allocation and
-  // a lock while decoding. This is bad for some cases especially if
-  // the application is marshalling object references across to the
-  // server end. But the server could use "lazy" evaluation and avoid
-  // this during marshalling.
-  //
-  // The only place this will get important is when a thead tries to
-  // use the object reference to create a CORBA object to make an
-  // invocation. Since creation of a CORBA object itself is expensive,
-  // it looks like we may not need to worry much.
-  //
-  // Remember strategizing needs  reconciliation of forces imposed
-  // by runtime memory growth. Doing a random strategization would
-  // destroy the wins in runtime memory growth got by using this
-  // table scheme.
-  TAO::ObjectKey ok;
-
-  // ... and object key.
-  if (TAO::ObjectKey::demarshal_key (ok,
-                                     cdr) == 0)
-    {
-      return -1;
-    }
-
-  TAO::ObjectKey_Table &okt = this->orb_core ()->object_key_table ();
-
-  if (okt.bind (ok, this->ref_object_key_) == -1)
-    {
-      return -1;
-    }
-
-  // Tagged Components *only* exist after version 1.0!
-  // For GIOP 1.2, IIOP and GIOP have same version numbers!
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    {
-      if (this->tagged_components_.decode (cdr) == 0)
-        {
-          return -1;
-        }
-    }
-
-  if (cdr.length () != 0 && TAO_debug_level)
-    {
-      // If there is extra data in the profile we are supposed to
-      // ignore it, but print a warning just in case...
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%d bytes out of %d left after profile data\n"),
-                  cdr.length (),
-                  encap_len));
-    }
-
-  // Decode any additional endpoints per profile.  (At the present,
-  // only RTCORBA takes advantage of this feature.)
-  if (this->decode_endpoints () == -1)
-    {
-      return -1;
-    }
-
-  return 1;
-}
-
-IOP::TaggedProfile *
-TAO_Profile::create_tagged_profile (void)
-{
-  if (this->tagged_profile_ == 0)
-    {
-      ACE_NEW_RETURN (this->tagged_profile_,
-                      IOP::TaggedProfile,
-                      0);
-
-      // As we have not created we will now create the TaggedProfile
-      this->tagged_profile_->tag = this->tag_;
-
-      // Create the encapsulation....
-      TAO_OutputCDR encap (ACE_DEFAULT_CDR_BUFSIZE,
-                           TAO_ENCAP_BYTE_ORDER,
-                           this->orb_core ()->output_cdr_buffer_allocator (),
-                           this->orb_core ()->output_cdr_dblock_allocator (),
-                           this->orb_core ()->output_cdr_msgblock_allocator (),
-                           this->orb_core ()->orb_params ()->cdr_memcpy_tradeoff (),
-                           TAO_DEF_GIOP_MAJOR,
-                           TAO_DEF_GIOP_MINOR);
-
-      // Create the profile body
-      this->create_profile_body (encap);
-
-      CORBA::ULong length =
-        static_cast <CORBA::ULong> (encap.total_length ());
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      // Place the message block in to the Sequence of Octets that we
-      // have
-      this->tagged_profile_->profile_data.replace (length,
-                                                   encap.begin ());
-#else
-      this->tagged_profile_->profile_data.length (length);
-      CORBA::Octet *buffer =
-        this->tagged_profile_->profile_data.get_buffer ();
-
-      for (const ACE_Message_Block *i = encap.begin ();
-           i != encap.end ();
-           i = i->next ())
-        {
-          ACE_OS::memcpy (buffer, i->rd_ptr (), i->length ());
-          buffer += i->length ();
-        }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-    }
-
-  return this->tagged_profile_;
-}
-
-void
-TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr)
-{
-  CORBA::ULong length = out_cdr.total_length ();
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-  tagged_component.component_data.length (length);
-  CORBA::Octet *buf =
-    tagged_component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
-       iterator = iterator->cont ())
-    {
-      CORBA::ULong i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
-
-      buf += i_length;
-    }
-
-  // Add component with encoded endpoint data to this profile's
-  // TaggedComponents.
-  tagged_components_.set_component (tagged_component);
-}
-
-
-void
-TAO_Profile::policies (CORBA::PolicyList *policy_list
-                       ACE_ENV_ARG_DECL)
-{
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  if (policy_list == 0)
-    {
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO_Profile::policies: ")
-                      ACE_TEXT ("Null Policy List!\n")));
-        }
-
-      return;
-    }
-
-  Messaging::PolicyValue pv;
-  Messaging::PolicyValueSeq policy_value_seq;
-
-  size_t length;
-  CORBA::Octet *buf = 0;
-
-  policy_value_seq.length (policy_list->length ());
-
-  // This loop iterates through CORBA::PolicyList to convert
-  // each CORBA::Policy into a CORBA::PolicyValue
-  const size_t plen = policy_list->length ();
-
-  for (CORBA::ULong i = 0; i < plen; ++i)
-    {
-      TAO_OutputCDR out_CDR;
-      policy_value_seq[i].ptype =
-        (*policy_list)[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-      (*policy_list)[i]->_tao_encode (out_CDR);
-
-      length = out_CDR.total_length ();
-      policy_value_seq[i].pvalue.length (static_cast <CORBA::ULong>(length));
-
-      buf = policy_value_seq[i].pvalue.get_buffer ();
-
-      // Copy the CDR buffer data into the octet sequence buffer.
-
-      for (const ACE_Message_Block *iterator = out_CDR.begin ();
-           iterator != 0;
-           iterator = iterator->cont ())
-        {
-          ACE_OS::memcpy (buf, iterator->rd_ptr (), iterator->length ());
-          buf += iterator->length ();
-        }
-    }
-
-  TAO_OutputCDR out_cdr;
-  // Now we have to embed the Messaging::PolicyValueSeq into
-  // a TaggedComponent.
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = Messaging::TAG_POLICIES;
-
-  out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  out_cdr << policy_value_seq;
-
-  length = out_cdr.total_length ();
-
-  tagged_component.component_data.length (static_cast <CORBA::ULong>(length));
-  buf = tagged_component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
-       iterator = iterator->cont ())
-    {
-      size_t i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
-
-      buf += i_length;
-    }
-
-  // Eventually we add the TaggedComponent to the TAO_TaggedComponents
-  // member variable.
-  tagged_components_.set_component (tagged_component);
-  this->are_policies_parsed_ = 1;
-
-#else /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  ACE_UNUSED_ARG (policy_list);
-  ACE_ENV_ARG_NOT_USED;  // FUZZ: ignore check_for_ace_check
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-}
-
-
-
-void
-TAO_Profile::get_policies (CORBA::PolicyList& pl
-                           ACE_ENV_ARG_DECL)
-{
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  if (!this->are_policies_parsed_)
-    // None has already parsed the policies.
-    {
-      IOP::TaggedComponent tagged_component;
-      tagged_component.tag = Messaging::TAG_POLICIES;
-
-      // This gets a component with the proper "tag" field
-      // if it exists.
-      if (this->tagged_components_.get_component (tagged_component))
-        {
-          const CORBA::Octet *buf =
-            tagged_component.component_data.get_buffer ();
-
-          TAO_InputCDR in_cdr (reinterpret_cast <const char *> (buf),
-                               tagged_component.component_data.length ());
-
-          // Extract the Byte Order
-          CORBA::Boolean byte_order;
-
-          if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            {
-              return ;
-            }
-
-          in_cdr.reset_byte_order (static_cast <int> (byte_order));
-
-          // Now we take out the Messaging::PolicyValueSeq out from the
-          // CDR.
-          Messaging::PolicyValueSeq policy_value_seq;
-
-          if (!(in_cdr >> policy_value_seq))
-            {
-              ACE_THROW (CORBA::INV_OBJREF ());
-            }
-
-          // Here we extract the Messaging::PolicyValue out of the sequence
-          // and we convert those into the proper CORBA::Policy
-
-          CORBA::Policy_var policy;
-          CORBA::ULong length = policy_value_seq.length ();
-
-          // Set the policy list length.
-          pl.length (length);
-
-          for (CORBA::ULong i = 0; i < length; ++i)
-            {
-              ACE_TRY_NEW_ENV
-                {
-                  policy =
-                    this->orb_core_->orb ()->_create_policy (
-                      policy_value_seq[i].ptype
-                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-
-                  if (!CORBA::is_nil (policy.in ()))
-                    {
-                      buf = policy_value_seq[i].pvalue.get_buffer ();
-
-                      TAO_InputCDR in_cdr (
-                        reinterpret_cast <const char*>  (buf),
-                        policy_value_seq[i].pvalue.length ());
-
-
-                      if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order)))
-                        ACE_TRY_THROW (CORBA::INV_OBJREF ());
-
-                      in_cdr.reset_byte_order (static_cast <int> (byte_order));
-
-                      policy->_tao_decode (in_cdr);
-                      pl[i] = policy._retn ();
-                    }
-                  else
-                    {
-                      // This case should occure when in the IOR are
-                      // embedded policies that TAO doesn't support,
-                      // so as specified by the RT-CORBA
-                      // spec. ptc/99-05-03 we just ignore these
-                      // un-understood policies.
-
-                      if (TAO_debug_level >= 5)
-                        ACE_DEBUG ((LM_DEBUG,
-                                    ACE_TEXT ("The IOR contains unsupported ")
-                                    ACE_TEXT ("policies.\n")));
-                    }
-                }
-              ACE_CATCHANY
-                {
-                  // This case should occur when in the IOR are
-                  // embedded policies that TAO doesn't support, so as
-                  // specified by the RT-CORBA spec. ptc/99-05-03 we
-                  // just ignore these un-understood policies.
-
-                  if (TAO_debug_level >= 5)
-                    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                                        ACE_TEXT ("IOR contains ")
-                                        ACE_TEXT ("unsupported policies."));
-                }
-              ACE_ENDTRY;
-            }
-        }
-    }
-
-#else
-  ACE_UNUSED_ARG (pl);
-  ACE_ENV_ARG_NOT_USED;    // FUZZ: ignore check_for_ace_check
-#endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
-
-}
-
-
-void
-TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // If the ORB isn't configured to support tagged components, then
-  // throw an exception.
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0
-      || !this->orb_core_->orb ()->_use_omg_ior_format ())
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Cannot add ")
-                      ACE_TEXT ("IOP::TaggedComponent to profile.\n")
-                      ACE_TEXT ("(%P|%t) Standard profile components ")
-                      ACE_TEXT ("have been disabled or URL style IORs\n")
-                      ACE_TEXT ("(%P|%t) are in use.  Try ")
-                      ACE_TEXT ("\"-ORBStdProfileComponents 1\" and/or\n")
-                      ACE_TEXT ("(%P|%t) \"-ORBObjRefStyle IOR\".\n")));
-        }
-
-      // According to the Portable Interceptor specification, we're
-      // supposed to throw a CORBA::BAD_PARAM exception if it isn't
-      // possible to add components to the profile.
-      // @todo: We need the proper minor code as soon as the spec is
-      //        updated.
-      ACE_THROW (CORBA::BAD_PARAM (
-                   CORBA::SystemException::_tao_minor_code (
-                      0,
-                      EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-}
-
-void
-TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // GIOP 1.0 does not support tagged components.  Throw an exception
-  // if the profile is a GIOP 1.0 profile.
-
-  if (this->version_.major == 1 && this->version_.minor == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) Cannot add ")
-                      ACE_TEXT ("IOP::TaggedComponent to GIOP 1.0")
-                      ACE_TEXT ("IOR profile.\n")
-                      ACE_TEXT ("(%P|%t) Try using a GIOP 1.1 or ")
-                      ACE_TEXT ("greater endpoint.\n")));
-        }
-
-      // According to the Portable Interceptor specification, we're
-      // supposed to throw a CORBA::BAD_PARAM exception if it isn't
-      // possible to add components to the profile.
-      // @todo: We need the proper minor code as soon as the spec is
-      //        updated.
-      ACE_THROW (CORBA::BAD_PARAM (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-}
-
-int
-TAO_Profile::supports_multicast (void) const
-{
-  // Most profiles do not support multicast endpoints.
-  return 0;
-}
-
-bool
-TAO_Profile::supports_non_blocking_oneways (void) const
-{
-  return !(this->version_.major == 1 && this->version_.minor == 0);
-}
-
-void
-TAO_Profile::addressing_mode (CORBA::Short addr
-                              ACE_ENV_ARG_DECL)
-{
-  // ** See race condition note about addressing mode in Profile.h **
-  switch (addr)
-    {
-    case TAO_Target_Specification::Key_Addr:
-    case TAO_Target_Specification::Profile_Addr:
-    case TAO_Target_Specification::Reference_Addr:
-      this->addressing_mode_ = addr;
-      break;
-
-    default:
-      ACE_THROW (CORBA::BAD_PARAM (
-             CORBA::SystemException::_tao_minor_code (
-               0,
-               EINVAL),
-             CORBA::COMPLETED_NO));
-    }
-}
-
-void
-TAO_Profile::parse_string (const char *ior
-                           ACE_ENV_ARG_DECL)
-{
-  if (!ior || !*ior)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Remove the "N.n@" version prefix, if it exists, and verify the
-  // version is one that we accept.
-
-  // Check for version
-  if (isdigit (ior [0]) &&
-      ior[1] == '.' &&
-      isdigit (ior [2]) &&
-      ior[3] == '@')
-    {
-      // @@ This may fail for non-ascii character sets [but take that
-      // with a grain of salt]
-      this->version_.set_version ((char) (ior[0] - '0'),
-                                  (char) (ior[2] - '0'));
-      ior += 4;
-      // Skip over the "N.n@"
-    }
-  else
-    {
-      // CORBA spec requires 1.0 if a version isn't specified.
-      this->version_.set_version (1, 0);
-    }
-
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor >  TAO_DEF_GIOP_MINOR)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  this->parse_string_i (ior
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_Profile::is_equivalent (const TAO_Profile *other)
-{
-  return
-    other != 0
-    && this->tag () == other->tag ()
-    && this->version_ == other->version ()
-    && this->endpoint_count () == other->endpoint_count ()
-    && this->object_key () == other->object_key ()
-    && this->do_is_equivalent (other)
-    && this->is_equivalent_hook (other);
-}
-
-CORBA::Boolean
-TAO_Profile::is_equivalent_hook (const TAO_Profile *other)
-{
-  // Allow services to apply their own definition of "equivalence."
-  return this->orb_core_->is_profile_equivalent (this, other);
-}
-
-CORBA::ULong
-TAO_Profile::hash_service_i (CORBA::ULong m)
-{
-  return this->orb_core_->hash_service (this, m);
-}
-
-// ****************************************************************
-
-TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag,
-                                          TAO_ORB_Core *orb_core)
-  : TAO_Profile (tag,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
-                                           TAO_DEF_GIOP_MINOR))
-{
-}
-
-TAO_Endpoint*
-TAO_Unknown_Profile::endpoint (void)
-{
-  return 0;
-}
-
-CORBA::ULong
-TAO_Unknown_Profile::endpoint_count (void) const
-{
-  return 0;
-}
-
-void
-TAO_Unknown_Profile::parse_string (const char *
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // @@ THROW something????
-}
-
-void
-TAO_Unknown_Profile::parse_string_i (const char *
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // @@ THROW something????
-}
-
-char
-TAO_Unknown_Profile::object_key_delimiter (void) const
-{
-  return 0;
-}
-
-char *
-TAO_Unknown_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  // @@ THROW something?
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::decode (TAO_InputCDR& cdr)
-{
-  if ((cdr >> this->body_) == 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::decode_profile (TAO_InputCDR &)
-{
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::decode_endpoints (void)
-{
-  return 0;
-}
-
-int
-TAO_Unknown_Profile::encode (TAO_OutputCDR &stream) const
-{
-  stream.write_ulong (this->tag ());
-  return (stream << this->body_);
-}
-
-int
-TAO_Unknown_Profile::encode_endpoints (void)
-{
-  return 0;
-}
-
-const TAO::ObjectKey &
-TAO_Unknown_Profile::object_key (void) const
-{
-  // @@ TODO this is wrong, but the function is deprecated anyway....
-  static TAO::ObjectKey empty_key;
-  return empty_key;
-}
-
-TAO::ObjectKey *
-TAO_Unknown_Profile::_key (void) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO_Unknown_Profile::do_is_equivalent (const TAO_Profile* other_profile)
-{
-  const TAO_Unknown_Profile * op =
-    dynamic_cast <const TAO_Unknown_Profile *> (other_profile);
-
-  return (CORBA::Boolean) (op == 0 ? 0 : this->body_ == op->body_);
-}
-
-CORBA::Boolean
-TAO_Unknown_Profile::is_equivalent_hook (const TAO_Profile * /* other */)
-{
-  // Override the default implementation since we don't need the
-  // additional checks it performs.
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_Unknown_Profile::hash (CORBA::ULong max
-                           ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return (ACE::hash_pjw (reinterpret_cast <const char*>
-                                          (this->body_.get_buffer ()),
-                         this->body_.length ()) % max);
-}
-
-void
-TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const
-{
-  // No idea about the profile body! Just return
-  return;
-}
-
-// *************************************************************
-// Operators for TAO_opaque encoding and decoding
-// *************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const TAO_opaque& x)
-{
-  CORBA::ULong length = x.length ();
-  cdr.write_ulong (length);
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  if (x.mb () != 0)
-    {
-      cdr.write_octet_array_mb (x.mb ());
-    }
-  else
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-    {
-      cdr.write_octet_array (x.get_buffer (), length);
-    }
-
-  return (CORBA::Boolean) cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
-{
-  CORBA::ULong length;
-  cdr.read_ulong (length);
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  if(ACE_BIT_DISABLED(cdr.start()->flags(),
-                      ACE_Message_Block::DONT_DELETE)
-     && (cdr.orb_core() == 0
-         || 1 == cdr.orb_core()->
-         resource_factory()->
-         input_cdr_allocator_type_locked()
-         )
-     )
-    {
-      x.replace (length, cdr.start ());
-      x.mb ()->wr_ptr (x.mb ()->rd_ptr () + length);
-      cdr.skip_bytes (length);
-    }
-  else
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    {
-      x.length (length);
-      cdr.read_octet_array (x.get_buffer (), length);
-    }
-
-  return (CORBA::Boolean) cdr.good_bit ();
-}
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
deleted file mode 100644
index cace0daceef..00000000000
--- a/TAO/tao/Profile.h
+++ /dev/null
@@ -1,409 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Profile.h
- *
- *  $Id$
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PROFILE_H
-#define TAO_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Tagged_Components.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/GIOP_Message_Version.h"
-#include "tao/Refcounted_ObjectKey.h"
-
-class ACE_Lock;
-class TAO_MProfile;
-class TAO_Stub;
-class TAO_Endpoint;
-class TAO_ORB_Core;
-
-namespace CORBA
-{
-  /// Forward declaration of PolicyList
-  class PolicyList;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-}
-
-/**
- * @class TAO_Profile
- *
- * @brief Defines the Profile interface
- *
- * An abstract base class for representing object location
- * information.  This is based on the CORBA IOR definitions.
- */
-class TAO_Export TAO_Profile
-{
-public:
-
-  /// Constructor
-  TAO_Profile (CORBA::ULong tag,
-               TAO_ORB_Core *orb_core,
-               const TAO_GIOP_Message_Version &version);
-
-  /// If you have a virtual method you need a virtual dtor.
-  virtual ~TAO_Profile (void);
-
-  /**
-   * @name Non virtual methods for the profile classes.
-  */
-
-  //@{
-  /// The tag, each concrete class will have a specific tag value.
-  CORBA::ULong tag (void) const;
-
-  /// Return a pointer to this profile's version.  This object
-  /// maintains ownership.
-  const TAO_GIOP_Message_Version &version (void) const;
-
-  /// Get a pointer to the TAO_ORB_Core.
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Increase the reference count by one on this object.
-  CORBA::ULong _incr_refcnt (void);
-
-  /// Decrement the object's reference count.  When this count goes to
-  /// 0 this object will be deleted.
-  CORBA::ULong _decr_refcnt (void);
-
-  /// Keep a pointer to the forwarded profile
-  void forward_to (TAO_MProfile *mprofiles);
-
-  /// MProfile accessor
-  TAO_MProfile* forward_to (void);
-
-  /// Access the tagged components, notice that they they could be
-  /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0)
-  const TAO_Tagged_Components& tagged_components (void) const;
-  TAO_Tagged_Components& tagged_components (void);
-
-  /// Add the given tagged component to the profile.
-  void add_tagged_component (const IOP::TaggedComponent &component
-                             ACE_ENV_ARG_DECL);
-
-  /**
-   * Return the current addressing mode for this profile.
-   * In almost all cases, this is TAO_Target_Specification::Key_Addr.
-   */
-  CORBA::Short addressing_mode (void) const;
-
-  /// @deprecated Return a reference to the Object Key.
-  const TAO::ObjectKey &object_key (void) const;
-
-  /// Obtain the object key, return 0 if the profile cannot be parsed.
-  /// The memory is owned by the caller!
-  TAO::ObjectKey *_key (void) const;
-  //@}
-
-
-  /**
-   * @name Template methods that needs to be implemented by the
-   * concrete classes. Some of the methods may be overridden only
-   * under specila circumstances.
-   */
-  //@{
-  /// Encode this profile in a stream, i.e. marshal it.
-  virtual int encode (TAO_OutputCDR &stream) const;
-
-  /// Initialize this object using the given CDR octet string.
-  virtual int decode (TAO_InputCDR& cdr);
-
-  /**
-   * This method is used to get the IOP::TaggedProfile. The profile
-   * information that is received from the server side would have
-   * already been decoded. So this method will just make a
-   * IOP::TaggedProfile struct from the existing information and
-   * return the reference to that. This method is necessary for GIOP
-   * 1.2.
-   */
-  IOP::TaggedProfile *create_tagged_profile (void);
-
-  /// This method sets the client exposed policies, i.e., the ones
-  /// propagated in the IOR, for this profile.
-  virtual void policies (CORBA::PolicyList *policy_list
-                         ACE_ENV_ARG_DECL);
-
-  /// Accessor for the client exposed policies of this profile.
-  //virtual CORBA::PolicyList&  policies (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void  get_policies (CORBA::PolicyList &policy_list
-                              ACE_ENV_ARG_DECL);
-
-  /// Returns true if this profile can specify multicast endpoints.
-  virtual int supports_multicast (void) const;
-
-  /// Returns true if this profile supports non blocking oneways
-  virtual bool supports_non_blocking_oneways (void) const;
-
-  /**
-   * Set the addressing mode if a remote servant replies with
-   * an addressing mode exception.  If this profile doesn't
-   * support a particular addressing mode, this method needs to
-   * be overridden signal the appropriate error.
-   *
-   * ** RACE CONDITION NOTE **
-   *
-   * Currently, getting and setting the addressing mode is not
-   * protected by a mutex.  Theoretically, this could cause a race
-   * condition if one thread sends a request, then gets an exception
-   * from the remote servant to change the addressing mode, and then
-   * another thread sends a different request to the same servant
-   * using the wrong addressing mode.  The result of this is that
-   * we'll get another address change exception.  (Annoying, but not
-   * that bad.)
-   *
-   * In practice at the current time, the above theoretical case
-   * never happens since the target specification always uses the
-   * object key except for MIOP requests.  Remote ORBs can't respond
-   * to MIOP requests even to send exceptions, so even in this case,
-   * the race condition can't happen.
-   *
-   * Therefore, for the time being, there is no lock to protect the
-   * addressing mode.  Given that the addressing mode is checked in
-   * the critical path, this decision seems like a good thing.
-   */
-  virtual void addressing_mode (CORBA::Short addr_mode
-                                ACE_ENV_ARG_DECL);
-
-  /// The object key delimiter.
-  virtual char object_key_delimiter (void) const = 0;
-
-  /// Initialize this object using the given input string.
-  /// Supports URL style of object references
-  virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
-
-  /// Return a string representation for this profile.  Client must
-  /// deallocate memory. Only one endpoint is included into the
-  /// string.
-  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /**
-   * Encodes this profile's endpoints into a tagged component.
-   * This is done only if RTCORBA is enabled, since currently this is
-   * the only case when we have more than one endpoint per profile.
-   */
-  virtual int encode_endpoints (void) = 0;
-
-  /**
-   * Return pointer to this profile's endpoint.  If the profile
-   * contains more than one endpoint, i.e., a list, the method returns
-   * the head of the list.
-   */
-  virtual TAO_Endpoint *endpoint (void) = 0;
-
-  /// Return how many endpoints this profile contains.
-  virtual CORBA::ULong endpoint_count (void) const = 0;
-
-  /// Verify profile equivalance.
-  /**
-   * Two profiles are equivalent if their tag, object_key, version
-   * and all endpoints are the same.
-   *
-   * @see do_is_equivalent_i()
-   * @see is_equivalent_hook()
-   *
-   * @return @c true if this profile is equivalent to @c other_profile.
-   */
-  CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL) = 0;
-  //@}
-
-protected:
-
-  /**
-   * @name Protected template methods.
-   */
-  //@{
-  /// Decode the protocol specific profile details.
-  virtual int decode_profile (TAO_InputCDR &cdr) = 0;
-
-  /// Creates an encapsulation of the ProfileBody struct in the @a cdr
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const = 0;
-
-  /**
-   * Helper for <decode>.  Decodes endpoints from a tagged component.
-   * Decode only if RTCORBA is enabled.  Furthermore, we may not find
-   * TAO_TAG_ENDPOINTS component, e.g., if we are talking to nonRT
-   * version of TAO or some other ORB.  This is not an error, and we
-   * must proceed.  Return 0 on success and -1 on failure.
-   */
-  virtual int decode_endpoints (void) = 0;
-
-  /// Protocol specific implementation of parse_string ()
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL) = 0;
-  //@}
-
-  /// To be used by inherited classes
-  TAO_Profile (CORBA::ULong tag,
-               TAO_ORB_Core *orb_core,
-               const TAO::ObjectKey &key,
-               const TAO_GIOP_Message_Version &version);
-
-  /// Helper method that encodes the endpoints for RTCORBA as
-  /// tagged_components.
-  void set_tagged_components (TAO_OutputCDR &cdr);
-
-  /// Profile equivalence template method invoked on subclasses.
-  /**
-   * TAO_Profile subclasses must implement this template method so
-   * that they can apply their own definition of profile equivalence.
-   */
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile * other) = 0;
-
-  /// Allow services to apply their own definition of "equivalence."
-  /**
-   * This method differs from the @c do_is_equivalent() template
-   * method in that it has a default implementation that may or not be
-   * applicable to all TAO_Profile subclasses.
-   */
-  virtual CORBA::Boolean is_equivalent_hook (const TAO_Profile * other);
-
-  CORBA::ULong hash_service_i (CORBA::ULong m);
-
-private:
-
-  /// This object keeps ownership of this object
-  TAO_MProfile *forward_to_i (void);
-
-  /// Verify that the current ORB's configuration supports tagged
-  /// components in IORs.
-  void verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Verify that the given profile supports tagged components,
-  /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL);
-
-  // Profiles should not be copied!
-  ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Profile&))
-
-protected:
-
-  /// IIOP version number.
-  TAO_GIOP_Message_Version version_;
-
-  /// The tagged components
-  TAO_Tagged_Components tagged_components_;
-
-  /// Flag indicating whether the lazy decoding of the client exposed
-  /// policies has taken place.
-  CORBA::Boolean are_policies_parsed_;
-
-  /// The current addressing mode.
-  /// This may be changed if a remote server sends back an address mode
-  /// exception.
-  CORBA::Short addressing_mode_;
-
-  /// Our tagged profile
-  IOP::TaggedProfile *tagged_profile_;
-
-  /// object_key associated with this profile.
-  TAO::Refcounted_ObjectKey *ref_object_key_;
-
-private:
-  /// IOP protocol tag.
-  CORBA::ULong tag_;
-
-  /// Pointer to the ORB core
-  TAO_ORB_Core *orb_core_;
-
-  /// The TAO_MProfile which contains the profiles for the forwarded
-  /// object.
-  TAO_MProfile* forward_to_;
-
-  /// Mutex to protect reference count.
-  ACE_Lock *refcount_lock_;
-
-  /// Number of outstanding references to this object.
-  CORBA::ULong refcount_;
-};
-
-// A helper class to handle the various kinds of octet sequences used
-// inside the ORB.
-
-typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
-
-TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const TAO_opaque&);
-
-TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, TAO_opaque&);
-
-/**
- * @class TAO_Unknown_Profile
- *
- * @brief A TAO_Profile class to handle foreign profiles.
- *
- * The CORBA spec implies that ORBs must be prepared to save and
- * pass around profiles for protocols it does not recognize. It is
- * not mandatory to *use* those profiles but they shouldn't be
- * dropped.
- * This class stores the information required to marshal and
- * demarshal an unknown profile, but simply returns an error if
- * any of the TAO internal methods are invoked.
- */
-class TAO_Export TAO_Unknown_Profile : public TAO_Profile
-{
-public:
-  /// Create the profile
-  TAO_Unknown_Profile (CORBA::ULong tag,
-                       TAO_ORB_Core *orb_core);
-
-  // = The TAO_Profile methods look above
-  virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
-  virtual char object_key_delimiter (void) const;
-  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int decode (TAO_InputCDR& cdr);
-  virtual int encode (TAO_OutputCDR &stream) const;
-  virtual int encode_endpoints (void);
-  virtual const TAO::ObjectKey &object_key (void) const;
-  virtual TAO::ObjectKey *_key (void) const;
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-
-  virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
-
-protected:
-
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile);
-  virtual CORBA::Boolean is_equivalent_hook (const TAO_Profile* other_profile);
-
-private:
-  virtual void create_profile_body (TAO_OutputCDR &encap) const;
-
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-private:
-  TAO_opaque body_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Profile.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_PROFILE_H */
diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i
deleted file mode 100644
index dde1611c1da..00000000000
--- a/TAO/tao/Profile.i
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_Profile::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE const TAO_GIOP_Message_Version &
-TAO_Profile::version (void) const
-{
-  return this->version_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_Profile::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE void
-TAO_Profile::forward_to (TAO_MProfile *mprofiles)
-{
-  this->forward_to_ = mprofiles;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to (void)
-{
-  return this->forward_to_;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to_i (void)
-{
-  return this->forward_to_;
-}
-
-ACE_INLINE const TAO_Tagged_Components&
-TAO_Profile::tagged_components (void) const
-{
-  return this->tagged_components_;
-}
-
-ACE_INLINE TAO_Tagged_Components&
-TAO_Profile::tagged_components (void)
-{
-  return this->tagged_components_;
-}
-
-ACE_INLINE CORBA::Short
-TAO_Profile::addressing_mode (void) const
-{
-  return this->addressing_mode_;
-}
-
-ACE_INLINE const TAO::ObjectKey &
-TAO_Profile::object_key (void) const
-{
-  return this->ref_object_key_->object_key ();
-}
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
deleted file mode 100644
index 0fab758b90c..00000000000
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-// $Id$
-
-#include "Profile_Transport_Resolver.h"
-#include "Profile.h"
-#include "Transport.h"
-#include "Stub.h"
-#include "Invocation_Endpoint_Selectors.h"
-#include "ORB_Core.h"
-#include "Endpoint_Selector_Factory.h"
-#include "Codeset_Manager.h"
-#include "Connector_Registry.h"
-#include "Transport_Connector.h"
-#include "Endpoint.h"
-#include "SystemException.h"
-
-#include "ace/Countdown_Time.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Profile_Transport_Resolver.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Profile_Transport_Resolver,
-           "$Id$")
-
-namespace TAO
-{
-
-  Profile_Transport_Resolver::~Profile_Transport_Resolver (void)
-  {
-    if (this->profile_)
-      {
-        this->profile_->_decr_refcnt ();
-      }
-
-    if (this->transport_)
-      {
-        if (this->is_released_ == false)
-          {
-            this->transport_->make_idle ();
-          }
-
-        this->transport_->remove_reference ();
-      }
-
-    delete this->inconsistent_policies_;
-  }
-
-  void
-  Profile_Transport_Resolver::profile (TAO_Profile *p)
-  {
-    // Dont do anything if the incoming profile is null
-    if (p)
-      {
-        // @note This is just a workaround for a more serious problem
-        // with profile management. This would cover some potential
-        // issues that Ossama is working on.  Ossama, please remove
-        // them when you are done.
-        TAO_Profile *tmp = this->profile_;
-
-        (void) p->_incr_refcnt ();
-        this->profile_ = p;
-
-        if (tmp)
-          {
-            (void) tmp->_decr_refcnt ();
-          }
-      }
-  }
-
-
-  void
-  Profile_Transport_Resolver::resolve (ACE_Time_Value *max_time_val
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_Countdown_Time countdown (max_time_val);
-
-    TAO_Invocation_Endpoint_Selector *es =
-      this->stub_->orb_core ()->endpoint_selector_factory ()->get_selector (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // Select the endpoint
-    es->select_endpoint (this,
-                         max_time_val
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (this->transport_ == 0)
-      {
-        ACE_THROW (CORBA::INTERNAL ());
-      }
-
-    const TAO_GIOP_Message_Version& version =
-      this->profile_->version ();
-
-    // Initialize the messaging object
-    if (this->transport_->messaging_init (version.major, version.minor) == -1)
-      {
-        ACE_THROW (CORBA::INTERNAL (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
-      }
-
-    if (!this->transport_->is_tcs_set ())
-      {
-        TAO_Codeset_Manager *tcm =
-          this->stub_->orb_core ()->codeset_manager ();
-        tcm->set_tcs (*this->profile_, *this->transport_);
-      }
-  }
-
-
-  bool
-  Profile_Transport_Resolver::try_connect (
-      TAO_Transport_Descriptor_Interface *desc,
-       ACE_Time_Value *max_time_value
-       ACE_ENV_ARG_DECL
-     )
-  {
-    TAO_Connector_Registry *conn_reg =
-      this->stub_->orb_core ()->connector_registry (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);
-
-    if (conn_reg == 0)
-      {
-        ACE_THROW_RETURN (CORBA::INTERNAL (
-                            CORBA::SystemException::_tao_minor_code (
-                              0,
-                              EINVAL),
-                            CORBA::COMPLETED_NO),
-                          false);
-      }
-
-    ACE_Time_Value connection_timeout;
-
-    const bool is_conn_timeout =
-      this->get_connection_timeout (connection_timeout);
-
-
-    ACE_Time_Value *max_wait_time = 0;
-
-    if (is_conn_timeout == true)
-      {
-        max_wait_time = &connection_timeout;
-      }
-    else
-      {
-        max_wait_time = max_time_value;
-      }
-
-
-    // Obtain a connection.
-    this->transport_ =
-      conn_reg->get_connector (desc->endpoint ()->tag ())->connect (
-        this,
-        desc,
-        max_wait_time
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);
-
-    // A timeout error occurred.
-    // If the user has set a roundtrip timeout policy, throw a timeout
-    // exception.  Otherwise, just fall through and return false to
-    // look at the next endpoint.
-    if (this->transport_ == 0
-        && is_conn_timeout == false
-        && errno == ETIME)
-      {
-        ACE_THROW_RETURN (CORBA::TIMEOUT (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO_TIMEOUT_CONNECT_MINOR_CODE,
-                              errno),
-                            CORBA::COMPLETED_NO),
-                          false);
-      }
-    else if (this->transport_ == 0)
-      {
-        return false;
-      }
-
-    return true;
-  }
-
-  bool
-  Profile_Transport_Resolver::get_connection_timeout (
-    ACE_Time_Value &max_wait_time)
-  {
-    bool is_conn_timeout = false;
-
-    // Check for the connection timout policy in the ORB
-    this->stub_->orb_core ()->connection_timeout (this->stub_,
-                                                  is_conn_timeout,
-                                                  max_wait_time);
-
-    return is_conn_timeout;
-  }
-
-
-  void
-  Profile_Transport_Resolver::init_inconsistent_policies (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    ACE_NEW_THROW_EX (this->inconsistent_policies_,
-                      CORBA::PolicyList (0),
-                      CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  }
-}
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
deleted file mode 100644
index 4c09b20d327..00000000000
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Profile_Transport_Resolver.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PROFILE_TRANSPORT_RESOLVER_H
-#define TAO_PROFILE_TRANSPORT_RESOLVER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Global_Macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-
-#include "tao/SystemException.h"
-
-class TAO_Stub;
-class TAO_Profile;
-class TAO_Transport;
-class TAO_Endpoint;
-class ACE_Time_Value;
-class TAO_Transport_Descriptor_Interface;
-
-namespace CORBA
-{
-  class Environment;
-  class Object;
-  class PolicyList;
-
-  class Object;
-  typedef Object *Object_ptr;
-}
-
-namespace TAO
-{
-  class Synch_Twoway_Invocation;
-
-  /**
-   * @class Profile_Transport_Resolver
-   *
-   * @brief Chooses the profile and a transport for a target object on
-   * which an invocation can be made.
-   *
-   * A target object is represented by multiple profiles, which
-   * theoretically provides multiple paths to the same target
-   * object. This class helps in choosing the right profile, and pick
-   * a transport from cache (or create a new transport if needed) that
-   * represents the profile.
-   */
-  class TAO_Export Profile_Transport_Resolver
-  {
-  public:
-    /// Constructor
-    /**
-     * With @a block we tell whether this resolved should always deliver
-     * a connection by blocking or unblock before the connection is
-     * completely established. Please note that this has *nothing* to
-     * do with the synchronous or asynch connect strategy used for
-     * making connections. This is a local flag used by the clients of
-     * this to dictate some local behavior.
-     */
-    Profile_Transport_Resolver (CORBA::Object *p,
-                                TAO_Stub *stub,
-                                bool block = true);
-
-    ~Profile_Transport_Resolver (void);
-
-    /// Method where the bunch of the action takes place.
-    /**
-     * This is the entry point from the TAO::Invocation_Adapter
-     * class. This method accesses the endpoint selector factory from
-     * the ORB_Core to decide on the strategy to be used for selecting
-     * the profile.
-     */
-    void resolve (ACE_Time_Value *val
-                  ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    //@{
-    /**
-     * Accessors and mutators for this class. The following methods
-     * are used by the clients of this class to access strategies and
-     * other internal workings.
-     */
-
-    /// Mutator for profile.
-    void profile (TAO_Profile *pfile);
-
-    /// Accessor for profile.
-    TAO_Profile *profile (void) const;
-
-    /// Accessor for TAO_Stub
-    TAO_Stub *stub (void) const;
-
-    /// Accessor for the target in use
-    CORBA::Object *object (void) const;
-
-    /// Accessor for the transport reserved for this invocation.
-    TAO_Transport *transport (void) const;
-
-    /// Accessor to indicate whether we should block while
-    /// establishing a connection.
-    bool blocked_connect (void) const;
-    //@}
-
-    /// Signal to let the resolver know that the transport has been
-    /// released back to the cache.
-    void transport_released (void) const;
-
-    /// This is a callback method used by the endpoint selectors, to
-    /// delegate the responsibility of reserving a transport from the
-    /// connection cache for this invocation.
-    bool try_connect (TAO_Transport_Descriptor_Interface *desc,
-                      ACE_Time_Value *val
-                      ACE_ENV_ARG_DECL);
-
-    /// Initialize the inconsistent policy list that this object has
-    /// cached.
-    void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    CORBA::PolicyList *inconsistent_policies (void) const;
-
-    CORBA::PolicyList *steal_inconsistent_policies (void);
-  private:
-
-    /// Helper method to access get the connection timeout from the
-    /// ORB.
-    bool get_connection_timeout (ACE_Time_Value &max_wait_time);
-
-  private:
-
-    /// Target object
-    mutable CORBA::Object *obj_;
-
-    /// Stub object for the target object.
-    TAO_Stub *stub_;
-
-    /// The transport selected for this invocation.
-    TAO_Transport *transport_;
-
-    /// The profile that has been selected for this invocation.
-    TAO_Profile *profile_;
-
-    /// List of inconsistent policies
-    /**
-     * If current effective policies cause the invocation to raise
-     * CORBA::INV_POLICY exception, the conflicting/problematic policies
-     * are stored in this list.  This is used by \param
-     * Object::_validate_connection method to inform clients about
-     * causes of invocation failure.
-     * @par
-     * Conflicting policies are only stored in this list if \param
-     * init_inconsistent_policies method has been called prior to the
-     * beginning of invocation.  This saves extra work of conflicting
-     * policies 'logging' when it's not needed.
-     *
-     * @note We don't use _var with a reason. Using _var would
-     * involve including the  header file for at least
-     * Policy_ForwardC.h, and that is what we precisely want to
-     * avoid.
-     */
-    CORBA::PolicyList *inconsistent_policies_;
-
-    /// Has the transport been idle?
-    mutable bool is_released_;
-
-    /// Should we block while trying to make a connection
-    bool const blocked_;
-  };
-} // TAO namespace end
-
-#if defined (__ACE_INLINE__)
-# include "Profile_Transport_Resolver.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_PROFILE_TRANSPORT_RESOLVER_H*/
diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl
deleted file mode 100644
index 2f35fa34c5b..00000000000
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-// $Id$
-namespace TAO
-{
-  ACE_INLINE
-  Profile_Transport_Resolver::Profile_Transport_Resolver (
-    CORBA::Object *p,
-    TAO_Stub *stub,
-    bool block)
-    : obj_ (p)
-      , stub_ (stub)
-      , transport_ (0)
-      , profile_ (0)
-      , inconsistent_policies_ (0)
-      , is_released_ (false)
-      , blocked_ (block)
-  {
-  }
-
-  ACE_INLINE TAO_Stub *
-  Profile_Transport_Resolver::stub (void) const
-  {
-    return this->stub_;
-  }
-
-  ACE_INLINE CORBA::Object_ptr
-  Profile_Transport_Resolver::object (void) const
-  {
-    return this->obj_;
-  }
-
-  ACE_INLINE TAO_Profile *
-  Profile_Transport_Resolver::profile (void) const
-  {
-    return this->profile_;
-  }
-
-  ACE_INLINE TAO_Transport *
-  Profile_Transport_Resolver::transport (void) const
-  {
-    return this->transport_;
-  }
-
-  ACE_INLINE bool
-  Profile_Transport_Resolver::blocked_connect (void) const
-  {
-    return this->blocked_;
-  }
-
-  ACE_INLINE void
-  Profile_Transport_Resolver::transport_released (void) const
-  {
-    this->is_released_ = true;
-  }
-
-  ACE_INLINE CORBA::PolicyList *
-  Profile_Transport_Resolver::inconsistent_policies (void) const
-  {
-    return this->inconsistent_policies_;
-  }
-
-  ACE_INLINE CORBA::PolicyList *
-  Profile_Transport_Resolver::steal_inconsistent_policies (void)
-  {
-    CORBA::PolicyList *tmp = this->inconsistent_policies_;
-    this->inconsistent_policies_ = 0;
-    return tmp;
-  }
-}
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
deleted file mode 100644
index 42d4eae11d6..00000000000
--- a/TAO/tao/Protocol_Factory.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#include "Protocol_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Protocol_Factory, 
-           "$Id$")
-
-static const char prefix_[] = "\0";
-
-TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag)
-  : tag_ (tag)
-{
-}
-
-TAO_Protocol_Factory::~TAO_Protocol_Factory (void)
-{
-}
-
-CORBA::ULong
-TAO_Protocol_Factory::tag (void) const
-{
-  return this->tag_;
-}
-
-int
-TAO_Protocol_Factory::init (int /* argc */,
-                            ACE_TCHAR * /* argv */ [])
-{
- return -1;
-}
-
-TAO_Acceptor *
-TAO_Protocol_Factory::make_acceptor (void)
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_Protocol_Factory::make_connector (void)
-{
-  return 0;
-}
-
-int
-TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */)
-{
-  return 0;
-}
-
-const char *
-TAO_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_Protocol_Factory::options_delimiter (void) const
-{
-  return '\0';
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Protocol_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Protocol_Factory>
-
-#endif
diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h
deleted file mode 100644
index 568be711664..00000000000
--- a/TAO/tao/Protocol_Factory.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Protocol_Factory.h
- *
- *  $Id$
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PROTOCOL_FACTORY_H
-#define TAO_PROTOCOL_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SStringfwd.h"
-
-#include "TAO_Export.h"
-#include "Basic_Types.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Export TAO_Protocol_Factory : public ACE_Service_Object
-{
-public:
-  TAO_Protocol_Factory (CORBA::ULong tag);
-  virtual ~TAO_Protocol_Factory (void);
-
-  /// Initialization hook.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// The protocol tag, each concrete class will have a specific tag
-  /// value.
-  CORBA::ULong tag (void) const;
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // Factory methods
-  /// Create an acceptor
-  virtual TAO_Acceptor *make_acceptor (void);
-
-  /// Create a connector
-  virtual TAO_Connector *make_connector  (void);
-
-  /**
-   * Some protocols should not create a default endpoint unless the
-   * user specifies a -ORBEndpoint option. For example, local IPC
-   * (aka UNIX domain sockets) is unable to remove the rendesvouz
-   * point if the server crashes.  For those protocols it is better to
-   * create the endpoint only if the user requests one.
-   */
-  virtual int requires_explicit_endpoint (void) const = 0;
-
-private:
-  /// IOP protocol tag.
-  CORBA::ULong tag_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PROTOCOL_FACTORY_H */
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
deleted file mode 100644
index fe6aee07028..00000000000
--- a/TAO/tao/Protocols_Hooks.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-
-#include "Protocols_Hooks.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Protocols_Hooks, 
-           "$Id$")
-
-TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void)
-  : send_buffer_size_ (0),
-    recv_buffer_size_ (0),
-    keep_alive_ (0),
-    dont_route_ (0),
-    no_delay_ (0),
-    enable_network_priority_ (0)
-{
-}
-  
-TAO_UIOP_Protocol_Properties::TAO_UIOP_Protocol_Properties (void)
-  : send_buffer_size_ (0),
-    recv_buffer_size_ (0)
-{
-}
-  
-TAO_SHMIOP_Protocol_Properties::TAO_SHMIOP_Protocol_Properties (void)
-  : send_buffer_size_ (0),
-    recv_buffer_size_ (0),
-    keep_alive_ (0),
-    dont_route_ (0),
-    no_delay_ (0),
-    preallocate_buffer_size_ (0),
-    mmap_filename_ (),
-    mmap_lockname_ ()
-{
-}
-  
-TAO_DIOP_Protocol_Properties::TAO_DIOP_Protocol_Properties (void)
-  : enable_network_priority_ (0)
-{
-}
-  
-TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void)
-  : send_buffer_size_ (0),
-    recv_buffer_size_ (0),
-    keep_alive_ (0),
-    dont_route_ (0),
-    no_delay_ (0),
-    enable_network_priority_ (0)
-{
-}
-  
-/// destructor
-TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Protocols_Hooks>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Protocols_Hooks>
-
-#endif
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
deleted file mode 100644
index 775abbde250..00000000000
--- a/TAO/tao/Protocols_Hooks.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Protocols_Hooks.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_PROTOCOLS_HOOKS_H
-#define TAO_PROTOCOLS_HOOKS_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#include "TAO_Export.h"
-#include "Basic_Types.h"
-#include "IOP_IORC.h"
-#include "ace/SString.h"
-
-namespace CORBA
-{
-  class Policy;
-  class Environment;
-}
-
-class TAO_ORB_Core;
-class TAO_GIOP_Invocation;
-class TAO_Resource_Factory;
-class TAO_Service_Context;
-class TAO_Acceptor_Registry;
-class TAO_Connection_Handler;
-class TAO_Transport;
-class TAO_Stub;
-
-class TAO_Export TAO_IIOP_Protocol_Properties
-{
-public:
-
-  TAO_IIOP_Protocol_Properties (void);
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  int keep_alive_;
-  int dont_route_;
-  int no_delay_;
-  CORBA::Boolean enable_network_priority_;
-};
-
-class TAO_Export TAO_UIOP_Protocol_Properties
-{
-public:
-
-  TAO_UIOP_Protocol_Properties (void);
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-};
-
-class TAO_Export TAO_SHMIOP_Protocol_Properties
-{
-public:
-
-  TAO_SHMIOP_Protocol_Properties (void);
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  int keep_alive_;
-  int dont_route_;
-  int no_delay_;
-  CORBA::Long preallocate_buffer_size_;
-  ACE_CString mmap_filename_;
-  ACE_CString mmap_lockname_;
-};
-
-class TAO_Export TAO_DIOP_Protocol_Properties
-{
-public:
-
-  TAO_DIOP_Protocol_Properties (void);
-
-  CORBA::Boolean enable_network_priority_;
-};
-
-class TAO_Export TAO_SCIOP_Protocol_Properties
-{
-public:
-
-  TAO_SCIOP_Protocol_Properties (void);
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  int keep_alive_;
-  int dont_route_;
-  int no_delay_;
-  CORBA::Boolean enable_network_priority_;
-};
-
-class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
-{
-public:
-  /// destructor
-  virtual ~TAO_Protocols_Hooks (void);
-
-  /// Initialize the protocols hooks instance.
-  virtual void init_hooks (TAO_ORB_Core *orb_core
-                           ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                                      TAO_Stub *stub
-                                                      ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                                      CORBA::Policy *policy
-                                                      ACE_ENV_ARG_DECL) = 0;
-
-  virtual void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
-
-  virtual CORBA::Long get_dscp_codepoint (void) = 0;
-
-  virtual void rt_service_context (TAO_Stub *stub,
-                                   TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart
-                                   ACE_ENV_ARG_DECL) = 0;
-
-  virtual void add_rt_service_context_hook (
-    TAO_Service_Context &service_context,
-    CORBA::Policy *model_policy,
-    CORBA::Short &client_priority
-    ACE_ENV_ARG_DECL) = 0;
-
-  virtual void get_selector_hook (CORBA::Policy *model_policy,
-                                  CORBA::Boolean
-                                  &is_client_propagated,
-                                  CORBA::Short &server_priority) = 0;
-
-  virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                               CORBA::Short priority,
-                                               CORBA::Short &min_priority,
-                                               CORBA::Short &max_priority,
-                                               int &in_range) = 0;
-
-  /**
-   * Accessor and modifier to the current thread priority, used to
-   * implement the RTCORBA::Current interface, but it is faster for
-   * some critical components.  If the RTCORBA library isn't used,
-   * these operations are no-ops.
-   */
-  //@{
-  virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         ACE_ENV_ARG_DECL) = 0;
-
-  virtual int get_thread_native_priority (CORBA::Short &
-                                          ACE_ENV_ARG_DECL) = 0;
-
-  virtual int get_thread_CORBA_and_native_priority (
-    CORBA::Short &,
-    CORBA::Short &
-    ACE_ENV_ARG_DECL) = 0;
-
-  virtual int set_thread_CORBA_priority (CORBA::Short
-                                         ACE_ENV_ARG_DECL) = 0;
-
-  virtual int set_thread_native_priority (CORBA::Short
-                                          ACE_ENV_ARG_DECL) = 0;
-
-  //@}
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp
deleted file mode 100644
index 5d0a9ebc3cd..00000000000
--- a/TAO/tao/Pseudo_VarOut_T.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#ifndef TAO_PSEUDO_VAROUT_T_C
-#define TAO_PSEUDO_VAROUT_T_C
-
-#include "tao/Pseudo_VarOut_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Pseudo_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Pseudo_VarOut_T,
-           "$Id$")
-
-template <typename T>
-TAO_Pseudo_Var_T<T> &
-TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = T::_duplicate (p.ptr ());
-    }
-
-  return *this;
-}
-#endif /* TAO_PSEUDO_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
deleted file mode 100644
index bdc0131b322..00000000000
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Pseudo_VarOut_T.h
- *
- *  $Id$
- *
- * @note This header should be included after all types to be passed
- * as template parameters to the TAO_Pseudo_{Var,Out}_T template
- * classes have been declared.  If the types in question are defined
- * in another header, include that header before this one.
- * @par
- * Including other headers like "tao/CORBA_methods.h" here can cause
- * circular dependency related problems when using compilers that
- * lookup and bind non-dependent names in templates at definition time
- * (i.e. while parsing the code) instead of at instantiation time.
- *
- * @todo Look into adding a template parameter to each of the
- *       templates in question that would be a trait containing the
- *       means for releasing references managed by the templates.
- *       Doing so should work around the non-dependent name issues in
- *       g++ 3.4, thus easing the requirement that this header be
- *       parsed last.
- *
- *         -Ossama
- *
- *
- * @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_PSEUDO_VAROUT_T_H
-#define TAO_PSEUDO_VAROUT_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Pseudo_Var_T
- *
- * @brief Parametrized implementation of _var class for
- * TypeCode, Object, AbstractBase, NamedValue, NVList,
- * Principal, Request, Context, ORB, LocalObject,
- * and Environment.
- *
- */
-template <typename T>
-class TAO_Pseudo_Var_T
-{
-public:
-  TAO_Pseudo_Var_T (void);
-  TAO_Pseudo_Var_T (T *);
-  TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &);
-
-  ~TAO_Pseudo_Var_T (void);
-
-  TAO_Pseudo_Var_T<T> & operator= (T *);
-  TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &);
-
-  T * operator-> (void) const;
-
-  operator T * const & () const;
-  operator T *& ();
-
-  typedef T *   _in_type;
-  typedef T *&  _inout_type;
-  typedef T *&  _out_type;
-  typedef T *   _retn_type;
-
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
-
-  // TAO extension.
-  _retn_type    ptr (void) const;
-
-private:
-  T * ptr_;
-};
-
-/**
- * @class TAO_Pseudo_Out_T
- *
- * @brief Parametrized implementation of _out class for
- * TypeCode, Object, AbstractBase, NamedValue, NVList,
- * Principal, Request, Context, ORB, LocalObject,
- * and Environment.
- *
- */
-template <typename T, typename T_var>
-class TAO_Pseudo_Out_T
-{
-public:
-  TAO_Pseudo_Out_T (T *&);
-  TAO_Pseudo_Out_T (T_var &);
-  TAO_Pseudo_Out_T (const TAO_Pseudo_Out_T<T,T_var> &);
-
-  TAO_Pseudo_Out_T<T,T_var> & operator= (const TAO_Pseudo_Out_T<T,T_var> &);
-  TAO_Pseudo_Out_T<T,T_var> & operator= (T *);
-
-  operator T *& ();
-
-  T *& ptr (void);
-
-  T * operator-> (void);
-
-private:
-  T *& ptr_;
-
-  /// Assignment from _var not allowed.
-  TAO_Pseudo_Out_T<T,T_var> & operator= (const T_var &);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Pseudo_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Pseudo_VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Pseudo_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PSEUDO_VAROUT_T_H */
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
deleted file mode 100644
index b13e74045a6..00000000000
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
-  : ptr_ (T::_nil ())
-{}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (T * p)
-  : ptr_ (p)
-{}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p)
-  : ptr_ (T::_duplicate (p.ptr ()))
-{}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T> &
-TAO_Pseudo_Var_T<T>::operator= (T * p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::operator T * const & () const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Var_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Var_T<T>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Var_T<T>::in (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Var_T<T>::inout (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Var_T<T>::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = T::_nil ();
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Var_T<T>::_retn (void)
-{
-  T * val = this->ptr_;
-  this->ptr_ = T::_nil ();
-  return val;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Var_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = T::_nil ();
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = T::_nil ();
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (
-    const TAO_Pseudo_Out_T<T,T_var> & p
-  )
-  : ptr_ (p.ptr_)
-{}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var> &
-TAO_Pseudo_Out_T<T,T_var>::operator= (const TAO_Pseudo_Out_T<T,T_var> & p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var> &
-TAO_Pseudo_Out_T<T,T_var>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Out_T<T,T_var>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Pseudo_Out_T<T,T_var>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Pseudo_Out_T<T,T_var>::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource.mpc
deleted file mode 100644
index 5ee2f216f62..00000000000
--- a/TAO/tao/QtResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_QtResource) : acelib, taolib, core, tao_output, taodefaults, ace_qtreactor {
-
-  sharedname   = TAO_QtResource
-  dynamicflags += TAO_QTRESOURCE_BUILD_DLL
-
-  Source_Files {
-    QtResource_Factory.cpp
-    QtResource_Loader.cpp
-  }
-
-  Header_Files {
-    QtResource_Factory.h
-    QtResource_Loader.h
-    TAO_QtResource_Export.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp
deleted file mode 100644
index 561fffca095..00000000000
--- a/TAO/tao/QtResource_Factory.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//$Id$
-
-#include "QtResource_Factory.h"
-#include "debug.h"
-#include "ace/QtReactor.h"
-
-ACE_RCSID( TAO_QtResource,
-           QtResource_Factory,
-           "$Id$");
-
-namespace TAO
-{
-
-  QtResource_Factory::QtResource_Factory (QApplication *qapp)
-    : reactor_impl_ (0)
-    , qapp_ (qapp)
-  {
-  }
-
-  ACE_Reactor_Impl *
-  QtResource_Factory::reactor_impl (void)
-  {    // synchronized by external locks
-    if (this->qapp_ == 0)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - QApplication is undefined.",
-                    " Cannot create ACE_XtReactor \n"));
-        return 0;
-      }
-
-    if (!this->reactor_impl_)
-      {
-
-        ACE_NEW_RETURN (this->reactor_impl_,
-                        ACE_QtReactor (qapp_),
-                        0);
-
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - ACE_QtReactor created\n"));
-      }
-
-    return this->reactor_impl_;
-  }
-}
diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource_Factory.h
deleted file mode 100644
index 83e37e7a3af..00000000000
--- a/TAO/tao/QtResource_Factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   QtResource_Factory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-#ifndef TAO_QTRESOURCE_FACTORY_H
-#define TAO_QTRESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_QtResource_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <qapplication.h>
-#include "ace/QtReactor.h"
-#include "tao/GUIResource_Factory.h"
-
-namespace TAO
-{
-
-  /**
-   * @class QtResource_Factory
-   *
-   * @brief TAO_GUI_Resource_Factory for creating QtReactor.
-   *
-   * This factory is intended for creating QtReactor for ORB. This
-   * factory can be feed into ORB using
-   * TAO_ORB_Core::set_gui_resource_factory method which is usually
-   * done by TAO_QtResource_Loader.
-   */
-  class TAO_QtResource_Export QtResource_Factory : public GUIResource_Factory
-  {
-  public:
-
-    QtResource_Factory (QApplication *qapp_);
-
-  protected:
-
-    /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
-
-  private:
-
-    /// Reactor created by this factory.
-    ACE_QtReactor *reactor_impl_;
-
-    /// QApplication running reactor
-    QApplication *qapp_;
-
-    /// For internal locking.
-    TAO_SYNCH_MUTEX lock_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_QTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp
deleted file mode 100644
index 70fdae3053c..00000000000
--- a/TAO/tao/QtResource_Loader.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//$Id$
-#include "QtResource_Loader.h"
-#include "ORB_Core.h"
-#include "QtResource_Factory.h"
-
-ACE_RCSID( TAO_QtResource,
-           QtResource_Loader,
-           "$Id$");
-
-namespace TAO
-{
-  QtResource_Loader::QtResource_Loader (QApplication *qapp)
-  {
-    QtResource_Factory *tmp = 0;
-
-    ACE_NEW (tmp,
-             QtResource_Factory (qapp));
-
-    TAO_ORB_Core::set_gui_resource_factory (tmp);
-  }
-
-  QtResource_Loader::~QtResource_Loader (void)
-  {
-  }
-}
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
deleted file mode 100644
index 14a2e6d84b6..00000000000
--- a/TAO/tao/QtResource_Loader.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   QtResource_Loader.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_QTRESOURCE_LOADER_H
-#define TAO_QTRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_QtResource_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include <qapplication.h>
-
-namespace TAO
-{
-  /**
-   * @class QtResource_Loader
-   *
-   * @brief Loads TAO resources related with Qt.
-   *
-   * This class changes the default reactor implementation into
-   * ACE_QtReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
-   * User should create an instance of this class before ORB_init
-   * when the TAO server has has to be integrated within Qt event loop.
-   *
-   * Please notice, this class has to be created in the main Qt thread,
-   * because set_gui_resource_factory creates a variable in TSS. This way
-   * QtReactor is instantiated only in Qt event loop thread.
-   */
-
-  class TAO_QtResource_Export QtResource_Loader
-  {
-  public:
-    QtResource_Loader  (QApplication *qapp);
-
-    virtual ~QtResource_Loader (void);
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_QTRESOURCE_LOADER_H */
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
deleted file mode 100644
index f303a112fce..00000000000
--- a/TAO/tao/Queued_Message.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Queued_Message.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Queued_Message.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Queued_Message, 
-           "$Id$")
-
-TAO_Queued_Message::TAO_Queued_Message (ACE_Allocator *alloc,
-                                        int is_heap_allocated)
-  : allocator_ (alloc)
-  , is_heap_created_ (is_heap_allocated)
-  , next_ (0)
-  , prev_ (0)
-{
-}
-
-TAO_Queued_Message::~TAO_Queued_Message (void)
-{
-}
-
-void
-TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
-                                      TAO_Queued_Message *&tail)
-{
-  if (this->prev_ != 0)
-    {
-      this->prev_->next_ = this->next_;
-    }
-  else if(head == this)
-    {
-      head = this->next_;
-    }
-
-  if (this->next_ != 0)
-    {
-      this->next_->prev_ = this->prev_;
-    }
-  else if(tail == this)
-    {
-      tail = this->prev_;
-    }
-
-  this->next_ = 0;
-  this->prev_ = 0;
-}
-
-void
-TAO_Queued_Message::push_back (TAO_Queued_Message *&head,
-                               TAO_Queued_Message *&tail)
-{
-  if (tail == 0)
-    {
-      tail = this;
-      head = this;
-      this->next_ = 0;
-      this->prev_ = 0;
-      return;
-    }
-
-  tail->next_ = this;
-  this->prev_ = tail;
-  this->next_ = 0;
-  tail = this;
-}
-
-void
-TAO_Queued_Message::push_front (TAO_Queued_Message *&head,
-                                TAO_Queued_Message *&tail)
-{
-  if (head == 0)
-    {
-      tail = this;
-      head = this;
-      this->next_ = 0;
-      this->prev_ = 0;
-      return;
-    }
-
-  head->prev_ = this;
-  this->next_ = head;
-  this->prev_ = 0;
-  head = this;
-}
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
deleted file mode 100644
index fdd723cddad..00000000000
--- a/TAO/tao/Queued_Message.h
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Queued_Message.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_QUEUED_MESSAGE_H
-#define TAO_QUEUED_MESSAGE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Invocation_Event.h"
-#include "ace/os_include/os_stddef.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-struct iovec;
-class ACE_Message_Block;
-class ACE_Allocator;
-
-/**
- * @class TAO_Queued_Message
- *
- * @brief Represent messages queued in the outgoing data path of the
- *        TAO_Transport class.
- *
- * Please read the documentation in the TAO_Transport class to find
- * out more about the design of the outgoing data path.
- *
- * In some configurations TAO needs to maintain a per-connection queue
- * of outgoing messages.  This queue is drained by the pluggable
- * protocols framework, normally under control of the ACE_Reactor, but
- * other configurations are conceivable.  The elements in the queue
- * may be removed early, for example, because the application can
- * specify timeouts for each message, or because the underlying
- * connection is broken.
- *
- * In many cases the message corresponds to some application request,
- * the application may be blocked waiting for the request to be sent,
- * even more importantlyl, the ORB can be configured to use the
- * Leader/Followers strategy, in which case one of the waiting threads
- * can be required to wake up before its message completes
- * each message may contain a 'Sent_Notifier'
- *
- * <H4>NOTE:</H4> The contents of the ACE_Message_Block may have been
- * allocated from TSS storage, in that case we cannot steal them.
- * However, we do not need to perform a deep copy all the time, for
- * example, in a twoway request the sending thread blocks until the
- * data goes out.  The queued message can borrow the memory as it will
- * be deallocated by the sending thread when it finishes.
- * Oneways and asynchronous calls are another story.
- *
- * @todo Change the ORB to allocate oneway and AMI buffer from global
- *       memory, to avoid the data copy in this path.  What happens
- *       if the there is no queueing?  Can we check that before
- *       allocating the memory?
- *
- */
-class TAO_Export TAO_Queued_Message : public TAO_LF_Invocation_Event
-{
-public:
-  /// Constructor
-  TAO_Queued_Message (ACE_Allocator *alloc = 0,
-                      int is_heap_allocated = 0);
-
-  /// Destructor
-  virtual ~TAO_Queued_Message (void);
-
-  /** @name Intrusive list manipulation
-   *
-   * The messages are put in a doubled linked list (for easy insertion
-   * and removal).  To minimize memory allocations the list is
-   * intrusive, i.e. each element in the list contains the pointers
-   * for the next and previous element.
-   *
-   * The following methods are used to manipulate this implicit list.
-   *
-   * @todo We should implement this as a base template, something
-   *        like:<BR>
-   * template<class T> Intrusive_Node {<BR>
-   * public:<BR><BR>
-   *   void next (T *);<BR>
-   *   T* next () const;<BR><BR>
-   * private:<BR>
-   *   T* next_;<BR>
-   * };<BR>
-   * and use it as follows:<BR>
-   * class TAO_Queued_Message : public Intrusive_Node<TAO_Queued_Message><BR>
-   * {<BR>
-   * };<BR>
-   *
-   */
-  //@{
-  /// Set/get the next element in the list
-  virtual TAO_Queued_Message *next (void) const;
-
-  /// Set/get the previous element in the list
-  virtual TAO_Queued_Message *prev (void) const;
-
-  /// Remove this element from the list
-  virtual void remove_from_list (TAO_Queued_Message *&head,
-                                 TAO_Queued_Message *&tail);
-
-  /// Insert the current element at the tail of the queue.
-  virtual void push_back (TAO_Queued_Message *&head,
-                          TAO_Queued_Message *&tail);
-
-  /// Insert the current element at the head of the queue.
-  virtual void push_front (TAO_Queued_Message *&head,
-                           TAO_Queued_Message *&tail);
-  //@}
-
-  /** @name Template Methods
-   */
-  //@{
-
-  /// Return the length of the message
-  /**
-   * If the message has been partially sent it returns the number of
-   * bytes that are still not sent.
-   */
-  virtual size_t message_length (void) const = 0;
-
-  /// Return 1 if all the data has been sent
-  virtual int all_data_sent (void) const = 0;
-
-  /// Fill up an io vector using the connects of the message
-  /**
-   * Different versions of this class represent the message using
-   * either a single buffer, or a message block.
-   * This method allows a derived class to fill up the contents of an
-   * io vector, the TAO_Transport class uses this method to group as
-   * many messages as possible in an iovector before sending them to
-   * the OS I/O subsystem.
-   *
-   * @param iovcnt_max The number of elements in iov
-   * @param iovcnt The number of elements already used by iov, this
-   *               method should update this counter
-   * @param iov The io vector
-   */
-  virtual void fill_iov (int iovcnt_max,
-                         int &iovcnt,
-                         iovec iov[]) const = 0;
-
-  /// Update the internal state, data has been sent.
-  /**
-   * After the TAO_Transport class completes a successful (or
-   * partially successful) I/O operation it must update the state of
-   * all the messages queued.  This callback method is used by each
-   * message to update its state and determine if all the data has
-   * been sent already.
-   *
-   * @param byte_count The number of bytes succesfully sent.  The
-   *                   TAO_Queued_Message should decrement this value
-   *                   by the number of bytes that must still be sent.
-   * @return Returns 1 if the TAO_Queued_Message has any more data to
-   *         send.
-   */
-  virtual void bytes_transferred (size_t &byte_count) = 0;
-
-  /// Clone this element
-  /*
-   * Clone the element and return a pointer to the cloned element on
-   * the heap.
-   *
-   * @param allocator Use the allocator for creating the new element
-   *                  on the heap. Remember, that the allocator will
-   *                  not be used allocate the data contained in this
-   *                  element.
-   */
-  virtual TAO_Queued_Message *clone (ACE_Allocator *allocator) = 0;
-
-  /// Reclaim resources
-  /**
-   * Reliable messages are allocated from the stack, thus they do not
-   * be deallocated.
-   * Asynchronous (SYNC_NONE) messages are allocated from the heap (or
-   * a pool), they need to be reclaimed explicitly.
-   */
-  virtual void destroy (void) = 0;
-  //@}
-
-protected:
-  /*
-   * Allocator that was used to create @c this object on the heap. If the
-   * allocator is null then @a this is on stack.
-   */
-  ACE_Allocator *allocator_;
-
-  /*
-   * A flag that acts as a boolean to indicate whether @a this is on
-   * stack or heap. A non-zero value indicates that @a this was created
-   * on  heap.
-   */
-  int is_heap_created_;
-
-private:
-  /// Implement an intrusive double-linked list for the message queue
-  TAO_Queued_Message *next_;
-  TAO_Queued_Message *prev_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Queued_Message.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl
deleted file mode 100644
index b4f6734aa71..00000000000
--- a/TAO/tao/Queued_Message.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE TAO_Queued_Message *
-TAO_Queued_Message::next (void) const
-{
-  return this->next_;
-}
-
-ACE_INLINE TAO_Queued_Message *
-TAO_Queued_Message::prev (void) const
-{
-  return this->prev_;
-}
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
deleted file mode 100644
index 1f4e661efcd..00000000000
--- a/TAO/tao/RTCORBA.mpc
+++ /dev/null
@@ -1,35 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_RTCORBA
-  dynamicflags = TAO_RTCORBA_BUILD_DLL
-  requires    += rt_corba
-
-  Source_Files {
-    RTCORBA
-  }
-    
-  Header_Files {
-    RTCORBA
-//	RTCORBA_includeC.h
-  }
-
-  Inline_Files {
-    RTCORBA
-  }
-
-  Template_Files {
-    RTCORBA
-  }
-
-  Resource_Files {
-    RTCORBA
-  }
-
-  PIDL_Files {
-    RTCORBA
-  }
-
-  Pkgconfig_Files {
-    RTCORBA/TAO_RTCORBA.pc.in
-  }
-}
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
deleted file mode 100644
index 9c548fafaf6..00000000000
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// $Id$
-
-#include "Continuous_Priority_Mapping.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
-
-TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
-  :  policy_ (policy)
-{
-  this->min_ =
-    ACE_Sched_Params::priority_min (this->policy_);
-
-  this->max_ =
-    ACE_Sched_Params::priority_max (this->policy_);
-}
-
-TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                            RTCORBA::NativePriority &native_priority)
-{
-  if (corba_priority < 0)
-    return 0;
-
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  int next_native_priority;
-  for (int i = 1; i <= corba_priority; ++i)
-    {
-      next_native_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_native_priority);
-
-      if (next_native_priority == current_native_priority)
-        return 0;
-
-      current_native_priority = next_native_priority;
-    }
-
-  native_priority = current_native_priority;
-  return 1;
-
-#else
-
-  if (this->min_ < this->max_)
-    {
-      native_priority = corba_priority + this->min_;
-      if (native_priority > this->max_)
-        return 0;
-    }
-  else if (this->min_ > this->max_)
-    {
-      native_priority = this->min_ - corba_priority;
-      if (native_priority < this->max_)
-        return 0;
-    }
-  else
-    {
-      // There is only one native priority.
-      if (corba_priority != 0)
-        return 0;
-
-      native_priority = this->min_;
-    }
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-
-}
-
-CORBA::Boolean
-TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                           RTCORBA::Priority &corba_priority)
-{
-
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  for (corba_priority = 0; ; ++corba_priority)
-    {
-      if (current_native_priority == native_priority)
-        return 1;
-
-      else if (current_native_priority == this->max_)
-        return 0;
-
-      else
-        current_native_priority =
-          ACE_Sched_Params::next_priority (this->policy_,
-                                           current_native_priority);
-    }
-
-#else
-
-  if (this->min_ < this->max_)
-    {
-      if (native_priority < this->min_
-          || native_priority > this->max_)
-        return 0;
-      corba_priority = native_priority - this->min_;
-    }
-  else if (this->min_ > this->max_)
-    {
-      if (native_priority > this->min_
-          || native_priority < this->max_)
-        return 0;
-      corba_priority = this->min_ - native_priority;
-    }
-  else if (this->min_ == this->max_)
-    {
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = 0;
-    }
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
deleted file mode 100644
index a227587ae57..00000000000
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//=============================================================================
-/**
- *  @file    Continuous_Priority_Mapping.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_CONTINUOUS_PRIORITY_MAPPING_H
-#define TAO_CONTINUOUS_PRIORITY_MAPPING_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtcorba_export.h"
-#include "Priority_Mapping.h"
-
-/**
- * @class TAO_Continuous_Priority_Mapping
- *
- * @brief Maps the first n CORBA priorities to the range of native
- * priorities, where n is the number of native priorities.
- *
- * The lowest native priority is mapped to CORBA priority 0, next
- * higher native priority is mapped to CORBA priority 1, and so
- * on. Since in all the operating systems where TAO is supported the
- * native priority set contains less than 32767 priorities, part of
- * the CORBA priority range is left unused.  Consider NT as an
- * example. NT native priorities -15 -2 -1 0 1 2 15 are mapped to
- * CORBA priorities 0 1 2 3 4 5 6, respectively, and the rest of the
- * CORBA priority range is not used.
- *
- * This class was previously called Direct_Priority_Mapping.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping
-  : public TAO_Priority_Mapping
-{
-public:
-
-  /// Constructor.
-  TAO_Continuous_Priority_Mapping (int policy = ACE_SCHED_OTHER);
-
-  /// Destructor.
-  ~TAO_Continuous_Priority_Mapping (void);
-
-  /// Convert CORBA priority to native priority.
-  CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
-                            RTCORBA::NativePriority &native_priority);
-
-  /// Convert native priority to CORBA priority.
-  CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority,
-                           RTCORBA::Priority &corba_priority);
-
-private:
-  int policy_;
-  int min_;
-  int max_;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CONTINUOUS_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
deleted file mode 100644
index e415bde990a..00000000000
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Direct_Priority_Mapping.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(RTCORBA,
-          Direct_Priority_Mapping,
-          "$Id$")
-
-TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long)
-{
-}
-
-TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Direct_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                        RTCORBA::NativePriority &native_priority)
-{
-  native_priority = corba_priority;
-  return 1;
-}
-
-CORBA::Boolean
-TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                       RTCORBA::Priority &corba_priority)
-{
-  corba_priority = native_priority;
-  return 1;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
deleted file mode 100644
index 1195b6e4f4d..00000000000
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//=============================================================================
-/**
- *  @file    Direct_Priority_Mapping.h
- *
- *  $Id$
- *
- *  Declares the Direct_Priority_Mapping interface, as defined in the
- *  RT-CORBA spec.
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-
-#ifndef TAO_DIRECT_PRIORITY_MAPPING_H
-#define TAO_DIRECT_PRIORITY_MAPPING_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#include "Priority_Mapping.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-/**
- * @class TAO_Direct_Priority_Mapping
- *
- * @brief A simple implementation of the Priority_Mapping interface
- *
- * This implementation uses direct mapping.
- */
-class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
-{
-public:
-  /// Default constructor
-  TAO_Direct_Priority_Mapping (long);
-
-  /// The destructor
-  virtual ~TAO_Direct_Priority_Mapping (void);
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
-
-private:
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DIRECT_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
deleted file mode 100644
index 084c47418b2..00000000000
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Linear_Network_Priority_Mapping.h"
-#include "tao/debug.h"
-
-#include "ace/Sched_Params.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (RTCORBA,
-           Linear_Network_Priority_Mapping,
-           "$Id$")
-
-#define IPDSFIELD_DSCP_DEFAULT  0x00
-#define IPDSFIELD_DSCP_CS1      0x08
-#define IPDSFIELD_DSCP_CS2      0x10
-#define IPDSFIELD_DSCP_CS3      0x18
-#define IPDSFIELD_DSCP_CS4      0x20
-#define IPDSFIELD_DSCP_CS5      0x28
-#define IPDSFIELD_DSCP_CS6      0x30
-#define IPDSFIELD_DSCP_CS7      0x38
-#define IPDSFIELD_DSCP_AF11     0x0A
-#define IPDSFIELD_DSCP_AF12     0x0C
-#define IPDSFIELD_DSCP_AF13     0x0E
-#define IPDSFIELD_DSCP_AF21     0x12
-#define IPDSFIELD_DSCP_AF22     0x14
-#define IPDSFIELD_DSCP_AF23     0x16
-#define IPDSFIELD_DSCP_AF31     0x1A
-#define IPDSFIELD_DSCP_AF32     0x1C
-#define IPDSFIELD_DSCP_AF33     0x1E
-#define IPDSFIELD_DSCP_AF41     0x22
-#define IPDSFIELD_DSCP_AF42     0x24
-#define IPDSFIELD_DSCP_AF43     0x26
-#define IPDSFIELD_ECT_MASK      0x02
-#define IPDSFIELD_CE_MASK       0x01
-#define IPDSFIELD_DSCP_EF       0x2E
-
-static int dscp [] =
-{
-  IPDSFIELD_DSCP_DEFAULT ,
-  IPDSFIELD_DSCP_CS1     ,
-  IPDSFIELD_DSCP_CS2     ,
-  IPDSFIELD_DSCP_CS3     ,
-  IPDSFIELD_DSCP_CS4     ,
-  IPDSFIELD_DSCP_CS5     ,
-  IPDSFIELD_DSCP_CS6     ,
-  IPDSFIELD_DSCP_CS7     ,
-  IPDSFIELD_DSCP_AF11    ,
-  IPDSFIELD_DSCP_AF12    ,
-  IPDSFIELD_DSCP_AF13    ,
-  IPDSFIELD_DSCP_AF21    ,
-  IPDSFIELD_DSCP_AF22    ,
-  IPDSFIELD_DSCP_AF23    ,
-  IPDSFIELD_DSCP_AF31    ,
-  IPDSFIELD_DSCP_AF32    ,
-  IPDSFIELD_DSCP_AF33    ,
-  IPDSFIELD_DSCP_AF41    ,
-  IPDSFIELD_DSCP_AF42    ,
-  IPDSFIELD_DSCP_AF43    ,
-  IPDSFIELD_DSCP_EF
-};
-
-/*
-static const char *dscp_char[]=
-{
-  "Normal",
-  "CS1",
-  "CS2",
-  "CS3",
-  "CS4",
-  "CS5",
-  "CS6",
-  "CS7",
-  "Assured Forwarding 11",
-  "Assured Forwarding 12",
-  "Assured Forwarding 13",
-  "Assured Forwarding 21",
-  "Assured Forwarding 22",
-  "Assured Forwarding 23",
-  "Assured Forwarding 31",
-  "Assured Forwarding 32",
-  "Assured Forwarding 33",
-  "Assured Forwarding 41",
-  "Assured Forwarding 42",
-  "Assured Forwarding 43",
-  "Expedited Forwarding"
-};
-*/
-
-TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long)
-{
-}
-
-CORBA::Boolean
-TAO_Linear_Network_Priority_Mapping::to_network (
-  RTCORBA::Priority corba_priority,
-  RTCORBA::NetworkPriority &network_priority)
-{
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Linear_Network_Priority_Mapping::to_network corba_priority %d\n",
-                corba_priority));
-
-  const int total_slots = sizeof (dscp) / sizeof (int);
-
-  int array_slot =
-    static_cast<int> (((corba_priority - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots);
-
-  if (array_slot == total_slots)
-    array_slot -= 1;
-
-  network_priority = dscp[array_slot];
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Linear_Network_Priority_Mapping::to_network = %x\n",
-                network_priority));
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_Linear_Network_Priority_Mapping::to_CORBA (RTCORBA::NetworkPriority network_priority,
-                                               RTCORBA::Priority &/*corba_priority*/)
-{
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Linear_Network_Priority_Mapping::to_CORBA network_priority %d\n",
-                network_priority));
-
-  return 0;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
deleted file mode 100644
index 34783c3b1c5..00000000000
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Linear_Network_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Linear_Network_Priority_Mapping interface,
-//
-// = AUTHOR
-//   Yamuna Krishnamurthy (yamuna@oomworks.com)
-//
-// ============================================================================
-
-#ifndef TAO_LINEAR_NETWORK_PRIORITY_MAPPING_H
-#define TAO_LINEAR_NETWORK_PRIORITY_MAPPING_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#include "rtcorba_export.h"
-#include "Network_Priority_Mapping.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-/**
- * @class TAO_Linear_Network_Priority_Mapping
- *
- * @brief A simple implementation of the Network_Priority_Mapping interface
- *
- * This implementation uses linear mapping between the range of
- * DiffServ priorities and CORBA priorities.
- */
-class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
-{
-public:
-  /// Default constructor
-  TAO_Linear_Network_Priority_Mapping (long policy);
-
-  CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
-                             RTCORBA::NetworkPriority &network_priority);
-
-  CORBA::Boolean to_CORBA (RTCORBA::NetworkPriority network_priority,
-                           RTCORBA::Priority &corba_priority);
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_LINEAR_NETWORK_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
deleted file mode 100644
index c793c7cfa0d..00000000000
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Linear_Priority_Mapping.h"
-#include "tao/debug.h"
-#include "ace/Sched_Params.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (RTCORBA,
-           Linear_Priority_Mapping,
-           "$Id$")
-
-TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy)
-  : policy_ (policy)
-{
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-}
-
-TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                        RTCORBA::NativePriority &native_priority)
-{
-  if (corba_priority < RTCORBA::minPriority
-           // The line below will always be false unless the value of
-           // RTCORBA::maxPriority, which is now assigned the value of
-           // 32767, is changed in RTCORBA.pidl.
-//      || corba_priority > RTCORBA::maxPriority
-     )
-    {
-      return 0;
-    }
-
-#if defined (ACE_WIN32)
-  // Count up the number of distinct native priorities on current
-  // platform.
-  int n;
-  int current_priority = this->min_;
-  for (n = 1; current_priority != this->max_; ++n)
-    {
-      current_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_priority);
-    }
-  int native_priority_index =
-    1
-    + ((n - 1)
-       * corba_priority
-       / (RTCORBA::maxPriority - RTCORBA::minPriority));
-
-  // Now, find the value corresponding to this index.
-  native_priority = this->min_;
-  for (int i = 2; i <= native_priority_index; ++i)
-    {
-      native_priority = ACE_Sched_Params::next_priority (this->policy_,
-                                                         native_priority);
-    }
-  return 1;
-
-#else
-
-  native_priority =
-    this->min_
-    + ((this->max_ - this->min_)
-       * corba_priority
-       / (RTCORBA::maxPriority - RTCORBA::minPriority));
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-}
-
-CORBA::Boolean
-TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                       RTCORBA::Priority &corba_priority)
-{
-#if defined (ACE_WIN32)
-
-  // Iterate over native priorities in order to 1) make sure
-  // <native_priority> argument contains a valid value, 2) count its
-  // index among all valid native pr. values, 3) get the total number
-  // of native priority values for the current platform.
-
-  int total;
-  int native_priority_index = 0;
-  int current_priority = this->min_;
-  for (total = 1; ; ++total)
-    {
-      if (native_priority == current_priority)
-        native_priority_index = total;
-
-      if (current_priority == this->max_)
-        break;
-
-      current_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_priority);
-    }
-
-  if (native_priority_index == 0)
-    return 0;
-
-  int delta = total - 1;
-  if (delta != 0)
-    {
-      corba_priority =
-        RTCORBA::minPriority
-        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-           * (native_priority_index - 1) / delta);
-    }
-  else
-    {
-      // There is only one native priority.
-      corba_priority = RTCORBA::minPriority;
-    }
-
-  return 1;
-
-#else
-
-  if ((this->min_ < this->max_
-       && (native_priority < this->min_
-           || native_priority > this->max_))
-      || (this->min_ > this->max_
-          && (native_priority < this->max_
-              || native_priority > this->min_)))
-    {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Linear_Priority_Mapping::to_CORBA: "
-                    " priority %d out of range [%d,%d]\n",
-                    native_priority, this->min_, this->max_));
-      return 0;
-    }
-
-  int delta = this->max_ - this->min_;
-  if (delta != 0)
-    {
-      corba_priority =
-        RTCORBA::minPriority
-        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-           * (native_priority - this->min_) / delta);
-    }
-  else
-    {
-      // There is only one native priority.
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = RTCORBA::minPriority;
-    }
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
deleted file mode 100644
index bee37377c26..00000000000
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Linear_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Linear_Priority_Mapping interface, as defined in the
-//   RT-CORBA spec.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_LINEAR_PRIORITY_MAPPING_H
-#define TAO_LINEAR_PRIORITY_MAPPING_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#include "rtcorba_export.h"
-#include "Priority_Mapping.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-/**
- * @class TAO_Linear_Priority_Mapping
- *
- * @brief A simple implementation of the Priority_Mapping interface.
- *
- * This implementation uses linear mapping between the range of
- * priorities for a given scheduling class (ACE_SCHED_OTHER,
- * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
- * priorities (0...32767)
- */
-class TAO_RTCORBA_Export TAO_Linear_Priority_Mapping : public TAO_Priority_Mapping
-{
-public:
-  /// Default constructor
-  TAO_Linear_Priority_Mapping (long policy);
-
-  /// The destructor
-  virtual ~TAO_Linear_Priority_Mapping (void);
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
-
-private:
-  /// The scheduling policy
-  long policy_;
-
-  // The range
-  int min_;
-  int max_;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_LINEAR_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
deleted file mode 100644
index 2704acc9628..00000000000
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-// $Id$
-// Multi_Priority_Mapping.cpp,v 1.0
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/RTCORBA/Multi_Priority_Mapping.h"
-#include "tao/debug.h"
-#include "ace/Log_Msg.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID (RTCORBA,
-           Multi_Priority_Mapping,
-           "$Id$")
-
-TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (int base_native_priority,
-                                                        int base_corba_priority,
-                                                        int priority_spacing,
-                                                        int priorities_contiguous,
-                                                        int policy)
-  :  base_native_priority_ (base_native_priority)
-  ,  base_corba_priority_ (base_corba_priority)
-  ,  priority_spacing_ (priority_spacing)
-  ,  priorities_contiguous_(priorities_contiguous)
-  ,  policy_ (policy)
-{
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-
-  if ( this->min_ < this->max_ )
-  {
-     if (base_native_priority_ < this->min_)
-     {
-        if (TAO_debug_level > 2)
-        {
-           ACE_DEBUG ((LM_DEBUG,
-                       "TAO (%P|%t) - Multi_Priority_Mapping::ctor: "
-                       " base_native_priority %d out of range [%d,%d]\n",
-                        base_native_priority_, this->min_, this->max_));
-        }
-     }
-  }
-  else
-  {
-     if (base_native_priority_ > this->min_)
-     {
-        if (TAO_debug_level > 2)
-        {
-           ACE_DEBUG ((LM_DEBUG,
-                       "TAO (%P|%t) - Multi_Priority_Mapping::ctor: "
-                       " base_native_priority %d out of range [%d,%d]\n",
-                        base_native_priority_, this->min_, this->max_));
-        }
-     }
-  }
-
-  if (base_corba_priority_ > RTCORBA::maxPriority)
-    {
-       if (TAO_debug_level > 2)
-         {
-           ACE_DEBUG ((LM_DEBUG,
-             "TAO (%P|%t) - Multi_Priority_Mapping::ctor: "
-             " base_corba_priority %d out of range [%d,%d]\n",
-             base_corba_priority_, RTCORBA::minPriority, RTCORBA::maxPriority));
-         }
-    }
-}
-
-TAO_Multi_Priority_Mapping::~TAO_Multi_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                       RTCORBA::NativePriority &native_priority)
-{
-  // Check for an invalid native priority
-  if (corba_priority < RTCORBA::minPriority || corba_priority > this->base_corba_priority_ )
-  {
-     if (TAO_debug_level > 2)
-     {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Multi_Priority_Mapping::to_native: "
-                    " corba priority %d out of range [%d,%d]\n",
-                    corba_priority, RTCORBA::minPriority, this->base_corba_priority_));
-     }
-     return 0;
-  }
-
-  if (corba_priority == base_corba_priority_)
-  {
-     // If this is the highest priority endpoint, then just give it the highest priority corba base priority
-     native_priority = base_native_priority_;
-  }
-  else
-  {
-     if (priorities_contiguous_ == 1)
-     {
-        if ( this->min_ < this->max_ )
-        {
-           native_priority = ( (corba_priority - base_corba_priority_) / priority_spacing_ ) + base_native_priority_;
-        }
-        else
-        {
-           native_priority = ( (base_corba_priority_ - corba_priority) / priority_spacing_ ) + base_native_priority_;
-        }
-     }
-     else
-     {
-        // Start at the max priority and search until we reach the base priority
-        int last_priority = this->base_corba_priority_;
-        while (true)
-        {
-           if (last_priority == RTCORBA::minPriority) break;
-           if (base_corba_priority_ >= --last_priority) break;
-        }
-
-        int priority_ndx = 0;
-        while (true)
-        {
-           if (last_priority == RTCORBA::minPriority) break;
-           if (corba_priority >= --last_priority) break;
-           priority_ndx++;
-        }
-
-        // Start at the max priority and search until we reach the base priority
-        last_priority = this->base_native_priority_;
-        for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++)
-        {
-           native_priority = ACE_Sched_Params::previous_priority (this->policy_,
-                                                                  last_priority,
-                                                                  ACE_SCOPE_THREAD);
-        }
-     }
-  }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                       RTCORBA::Priority &corba_priority)
-{
-  // Check for an invalid native priority
-  if ((this->min_ < this->max_ && (native_priority < this->min_ || native_priority > this->base_native_priority_ )) ||
-      (this->min_ > this->max_ && (native_priority < this->base_corba_priority_ || native_priority > this->min_)))
-  {
-     if (TAO_debug_level > 2)
-     {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Multi_Priority_Mapping::to_CORBA: "
-                    " priority %d out of range [%d,%d]\n",
-                    native_priority, this->min_, this->base_corba_priority_));
-     }
-     return 0;
-  }
-
-  if (native_priority == base_native_priority_)
-  {
-     // If this is the highest priority endpoint, then just give it the highest priority corba base priority
-     corba_priority = base_corba_priority_;
-  }
-  else
-  {
-     if (priorities_contiguous_ == 1)
-     {
-        if ( this->min_ < this->max_ )
-        {
-           corba_priority = ( (native_priority - base_native_priority_) * priority_spacing_ ) + base_corba_priority_;
-        }
-        else
-        {
-           corba_priority = ( (base_native_priority_ - native_priority) * priority_spacing_ ) + base_corba_priority_;
-        }
-     }
-     else
-     {
-        // Start at the max priority and search until we reach the base priority
-        int last_priority = this->base_native_priority_;
-        while (true)
-        {
-           int previous_priority = ACE_Sched_Params::previous_priority (this->policy_,
-                                                                    last_priority,
-                                                                    ACE_SCOPE_THREAD);
-           last_priority = previous_priority;
-
-           if (last_priority == this->min_)
-           {
-              break;
-           }
-
-           if ( this->min_ < this->max_ )
-           {
-              if (base_native_priority_ >= previous_priority) break;
-           }
-           else
-           {
-              if (base_native_priority_ <= previous_priority) break;
-           }
-        }
-
-        int priority_ndx = 1;
-        while (true)
-        {
-           if (last_priority == this->min_)
-           {
-              break;
-           }
-
-           if ( this->min_ < this->max_ )
-           {
-              if (native_priority >= last_priority) break;
-           }
-           else
-           {
-              if (native_priority <= last_priority) break;
-           }
-
-           int previous_priority = ACE_Sched_Params::previous_priority (this->policy_,
-                                                                        last_priority,
-                                                                        ACE_SCOPE_THREAD);
-           last_priority = previous_priority;
-           priority_ndx++;
-        }
-
-        corba_priority = base_corba_priority_ - priority_ndx;
-     }
-  }
-
-  return 1;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
deleted file mode 100644
index 6d5b3623dc7..00000000000
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-// Multi_Priority_Mapping.h,v 1.0
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Multi_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares a priority mapping to support cross platform communication.
-//
-// = AUTHOR
-//   Brian Mendel (brian.r.mendel@boeing.com)
-//
-// ============================================================================
-
-#ifndef TAO_MULTI_PRIORITY_MAPPING_H
-#define TAO_MULTI_PRIORITY_MAPPING_H
-
-#include "tao/orbconf.h"
-
-#include "tao/RTCORBA/Priority_Mapping.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-/**
- * @class TAO_Multi_Priority_Mapping
- *
- * @brief An implementation of the Priority_Mapping interface for communication
- * between different platforms
- *
- * This implementation uses a custom mapping between the range of
- * priorities for a given scheduling class (ACE_SCHED_OTHER,
- * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
- * priorities (0...32767)
- */
-class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping : public TAO_Priority_Mapping
-{
-public:
-  /// Default constructor
-  /**
-   * @param base_native_priority The native priority to use for the highest
-   * priority endpoint.
-   * @param base_corba_priority The corba priority to use for the highest
-   * priority endpoint
-   * @param priority_spacing The priority increment to use between endpoints
-   * @param priorities_contiguous Some platforms do use contiguous priorities
-   * @param policy The scheduling policy to use.
-   */
-  TAO_Multi_Priority_Mapping (int base_native_priority,
-                              int base_corba_priority,
-                              int priority_spacing = 1,
-                              int priorities_contiguous = 1,
-                              int policy = ACE_SCHED_FIFO);
-
-  /// The destructor
-  virtual ~TAO_Multi_Priority_Mapping (void);
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
-
-private:
-
-  int base_native_priority_;
-  int base_corba_priority_;
-  // The base settings
-
-  const int priority_spacing_;
-  const int priorities_contiguous_;
-
-  /// The scheduling policy
-  int policy_;
-
-  int min_;
-  int max_;
-  // The range
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#endif /* TAO_MULTI_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
deleted file mode 100644
index cc7eb22da38..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#include "Network_Priority_Mapping.h"
-
-ACE_RCSID(RTCORBA,
-          Network_Priority_Mapping,
-          "$Id$")
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void)
-{
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
deleted file mode 100644
index 5c847b1f984..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   Network_Priority_Mapping.h
- *
- *  $Id$
- *
- *  Class that declares the Network Priority Mapping
- *  that can be overriden to provide different mappings
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@oomworks.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_NETWORK_PRIORITY_MAPPING_H
-#define TAO_NETWORK_PRIORITY_MAPPING_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-/**
- * @class TAO_Network_Priority_Mapping
- *
- * @brief The interface for priority mapping.
- *
- * Check the RT-CORBA spec (orbos/99-02-12) secions 4.5.2
- */
-class TAO_RTCORBA_Export TAO_Network_Priority_Mapping
-{
-public:
-  /// The destructor
-  virtual ~TAO_Network_Priority_Mapping (void);
-
-  virtual CORBA::Boolean
-    to_network (RTCORBA::Priority corba_priority,
-		RTCORBA::NetworkPriority &network_priority) = 0;
-  virtual CORBA::Boolean
-    to_CORBA (RTCORBA::NetworkPriority network_priority,
-	      RTCORBA::Priority &corba_priority) = 0;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NETWORK_PRIORITY_MAPPING_H */
-
-
-
-
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
deleted file mode 100644
index 80380c5d6ad..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-#include "Network_Priority_Mapping_Manager.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if ! defined (__ACE_INLINE__)
-#include "Network_Priority_Mapping_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RTCORBA, 
-           Network_Priority_Mapping_Manager,
-           "$Id$")
-
-TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager (
-    void
-  )
-{
-  delete mapping_;
-}
-
-TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
-                                               ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (obj))
-    {
-      return TAO_Network_Priority_Mapping_Manager::_nil ();
-    }
-
-  return 
-    TAO_Network_Priority_Mapping_Manager::_duplicate (
-        dynamic_cast<TAO_Network_Priority_Mapping_Manager_ptr> (obj)
-      );
-}
-
-TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager::_duplicate (
-    TAO_Network_Priority_Mapping_Manager_ptr obj
-  )
-{
-  if (!CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-const char*
-TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const
-{
-  return "IDL:Network_Priority_Mapping_Manager:1.0";
-}
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
deleted file mode 100644
index bd9a33202cd..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Network_Priority_Mapping_Manager.h
- *
- *  $Id$
- *
- *  @author Yamuna Krishnamurthy (yamuna@oomworks.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_NETWORK_PRIORITY_MAPPING_MANAGER_H
-#define TAO_NETWORK_PRIORITY_MAPPING_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Network_Priority_Mapping.h"
-#include "tao/LocalObject.h"
-
-class TAO_Network_Priority_Mapping_Manager;
-class TAO_Network_Priority_Mapping_Manager_var;
-typedef TAO_Network_Priority_Mapping_Manager *TAO_Network_Priority_Mapping_Manager_ptr;
-
-
-namespace RTCORBA
-{
-}
-/**
- * @class TAO_Network_Priority_Mapping_Manager
- *
- * @brief Network_Priority_Mapping_Manager pseudo-objref.
- *
- * Allows setting of user-defined Network_Priority_Mapping at run-time.
- */
-class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager :
-  public virtual TAO_Local_RefCounted_Object
-{
-
-public:
-  /// Constructor.
-  TAO_Network_Priority_Mapping_Manager (RTCORBA::NetworkPriorityMapping * mapping);
-
-  ///
-  void mapping (RTCORBA::NetworkPriorityMapping * mapping);
-
-  ///
-  RTCORBA::NetworkPriorityMapping *mapping (void);
-
-public:
-  typedef TAO_Network_Priority_Mapping_Manager_ptr _ptr_type;
-  typedef TAO_Network_Priority_Mapping_Manager_var _var_type;
-
-  // the static operations
-  static TAO_Network_Priority_Mapping_Manager_ptr _duplicate (
-      TAO_Network_Priority_Mapping_Manager_ptr obj
-    );
-  static TAO_Network_Priority_Mapping_Manager_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  static TAO_Network_Priority_Mapping_Manager_ptr _nil (void)
-    {
-      return (TAO_Network_Priority_Mapping_Manager_ptr)0;
-    }
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  ~TAO_Network_Priority_Mapping_Manager (void);
-
-private:
-
-  TAO_Network_Priority_Mapping_Manager (const TAO_Network_Priority_Mapping_Manager &);
-  void operator= (const TAO_Network_Priority_Mapping_Manager &);
-
-private:
-
-  TAO_Network_Priority_Mapping *mapping_;
-};
-
-class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var
-  : private TAO_Base_var
-{
-public:
-  TAO_Network_Priority_Mapping_Manager_var (void); // default constructor
-  TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr);
-  TAO_Network_Priority_Mapping_Manager_var (const TAO_Network_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Network_Priority_Mapping_Manager_var (void); // destructor
-
-  TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
-  TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
-  TAO_Network_Priority_Mapping_Manager_ptr operator-> (void) const;
-
-  /// in, inout, out, _retn
-  operator const TAO_Network_Priority_Mapping_Manager_ptr &() const;
-  operator TAO_Network_Priority_Mapping_Manager_ptr &();
-  TAO_Network_Priority_Mapping_Manager_ptr in (void) const;
-  TAO_Network_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Network_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Network_Priority_Mapping_Manager_ptr _retn (void);
-  TAO_Network_Priority_Mapping_Manager_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static TAO_Network_Priority_Mapping_Manager_ptr duplicate (TAO_Network_Priority_Mapping_Manager_ptr);
-  static void release (TAO_Network_Priority_Mapping_Manager_ptr);
-  static TAO_Network_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
-  static CORBA::Object * upcast (void *);
-
-private:
-  /// Unimplemented - prevents widening assignment.
-  TAO_Network_Priority_Mapping_Manager_ptr ptr_;
-  TAO_Network_Priority_Mapping_Manager_var (const TAO_Base_var &rhs);
-  TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs);
-};
-
-class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_out
-{
-public:
-  TAO_Network_Priority_Mapping_Manager_out (TAO_Network_Priority_Mapping_Manager_ptr &);
-  TAO_Network_Priority_Mapping_Manager_out (TAO_Network_Priority_Mapping_Manager_var &);
-  TAO_Network_Priority_Mapping_Manager_out (const TAO_Network_Priority_Mapping_Manager_out &);
-  TAO_Network_Priority_Mapping_Manager_out &operator= (const TAO_Network_Priority_Mapping_Manager_out &);
-  TAO_Network_Priority_Mapping_Manager_out &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
-  TAO_Network_Priority_Mapping_Manager_out &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
-  operator TAO_Network_Priority_Mapping_Manager_ptr &();
-  TAO_Network_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Network_Priority_Mapping_Manager_ptr operator-> (void);
-
-private:
-  TAO_Network_Priority_Mapping_Manager_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Network_Priority_Mapping_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NETWORK_PRIORITY_MAPPING_MANAGER_H */
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
deleted file mode 100644
index 6a483ec6cd9..00000000000
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
+++ /dev/null
@@ -1,220 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class TAO_Network_Priority_Mapping_Manager_var
-// *************************************************************
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (void) // default constructor
-  : ptr_ (TAO_Network_Priority_Mapping_Manager::_nil ())
-{}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (const ::TAO_Network_Priority_Mapping_Manager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TAO_Network_Priority_Mapping_Manager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_Network_Priority_Mapping_Manager_var &
-TAO_Network_Priority_Mapping_Manager_var::operator= (TAO_Network_Priority_Mapping_Manager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_Network_Priority_Mapping_Manager_var &
-TAO_Network_Priority_Mapping_Manager_var::operator= (const ::TAO_Network_Priority_Mapping_Manager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::operator const ::TAO_Network_Priority_Mapping_Manager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::operator ::TAO_Network_Priority_Mapping_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_Network_Priority_Mapping_Manager_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
-  return val;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::duplicate (TAO_Network_Priority_Mapping_Manager_ptr p)
-{
-  return ::TAO_Network_Priority_Mapping_Manager::_duplicate (p);
-}
-
-ACE_INLINE void
-TAO_Network_Priority_Mapping_Manager_var::release (TAO_Network_Priority_Mapping_Manager_ptr p)
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::nil (void)
-{
-  return ::TAO_Network_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_Network_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-TAO_Network_Priority_Mapping_Manager_var::upcast (void *src)
-{
-  TAO_Network_Priority_Mapping_Manager **tmp =
-    static_cast<TAO_Network_Priority_Mapping_Manager **> (src);
-  return *tmp;
-}
-
-
-// *************************************************************
-// Inline operations for class TAO_Network_Priority_Mapping_Manager_out
-// *************************************************************
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_out::TAO_Network_Priority_Mapping_Manager_out (TAO_Network_Priority_Mapping_Manager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_out::TAO_Network_Priority_Mapping_Manager_out (TAO_Network_Priority_Mapping_Manager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_out::TAO_Network_Priority_Mapping_Manager_out (const ::TAO_Network_Priority_Mapping_Manager_out &p) // copy constructor
-  : ptr_ (const_cast<TAO_Network_Priority_Mapping_Manager_out &> (p).ptr_)
-{}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_out &
-TAO_Network_Priority_Mapping_Manager_out::operator= (const ::TAO_Network_Priority_Mapping_Manager_out &p)
-{
-  this->ptr_ = const_cast<TAO_Network_Priority_Mapping_Manager_out&> (p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_Network_Priority_Mapping_Manager_out &
-TAO_Network_Priority_Mapping_Manager_out::operator= (const ::TAO_Network_Priority_Mapping_Manager_var &p)
-{
-  this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_Network_Priority_Mapping_Manager_out &
-TAO_Network_Priority_Mapping_Manager_out::operator= (TAO_Network_Priority_Mapping_Manager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_out::operator ::TAO_Network_Priority_Mapping_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-///////////////////////////////////////////////////////////////////////////
-ACE_INLINE
-TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCORBA::NetworkPriorityMapping * mapping)
-  : mapping_ (mapping)
-{
-}
-
-ACE_INLINE RTCORBA::NetworkPriorityMapping *
-TAO_Network_Priority_Mapping_Manager::mapping (void)
-{
-  return mapping_;
-}
-
-ACE_INLINE void
-TAO_Network_Priority_Mapping_Manager::mapping (RTCORBA::NetworkPriorityMapping *mapping)
-{
-  delete mapping_;
-  mapping_ = mapping;
-}
-
-
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
deleted file mode 100644
index 99ad2c6bbfd..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Priority_Mapping.h"
-
-ACE_RCSID(RTCORBA,
-          Priority_Mapping,
-          "$Id$")
-
-TAO_Priority_Mapping::~TAO_Priority_Mapping (void)
-{
-}
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h
deleted file mode 100644
index 0e1bcbce46e..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ /dev/null
@@ -1,57 +0,0 @@
-
-//=============================================================================
-/**
- *  @file   Priority_Mapping.h
- *
- *  $Id$
- *
- * Declares the Priority_Mapping interface, as defined in the
- * RT-CORBA spec.
- *
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_PRIORITY_MAPPING_H
-#define TAO_PRIORITY_MAPPING_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-/**
- * @class TAO_Priority_Mapping
- *
- * @brief The interface for priority mapping.
- *
- * Check the RT-CORBA spec (orbos/99-02-12) secions 4.5.2
- */
-class TAO_RTCORBA_Export TAO_Priority_Mapping
-{
-public:
-  /// The destructor
-  virtual ~TAO_Priority_Mapping (void);
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority) = 0;
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority) = 0;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
deleted file mode 100644
index 11a7d1c9ed3..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#include "Priority_Mapping_Manager.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if ! defined (__ACE_INLINE__)
-#include "Priority_Mapping_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RTCORBA, 
-           Priority_Mapping_Manager, 
-           "$Id$")
-
-TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
-{
-  delete mapping_;
-}
-
-TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
-                                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (obj))
-    {
-      return TAO_Priority_Mapping_Manager::_nil ();
-    }
-
-  return 
-    TAO_Priority_Mapping_Manager::_duplicate (
-        dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj)
-      );
-}
-
-TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager::_duplicate (TAO_Priority_Mapping_Manager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
-
-const char*
-TAO_Priority_Mapping_Manager::_interface_repository_id (void) const
-{
-  return "IDL:Priority_Mapping_Manager:1.0";
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
deleted file mode 100644
index 3b5d06c7808..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   Priority_Mapping_Manager.h
- *
- *  $Id$
- *
- *  @author Marina Spivak (marina@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_PRIORITY_MAPPING_MANAGER_H
-#define TAO_PRIORITY_MAPPING_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Priority_Mapping.h"
-#include "tao/LocalObject.h"
-
-class TAO_Priority_Mapping_Manager;
-class TAO_Priority_Mapping_Manager_var;
-typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr;
-
-
-/**
- * @class TAO_Priority_Mapping_Manager
- *
- * @brief Priority_Mapping_Manager pseudo-objref.
- *
- * Allows setting of user-defined Priority_Mapping at run-time.
- */
-class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager :
-  public virtual TAO_Local_RefCounted_Object
-{
-
-public:
-  /// Constructor.
-  TAO_Priority_Mapping_Manager (RTCORBA::PriorityMapping * mapping);
-
-  ///
-  void mapping (RTCORBA::PriorityMapping * mapping);
-
-  ///
-  RTCORBA::PriorityMapping *mapping (void);
-
-public:
-  typedef TAO_Priority_Mapping_Manager_ptr _ptr_type;
-  typedef TAO_Priority_Mapping_Manager_var _var_type;
-
-  // the static operations
-  static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
-  static TAO_Priority_Mapping_Manager_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  static TAO_Priority_Mapping_Manager_ptr _nil (void)
-    {
-      return (TAO_Priority_Mapping_Manager_ptr)0;
-    }
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  ~TAO_Priority_Mapping_Manager (void);
-
-private:
-
-  TAO_Priority_Mapping_Manager (const TAO_Priority_Mapping_Manager &);
-  void operator= (const TAO_Priority_Mapping_Manager &);
-
-private:
-
-  TAO_Priority_Mapping *mapping_;
-};
-
-class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var
-  : private TAO_Base_var
-{
-public:
-  TAO_Priority_Mapping_Manager_var (void); // default constructor
-  TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr);
-  TAO_Priority_Mapping_Manager_var (const TAO_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Priority_Mapping_Manager_var (void); // destructor
-
-  TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr);
-  TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &);
-  TAO_Priority_Mapping_Manager_ptr operator-> (void) const;
-
-  /// in, inout, out, _retn
-  operator const TAO_Priority_Mapping_Manager_ptr &() const;
-  operator TAO_Priority_Mapping_Manager_ptr &();
-  TAO_Priority_Mapping_Manager_ptr in (void) const;
-  TAO_Priority_Mapping_Manager_ptr &inout (void);
-  TAO_Priority_Mapping_Manager_ptr &out (void);
-  TAO_Priority_Mapping_Manager_ptr _retn (void);
-  TAO_Priority_Mapping_Manager_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
-  static void release (TAO_Priority_Mapping_Manager_ptr);
-  static TAO_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
-  static CORBA::Object * upcast (void *);
-
-private:
-  /// Unimplemented - prevents widening assignment.
-  TAO_Priority_Mapping_Manager_ptr ptr_;
-  TAO_Priority_Mapping_Manager_var (const TAO_Base_var &rhs);
-  TAO_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs);
-};
-
-class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_out
-{
-public:
-  TAO_Priority_Mapping_Manager_out (TAO_Priority_Mapping_Manager_ptr &);
-  TAO_Priority_Mapping_Manager_out (TAO_Priority_Mapping_Manager_var &);
-  TAO_Priority_Mapping_Manager_out (const TAO_Priority_Mapping_Manager_out &);
-  TAO_Priority_Mapping_Manager_out &operator= (const TAO_Priority_Mapping_Manager_out &);
-  TAO_Priority_Mapping_Manager_out &operator= (const TAO_Priority_Mapping_Manager_var &);
-  TAO_Priority_Mapping_Manager_out &operator= (TAO_Priority_Mapping_Manager_ptr);
-  operator TAO_Priority_Mapping_Manager_ptr &();
-  TAO_Priority_Mapping_Manager_ptr &ptr (void);
-  TAO_Priority_Mapping_Manager_ptr operator-> (void);
-
-private:
-  TAO_Priority_Mapping_Manager_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Priority_Mapping_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PRIORITY_MAPPING_MANAGER_H */
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
deleted file mode 100644
index 77eb6dec547..00000000000
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
+++ /dev/null
@@ -1,220 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class TAO_Priority_Mapping_Manager_var
-// *************************************************************
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (void) // default constructor
-  : ptr_ (TAO_Priority_Mapping_Manager::_nil ())
-{}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (const ::TAO_Priority_Mapping_Manager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TAO_Priority_Mapping_Manager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_Priority_Mapping_Manager_var &
-TAO_Priority_Mapping_Manager_var::operator= (TAO_Priority_Mapping_Manager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_Priority_Mapping_Manager_var &
-TAO_Priority_Mapping_Manager_var::operator= (const ::TAO_Priority_Mapping_Manager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_Priority_Mapping_Manager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::operator const ::TAO_Priority_Mapping_Manager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_var::operator ::TAO_Priority_Mapping_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_Priority_Mapping_Manager_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
-  return val;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::duplicate (TAO_Priority_Mapping_Manager_ptr p)
-{
-  return ::TAO_Priority_Mapping_Manager::_duplicate (p);
-}
-
-ACE_INLINE void
-TAO_Priority_Mapping_Manager_var::release (TAO_Priority_Mapping_Manager_ptr p)
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::nil (void)
-{
-  return ::TAO_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-TAO_Priority_Mapping_Manager_var::upcast (void *src)
-{
-  TAO_Priority_Mapping_Manager **tmp =
-    static_cast<TAO_Priority_Mapping_Manager **> (src);
-  return *tmp;
-}
-
-
-// *************************************************************
-// Inline operations for class TAO_Priority_Mapping_Manager_out
-// *************************************************************
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_out::TAO_Priority_Mapping_Manager_out (TAO_Priority_Mapping_Manager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_out::TAO_Priority_Mapping_Manager_out (TAO_Priority_Mapping_Manager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_out::TAO_Priority_Mapping_Manager_out (const ::TAO_Priority_Mapping_Manager_out &p) // copy constructor
-  : ptr_ (const_cast<TAO_Priority_Mapping_Manager_out &> (p).ptr_)
-{}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_out &
-TAO_Priority_Mapping_Manager_out::operator= (const ::TAO_Priority_Mapping_Manager_out &p)
-{
-  this->ptr_ = const_cast<TAO_Priority_Mapping_Manager_out&> (p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_Priority_Mapping_Manager_out &
-TAO_Priority_Mapping_Manager_out::operator= (const ::TAO_Priority_Mapping_Manager_var &p)
-{
-  this->ptr_ = ::TAO_Priority_Mapping_Manager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_Priority_Mapping_Manager_out &
-TAO_Priority_Mapping_Manager_out::operator= (TAO_Priority_Mapping_Manager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_Priority_Mapping_Manager_out::operator ::TAO_Priority_Mapping_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-///////////////////////////////////////////////////////////////////////////
-ACE_INLINE
-TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMapping * mapping)
-  : mapping_ (mapping)
-{
-}
-
-ACE_INLINE RTCORBA::PriorityMapping *
-TAO_Priority_Mapping_Manager::mapping (void)
-{
-  return mapping_;
-}
-
-ACE_INLINE void
-TAO_Priority_Mapping_Manager::mapping (RTCORBA::PriorityMapping *mapping)
-{
-  delete mapping_;
-  mapping_ = mapping;
-}
-
-
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
deleted file mode 100644
index f1bf07f576d..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#include "RTCORBA.h"
-
-#if TAO_HAS_CORBA_MESSAGING == 1
-
-#include "RT_ORB_Loader.h"
-
-ACE_RCSID (RTCORBA, RTCORBA, "$Id$")
-
-TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
deleted file mode 100644
index f996f03c640..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-//=============================================================================
-/**
- *  @file RTCORBA.h
- *
- *  $Id$
- *
- *   Takes care of the RT ORB loading on static build.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RTCORBA_H_
-#define TAO_RTCORBA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if TAO_HAS_CORBA_MESSAGING == 1
-
-class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
-{
-public:
-  // Constructor.
-  TAO_RTCORBA_Initializer (void);
-};
-
-static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#endif /* TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RTCORBA_H_ */
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
deleted file mode 100644
index 327f4441339..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
- * @file RTCORBA.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the RTCORBA module.
- *
- * The RTCORBA module specified in CORBA v2.4.2 Chapter 24 (February,
- * 2001).
- *
- * Changes to the original OMG idl:
- *
- *     1.  Two TAO-specific interfaces, UnixDomainProtocolProperties
- *         and SharedMemoryProtocolProperties, have been added to allow
- *         configuration of TAO's UIOP and SHMEM pluggable protocols
- *         through RTCORBA Protocol Policies.
- *     2.  TAO-specific support for named mutexes has been added.
- *     3.  Added RT_ORB::create_tcp_protocol_properties which seems
- *         to come and go from the formal specification, but is needed.
- *
- *   This file was used to generate the code in RTCORBAC.{h,inl,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -o orig -Gp -Gd -Ge 1 -Sci -I../..
- *          -Wb,export_macro=TAO_RTCORBA_Export
- *          -Wb,export_include="rtcorba_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTCORBA.pidl
- *
- *   2. Then apply the patches in tao/RTCORBA/diffs to the generated code.
- *   The patches provide the following fixes: 1) remove several unnecessary
- *   includes, e.g., corba.h, stream.h, Policy.h, 3) add anything else we
- *   need into the namespace, i.e., TAO_Priority_Mapping, and 4) fix
- *   "nested_class" occurrences in the .cpp.
- *
- * Apply patches using the following commands:
- *
- *   patch < diffs/RTCORBA.diff
- *
- * Note: The diffs were generated with these commands:
- *
- *   for i in RTCORBAC.{h,inl,cpp}; do
- *     diff -wBbu orig/$i $i
- *   done > diffs/RTCORBA.diff
- *
- */
-
-#ifndef _RT_CORBA_IDL_
-#define _RT_CORBA_IDL_
-
-#include <IOP.pidl>
-#include <TimeBase.pidl>
-#include <Policy.pidl>
-
-#pragma prefix "omg.org"
-
-module RTCORBA
-{
-  // Priorities.
-  typedef short NativePriority;
-  typedef short Priority;
-  const Priority minPriority = 0;
-  const Priority maxPriority = 32767;
-
-  native PriorityMapping;
-  native PriorityTransform;
-
-  typedef long NetworkPriority;
-  native NetworkPriorityMapping;
-
-  // Threadpool types.
-  typedef unsigned long ThreadpoolId;
-
-  struct ThreadpoolLane
-  {
-    Priority lane_priority;
-    unsigned long static_threads;
-    unsigned long dynamic_threads;
-  };
-  typedef sequence <ThreadpoolLane> ThreadpoolLanes;
-
-  // RT Policies.
-
-  // Priority Model Policy.
-  const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
-  enum PriorityModel
-  {
-    CLIENT_PROPAGATED,
-    SERVER_DECLARED
-  };
-
-  local interface PriorityModelPolicy : CORBA::Policy
-  {
-      readonly attribute PriorityModel priority_model;
-      readonly attribute Priority server_priority;
-  };
-
-  // Threadpool Policy.
-  const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
-  local interface ThreadpoolPolicy : CORBA::Policy
-  {
-      readonly attribute ThreadpoolId threadpool;
-  };
-
-  // Protocol Properties.
-  local interface ProtocolProperties {};
-
-  struct Protocol
-  {
-      IOP::ProfileId protocol_type;
-      ProtocolProperties orb_protocol_properties;
-      ProtocolProperties transport_protocol_properties;
-  };
-
-  typedef sequence <Protocol> ProtocolList;
-
-  // Server Protocol Policy
-  const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42;
-
-  // Locality constrained interface
-  local interface ServerProtocolPolicy : CORBA::Policy
-  {
-    readonly attribute ProtocolList protocols;
-  };
-
-  // Client Protocol Policy
-  const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43;
-
-  // Locality constrained interface
-  local interface ClientProtocolPolicy : CORBA::Policy
-  {
-    readonly attribute ProtocolList protocols;
-  };
-
-  // Private Connection Policy
-  const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44;
-
-  // Locality constrained interface
-  local interface PrivateConnectionPolicy : CORBA::Policy {};
-
-  local interface TCPProtocolProperties : ProtocolProperties
-  {
-    attribute long send_buffer_size;
-    attribute long recv_buffer_size;
-    attribute boolean keep_alive;
-    attribute boolean dont_route;
-    attribute boolean no_delay;
-    attribute boolean enable_network_priority;
-  };
-
-  local interface GIOPProtocolProperties : ProtocolProperties {};
-
-  // Properties for TAO-specific protocols (these protocols &
-  // interfaces are not specified by the OMG).
-
-  // Communication over Unix Domain Sockets (Local IPC).
-  local interface UnixDomainProtocolProperties : ProtocolProperties
-  {
-    attribute long send_buffer_size;
-    attribute long recv_buffer_size;
-  };
-
-  // Communication over Shared Memory.
-  local interface SharedMemoryProtocolProperties : ProtocolProperties
-  {
-    attribute long send_buffer_size;
-    attribute long recv_buffer_size;
-    attribute boolean keep_alive;
-    attribute boolean dont_route;
-    attribute boolean no_delay;
-    attribute long preallocate_buffer_size;
-    attribute string mmap_filename;
-    attribute string mmap_lockname;
-  };
-
-  local interface UserDatagramProtocolProperties : ProtocolProperties
-  {
-    attribute boolean enable_network_priority;
-  };
-
-  local interface StreamControlProtocolProperties : ProtocolProperties
-  {
-    attribute long send_buffer_size;
-    attribute long recv_buffer_size;
-    attribute boolean keep_alive;
-    attribute boolean dont_route;
-    attribute boolean no_delay;
-    attribute boolean enable_network_priority;
-  };
-
-  // End of TAO-specific interfaces.
-
-  // PriorityBandedConnectionPolicy.
-  struct PriorityBand
-  {
-    Priority low;
-    Priority high;
-  };
-  typedef sequence <PriorityBand> PriorityBands;
-
-  const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
-  local interface PriorityBandedConnectionPolicy : CORBA::Policy
-  {
-    readonly attribute PriorityBands priority_bands;
-  };
-
-  // RT Current.
-  local interface Current : CORBA::Current
-  {
-    attribute Priority the_priority;
-  };
-
-  // Mutex.
-  local interface Mutex
-  {
-      void lock ();
-      void unlock ();
-      boolean try_lock (in TimeBase::TimeT max_wait);
-    // if max_wait = 0 then return immediately
-  };
-
-  // RTORB.
-  local interface RTORB
-  {
-    // Mutex creation/destruction.
-    Mutex create_mutex ();
-    void destroy_mutex (in Mutex the_mutex);
-
-    // TAO specific
-    // Named Mutex creation/opening
-    exception MutexNotFound {};
-    Mutex create_named_mutex (in string name,
-                              out boolean created_flag);
-    Mutex open_named_mutex (in string name)
-      raises (MutexNotFound);
-
-    // End TAO specific
-
-    TCPProtocolProperties create_tcp_protocol_properties(
-                                                     in long send_buffer_size,
-                                                     in long recv_buffer_size,
-                                                     in boolean keep_alive,
-                                                     in boolean dont_route,
-                                                     in boolean no_delay,
-                                                     in boolean enable_network_priority);
-
-    UnixDomainProtocolProperties create_unix_domain_protocol_properties(
-                                                     in long send_buffer_size,
-                                                     in long recv_buffer_size);
-
-    SharedMemoryProtocolProperties create_shared_memory_protocol_properties(
-                                                     in long send_buffer_size,
-                                                     in long recv_buffer_size,
-                                                     in boolean keep_alive,
-                                                     in boolean dont_route,
-                                                     in boolean no_delay,
-                                                     in long preallocate_buffer_size,
-                                                     in string mmap_filename,
-                                                     in string mmap_lockname);
-
-    UserDatagramProtocolProperties create_user_datagram_protocol_properties(
-                                                     in boolean enable_network_priority);
-
-    StreamControlProtocolProperties create_stream_control_protocol_properties(
-                                                     in long send_buffer_size,
-                                                     in long recv_buffer_size,
-                                                     in boolean keep_alive,
-                                                     in boolean dont_route,
-                                                     in boolean no_delay,
-                                                     in boolean enable_network_priority);
-
-    // Threadpool creation/destruction.
-    exception InvalidThreadpool {};
-
-    ThreadpoolId create_threadpool (in unsigned long stacksize,
-                                    in unsigned long static_threads,
-                                    in unsigned long dynamic_threads,
-                                    in Priority default_priority,
-                                    in boolean allow_request_buffering,
-                                    in unsigned long max_buffered_requests,
-                                    in unsigned long max_request_buffer_size);
-
-    ThreadpoolId create_threadpool_with_lanes (in unsigned long stacksize,
-                                               in ThreadpoolLanes lanes,
-                                               in boolean allow_borrowing,
-                                               in boolean allow_request_buffering,
-                                               in unsigned long max_buffered_requests,
-                                               in unsigned long max_request_buffer_size);
-
-    void destroy_threadpool (in ThreadpoolId threadpool)
-      raises (InvalidThreadpool);
-
-    // RT Policies creation.
-    PriorityModelPolicy create_priority_model_policy (in PriorityModel priority_model,
-                                                      in Priority server_priority);
-
-    ThreadpoolPolicy create_threadpool_policy (in ThreadpoolId threadpool);
-
-    PriorityBandedConnectionPolicy
-      create_priority_banded_connection_policy (in PriorityBands priority_bands);
-
-
-    ServerProtocolPolicy create_server_protocol_policy (in ProtocolList protocols);
-
-    ClientProtocolPolicy create_client_protocol_policy (in ProtocolList protocols);
-
-    PrivateConnectionPolicy create_private_connection_policy ();
-  };
-};
-
-#endif /* _RT_CORBA_IDL_ */
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
deleted file mode 100644
index f14feb4cb8a..00000000000
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ /dev/null
@@ -1,2467 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RTCORBA.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_NativePriority (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/NativePriority:1.0",
-    "NativePriority",
-    &CORBA::_tc_short);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_NativePriority =
-    &_tao_tc_RTCORBA_NativePriority;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_Priority (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/Priority:1.0",
-    "Priority",
-    &CORBA::_tc_short);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Priority =
-    &_tao_tc_RTCORBA_Priority;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_NetworkPriority (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/NetworkPriority:1.0",
-    "NetworkPriority",
-    &CORBA::_tc_long);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_NetworkPriority =
-    &_tao_tc_RTCORBA_NetworkPriority;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ThreadpoolId (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/ThreadpoolId:1.0",
-    "ThreadpoolId",
-    &CORBA::_tc_ulong);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadpoolId =
-    &_tao_tc_RTCORBA_ThreadpoolId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_RTCORBA_ThreadpoolLane[] =
-  {
-    { "lane_priority", &RTCORBA::_tc_Priority },
-    { "static_threads", &CORBA::_tc_ulong },
-    { "dynamic_threads", &CORBA::_tc_ulong }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ThreadpoolLane (
-    CORBA::tk_struct,
-    "IDL:omg.org/RTCORBA/ThreadpoolLane:1.0",
-    "ThreadpoolLane",
-    _tao_fields_RTCORBA_ThreadpoolLane,
-    3);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane =
-    &_tao_tc_RTCORBA_ThreadpoolLane;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_RTCORBA_ThreadpoolLanes_GUARD
-#define _TAO_TYPECODE_RTCORBA_ThreadpoolLanes_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      RTCORBA_ThreadpoolLanes_0 (
-        CORBA::tk_sequence,
-        &RTCORBA::_tc_ThreadpoolLane,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_RTCORBA_ThreadpoolLanes_0 =
-      &RTCORBA_ThreadpoolLanes_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_RTCORBA_ThreadpoolLanes_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ThreadpoolLanes (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0",
-    "ThreadpoolLanes",
-    &TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes =
-    &_tao_tc_RTCORBA_ThreadpoolLanes;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_RTCORBA_PriorityModel[] =
-  {
-    "CLIENT_PROPAGATED",
-    "SERVER_DECLARED"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PriorityModel (
-    "IDL:omg.org/RTCORBA/PriorityModel:1.0",
-    "PriorityModel",
-    _tao_enumerators_RTCORBA_PriorityModel,
-    2);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityModel =
-    &_tao_tc_RTCORBA_PriorityModel;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PriorityModelPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0",
-    "PriorityModelPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy =
-    &_tao_tc_RTCORBA_PriorityModelPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ThreadpoolPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0",
-    "ThreadpoolPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy =
-    &_tao_tc_RTCORBA_ThreadpoolPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/ProtocolProperties:1.0",
-    "ProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ProtocolProperties =
-    &_tao_tc_RTCORBA_ProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_RTCORBA_Protocol[] =
-  {
-    { "protocol_type", &IOP::_tc_ProfileId },
-    { "orb_protocol_properties", &RTCORBA::_tc_ProtocolProperties },
-    { "transport_protocol_properties", &RTCORBA::_tc_ProtocolProperties }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_Protocol (
-    CORBA::tk_struct,
-    "IDL:omg.org/RTCORBA/Protocol:1.0",
-    "Protocol",
-    _tao_fields_RTCORBA_Protocol,
-    3);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Protocol =
-    &_tao_tc_RTCORBA_Protocol;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_RTCORBA_ProtocolList_GUARD
-#define _TAO_TYPECODE_RTCORBA_ProtocolList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      RTCORBA_ProtocolList_0 (
-        CORBA::tk_sequence,
-        &RTCORBA::_tc_Protocol,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_RTCORBA_ProtocolList_0 =
-      &RTCORBA_ProtocolList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_RTCORBA_ProtocolList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ProtocolList (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/ProtocolList:1.0",
-    "ProtocolList",
-    &TAO::TypeCode::tc_RTCORBA_ProtocolList_0);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ProtocolList =
-    &_tao_tc_RTCORBA_ProtocolList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ServerProtocolPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0",
-    "ServerProtocolPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy =
-    &_tao_tc_RTCORBA_ServerProtocolPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_ClientProtocolPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0",
-    "ClientProtocolPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy =
-    &_tao_tc_RTCORBA_ClientProtocolPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PrivateConnectionPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0",
-    "PrivateConnectionPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy =
-    &_tao_tc_RTCORBA_PrivateConnectionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_TCPProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0",
-    "TCPProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties =
-    &_tao_tc_RTCORBA_TCPProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_GIOPProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0",
-    "GIOPProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties =
-    &_tao_tc_RTCORBA_GIOPProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_UnixDomainProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0",
-    "UnixDomainProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties =
-    &_tao_tc_RTCORBA_UnixDomainProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_SharedMemoryProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0",
-    "SharedMemoryProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties =
-    &_tao_tc_RTCORBA_SharedMemoryProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_UserDatagramProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0",
-    "UserDatagramProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties =
-    &_tao_tc_RTCORBA_UserDatagramProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_StreamControlProtocolProperties (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0",
-    "StreamControlProtocolProperties");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties =
-    &_tao_tc_RTCORBA_StreamControlProtocolProperties;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_RTCORBA_PriorityBand[] =
-  {
-    { "low", &RTCORBA::_tc_Priority },
-    { "high", &RTCORBA::_tc_Priority }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PriorityBand (
-    CORBA::tk_struct,
-    "IDL:omg.org/RTCORBA/PriorityBand:1.0",
-    "PriorityBand",
-    _tao_fields_RTCORBA_PriorityBand,
-    2);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityBand =
-    &_tao_tc_RTCORBA_PriorityBand;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_RTCORBA_PriorityBands_GUARD
-#define _TAO_TYPECODE_RTCORBA_PriorityBands_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      RTCORBA_PriorityBands_0 (
-        CORBA::tk_sequence,
-        &RTCORBA::_tc_PriorityBand,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_RTCORBA_PriorityBands_0 =
-      &RTCORBA_PriorityBands_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_RTCORBA_PriorityBands_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PriorityBands (
-    CORBA::tk_alias,
-    "IDL:omg.org/RTCORBA/PriorityBands:1.0",
-    "PriorityBands",
-    &TAO::TypeCode::tc_RTCORBA_PriorityBands_0);
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityBands =
-    &_tao_tc_RTCORBA_PriorityBands;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_PriorityBandedConnectionPolicy (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0",
-    "PriorityBandedConnectionPolicy");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy =
-    &_tao_tc_RTCORBA_PriorityBandedConnectionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/Current:1.0",
-    "Current");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_RTCORBA_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_Mutex (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/Mutex:1.0",
-    "Mutex");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Mutex =
-    &_tao_tc_RTCORBA_Mutex;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_RTCORBA_RTORB_MutexNotFound = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_RTORB_MutexNotFound (
-    CORBA::tk_except,
-    "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
-    "MutexNotFound",
-    _tao_fields_RTCORBA_RTORB_MutexNotFound,
-    0);
-  
-::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound =
-  &_tao_tc_RTCORBA_RTORB_MutexNotFound;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_RTCORBA_RTORB_InvalidThreadpool = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_RTORB_InvalidThreadpool (
-    CORBA::tk_except,
-    "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
-    "InvalidThreadpool",
-    _tao_fields_RTCORBA_RTORB_InvalidThreadpool,
-    0);
-  
-::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool =
-  &_tao_tc_RTCORBA_RTORB_InvalidThreadpool;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTCORBA_RTORB (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTCORBA/RTORB:1.0",
-    "RTORB");
-  
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RTORB =
-    &_tao_tc_RTCORBA_RTORB;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLane &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert_copy (
-      _tao_any,
-      RTCORBA::ThreadpoolLane::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLane,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLane *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolLane::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLane,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLane *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLane *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLane *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolLane::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolLane,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLanes &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert_copy (
-      _tao_any,
-      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLanes *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLanes *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLanes *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLanes *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-        TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModel _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::insert (
-      _tao_any,
-      RTCORBA::_tc_PriorityModel,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityModel &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
-        _tao_any,
-        RTCORBA::_tc_PriorityModel,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityModelPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PriorityModelPolicy_ptr _tao_objptr =
-    RTCORBA::PriorityModelPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::insert (
-      _tao_any,
-      RTCORBA::PriorityModelPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PriorityModelPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::extract (
-        _tao_any,
-        RTCORBA::PriorityModelPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PriorityModelPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ThreadpoolPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ThreadpoolPolicy_ptr _tao_objptr =
-    RTCORBA::ThreadpoolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::ProtocolProperties_ptr _tao_objptr =
-    RTCORBA::ProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::ProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::ProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_ProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::Protocol &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert_copy (
-      _tao_any,
-      RTCORBA::Protocol::_tao_any_destructor,
-      RTCORBA::_tc_Protocol,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Protocol *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert (
-      _tao_any,
-      RTCORBA::Protocol::_tao_any_destructor,
-      RTCORBA::_tc_Protocol,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Protocol *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::Protocol *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::Protocol *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::extract (
-        _tao_any,
-        RTCORBA::Protocol::_tao_any_destructor,
-        RTCORBA::_tc_Protocol,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert_copy (
-      _tao_any,
-      RTCORBA::ProtocolList::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_ProtocolList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert (
-      _tao_any,
-      RTCORBA::ProtocolList::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_ProtocolList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ProtocolList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::extract (
-        _tao_any,
-        RTCORBA::ProtocolList::_tao_any_destructor,
-        TAO::TypeCode::tc_RTCORBA_ProtocolList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ServerProtocolPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ServerProtocolPolicy_ptr _tao_objptr =
-    RTCORBA::ServerProtocolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ServerProtocolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ServerProtocolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ClientProtocolPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ClientProtocolPolicy_ptr _tao_objptr =
-    RTCORBA::ClientProtocolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ClientProtocolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ClientProtocolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PrivateConnectionPolicy_ptr _tao_objptr =
-    RTCORBA::PrivateConnectionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::insert (
-      _tao_any,
-      RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PrivateConnectionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::extract (
-        _tao_any,
-        RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PrivateConnectionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::TCPProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::TCPProtocolProperties_ptr _tao_objptr =
-    RTCORBA::TCPProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::TCPProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_TCPProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::TCPProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_TCPProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::GIOPProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::GIOPProtocolProperties_ptr _tao_objptr =
-    RTCORBA::GIOPProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_GIOPProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_GIOPProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::UnixDomainProtocolProperties_ptr _tao_objptr =
-    RTCORBA::UnixDomainProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_UnixDomainProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_UnixDomainProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::SharedMemoryProtocolProperties_ptr _tao_objptr =
-    RTCORBA::SharedMemoryProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_SharedMemoryProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_SharedMemoryProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::UserDatagramProtocolProperties_ptr _tao_objptr =
-    RTCORBA::UserDatagramProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_UserDatagramProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_UserDatagramProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::StreamControlProtocolProperties_ptr _tao_objptr =
-    RTCORBA::StreamControlProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_StreamControlProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_StreamControlProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBand &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert_copy (
-      _tao_any,
-      RTCORBA::PriorityBand::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBand,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBand *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert (
-      _tao_any,
-      RTCORBA::PriorityBand::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBand,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBand *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBand *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBand *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::extract (
-        _tao_any,
-        RTCORBA::PriorityBand::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBand,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBands &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert_copy (
-      _tao_any,
-      RTCORBA::PriorityBands::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_PriorityBands_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBands *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert (
-      _tao_any,
-      RTCORBA::PriorityBands::_tao_any_destructor,
-      TAO::TypeCode::tc_RTCORBA_PriorityBands_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBands *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBands *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBands *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::extract (
-        _tao_any,
-        RTCORBA::PriorityBands::_tao_any_destructor,
-        TAO::TypeCode::tc_RTCORBA_PriorityBands_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_objptr =
-    RTCORBA::PriorityBandedConnectionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::insert (
-      _tao_any,
-      RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBandedConnectionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::extract (
-        _tao_any,
-        RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBandedConnectionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr _tao_elem
-  )
-{
-  RTCORBA::Current_ptr _tao_objptr =
-    RTCORBA::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::Current>::insert (
-      _tao_any,
-      RTCORBA::Current::_tao_any_destructor,
-      RTCORBA::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::Current>::extract (
-        _tao_any,
-        RTCORBA::Current::_tao_any_destructor,
-        RTCORBA::_tc_Current,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Mutex>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr _tao_elem
-  )
-{
-  RTCORBA::Mutex_ptr _tao_objptr =
-    RTCORBA::Mutex::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::Mutex>::insert (
-      _tao_any,
-      RTCORBA::Mutex::_tao_any_destructor,
-      RTCORBA::_tc_Mutex,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::Mutex>::extract (
-        _tao_any,
-        RTCORBA::Mutex::_tao_any_destructor,
-        RTCORBA::_tc_Mutex,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::RTORB>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr _tao_elem
-  )
-{
-  RTCORBA::RTORB_ptr _tao_objptr =
-    RTCORBA::RTORB::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::RTORB>::insert (
-      _tao_any,
-      RTCORBA::RTORB::_tao_any_destructor,
-      RTCORBA::_tc_RTORB,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::RTORB>::extract (
-        _tao_any,
-        RTCORBA::RTORB::_tao_any_destructor,
-        RTCORBA::_tc_RTORB,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::MutexNotFound &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert_copy (
-      _tao_any,
-      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_MutexNotFound,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB::MutexNotFound *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert (
-      _tao_any,
-      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_MutexNotFound,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB::MutexNotFound *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::MutexNotFound *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::MutexNotFound *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::extract (
-        _tao_any,
-        RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-        RTCORBA::RTORB::_tc_MutexNotFound,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::InvalidThreadpool &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert_copy (
-      _tao_any,
-      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_InvalidThreadpool,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB::InvalidThreadpool *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert (
-      _tao_any,
-      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_InvalidThreadpool,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::InvalidThreadpool *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::extract (
-        _tao_any,
-        RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-        RTCORBA::RTORB::_tc_InvalidThreadpool,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
deleted file mode 100644
index a442e9accdb..00000000000
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ /dev/null
@@ -1,2975 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "RTCORBA.h"
-#include "tao/CDR.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-//////////////////////////////////////////////////////
-// CDR Encoding Support hand crafted
-
-CORBA::Boolean
-RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
-{
-  return 1;
-}
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
-
-CORBA::Boolean
-RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
-{
-  return 1;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-RTCORBA::ThreadpoolLane::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ThreadpoolLane *_tao_tmp_pointer =
-    static_cast<ThreadpoolLane *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_RTCORBA_THREADPOOLLANES_CS_)
-#define _RTCORBA_THREADPOOLLANES_CS_
-
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void)
-{}
-
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::ThreadpoolLane
-      >
-    (max)
-{}
-
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::ThreadpoolLane * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::ThreadpoolLane
-      >
-    (max, length, buffer, release)
-{}
-
-RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
-    const ThreadpoolLanes &seq
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::ThreadpoolLane
-      >
-    (seq)
-{}
-
-RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void)
-{}
-
-void RTCORBA::ThreadpoolLanes::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ThreadpoolLanes * _tao_tmp_pointer =
-    static_cast<ThreadpoolLanes *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::PriorityModelPolicy.
-
-RTCORBA::PriorityModelPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate (
-    RTCORBA::PriorityModelPolicy_ptr p
-  )
-{
-  return RTCORBA::PriorityModelPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release (
-    RTCORBA::PriorityModelPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::PriorityModelPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::nil (void)
-{
-  return RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal (
-    RTCORBA::PriorityModelPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
-{}
-
-RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
-{}
-
-void 
-RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PriorityModelPolicy *_tao_tmp_pointer =
-    static_cast<PriorityModelPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PriorityModelPolicy::_nil ();
-    }
-  
-  PriorityModelPolicy_ptr proxy =
-    dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-  
-  return PriorityModelPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PriorityModelPolicy::_nil ();
-    }
-  
-  PriorityModelPolicy_ptr proxy =
-    dynamic_cast<PriorityModelPolicy_ptr> (_tao_objref);
-  
-  return PriorityModelPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::PriorityModelPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::ThreadpoolPolicy.
-
-RTCORBA::ThreadpoolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate (
-    RTCORBA::ThreadpoolPolicy_ptr p
-  )
-{
-  return RTCORBA::ThreadpoolPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release (
-    RTCORBA::ThreadpoolPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::ThreadpoolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::nil (void)
-{
-  return RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal (
-    RTCORBA::ThreadpoolPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
-{}
-
-RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
-{}
-
-void 
-RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ThreadpoolPolicy *_tao_tmp_pointer =
-    static_cast<ThreadpoolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadpoolPolicy::_nil ();
-    }
-  
-  ThreadpoolPolicy_ptr proxy =
-    dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-  
-  return ThreadpoolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadpoolPolicy::_nil ();
-    }
-  
-  ThreadpoolPolicy_ptr proxy =
-    dynamic_cast<ThreadpoolPolicy_ptr> (_tao_objref);
-  
-  return ThreadpoolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::ThreadpoolPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::ProtocolProperties.
-
-RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate (
-    RTCORBA::ProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::ProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release (
-    RTCORBA::ProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void)
-{
-  return RTCORBA::ProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
-    RTCORBA::ProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::ProtocolProperties::ProtocolProperties (void)
-{}
-
-RTCORBA::ProtocolProperties::~ProtocolProperties (void)
-{}
-
-void 
-RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ProtocolProperties *_tao_tmp_pointer =
-    static_cast<ProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ProtocolProperties::_nil ();
-    }
-  
-  ProtocolProperties_ptr proxy =
-    dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-  
-  return ProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ProtocolProperties::_nil ();
-    }
-  
-  ProtocolProperties_ptr proxy =
-    dynamic_cast<ProtocolProperties_ptr> (_tao_objref);
-  
-  return ProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::ProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-RTCORBA::Protocol::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Protocol *_tao_tmp_pointer =
-    static_cast<Protocol *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
-#define _RTCORBA_PROTOCOLLIST_CS_
-
-RTCORBA::ProtocolList::ProtocolList (void)
-{}
-
-RTCORBA::ProtocolList::ProtocolList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::Protocol
-      >
-    (max)
-{}
-
-RTCORBA::ProtocolList::ProtocolList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::Protocol * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::Protocol
-      >
-    (max, length, buffer, release)
-{}
-
-RTCORBA::ProtocolList::ProtocolList (
-    const ProtocolList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::Protocol
-      >
-    (seq)
-{}
-
-RTCORBA::ProtocolList::~ProtocolList (void)
-{}
-
-void RTCORBA::ProtocolList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ProtocolList * _tao_tmp_pointer =
-    static_cast<ProtocolList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::ServerProtocolPolicy.
-
-RTCORBA::ServerProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate (
-    RTCORBA::ServerProtocolPolicy_ptr p
-  )
-{
-  return RTCORBA::ServerProtocolPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release (
-    RTCORBA::ServerProtocolPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::ServerProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::nil (void)
-{
-  return RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal (
-    RTCORBA::ServerProtocolPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
-{}
-
-RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
-{}
-
-void 
-RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerProtocolPolicy *_tao_tmp_pointer =
-    static_cast<ServerProtocolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerProtocolPolicy::_nil ();
-    }
-  
-  ServerProtocolPolicy_ptr proxy =
-    dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-  
-  return ServerProtocolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerProtocolPolicy::_nil ();
-    }
-  
-  ServerProtocolPolicy_ptr proxy =
-    dynamic_cast<ServerProtocolPolicy_ptr> (_tao_objref);
-  
-  return ServerProtocolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::ServerProtocolPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::ClientProtocolPolicy.
-
-RTCORBA::ClientProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate (
-    RTCORBA::ClientProtocolPolicy_ptr p
-  )
-{
-  return RTCORBA::ClientProtocolPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release (
-    RTCORBA::ClientProtocolPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::ClientProtocolPolicy_ptr
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::nil (void)
-{
-  return RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal (
-    RTCORBA::ClientProtocolPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
-{}
-
-RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
-{}
-
-void 
-RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientProtocolPolicy *_tao_tmp_pointer =
-    static_cast<ClientProtocolPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientProtocolPolicy::_nil ();
-    }
-  
-  ClientProtocolPolicy_ptr proxy =
-    dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-  
-  return ClientProtocolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientProtocolPolicy::_nil ();
-    }
-  
-  ClientProtocolPolicy_ptr proxy =
-    dynamic_cast<ClientProtocolPolicy_ptr> (_tao_objref);
-  
-  return ClientProtocolPolicy::_duplicate (proxy);
-}
-
-RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::ClientProtocolPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::PrivateConnectionPolicy.
-
-RTCORBA::PrivateConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate (
-    RTCORBA::PrivateConnectionPolicy_ptr p
-  )
-{
-  return RTCORBA::PrivateConnectionPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release (
-    RTCORBA::PrivateConnectionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::nil (void)
-{
-  return RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal (
-    RTCORBA::PrivateConnectionPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
-{}
-
-RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
-{}
-
-void 
-RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PrivateConnectionPolicy *_tao_tmp_pointer =
-    static_cast<PrivateConnectionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PrivateConnectionPolicy::_nil ();
-    }
-  
-  PrivateConnectionPolicy_ptr proxy =
-    dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-  
-  return PrivateConnectionPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PrivateConnectionPolicy::_nil ();
-    }
-  
-  PrivateConnectionPolicy_ptr proxy =
-    dynamic_cast<PrivateConnectionPolicy_ptr> (_tao_objref);
-  
-  return PrivateConnectionPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::PrivateConnectionPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::TCPProtocolProperties.
-
-RTCORBA::TCPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate (
-    RTCORBA::TCPProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::TCPProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release (
-    RTCORBA::TCPProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::TCPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::nil (void)
-{
-  return RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal (
-    RTCORBA::TCPProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
-{}
-
-RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
-{}
-
-void 
-RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TCPProtocolProperties *_tao_tmp_pointer =
-    static_cast<TCPProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TCPProtocolProperties::_nil ();
-    }
-  
-  TCPProtocolProperties_ptr proxy =
-    dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-  
-  return TCPProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TCPProtocolProperties::_nil ();
-    }
-  
-  TCPProtocolProperties_ptr proxy =
-    dynamic_cast<TCPProtocolProperties_ptr> (_tao_objref);
-  
-  return TCPProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::TCPProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::GIOPProtocolProperties.
-
-RTCORBA::GIOPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate (
-    RTCORBA::GIOPProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::GIOPProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release (
-    RTCORBA::GIOPProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::GIOPProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::nil (void)
-{
-  return RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal (
-    RTCORBA::GIOPProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
-{}
-
-RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
-{}
-
-void 
-RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  GIOPProtocolProperties *_tao_tmp_pointer =
-    static_cast<GIOPProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return GIOPProtocolProperties::_nil ();
-    }
-  
-  GIOPProtocolProperties_ptr proxy =
-    dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-  
-  return GIOPProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return GIOPProtocolProperties::_nil ();
-    }
-  
-  GIOPProtocolProperties_ptr proxy =
-    dynamic_cast<GIOPProtocolProperties_ptr> (_tao_objref);
-  
-  return GIOPProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::GIOPProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::UnixDomainProtocolProperties.
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate (
-    RTCORBA::UnixDomainProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release (
-    RTCORBA::UnixDomainProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::nil (void)
-{
-  return RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal (
-    RTCORBA::UnixDomainProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
-{}
-
-RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
-{}
-
-void 
-RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UnixDomainProtocolProperties *_tao_tmp_pointer =
-    static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return UnixDomainProtocolProperties::_nil ();
-    }
-  
-  UnixDomainProtocolProperties_ptr proxy =
-    dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-  
-  return UnixDomainProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return UnixDomainProtocolProperties::_nil ();
-    }
-  
-  UnixDomainProtocolProperties_ptr proxy =
-    dynamic_cast<UnixDomainProtocolProperties_ptr> (_tao_objref);
-  
-  return UnixDomainProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::UnixDomainProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::SharedMemoryProtocolProperties.
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate (
-    RTCORBA::SharedMemoryProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release (
-    RTCORBA::SharedMemoryProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::nil (void)
-{
-  return RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal (
-    RTCORBA::SharedMemoryProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
-{}
-
-RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
-{}
-
-void 
-RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  SharedMemoryProtocolProperties *_tao_tmp_pointer =
-    static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return SharedMemoryProtocolProperties::_nil ();
-    }
-  
-  SharedMemoryProtocolProperties_ptr proxy =
-    dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-  
-  return SharedMemoryProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return SharedMemoryProtocolProperties::_nil ();
-    }
-  
-  SharedMemoryProtocolProperties_ptr proxy =
-    dynamic_cast<SharedMemoryProtocolProperties_ptr> (_tao_objref);
-  
-  return SharedMemoryProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::SharedMemoryProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::UserDatagramProtocolProperties.
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::duplicate (
-    RTCORBA::UserDatagramProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::UserDatagramProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release (
-    RTCORBA::UserDatagramProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::nil (void)
-{
-  return RTCORBA::UserDatagramProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::marshal (
-    RTCORBA::UserDatagramProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::UserDatagramProtocolProperties::UserDatagramProtocolProperties (void)
-{}
-
-RTCORBA::UserDatagramProtocolProperties::~UserDatagramProtocolProperties (void)
-{}
-
-void 
-RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UserDatagramProtocolProperties *_tao_tmp_pointer =
-    static_cast<UserDatagramProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-RTCORBA::UserDatagramProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return UserDatagramProtocolProperties::_nil ();
-    }
-  
-  UserDatagramProtocolProperties_ptr proxy =
-    dynamic_cast<UserDatagramProtocolProperties_ptr> (_tao_objref);
-  
-  return UserDatagramProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return UserDatagramProtocolProperties::_nil ();
-    }
-  
-  UserDatagramProtocolProperties_ptr proxy =
-    dynamic_cast<UserDatagramProtocolProperties_ptr> (_tao_objref);
-  
-  return UserDatagramProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-RTCORBA::UserDatagramProtocolProperties::_duplicate (UserDatagramProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::UserDatagramProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::UserDatagramProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::StreamControlProtocolProperties.
-
-RTCORBA::StreamControlProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::duplicate (
-    RTCORBA::StreamControlProtocolProperties_ptr p
-  )
-{
-  return RTCORBA::StreamControlProtocolProperties::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release (
-    RTCORBA::StreamControlProtocolProperties_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::StreamControlProtocolProperties_ptr
-TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::nil (void)
-{
-  return RTCORBA::StreamControlProtocolProperties::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::marshal (
-    RTCORBA::StreamControlProtocolProperties_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::StreamControlProtocolProperties::StreamControlProtocolProperties (void)
-{}
-
-RTCORBA::StreamControlProtocolProperties::~StreamControlProtocolProperties (void)
-{}
-
-void 
-RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
-{
-  StreamControlProtocolProperties *_tao_tmp_pointer =
-    static_cast<StreamControlProtocolProperties *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::StreamControlProtocolProperties_ptr
-RTCORBA::StreamControlProtocolProperties::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return StreamControlProtocolProperties::_nil ();
-    }
-  
-  StreamControlProtocolProperties_ptr proxy =
-    dynamic_cast<StreamControlProtocolProperties_ptr> (_tao_objref);
-  
-  return StreamControlProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::StreamControlProtocolProperties_ptr
-RTCORBA::StreamControlProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return StreamControlProtocolProperties::_nil ();
-    }
-  
-  StreamControlProtocolProperties_ptr proxy =
-    dynamic_cast<StreamControlProtocolProperties_ptr> (_tao_objref);
-  
-  return StreamControlProtocolProperties::_duplicate (proxy);
-}
-
-RTCORBA::StreamControlProtocolProperties_ptr
-RTCORBA::StreamControlProtocolProperties::_duplicate (StreamControlProtocolProperties_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolProperties_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::StreamControlProtocolProperties::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::StreamControlProtocolProperties::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-RTCORBA::PriorityBand::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  PriorityBand *_tao_tmp_pointer =
-    static_cast<PriorityBand *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
-#define _RTCORBA_PRIORITYBANDS_CS_
-
-RTCORBA::PriorityBands::PriorityBands (void)
-{}
-
-RTCORBA::PriorityBands::PriorityBands (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::PriorityBand
-      >
-    (max)
-{}
-
-RTCORBA::PriorityBands::PriorityBands (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::PriorityBand * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::PriorityBand
-      >
-    (max, length, buffer, release)
-{}
-
-RTCORBA::PriorityBands::PriorityBands (
-    const PriorityBands &seq
-  )
-  : TAO_Unbounded_Sequence<
-        RTCORBA::PriorityBand
-      >
-    (seq)
-{}
-
-RTCORBA::PriorityBands::~PriorityBands (void)
-{}
-
-void RTCORBA::PriorityBands::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  PriorityBands * _tao_tmp_pointer =
-    static_cast<PriorityBands *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::PriorityBandedConnectionPolicy.
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate (
-    RTCORBA::PriorityBandedConnectionPolicy_ptr p
-  )
-{
-  return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release (
-    RTCORBA::PriorityBandedConnectionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::nil (void)
-{
-  return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal (
-    RTCORBA::PriorityBandedConnectionPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
-{}
-
-RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
-{}
-
-void 
-RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PriorityBandedConnectionPolicy *_tao_tmp_pointer =
-    static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PriorityBandedConnectionPolicy::_nil ();
-    }
-  
-  PriorityBandedConnectionPolicy_ptr proxy =
-    dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-  
-  return PriorityBandedConnectionPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PriorityBandedConnectionPolicy::_nil ();
-    }
-  
-  PriorityBandedConnectionPolicy_ptr proxy =
-    dynamic_cast<PriorityBandedConnectionPolicy_ptr> (_tao_objref);
-  
-  return PriorityBandedConnectionPolicy::_duplicate (proxy);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::PriorityBandedConnectionPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::Current.
-
-RTCORBA::Current_ptr
-TAO::Objref_Traits<RTCORBA::Current>::duplicate (
-    RTCORBA::Current_ptr p
-  )
-{
-  return RTCORBA::Current::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::Current>::release (
-    RTCORBA::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::Current_ptr
-TAO::Objref_Traits<RTCORBA::Current>::nil (void)
-{
-  return RTCORBA::Current::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::Current>::marshal (
-    RTCORBA::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::Current::Current (void)
-{}
-
-RTCORBA::Current::~Current (void)
-{}
-
-void 
-RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::Current_ptr
-RTCORBA::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-RTCORBA::Current_ptr
-RTCORBA::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-RTCORBA::Current_ptr
-RTCORBA::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::Current::_tao_release (Current_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::Current::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/Current:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::Current::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::Mutex.
-
-RTCORBA::Mutex_ptr
-TAO::Objref_Traits<RTCORBA::Mutex>::duplicate (
-    RTCORBA::Mutex_ptr p
-  )
-{
-  return RTCORBA::Mutex::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::Mutex>::release (
-    RTCORBA::Mutex_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::Mutex_ptr
-TAO::Objref_Traits<RTCORBA::Mutex>::nil (void)
-{
-  return RTCORBA::Mutex::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::Mutex>::marshal (
-    RTCORBA::Mutex_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTCORBA::Mutex::Mutex (void)
-{}
-
-RTCORBA::Mutex::~Mutex (void)
-{}
-
-void 
-RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Mutex *_tao_tmp_pointer =
-    static_cast<Mutex *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::Mutex_ptr
-RTCORBA::Mutex::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Mutex::_nil ();
-    }
-  
-  Mutex_ptr proxy =
-    dynamic_cast<Mutex_ptr> (_tao_objref);
-  
-  return Mutex::_duplicate (proxy);
-}
-
-RTCORBA::Mutex_ptr
-RTCORBA::Mutex::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Mutex::_nil ();
-    }
-  
-  Mutex_ptr proxy =
-    dynamic_cast<Mutex_ptr> (_tao_objref);
-  
-  return Mutex::_duplicate (proxy);
-}
-
-RTCORBA::Mutex_ptr
-RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::Mutex::_tao_release (Mutex_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::Mutex::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/Mutex:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::Mutex::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/Mutex:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::Mutex::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTCORBA::RTORB.
-
-RTCORBA::RTORB_ptr
-TAO::Objref_Traits<RTCORBA::RTORB>::duplicate (
-    RTCORBA::RTORB_ptr p
-  )
-{
-  return RTCORBA::RTORB::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTCORBA::RTORB>::release (
-    RTCORBA::RTORB_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTCORBA::RTORB_ptr
-TAO::Objref_Traits<RTCORBA::RTORB>::nil (void)
-{
-  return RTCORBA::RTORB::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
-    RTCORBA::RTORB_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
-  : CORBA::UserException (
-        "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
-        "MutexNotFound"
-      )
-{
-}
-
-RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void)
-{
-}
-
-RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-RTCORBA::RTORB::MutexNotFound&
-RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
-{
-  MutexNotFound *_tao_tmp_pointer =
-    static_cast<MutexNotFound *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-RTCORBA::RTORB::MutexNotFound *
-RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<MutexNotFound *> (_tao_excp);
-}
-
-const RTCORBA::RTORB::MutexNotFound *
-RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const MutexNotFound *> (_tao_excp);
-}
-
-CORBA::Exception *RTCORBA::RTORB::MutexNotFound::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::MutexNotFound, 0);
-  return retval;
-}
-
-CORBA::Exception *
-RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::RTCORBA::RTORB::MutexNotFound (*this),
-      0
-    );
-  return result;
-}
-
-void RTCORBA::RTORB::MutexNotFound::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void RTCORBA::RTORB::MutexNotFound::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void RTCORBA::RTORB::MutexNotFound::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_tao_type (void) const
-{
-  return ::RTCORBA::RTORB::_tc_MutexNotFound;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
-  : CORBA::UserException (
-        "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
-        "InvalidThreadpool"
-      )
-{
-}
-
-RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void)
-{
-}
-
-RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-RTCORBA::RTORB::InvalidThreadpool&
-RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidThreadpool *_tao_tmp_pointer =
-    static_cast<InvalidThreadpool *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-RTCORBA::RTORB::InvalidThreadpool *
-RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidThreadpool *> (_tao_excp);
-}
-
-const RTCORBA::RTORB::InvalidThreadpool *
-RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidThreadpool *> (_tao_excp);
-}
-
-CORBA::Exception *RTCORBA::RTORB::InvalidThreadpool::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::RTCORBA::RTORB::InvalidThreadpool, 0);
-  return retval;
-}
-
-CORBA::Exception *
-RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::RTCORBA::RTORB::InvalidThreadpool (*this),
-      0
-    );
-  return result;
-}
-
-void RTCORBA::RTORB::InvalidThreadpool::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_tao_type (void) const
-{
-  return ::RTCORBA::RTORB::_tc_InvalidThreadpool;
-}
-
-RTCORBA::RTORB::RTORB (void)
-{}
-
-RTCORBA::RTORB::~RTORB (void)
-{}
-
-void 
-RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RTORB *_tao_tmp_pointer =
-    static_cast<RTORB *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTCORBA::RTORB_ptr
-RTCORBA::RTORB::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RTORB::_nil ();
-    }
-  
-  RTORB_ptr proxy =
-    dynamic_cast<RTORB_ptr> (_tao_objref);
-  
-  return RTORB::_duplicate (proxy);
-}
-
-RTCORBA::RTORB_ptr
-RTCORBA::RTORB::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RTORB::_nil ();
-    }
-  
-  RTORB_ptr proxy =
-    dynamic_cast<RTORB_ptr> (_tao_objref);
-  
-  return RTORB::_duplicate (proxy);
-}
-
-RTCORBA::RTORB_ptr
-RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTCORBA::RTORB::_tao_release (RTORB_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTCORBA::RTORB::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/RTORB:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTCORBA::RTORB::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/RTORB:1.0";
-}
-
-CORBA::Boolean
-RTCORBA::RTORB::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const RTCORBA::ThreadpoolLane &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.lane_priority) &&
-    (strm << _tao_aggregate.static_threads) &&
-    (strm << _tao_aggregate.dynamic_threads);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    RTCORBA::ThreadpoolLane &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.lane_priority) &&
-    (strm >> _tao_aggregate.static_threads) &&
-    (strm >> _tao_aggregate.dynamic_threads);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
-#define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const RTCORBA::ThreadpoolLanes &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    RTCORBA::ThreadpoolLanes &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, RTCORBA::PriorityModel _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, RTCORBA::PriorityModel & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<RTCORBA::PriorityModel> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const RTCORBA::PriorityBand &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.low) &&
-    (strm << _tao_aggregate.high);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    RTCORBA::PriorityBand &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.low) &&
-    (strm >> _tao_aggregate.high);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
-#define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const RTCORBA::PriorityBands &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    RTCORBA::PriorityBands &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
deleted file mode 100644
index df79549f42e..00000000000
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ /dev/null
@@ -1,3516 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_RTCORBAC_H_
-#define _TAO_IDL_ORIG_RTCORBAC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#ifndef TAO_RTCORBA_SAFE_INCLUDE
-#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
-#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "rtcorba_export.h"
-#include "rtcorba_typedefs.h"
-#include "tao/ORB.h"
-#include "tao/TimeBaseC.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/IOPC.h"
-#include "tao/TimeBaseC.h"
-#include "tao/PolicyC.h"
-
-#include "tao/Encodable.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_RTCORBA_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace RTCORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short NativePriority;
-  typedef CORBA::Short_out NativePriority_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_NativePriority;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short Priority;
-  typedef CORBA::Short_out Priority_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Priority;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const RTCORBA::Priority minPriority = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const RTCORBA::Priority maxPriority = 32767;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Long NetworkPriority;
-  typedef CORBA::Long_out NetworkPriority_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_NetworkPriority;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ThreadpoolId;
-  typedef CORBA::ULong_out ThreadpoolId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolId;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ThreadpoolLane;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        ThreadpoolLane
-      >
-    ThreadpoolLane_var;
-  
-  typedef
-    ThreadpoolLane &
-    ThreadpoolLane_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_RTCORBA_Export ThreadpoolLane
-  {
-    typedef ThreadpoolLane_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    RTCORBA::Priority lane_priority;
-    CORBA::ULong static_threads;
-    CORBA::ULong dynamic_threads;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_RTCORBA_THREADPOOLLANES_CH_)
-#define _RTCORBA_THREADPOOLLANES_CH_
-  
-  class ThreadpoolLanes;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ThreadpoolLanes,
-        ThreadpoolLane
-      >
-    ThreadpoolLanes_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ThreadpoolLanes,
-        ThreadpoolLanes_var,
-        ThreadpoolLane
-      >
-    ThreadpoolLanes_out;
-  
-  class TAO_RTCORBA_Export ThreadpoolLanes
-    : public
-        TAO_Unbounded_Sequence<
-            ThreadpoolLane
-          >
-  {
-  public:
-    ThreadpoolLanes (void);
-    ThreadpoolLanes (CORBA::ULong max);
-    ThreadpoolLanes (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ThreadpoolLane* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ThreadpoolLanes (const ThreadpoolLanes &);
-    ~ThreadpoolLanes (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ThreadpoolLanes_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum PriorityModel
-  {
-    CLIENT_PROPAGATED,
-    SERVER_DECLARED
-  };
-  
-  typedef PriorityModel &PriorityModel_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityModel;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
-  
-  class PriorityModelPolicy;
-  typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PriorityModelPolicy
-      >
-    PriorityModelPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PriorityModelPolicy
-      >
-    PriorityModelPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY_CH_
-  
-  class TAO_RTCORBA_Export PriorityModelPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef PriorityModelPolicy_ptr _ptr_type;
-    typedef PriorityModelPolicy_var _var_type;
-    
-    // The static operations.
-    static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-    
-    static void _tao_release (PriorityModelPolicy_ptr obj);
-    
-    static PriorityModelPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PriorityModelPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PriorityModelPolicy_ptr _nil (void)
-    {
-      return static_cast<PriorityModelPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::PriorityModel priority_model (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual RTCORBA::Priority server_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PriorityModelPolicy (void);
-    
-    virtual ~PriorityModelPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PriorityModelPolicy (const PriorityModelPolicy &);
-    
-    void operator= (const PriorityModelPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
-  
-  class ThreadpoolPolicy;
-  typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ThreadpoolPolicy
-      >
-    ThreadpoolPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ThreadpoolPolicy
-      >
-    ThreadpoolPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
-#define _RTCORBA_THREADPOOLPOLICY_CH_
-  
-  class TAO_RTCORBA_Export ThreadpoolPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ThreadpoolPolicy_ptr _ptr_type;
-    typedef ThreadpoolPolicy_var _var_type;
-    
-    // The static operations.
-    static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-    
-    static void _tao_release (ThreadpoolPolicy_ptr obj);
-    
-    static ThreadpoolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ThreadpoolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ThreadpoolPolicy_ptr _nil (void)
-    {
-      return static_cast<ThreadpoolPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual RTCORBA::ThreadpoolId threadpool (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ThreadpoolPolicy (void);
-    
-    virtual ~ThreadpoolPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ThreadpoolPolicy (const ThreadpoolPolicy &);
-    
-    void operator= (const ThreadpoolPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class ProtocolProperties;
-  typedef ProtocolProperties *ProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ProtocolProperties
-      >
-    ProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ProtocolProperties
-      >
-    ProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export ProtocolProperties
-    : public virtual CORBA::Object
-    , public virtual TAO_Encodable
-  {
-  public:
-    typedef ProtocolProperties_ptr _ptr_type;
-    typedef ProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    
-    static void _tao_release (ProtocolProperties_ptr obj);
-    
-    static ProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<ProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-    // CDR Encoder/Decoder methods. (handcrafted)
-    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-  protected:
-    // Abstract or local interface only.
-    ProtocolProperties (void);
-    
-    virtual ~ProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ProtocolProperties (const ProtocolProperties &);
-    
-    void operator= (const ProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct Protocol;
-  
-  typedef
-    TAO_Var_Var_T<
-        Protocol
-      >
-    Protocol_var;
-  
-  typedef
-    TAO_Out_T<
-        Protocol,
-        Protocol_var
-      >
-    Protocol_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_RTCORBA_Export Protocol
-  {
-    typedef Protocol_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    IOP::ProfileId protocol_type;
-    RTCORBA::ProtocolProperties_var orb_protocol_properties;
-    RTCORBA::ProtocolProperties_var transport_protocol_properties;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Protocol;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_RTCORBA_PROTOCOLLIST_CH_)
-#define _RTCORBA_PROTOCOLLIST_CH_
-  
-  class ProtocolList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ProtocolList,
-        Protocol
-      >
-    ProtocolList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ProtocolList,
-        ProtocolList_var,
-        Protocol
-      >
-    ProtocolList_out;
-  
-  class TAO_RTCORBA_Export ProtocolList
-    : public
-        TAO_Unbounded_Sequence<
-            Protocol
-          >
-  {
-  public:
-    ProtocolList (void);
-    ProtocolList (CORBA::ULong max);
-    ProtocolList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Protocol* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ProtocolList (const ProtocolList &);
-    ~ProtocolList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ProtocolList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ProtocolList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
-  
-  class ServerProtocolPolicy;
-  typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServerProtocolPolicy
-      >
-    ServerProtocolPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServerProtocolPolicy
-      >
-    ServerProtocolPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
-  
-  class TAO_RTCORBA_Export ServerProtocolPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ServerProtocolPolicy_ptr _ptr_type;
-    typedef ServerProtocolPolicy_var _var_type;
-    
-    // The static operations.
-    static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-    
-    static void _tao_release (ServerProtocolPolicy_ptr obj);
-    
-    static ServerProtocolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerProtocolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerProtocolPolicy_ptr _nil (void)
-    {
-      return static_cast<ServerProtocolPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::ProtocolList * protocols (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ServerProtocolPolicy (void);
-    
-    virtual ~ServerProtocolPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerProtocolPolicy (const ServerProtocolPolicy &);
-    
-    void operator= (const ServerProtocolPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
-  
-  class ClientProtocolPolicy;
-  typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ClientProtocolPolicy
-      >
-    ClientProtocolPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ClientProtocolPolicy
-      >
-    ClientProtocolPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
-  
-  class TAO_RTCORBA_Export ClientProtocolPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ClientProtocolPolicy_ptr _ptr_type;
-    typedef ClientProtocolPolicy_var _var_type;
-    
-    // The static operations.
-    static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-    
-    static void _tao_release (ClientProtocolPolicy_ptr obj);
-    
-    static ClientProtocolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientProtocolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientProtocolPolicy_ptr _nil (void)
-    {
-      return static_cast<ClientProtocolPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::ProtocolList * protocols (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ClientProtocolPolicy (void);
-    
-    virtual ~ClientProtocolPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ClientProtocolPolicy (const ClientProtocolPolicy &);
-    
-    void operator= (const ClientProtocolPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
-  
-  class PrivateConnectionPolicy;
-  typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PrivateConnectionPolicy
-      >
-    PrivateConnectionPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PrivateConnectionPolicy
-      >
-    PrivateConnectionPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-  
-  class TAO_RTCORBA_Export PrivateConnectionPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef PrivateConnectionPolicy_ptr _ptr_type;
-    typedef PrivateConnectionPolicy_var _var_type;
-    
-    // The static operations.
-    static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-    
-    static void _tao_release (PrivateConnectionPolicy_ptr obj);
-    
-    static PrivateConnectionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PrivateConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PrivateConnectionPolicy_ptr _nil (void)
-    {
-      return static_cast<PrivateConnectionPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PrivateConnectionPolicy (void);
-    
-    virtual ~PrivateConnectionPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PrivateConnectionPolicy (const PrivateConnectionPolicy &);
-    
-    void operator= (const PrivateConnectionPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class TCPProtocolProperties;
-  typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        TCPProtocolProperties
-      >
-    TCPProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        TCPProtocolProperties
-      >
-    TCPProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export TCPProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef TCPProtocolProperties_ptr _ptr_type;
-    typedef TCPProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
-    
-    static void _tao_release (TCPProtocolProperties_ptr obj);
-    
-    static TCPProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TCPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TCPProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<TCPProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void keep_alive (
-        ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void dont_route (
-        ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void no_delay (
-        ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void enable_network_priority (
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    TCPProtocolProperties (void);
-    
-    virtual ~TCPProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    TCPProtocolProperties (const TCPProtocolProperties &);
-    
-    void operator= (const TCPProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class GIOPProtocolProperties;
-  typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        GIOPProtocolProperties
-      >
-    GIOPProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        GIOPProtocolProperties
-      >
-    GIOPProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export GIOPProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef GIOPProtocolProperties_ptr _ptr_type;
-    typedef GIOPProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
-    
-    static void _tao_release (GIOPProtocolProperties_ptr obj);
-    
-    static GIOPProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static GIOPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static GIOPProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<GIOPProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    GIOPProtocolProperties (void);
-    
-    virtual ~GIOPProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    GIOPProtocolProperties (const GIOPProtocolProperties &);
-    
-    void operator= (const GIOPProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class UnixDomainProtocolProperties;
-  typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        UnixDomainProtocolProperties
-      >
-    UnixDomainProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        UnixDomainProtocolProperties
-      >
-    UnixDomainProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export UnixDomainProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef UnixDomainProtocolProperties_ptr _ptr_type;
-    typedef UnixDomainProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
-    
-    static void _tao_release (UnixDomainProtocolProperties_ptr obj);
-    
-    static UnixDomainProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UnixDomainProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UnixDomainProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<UnixDomainProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    UnixDomainProtocolProperties (void);
-    
-    virtual ~UnixDomainProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
-    
-    void operator= (const UnixDomainProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class SharedMemoryProtocolProperties;
-  typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        SharedMemoryProtocolProperties
-      >
-    SharedMemoryProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        SharedMemoryProtocolProperties
-      >
-    SharedMemoryProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export SharedMemoryProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef SharedMemoryProtocolProperties_ptr _ptr_type;
-    typedef SharedMemoryProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
-    
-    static void _tao_release (SharedMemoryProtocolProperties_ptr obj);
-    
-    static SharedMemoryProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static SharedMemoryProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<SharedMemoryProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void keep_alive (
-        ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void dont_route (
-        ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void no_delay (
-        ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long preallocate_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void preallocate_buffer_size (
-        ::CORBA::Long preallocate_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * mmap_filename (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void mmap_filename (
-        const char * mmap_filename
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * mmap_lockname (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void mmap_lockname (
-        const char * mmap_lockname
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    SharedMemoryProtocolProperties (void);
-    
-    virtual ~SharedMemoryProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
-    
-    void operator= (const SharedMemoryProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class UserDatagramProtocolProperties;
-  typedef UserDatagramProtocolProperties *UserDatagramProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        UserDatagramProtocolProperties
-      >
-    UserDatagramProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        UserDatagramProtocolProperties
-      >
-    UserDatagramProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export UserDatagramProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef UserDatagramProtocolProperties_ptr _ptr_type;
-    typedef UserDatagramProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static UserDatagramProtocolProperties_ptr _duplicate (UserDatagramProtocolProperties_ptr obj);
-    
-    static void _tao_release (UserDatagramProtocolProperties_ptr obj);
-    
-    static UserDatagramProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UserDatagramProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static UserDatagramProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<UserDatagramProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void enable_network_priority (
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    UserDatagramProtocolProperties (void);
-    
-    virtual ~UserDatagramProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    UserDatagramProtocolProperties (const UserDatagramProtocolProperties &);
-    
-    void operator= (const UserDatagramProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_)
-#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_
-  
-  class StreamControlProtocolProperties;
-  typedef StreamControlProtocolProperties *StreamControlProtocolProperties_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        StreamControlProtocolProperties
-      >
-    StreamControlProtocolProperties_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        StreamControlProtocolProperties
-      >
-    StreamControlProtocolProperties_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_
-  
-  class TAO_RTCORBA_Export StreamControlProtocolProperties
-    : public virtual ::RTCORBA::ProtocolProperties
-  {
-  public:
-    typedef StreamControlProtocolProperties_ptr _ptr_type;
-    typedef StreamControlProtocolProperties_var _var_type;
-    
-    // The static operations.
-    static StreamControlProtocolProperties_ptr _duplicate (StreamControlProtocolProperties_ptr obj);
-    
-    static void _tao_release (StreamControlProtocolProperties_ptr obj);
-    
-    static StreamControlProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StreamControlProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static StreamControlProtocolProperties_ptr _nil (void)
-    {
-      return static_cast<StreamControlProtocolProperties_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_buffer_size (
-        ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void recv_buffer_size (
-        ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void keep_alive (
-        ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void dont_route (
-        ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void no_delay (
-        ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void enable_network_priority (
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    StreamControlProtocolProperties (void);
-    
-    virtual ~StreamControlProtocolProperties (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    StreamControlProtocolProperties (const StreamControlProtocolProperties &);
-    
-    void operator= (const StreamControlProtocolProperties &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct PriorityBand;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        PriorityBand
-      >
-    PriorityBand_var;
-  
-  typedef
-    PriorityBand &
-    PriorityBand_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_RTCORBA_Export PriorityBand
-  {
-    typedef PriorityBand_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    RTCORBA::Priority low;
-    RTCORBA::Priority high;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBand;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_RTCORBA_PRIORITYBANDS_CH_)
-#define _RTCORBA_PRIORITYBANDS_CH_
-  
-  class PriorityBands;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        PriorityBands,
-        PriorityBand
-      >
-    PriorityBands_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        PriorityBands,
-        PriorityBands_var,
-        PriorityBand
-      >
-    PriorityBands_out;
-  
-  class TAO_RTCORBA_Export PriorityBands
-    : public
-        TAO_Unbounded_Sequence<
-            PriorityBand
-          >
-  {
-  public:
-    PriorityBands (void);
-    PriorityBands (CORBA::ULong max);
-    PriorityBands (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PriorityBand* buffer, 
-        CORBA::Boolean release = 0
-      );
-    PriorityBands (const PriorityBands &);
-    ~PriorityBands (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef PriorityBands_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBands;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
-  
-  class PriorityBandedConnectionPolicy;
-  typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PriorityBandedConnectionPolicy
-      >
-    PriorityBandedConnectionPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PriorityBandedConnectionPolicy
-      >
-    PriorityBandedConnectionPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
-  
-  class TAO_RTCORBA_Export PriorityBandedConnectionPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
-    typedef PriorityBandedConnectionPolicy_var _var_type;
-    
-    // The static operations.
-    static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-    
-    static void _tao_release (PriorityBandedConnectionPolicy_ptr obj);
-    
-    static PriorityBandedConnectionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PriorityBandedConnectionPolicy_ptr _nil (void)
-    {
-      return static_cast<PriorityBandedConnectionPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::PriorityBands * priority_bands (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PriorityBandedConnectionPolicy (void);
-    
-    virtual ~PriorityBandedConnectionPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
-    
-    void operator= (const PriorityBandedConnectionPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
-#define _RTCORBA_CURRENT__VAR_OUT_CH_
-  
-  class Current;
-  typedef Current *Current_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Current
-      >
-    Current_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Current
-      >
-    Current_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_CURRENT_CH_)
-#define _RTCORBA_CURRENT_CH_
-  
-  class TAO_RTCORBA_Export Current
-    : public virtual ::CORBA::Current
-  {
-  public:
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-    
-    // The static operations.
-    static Current_ptr _duplicate (Current_ptr obj);
-    
-    static void _tao_release (Current_ptr obj);
-    
-    static Current_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _nil (void)
-    {
-      return static_cast<Current_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual RTCORBA::Priority the_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void the_priority (
-        ::RTCORBA::Priority the_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Current (void);
-    
-    virtual ~Current (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-    
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Current;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
-#define _RTCORBA_MUTEX__VAR_OUT_CH_
-  
-  class Mutex;
-  typedef Mutex *Mutex_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Mutex
-      >
-    Mutex_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Mutex
-      >
-    Mutex_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_MUTEX_CH_)
-#define _RTCORBA_MUTEX_CH_
-  
-  class TAO_RTCORBA_Export Mutex
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Mutex_ptr _ptr_type;
-    typedef Mutex_var _var_type;
-    
-    // The static operations.
-    static Mutex_ptr _duplicate (Mutex_ptr obj);
-    
-    static void _tao_release (Mutex_ptr obj);
-    
-    static Mutex_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Mutex_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Mutex_ptr _nil (void)
-    {
-      return static_cast<Mutex_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void lock (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void unlock (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean try_lock (
-        ::TimeBase::TimeT max_wait
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Mutex (void);
-    
-    virtual ~Mutex (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Mutex (const Mutex &);
-    
-    void operator= (const Mutex &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Mutex;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
-#define _RTCORBA_RTORB__VAR_OUT_CH_
-  
-  class RTORB;
-  typedef RTORB *RTORB_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RTORB
-      >
-    RTORB_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RTORB
-      >
-    RTORB_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTCORBA_RTORB_CH_)
-#define _RTCORBA_RTORB_CH_
-  
-  class TAO_RTCORBA_Export RTORB
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef RTORB_ptr _ptr_type;
-    typedef RTORB_var _var_type;
-    
-    // The static operations.
-    static RTORB_ptr _duplicate (RTORB_ptr obj);
-    
-    static void _tao_release (RTORB_ptr obj);
-    
-    static RTORB_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RTORB_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RTORB_ptr _nil (void)
-    {
-      return static_cast<RTORB_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::Mutex_ptr create_mutex (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void destroy_mutex (
-        ::RTCORBA::Mutex_ptr the_mutex
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
-#define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
-    
-    class TAO_RTCORBA_Export MutexNotFound : public CORBA::UserException
-    {
-    public:
-      
-      MutexNotFound (void);
-      MutexNotFound (const MutexNotFound &);
-      ~MutexNotFound (void);
-
-      MutexNotFound &operator= (const MutexNotFound &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static MutexNotFound *_downcast (CORBA::Exception *);
-      static const MutexNotFound *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_MutexNotFound;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::Mutex_ptr create_named_mutex (
-        const char * name,
-        ::CORBA::Boolean_out created_flag
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::Mutex_ptr open_named_mutex (
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::MutexNotFound
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
-        ::CORBA::Long send_buffer_size,
-        ::CORBA::Long recv_buffer_size,
-        ::CORBA::Boolean keep_alive,
-        ::CORBA::Boolean dont_route,
-        ::CORBA::Boolean no_delay,
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties (
-        ::CORBA::Long send_buffer_size,
-        ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties (
-        ::CORBA::Long send_buffer_size,
-        ::CORBA::Long recv_buffer_size,
-        ::CORBA::Boolean keep_alive,
-        ::CORBA::Boolean dont_route,
-        ::CORBA::Boolean no_delay,
-        ::CORBA::Long preallocate_buffer_size,
-        const char * mmap_filename,
-        const char * mmap_lockname
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties (
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties (
-        ::CORBA::Long send_buffer_size,
-        ::CORBA::Long recv_buffer_size,
-        ::CORBA::Boolean keep_alive,
-        ::CORBA::Boolean dont_route,
-        ::CORBA::Boolean no_delay,
-        ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
-#define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
-    
-    class TAO_RTCORBA_Export InvalidThreadpool : public CORBA::UserException
-    {
-    public:
-      
-      InvalidThreadpool (void);
-      InvalidThreadpool (const InvalidThreadpool &);
-      ~InvalidThreadpool (void);
-
-      InvalidThreadpool &operator= (const InvalidThreadpool &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static InvalidThreadpool *_downcast (CORBA::Exception *);
-      static const InvalidThreadpool *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_InvalidThreadpool;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual RTCORBA::ThreadpoolId create_threadpool (
-        ::CORBA::ULong stacksize,
-        ::CORBA::ULong static_threads,
-        ::CORBA::ULong dynamic_threads,
-        ::RTCORBA::Priority default_priority,
-        ::CORBA::Boolean allow_request_buffering,
-        ::CORBA::ULong max_buffered_requests,
-        ::CORBA::ULong max_request_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
-        ::CORBA::ULong stacksize,
-        const ::RTCORBA::ThreadpoolLanes & lanes,
-        ::CORBA::Boolean allow_borrowing,
-        ::CORBA::Boolean allow_request_buffering,
-        ::CORBA::ULong max_buffered_requests,
-        ::CORBA::ULong max_request_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void destroy_threadpool (
-        ::RTCORBA::ThreadpoolId threadpool
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTCORBA::RTORB::InvalidThreadpool
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
-        ::RTCORBA::PriorityModel priority_model,
-        ::RTCORBA::Priority server_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
-        ::RTCORBA::ThreadpoolId threadpool
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
-        const ::RTCORBA::PriorityBands & priority_bands
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
-        const ::RTCORBA::ProtocolList & protocols
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
-        const ::RTCORBA::ProtocolList & protocols
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RTORB (void);
-    
-    virtual ~RTORB (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RTORB (const RTORB &);
-    
-    void operator= (const RTORB &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_RTORB;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module RTCORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityModelPolicy>
-  {
-    static ::RTCORBA::PriorityModelPolicy_ptr duplicate (
-        ::RTCORBA::PriorityModelPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::PriorityModelPolicy_ptr
-      );
-    static ::RTCORBA::PriorityModelPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PriorityModelPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY__TRAITS_CH_)
-#define _RTCORBA_THREADPOOLPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ThreadpoolPolicy>
-  {
-    static ::RTCORBA::ThreadpoolPolicy_ptr duplicate (
-        ::RTCORBA::ThreadpoolPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::ThreadpoolPolicy_ptr
-      );
-    static ::RTCORBA::ThreadpoolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ThreadpoolPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties>
-  {
-    static ::RTCORBA::ProtocolProperties_ptr duplicate (
-        ::RTCORBA::ProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::ProtocolProperties_ptr
-      );
-    static ::RTCORBA::ProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ServerProtocolPolicy>
-  {
-    static ::RTCORBA::ServerProtocolPolicy_ptr duplicate (
-        ::RTCORBA::ServerProtocolPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::ServerProtocolPolicy_ptr
-      );
-    static ::RTCORBA::ServerProtocolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ServerProtocolPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ClientProtocolPolicy>
-  {
-    static ::RTCORBA::ClientProtocolPolicy_ptr duplicate (
-        ::RTCORBA::ClientProtocolPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::ClientProtocolPolicy_ptr
-      );
-    static ::RTCORBA::ClientProtocolPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::ClientProtocolPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PrivateConnectionPolicy>
-  {
-    static ::RTCORBA::PrivateConnectionPolicy_ptr duplicate (
-        ::RTCORBA::PrivateConnectionPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::PrivateConnectionPolicy_ptr
-      );
-    static ::RTCORBA::PrivateConnectionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PrivateConnectionPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::TCPProtocolProperties>
-  {
-    static ::RTCORBA::TCPProtocolProperties_ptr duplicate (
-        ::RTCORBA::TCPProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::TCPProtocolProperties_ptr
-      );
-    static ::RTCORBA::TCPProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::TCPProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::GIOPProtocolProperties>
-  {
-    static ::RTCORBA::GIOPProtocolProperties_ptr duplicate (
-        ::RTCORBA::GIOPProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::GIOPProtocolProperties_ptr
-      );
-    static ::RTCORBA::GIOPProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::GIOPProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UnixDomainProtocolProperties>
-  {
-    static ::RTCORBA::UnixDomainProtocolProperties_ptr duplicate (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr
-      );
-    static ::RTCORBA::UnixDomainProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::UnixDomainProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::SharedMemoryProtocolProperties>
-  {
-    static ::RTCORBA::SharedMemoryProtocolProperties_ptr duplicate (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr
-      );
-    static ::RTCORBA::SharedMemoryProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::SharedMemoryProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::UserDatagramProtocolProperties>
-  {
-    static ::RTCORBA::UserDatagramProtocolProperties_ptr duplicate (
-        ::RTCORBA::UserDatagramProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::UserDatagramProtocolProperties_ptr
-      );
-    static ::RTCORBA::UserDatagramProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::UserDatagramProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_)
-#define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::StreamControlProtocolProperties>
-  {
-    static ::RTCORBA::StreamControlProtocolProperties_ptr duplicate (
-        ::RTCORBA::StreamControlProtocolProperties_ptr
-      );
-    static void release (
-        ::RTCORBA::StreamControlProtocolProperties_ptr
-      );
-    static ::RTCORBA::StreamControlProtocolProperties_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::StreamControlProtocolProperties_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::PriorityBandedConnectionPolicy>
-  {
-    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-      );
-    static void release (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-      );
-    static ::RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::PriorityBandedConnectionPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CURRENT__TRAITS_CH_)
-#define _RTCORBA_CURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Current>
-  {
-    static ::RTCORBA::Current_ptr duplicate (
-        ::RTCORBA::Current_ptr
-      );
-    static void release (
-        ::RTCORBA::Current_ptr
-      );
-    static ::RTCORBA::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::Current_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_MUTEX__TRAITS_CH_)
-#define _RTCORBA_MUTEX__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::Mutex>
-  {
-    static ::RTCORBA::Mutex_ptr duplicate (
-        ::RTCORBA::Mutex_ptr
-      );
-    static void release (
-        ::RTCORBA::Mutex_ptr
-      );
-    static ::RTCORBA::Mutex_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::Mutex_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_RTORB__TRAITS_CH_)
-#define _RTCORBA_RTORB__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::RTORB>
-  {
-    static ::RTCORBA::RTORB_ptr duplicate (
-        ::RTCORBA::RTORB_ptr
-      );
-    static void release (
-        ::RTCORBA::RTORB_ptr
-      );
-    static ::RTCORBA::RTORB_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTCORBA::RTORB_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolLane *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolLanes *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel);
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Protocol *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolList *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBand *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBands *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB::MutexNotFound *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version
-TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool *&); // deprecated
-TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &);
-TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
-#define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
-
-TAO_RTCORBA_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const RTCORBA::ThreadpoolLanes &
-  );
-TAO_RTCORBA_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    RTCORBA::ThreadpoolLanes &
-  );
-
-#endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, RTCORBA::PriorityModel);
-TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &);
-TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_
-#define _TAO_CDR_OP_RTCORBA_PriorityBands_H_
-
-TAO_RTCORBA_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const RTCORBA::PriorityBands &
-  );
-TAO_RTCORBA_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    RTCORBA::PriorityBands &
-  );
-
-#endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RTCORBA/RTCORBA_include.pidl b/TAO/tao/RTCORBA/RTCORBA_include.pidl
deleted file mode 100644
index 206fc6d2c8c..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_include.pidl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file RTCORBA_include.pidl
- *
- * $Id$
- *
- * @brief Include file for use in applications that need RTCORBA.pidl.
- *
- * This file just includes RTCORBA.pidl. The *C.h file generated from
- * this is hand-crafted to itself include RTCORBA.h instead of 
- * RTCORBAC.h (which will produce a compiler error message if 
- * included directly). The RTCORBA_includeC.h file can then be
- * included directly and automatically by the IDL compiler when
- * building the application.
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *     this is:
- *
- *     tao_idl -o orig -St -Sc -Sp
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTCORBA_include.pidl
- *
- *   2. Then change this line in RTCORBA_includeC.h:
- *
- *          #include "RTCORBAC.h"
- *
- *      to
- *
- *          #include "RTCORBA.h"
- */
-
-#ifndef _RT_CORBA_INCLUDE_IDL_
-#define _RT_CORBA_INCLUDE_IDL_
-
-#include "tao/RTCORBA/RTCORBA.pidl"
-
-#endif /* _RT_CORBA_INCLUDE_IDL_ */
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h
deleted file mode 100644
index a37e92f1656..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_includeC.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:186
-
-#ifndef _TAO_IDL_ORIG_RTCORBA_INCLUDEC_H_
-#define _TAO_IDL_ORIG_RTCORBA_INCLUDEC_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#include "RTCORBA.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:50
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1050
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeS.h b/TAO/tao/RTCORBA/RTCORBA_includeS.h
deleted file mode 100644
index e0779b11bc4..00000000000
--- a/TAO/tao/RTCORBA/RTCORBA_includeS.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//$Id$
-/**
-* Just a place holder for files that include RTCORBA_include.pidl
-*/
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
deleted file mode 100644
index 9bc7068f28c..00000000000
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// $Id$
-//
-
-#include "RT_Current.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Priority_Mapping.h"
-
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/Protocols_Hooks.h"
-
-#include "ace/Thread.h"
-
-ACE_RCSID (RTCORBA,
-           RT_Current,
-           "$Id$")
-
-TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
-{
-}
-
-TAO_RT_Current::~TAO_RT_Current (void)
-{
-}
-
-RTCORBA::Priority
-TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Protocols_Hooks *tph =
-    this->orb_core_->get_protocols_hooks ();
-
-  RTCORBA::Priority priority;
-
-  int result =
-    tph->get_thread_CORBA_priority (priority
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (result == -1)
-    ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO), -1);
-
-  return priority;
-}
-
-void
-TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core_->get_protocols_hooks ();
-
-  int result =
-    tph->set_thread_CORBA_priority (the_priority
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (result == -1)
-    ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
deleted file mode 100644
index eed5b7e39f9..00000000000
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   RT_Current.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_CURRENT_H
-#define TAO_RT_CURRENT_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "tao/LocalObject.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_RT_Current
- *
- * @brief RTCORBA::Current interface iplementation.
- *
- * Allows setting/getting the priority of the current thread.
- */
-class TAO_RTCORBA_Export TAO_RT_Current
-  : public RTCORBA::Current,
-    public TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Default constructor.
-  TAO_RT_Current (TAO_ORB_Core *orb_core);
-
-  virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void the_priority (RTCORBA::Priority the_priority
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_RT_Current (void);
-
-private:
-
-  /// ORB Core that owns us.
-  TAO_ORB_Core *orb_core_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_CURRENT_H */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
deleted file mode 100644
index 874795e7a10..00000000000
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "RT_Endpoint_Selector_Factory.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Invocation_Endpoint_Selectors.h"
-#include "RT_Endpoint_Utils.h"
-#include "RT_Stub.h"
-
-#include "tao/Protocols_Hooks.h"
-
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Selector_Factory,
-           "$Id$")
-
-
-// ****************************************************************
-
-RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
-{
-  ACE_NEW (this->rt_invocation_endpoint_selector_,
-           TAO_RT_Invocation_Endpoint_Selector);
-}
-
-RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
-{
-  delete this->rt_invocation_endpoint_selector_;
-}
-
-TAO_Invocation_Endpoint_Selector *
-RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->rt_invocation_endpoint_selector_;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory,
-                       ACE_TEXT ("RT_Endpoint_Selector_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (RT_Endpoint_Selector_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
deleted file mode 100644
index b6b5eca2d76..00000000000
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   RT_Endpoint_Selector_Factory.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef RT_ENDPOINT_SELECTOR_FACTORY_H
-#define RT_ENDPOINT_SELECTOR_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Endpoint_Selector_Factory.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "ace/Service_Config.h"
-
-class TAO_RT_Invocation_Endpoint_Selector;
-
-// ****************************************************************
-/**
- * @class RT_Endpoint_Selector_Factory
- *
- * @brief Factory for obtaining appropriate <Invocation_Selector>.
- *
- * Used by Invocation classes to intialize its endpoint selection
- * strategy and state based on the effective policies.  Endpoint
- * selection strategies are stateless objects - all the state they
- * need is contained by Invocation.  Thus, rather than allocating an
- * endpoint selection strategy object for each Invocation, the factory
- * simply returns the appropriate one from the set preallocated in the
- * ORB_Core.  One endpoint selection strategy object can be used by
- * many invocations concurrently.
- */
-class TAO_RTCORBA_Export RT_Endpoint_Selector_Factory
-  : public TAO_Endpoint_Selector_Factory
-{
-public:
-  /// Constructor.
-  RT_Endpoint_Selector_Factory (void);
-
-  /// Destructor.
-  virtual ~RT_Endpoint_Selector_Factory (void);
-
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-              ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
-ACE_FACTORY_DECLARE (TAO_RTCORBA, RT_Endpoint_Selector_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif  /* RT_ENDPOINT_SELECTOR_FACTORY_H */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
deleted file mode 100644
index b8e4d6d2ee2..00000000000
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "RT_Endpoint_Utils.h"
-#include "tao/Profile_Transport_Resolver.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Endpoint_Selector_Factory.h"
-#include "RT_Invocation_Endpoint_Selectors.h"
-
-#include "RT_Stub.h"
-
-ACE_RCSID (RTCORBA,
-           RT_Endpoint_Utils,
-           "$Id$")
-
-// ****************************************************************
-
-CORBA::Policy *
-TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
-                               TAO::Profile_Transport_Resolver &r
-                               ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy *policy = CORBA::Policy::_nil ();
-
-  TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ());
-
-  ACE_TRY
-    {
-      policy =
-        rt_stub->get_cached_policy (type
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
-    {
-      if (r.inconsistent_policies ())
-        {
-          CORBA::PolicyList *p = r.inconsistent_policies ();
-          p->length (1);
-          (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
-                                                           ACE_ENV_ARG_PARAMETER);
-        }
-
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return policy;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
deleted file mode 100644
index d918ef4a12b..00000000000
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   RT_Endpoint_Utils.h
- *
- *  $Id$
- *
- *  Commonly used utility methods used by RT_Endpoint_Selectors.
- *
- *  @author Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef RT_ENDPOINT_UTILS_H
-#define RT_ENDPOINT_UTILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Policy_ForwardC.h"
-
-class TAO_GIOP_Invocation;
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-}
-
-/**
- * @class RT_Endpoint_Utils
- *
- * @brief Commonly used utility methods used by the RT_Endpoint_Selectors.
- *
- */
-class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils
-{
-public:
-  static 
-  CORBA::Policy *policy (TAO_Cached_Policy_Type type,
-                         TAO::Profile_Transport_Resolver &r
-                         ACE_ENV_ARG_DECL);
-
-private:
-  /// ctor.
-  TAO_RT_Endpoint_Utils ();
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* RT_ENDPOINT_UTILS_H */
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
deleted file mode 100644
index eff4b4a1520..00000000000
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-#include "RT_Invocation_Endpoint_Selectors.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Policy_i.h"
-#include "RT_Stub.h"
-#include "RT_Transport_Descriptor.h"
-#include "RT_Transport_Descriptor_Property.h"
-#include "RT_Endpoint_Utils.h"
-#include "RT_Protocols_Hooks.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Endpoint.h"
-#include "tao/debug.h"
-#include "tao/Profile.h"
-#include "tao/Endpoint.h"
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/ORB_Core.h"
-
-ACE_RCSID (RTCORBA,
-           RT_Invocation_Endpoint_Selectors,
-           "$Id$")
-
-void
-TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
-    TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
-{
-  if (r == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  CORBA::Policy_var client_protocol_policy_base =
-    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL,
-                                   *r
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (client_protocol_policy_base.ptr () == 0)
-    {
-      do
-        {
-          r->profile (r->stub ()->profile_in_use ());
-
-          int status =
-            this->endpoint_from_profile (*r,
-                                         val
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          if (status == 1)
-            return;
-        }
-      while (r->stub ()->next_profile_retry () != 0);
-
-      // If we get here, we completely failed to find an endpoint selector
-      // that we know how to use, so throw an exception.
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
-    }
-  else
-    {
-      RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-        RTCORBA::ClientProtocolPolicy::_narrow (
-          client_protocol_policy_base.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      /// Cast to TAO_ClientProtocolPolicy
-      TAO_ClientProtocolPolicy *tao_client_protocol_policy =
-        static_cast<TAO_ClientProtocolPolicy *> (client_protocol_policy.in ());
-
-      /// Get the ProtocolList
-      RTCORBA::ProtocolList &client_protocols =
-        tao_client_protocol_policy->protocols_rep ();
-
-      this->select_endpoint_based_on_client_protocol_policy (
-        *r,
-        client_protocol_policy.in (),
-        client_protocols,
-        val
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_policy (
-    TAO::Profile_Transport_Resolver &r,
-    RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
-    RTCORBA::ProtocolList &client_protocols,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean valid_profile_found = 0;
-
-  // Even though cycling through all the protocols is the correct
-  // things to do to find a match, starting from the start of the
-  // profile list is not.  In addition, this code is also ignoring the
-  // forwarded reference (if it exists).  This behavior is caused by
-  // problems with the profile management in TAO which are documented
-  // in bugzilla bugs 1237, 1238, and 1239.  Once the above problems
-  // are fixed, this behavior should be fixed to do the right thing.
-  for (CORBA::ULong protocol_index = 0;
-       protocol_index < client_protocols.length ();
-       ++protocol_index)
-    {
-      // Find the profiles that match the current protocol.
-      TAO_Profile *profile = 0;
-      TAO_MProfile &mprofile = r.stub ()->base_profiles ();
-
-      for (TAO_PHandle i = 0;
-           i < mprofile.profile_count ();
-           ++i)
-        {
-          profile = mprofile.get_profile (i);
-
-          if (profile->tag () == client_protocols[protocol_index].protocol_type)
-            {
-              valid_profile_found = 1;
-
-              r.profile (profile);
-
-              int status =
-                this->endpoint_from_profile (r,
-                                             val
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-
-              if (status == 1)
-                return;
-              // @@ Else we should check for potential forwarding here.
-            }
-        }
-    }
-
-  // We have tried all the profiles specified in the client protocol
-  // policy with no success.  Throw exception.
-  if (!valid_profile_found)
-    {
-      if (r.inconsistent_policies ())
-        {
-          CORBA::PolicyList *p =
-            r.inconsistent_policies ();
-
-          p->length (1);
-          (*p)[0u] =
-            CORBA::Policy::_duplicate (client_protocol_policy);
-        }
-      ACE_THROW (CORBA::INV_POLICY ());
-    }
-
-  // If we get here, we found at least one pertinent profile, but no
-  // usable endpoints.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
-
-}
-
-int
-TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
-    TAO::Profile_Transport_Resolver &r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
-{
-  // Narrow to the RT Stub.
-  TAO_RT_Stub *rt_stub =
-    dynamic_cast <TAO_RT_Stub *> (r.stub ());
-
-  // Get the priority model policy.
-  CORBA::Policy_var priority_model_policy =
-    rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Get the bands policy.
-  CORBA::Policy_var bands_policy =
-    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION,
-                                   r
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  int all_endpoints_are_valid = 0;
-  int match_priority = 0;
-  int match_bands = 0;
-  CORBA::Short client_thread_priority = 0;
-  CORBA::Short min_priority = 0;
-  CORBA::Short max_priority = 0;
-
-  // If the priority model policy is not set.
-  if (priority_model_policy.ptr () == 0)
-    {
-      // Bands without priority model do not make sense.
-      if (bands_policy.ptr () != 0)
-        {
-          if (r.inconsistent_policies ())
-            {
-              CORBA::PolicyList *p =
-                r.inconsistent_policies ();
-
-              p->length (1);
-              (*p)[0u] =
-                CORBA::Policy::_duplicate (bands_policy.in ());
-            }
-          // Indicate error.
-          ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
-        }
-
-      // No priority model policy (and no bands policy): all endpoints
-      // are fair game.
-      all_endpoints_are_valid = 1;
-    }
-  // If the priority model policy is set.
-  else
-    {
-      // Get the protocol hooks.
-      TAO_Protocols_Hooks *protocol_hooks =
-        r.stub ()->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Short server_priority = 0;
-      CORBA::Boolean is_client_propagated = 0;
-
-      // Check the priority model policy to see if it is client
-      // propagated.
-      protocol_hooks->get_selector_hook (priority_model_policy.in (),
-                                         is_client_propagated,
-                                         server_priority);
-
-      if (!is_client_propagated)
-        {
-          // Server declared: all endpoints are fair game.
-          all_endpoints_are_valid = 1;
-        }
-      // Client propagated.
-      else
-        {
-          // Get client thread priority.
-          int status =
-            protocol_hooks->get_thread_CORBA_priority (
-              client_thread_priority  // side effect
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-          if (status == -1)
-            {
-              ACE_THROW_RETURN (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                                        CORBA::COMPLETED_NO),
-                                0);
-            }
-
-          // If there are no bands.
-          if (bands_policy.ptr () == 0)
-            {
-
-              // Match the priority of the client thread with the
-              // endpoint.
-              match_priority = 1;
-            }
-          // There are bands.
-          else
-            {
-
-              // Check which band range we fall in.
-              int in_range = 0;
-              protocol_hooks->get_selector_bands_policy_hook (
-                bands_policy.in (),
-                client_thread_priority,
-                min_priority,
-                max_priority,
-                in_range);
-
-              // If priority doesn't fall into any of the bands.
-              if (!in_range)
-                {
-                  if (r.inconsistent_policies ())
-                    {
-
-                      CORBA::PolicyList *p =
-                        r.inconsistent_policies ();
-                      p->length (2);
-                      (*p)[0u] =
-                        CORBA::Policy::_duplicate (bands_policy.in ());
-                      (*p)[1u] =
-                        CORBA::Policy::_duplicate (
-                          priority_model_policy.in ());
-                    }
-
-                  // Indicate error.
-                  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                                    0);
-                }
-
-              // Match the priority of the band with the endpoint.
-              match_bands = 1;
-            }
-        }
-    }
-
-  TAO_Endpoint *ep =
-    r.profile ()->endpoint ();
-
-  while (ep != 0)
-    {
-      // Get the priority of the endpoint.
-      CORBA::Short endpoint_priority =
-        ep->priority ();
-
-      // If <all_endpoints_are_valid> or match the priority of the
-      // client thread or match the priority of the band or
-      // profile contains just one endpoint.  This happens when:
-      //    a) we are talking to a nonTAO server (which doesn't have
-      //       the concept of multiple endpoints per profile)
-      //    or
-      //    b) we have TAO server with a non-lane threadpool, in which
-      //    case there is only one acceptor
-      // In both cases we should use the endpoint regardless of its priority.
-
-      if (all_endpoints_are_valid ||
-          (match_priority &&
-           client_thread_priority == endpoint_priority) ||
-          (match_bands &&
-           endpoint_priority <= max_priority &&
-           endpoint_priority >= min_priority) ||
-          r.profile ()->endpoint_count () == 1 &&
-          endpoint_priority == TAO_INVALID_PRIORITY)
-        {
-          TAO_RT_Transport_Descriptor_Private_Connection_Property
-            private_connection_descriptor_property;
-
-          TAO_RT_Transport_Descriptor_Banded_Connection_Property
-            banded_connection_descriptor_property;
-
-          TAO_RT_Transport_Descriptor
-            rt_transport_descriptor (ep);
-
-          CORBA::Policy_var private_connection_policy =
-            rt_stub->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          if (!CORBA::is_nil (private_connection_policy.in ()))
-            {
-              private_connection_descriptor_property.init
-                (static_cast<long> (reinterpret_cast<ptrdiff_t> (r.stub ())));
-              rt_transport_descriptor.insert
-                (&private_connection_descriptor_property);
-            }
-
-          if (match_bands)
-            {
-              banded_connection_descriptor_property.init
-                (min_priority, max_priority);
-
-              rt_transport_descriptor.insert
-                (&banded_connection_descriptor_property);
-            }
-
-          bool status =
-            r.try_connect (&rt_transport_descriptor,
-                           val
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          // Check if the invocation has completed.
-          if (status == true)
-            return 1;
-        }
-
-      // Go to the next endpoint in this profile.
-      ep = ep->next();
-    }
-
-  return 0;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
deleted file mode 100644
index 539cc86f44b..00000000000
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   RT_Invocation_Endpoint_Selectors.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H
-#define TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RTCORBA.h"
-
-#include "tao/Invocation_Endpoint_Selectors.h"
-
-/**
- * @class TAO_RT_Invocation_Endpoint_Selector
- *
- * @brief TAO_RT_Invocation_Endpoint_Selector
- *
- * This strategy is used when the only policy that might be set is the
- * private connection policy.
- *
- **/
-class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector :
-  public TAO_Invocation_Endpoint_Selector
-{
-public:
-
-  virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
-
-protected:
-  void select_endpoint_based_on_client_protocol_policy (
-      TAO::Profile_Transport_Resolver &r,
-      RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
-      RTCORBA::ProtocolList &protocols,
-      ACE_Time_Value *v
-      ACE_ENV_ARG_DECL
-    );
-
-  int endpoint_from_profile (TAO::Profile_Transport_Resolver &r,
-                             ACE_Time_Value *v
-                             ACE_ENV_ARG_DECL);
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
deleted file mode 100644
index 93117952560..00000000000
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-#include "RT_Mutex.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_ORB.h"
-#include "ace/OS_NS_sys_time.h"
-
-ACE_RCSID(RTCORBA,
-          RT_Mutex,
-          "$Id$")
-
-TAO_RT_Mutex::TAO_RT_Mutex (void)
-{
-}
-
-TAO_RT_Mutex::~TAO_RT_Mutex (void)
-{
-}
-
-void
-TAO_RT_Mutex::lock (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->mu_.acquire () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
-}
-
-void
-TAO_RT_Mutex::unlock (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->mu_.release () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
-}
-
-CORBA::Boolean
-TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  int result;
-
-  if (wait_time == 0)
-    // No wait.
-    result = this->mu_.tryacquire ();
-  else
-    {
-      // Wait for the specified amount of time before giving up.
-      // (wait_time units are 100ns.  See TimeBase.pidl)
-      TimeBase::TimeT seconds = wait_time / 10000000u;
-      TimeBase::TimeT microseconds = (wait_time % 10000000u) / 10;
-
-      ACE_Time_Value relative_time (ACE_U64_TO_U32 (seconds),
-                                    ACE_U64_TO_U32 (microseconds));
-
-      ACE_Time_Value absolute_time =
-        relative_time +
-        ACE_OS::gettimeofday ();
-
-      result = this->mu_.acquire (absolute_time);
-    }
-
-  if (result == 0)
-    return 1;
-  else if (result == -1 &&
-           (errno == ETIME ||
-            errno == EBUSY))
-    return 0;
-  else
-    // Some really bad error.
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-}
-
-const char *
-TAO_RT_Mutex::name (void) const
-{
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name)
-  : name_ (name)
-{
-}
-
-const char *
-TAO_Named_RT_Mutex::name (void) const
-{
-  return this->name_.c_str ();
-}
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
deleted file mode 100644
index c12409e8cd0..00000000000
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   RT_Mutex.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_MUTEX_H
-#define TAO_RT_MUTEX_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "tao/LocalObject.h"
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-# include "ace/SString.h"
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class TAO_RT_Mutex
- *
- * @brief  Abstract base class for the TAO RT Mutex implementations
- *
- * This class just serves as a base class for any of the TAO
- * RT Mutex implementations.  Instances of these classes should
- * be created using the RTCORBA::create_mutex() method.
- *
- */
-
-class TAO_RTCORBA_Export TAO_RT_Mutex
-  : public RTCORBA::Mutex,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_RT_Mutex (void);
-
-  /// Destructor.
-  virtual ~TAO_RT_Mutex (void);
-
-  /// Acquire the lock.
-  virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Release the lock.
-  virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Acquire the lock, but only wait up to @a max_wait time.  Note
-   * that this operation may not be available on all OS platforms, so
-   * if you're interested in writing maximally portable programs avoid
-   * using this operation in your program designs.
-   */
-  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Returns the name of the mutex.
-  virtual const char *name (void) const;
-
-protected:
-  /// Synchronization lock.
-  TAO_SYNCH_MUTEX mu_;
-};
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-/**
- * @class TAO_Named_RT_Mutex
- *
- * @brief Extension to TAO_RT_Mutex to support named mutexes.
- *
- */
-class TAO_RTCORBA_Export TAO_Named_RT_Mutex : public TAO_RT_Mutex
-{
-public:
-  /// Constructor.
-  TAO_Named_RT_Mutex (const char *name);
-
-  /// Returns the name of the mutex.
-  virtual const char *name (void) const;
-
-protected:
-
-  /// My name.
-  ACE_CString name_;
-};
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_MUTEX_H */
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
deleted file mode 100644
index d7d1ac44138..00000000000
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-// $Id$
-
-#include "RT_ORB.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Policy_i.h"
-#include "RT_Mutex.h"
-#include "Priority_Mapping_Manager.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(RTCORBA,
-          RT_ORB,
-          "$Id$")
-
-TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core),
-    mutex_mgr_ (),
-    tp_manager_ (0)
-{
-  TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager =
-    &this->orb_core_->thread_lane_resources_manager ();
-
-  TAO_RT_Thread_Lane_Resources_Manager *rt_thread_lane_resources_manager =
-    (TAO_RT_Thread_Lane_Resources_Manager *) thread_lane_resources_manager;
-
-  this->tp_manager_ =
-    &rt_thread_lane_resources_manager->tp_manager ();
-}
-
-TAO_RT_ORB::~TAO_RT_ORB (void)
-{
-}
-
-RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->mutex_mgr_.create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->mutex_mgr_.destroy_mutex (mutex
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-
-RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_named_mutex (const char *name,
-                                CORBA::Boolean_out created_flag
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->mutex_mgr_.create_named_mutex (name,
-                                              created_flag
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::Mutex_ptr
-TAO_RT_ORB::open_named_mutex (const char *name
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
-{
-  return this->mutex_mgr_.open_named_mutex (name
-                                            ACE_ENV_ARG_PARAMETER);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager (void)
-{
-}
-
-TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
-{
-}
-
-RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RT_Mutex *mutex = 0;
-  ACE_NEW_THROW_EX (mutex,
-                    TAO_RT_Mutex (),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-  return mutex;
-}
-
-// If Named RT_Mutexes aren't enabled, this function is a nop
-// as also indicated by the comment below.
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RT_Mutex *tao_mutex =
-    dynamic_cast<TAO_RT_Mutex *> (mutex);
-
-  // If this mutex is named, then we need to remove it from our table.
-  // Otherwise, we don't have to do anything.
-  const char *name = tao_mutex->name ();
-  if (name != 0)
-    {
-      // The following should be atomic.
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                          monitor,
-                          this->lock_,
-                          CORBA::INTERNAL ());
-      ACE_CHECK;
-
-      int result =
-        this->map_.unbind (name);
-
-      if (result != 0)
-        ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-#else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
-                                                CORBA::Boolean_out created_flag
-                                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-  // The following should be atomic.
-  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                      monitor,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-  // Optimistic that we'll find it.
-  created_flag = 0;
-
-  // If we find the mutex, simply return it.
-  RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
-    {
-      // Oops, we didn't find it.
-      created_flag = 1;
-
-      RTCORBA::Mutex_ptr tmp_mutex;
-
-      // Create a new one.
-      ACE_NEW_THROW_EX (tmp_mutex,
-                        TAO_Named_RT_Mutex (name),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-      mutex = tmp_mutex;
-
-      // Add it to the map.
-      int result =
-        this->map_.bind (name,
-                         mutex);
-
-      if (result != 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          RTCORBA::Mutex::_nil ());
-    }
-
-  // Return the one we found or created.
-  return mutex._retn ();
-#else /* TAO_HAS_NAMED_RT_MUTEXES */
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (created_flag);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
-#endif /* TAO_HAS_NAMED_RT_MUTEXES */
-}
-
-RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
-{
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-  // The following should be atomic.
-  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                      monitor,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-  // If we find the mutex, simply return it.
-  RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
-    ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (),
-                      RTCORBA::Mutex::_nil ());
-
-  // Return the one we found.
-  return mutex._retn ();
-#else /* TAO_HAS_NAMED_RT_MUTEXES */
-  ACE_UNUSED_ARG (name);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
-#endif /* TAO_HAS_NAMED_RT_MUTEXES */
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-RTCORBA::TCPProtocolProperties_ptr
-TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
-                                            CORBA::Long recv_buffer_size,
-                                            CORBA::Boolean keep_alive,
-                                            CORBA::Boolean dont_route,
-                                            CORBA::Boolean no_delay,
-                                            CORBA::Boolean enable_network_priority
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException ))
-{
-  TAO_TCP_Protocol_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_TCP_Protocol_Properties (send_buffer_size,
-                                        recv_buffer_size,
-                                        keep_alive,
-                                        dont_route,
-                                        no_delay,
-                                        enable_network_priority),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::TCPProtocolProperties::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::UnixDomainProtocolProperties_ptr
-TAO_RT_ORB::create_unix_domain_protocol_properties (
-                                                    CORBA::Long send_buffer_size,
-                                                    CORBA::Long recv_buffer_size
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_UnixDomain_Protocol_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_UnixDomain_Protocol_Properties (
-                                               send_buffer_size,
-                                               recv_buffer_size),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::UnixDomainProtocolProperties::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_ptr
-TAO_RT_ORB::create_shared_memory_protocol_properties (
-                                                      CORBA::Long send_buffer_size,
-                                                      CORBA::Long recv_buffer_size,
-                                                      CORBA::Boolean keep_alive,
-                                                      CORBA::Boolean dont_route,
-                                                      CORBA::Boolean no_delay,
-                                                      CORBA::Long preallocate_buffer_size,
-                                                      const char *mmap_filename,
-                                                      const char *mmap_lockname
-                                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_SharedMemory_Protocol_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_SharedMemory_Protocol_Properties (send_buffer_size,
-                                                          recv_buffer_size,
-                                                          keep_alive,
-                                                          dont_route,
-                                                          no_delay,
-                                                          preallocate_buffer_size,
-                                                          mmap_filename,
-                                                          mmap_lockname),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::SharedMemoryProtocolProperties::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::UserDatagramProtocolProperties_ptr
-TAO_RT_ORB::create_user_datagram_protocol_properties (
-                                                      CORBA::Boolean enable_network_priority
-                                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_UserDatagram_Protocol_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_UserDatagram_Protocol_Properties (
-                                                 enable_network_priority),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::UserDatagramProtocolProperties::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::StreamControlProtocolProperties_ptr
-TAO_RT_ORB::create_stream_control_protocol_properties (
-                                                       CORBA::Long send_buffer_size,
-                                                       CORBA::Long recv_buffer_size,
-                                                       CORBA::Boolean keep_alive,
-                                                       CORBA::Boolean dont_route,
-                                                       CORBA::Boolean no_delay,
-                                                       CORBA::Boolean enable_network_priority
-                                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_StreamControl_Protocol_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_StreamControl_Protocol_Properties (
-                                                  send_buffer_size,
-                                                  recv_buffer_size,
-                                                  keep_alive,
-                                                  dont_route,
-                                                  no_delay,
-                                                  enable_network_priority),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::StreamControlProtocolProperties::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ThreadpoolId
-TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
-                               CORBA::ULong static_threads,
-                               CORBA::ULong dynamic_threads,
-                               RTCORBA::Priority default_priority,
-                               CORBA::Boolean allow_request_buffering,
-                               CORBA::ULong max_buffered_requests,
-                               CORBA::ULong max_request_buffer_size
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->tp_manager_->create_threadpool (stacksize,
-                                               static_threads,
-                                               dynamic_threads,
-                                               default_priority,
-                                               allow_request_buffering,
-                                               max_buffered_requests,
-                                               max_request_buffer_size
-                                               ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolId
-TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
-                                          const RTCORBA::ThreadpoolLanes &lanes,
-                                          CORBA::Boolean allow_borrowing,
-                                          CORBA::Boolean allow_request_buffering,
-                                          CORBA::ULong max_buffered_requests,
-                                          CORBA::ULong max_request_buffer_size
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->tp_manager_->create_threadpool_with_lanes (stacksize,
-                                                          lanes,
-                                                          allow_borrowing,
-                                                          allow_request_buffering,
-                                                          max_buffered_requests,
-                                                          max_request_buffer_size
-                                                          ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::InvalidThreadpool))
-{
-  this->tp_manager_->destroy_threadpool (threadpool
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::PriorityModelPolicy_ptr
-TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
-                                          RTCORBA::Priority server_priority
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PriorityModelPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PriorityModelPolicy (priority_model, server_priority),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PriorityModelPolicy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ThreadpoolPolicy_ptr
-TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ThreadpoolPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ThreadpoolPolicy (threadpool),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ThreadpoolPolicy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-TAO_RT_ORB::create_priority_banded_connection_policy (const
-                                                      RTCORBA::PriorityBands & priority_bands
-                                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PriorityBandedConnectionPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PriorityBandedConnectionPolicy (priority_bands),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PriorityBandedConnectionPolicy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PrivateConnectionPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PrivateConnectionPolicy (),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PrivateConnectionPolicy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ServerProtocolPolicy_ptr
-TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ServerProtocolPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ServerProtocolPolicy (protocols),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ServerProtocolPolicy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ClientProtocolPolicy_ptr
-TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ClientProtocolPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ClientProtocolPolicy (protocols),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ClientProtocolPolicy::_nil ());
-
-  return tmp;
-}
-
-TAO_Thread_Pool_Manager &
-TAO_RT_ORB::tp_manager (void) const
-{
-  return *this->tp_manager_;
-}
-
-TAO_ORB_Core *
-TAO_RT_ORB::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-/* static */
-int
-TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
-{
-  //
-  // This method changes the scheduling policy of the calling thread
-  // to match the scheduling policy specified in the svc.conf file.
-  // The priority of the calling thread will be set to the minimum
-  // priority supported by that scheduling policy.
-  //
-  // This method make sense on those platform (e.g., Linux) where
-  // PTHREAD_SCOPE_SYSTEM is the only scheduling scope supported.  On
-  // other platforms, this method is a no-op since the only way to get
-  // the real-time threading behavior is to setup the
-  // PTHREAD_SCOPE_SYSTEM scheduling scope when a thread is being
-  // created.  On such platforms, one can set the correct scheduling
-  // scope and policy when creating the thread, thus not needing to
-  // use this method.
-  //
-
-#if defined (linux)
-
-  int sched_policy =
-    orb->orb_core ()->orb_params ()->ace_sched_policy ();
-
-  int minimum_priority =
-    ACE_Sched_Params::priority_min (sched_policy);
-
-  ACE_hthread_t thread_id;
-  ACE_Thread::self (thread_id);
-
-  return ACE_Thread::setprio (thread_id,
-                              minimum_priority,
-                              sched_policy);
-
-#else /* linux */
-
-  ACE_UNUSED_ARG (orb);
-  ACE_NOTSUP_RETURN (-1);
-
-#endif /* linux */
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var>;
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var>
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
deleted file mode 100644
index 9b5daea2202..00000000000
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   RT_ORB.h
- *
- *  $Id$
- *
- *  @author Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RT_ORB_H
-#define TAO_RT_ORB_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "tao/LocalObject.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-# include "ace/Null_Mutex.h"
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// Forward reference for TAO_Named_RT_Mutex_Manager
-class TAO_RT_Mutex;
-class TAO_Thread_Pool_Manager;
-
-/**
- * @class TAO_Named_RT_Mutex_Manager
- *
- * @brief Manages the names of named and unnamed RT Mutexes
- *
- */
-
-class TAO_RTCORBA_Export TAO_Named_RT_Mutex_Manager
-{
-
-public:
-  /// Constructor.
-  TAO_Named_RT_Mutex_Manager (void);
-
-  /// Destructor.
-  ~TAO_Named_RT_Mutex_Manager (void);
-
-  RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                         CORBA::Boolean_out created_flag
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::MutexNotFound
-                     ));
-
-private:
-
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-  /// Hash map for named RT Mutexes
-  ACE_Hash_Map_Manager_Ex<
-    ACE_CString,
-    RTCORBA::Mutex_var,
-    ACE_Hash<ACE_CString>,
-    ACE_Equal_To<ACE_CString>,
-    ACE_Null_Mutex> map_;
-
-  TAO_SYNCH_MUTEX lock_;
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-};
-
-
-/**
- * @class TAO_RT_ORB
- *
- * @brief RTCORBA::RTORB implementation
- *
- * Creates and destroys RT CORBA objects, i.e., policies,
- * threadpools, mutexes.
- */
-class TAO_RTCORBA_Export TAO_RT_ORB
-  : public RTCORBA::RTORB,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_RT_ORB (TAO_ORB_Core *orb_core);
-
-  /**
-   * Create a new mutex.  Mutexes returned by this method
-   * are the same as those used internally by the ORB, so that
-   * consistant priority inheritance/piority ceiling semantics
-   * can be guaranteed.
-   */
-  virtual RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Destroy a mutex.  Currently this is a no-op since RTCORBA::Mutex
-   * instances are destroyed as soon as their reference counts go to
-   * 0.
-   */
-  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a mutex and assign a name to it.  If the
-   * mutex already exists, it is returned and the created_flag
-   * is set to 0.
-   */
-  virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                                 CORBA::Boolean_out created_flag
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Retrieve a previously created mutex.
-  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS )
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RTCORBA::RTORB::MutexNotFound
-                      ));
-
-  /**
-   * Create and return a TCPProtocolProperties instance with the specified
-   * parameters.
-   */
-  RTCORBA::TCPProtocolProperties_ptr
-  create_tcp_protocol_properties (
-                                  CORBA::Long send_buffer_size,
-                                  CORBA::Long recv_buffer_size,
-                                  CORBA::Boolean keep_alive,
-                                  CORBA::Boolean dont_route,
-                                  CORBA::Boolean no_delay,
-                                  CORBA::Boolean enable_network_priority
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException ));
-
-  RTCORBA::UnixDomainProtocolProperties_ptr
-  create_unix_domain_protocol_properties (
-                                          CORBA::Long send_buffer_size,
-                                          CORBA::Long recv_buffer_size
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::SharedMemoryProtocolProperties_ptr
-  create_shared_memory_protocol_properties (
-                                            CORBA::Long send_buffer_size,
-                                            CORBA::Long recv_buffer_size,
-                                            CORBA::Boolean keep_alive,
-                                            CORBA::Boolean dont_route,
-                                            CORBA::Boolean no_delay,
-                                            CORBA::Long preallocate_buffer_size,
-                                            const char *mmap_filename,
-                                            const char *mmap_lockname
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::UserDatagramProtocolProperties_ptr
-  create_user_datagram_protocol_properties (
-                                            CORBA::Boolean enable_network_priority
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::StreamControlProtocolProperties_ptr
-  create_stream_control_protocol_properties (
-                                             CORBA::Long send_buffer_size,
-                                             CORBA::Long recv_buffer_size,
-                                             CORBA::Boolean keep_alive,
-                                             CORBA::Boolean dont_route,
-                                             CORBA::Boolean no_delay,
-                                             CORBA::Boolean enable_network_priority
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Create a RTCORBA threadpool to manage a set of threads without lanes.
-  virtual RTCORBA::ThreadpoolId
-  create_threadpool (CORBA::ULong stacksize,
-                     CORBA::ULong static_threads,
-                     CORBA::ULong dynamic_threads,
-                     RTCORBA::Priority default_priority,
-                     CORBA::Boolean allow_request_buffering,
-                     CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a threadpool and separate it into subsets based on
-   * priorities.
-   */
-  virtual RTCORBA::ThreadpoolId
-  create_threadpool_with_lanes (CORBA::ULong stacksize,
-                                const RTCORBA::ThreadpoolLanes & lanes,
-                                CORBA::Boolean allow_borrowing,
-                                CORBA::Boolean allow_request_buffering,
-                                CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Free the resources associated with the specified threadpool.
-  virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::InvalidThreadpool));
-
-  /// Create a priority model policy for use when configuring a POA.
-  virtual RTCORBA::PriorityModelPolicy_ptr
-  create_priority_model_policy (
-                                RTCORBA::PriorityModel priority_model,
-                                RTCORBA::Priority server_priority
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Create a ThreadpoolPolicy instance for POA creation
-  virtual RTCORBA::ThreadpoolPolicy_ptr
-  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a PriorityBandedConnectionPolicy instance
-   * for use on either the client or server side
-   */
-  virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
-  create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
-                                            priority_bands
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a PrivateConnectionPolicy instance to use on client
-   * to request a private (non-multiplexed) transport connection
-   * to the server.
-   */
-  virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a ServerProtocolPolicy instance to select and configure
-   * communication protocols on the server side.
-   */
-  virtual RTCORBA::ServerProtocolPolicy_ptr
-  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * Create a ClientProtocolPolicy instance to select and configure
-   * communication protocols on the client side.
-   */
-  virtual RTCORBA::ClientProtocolPolicy_ptr
-  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Reference to our creating ORB Core.
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Get the Thread Pool Manager.
-  TAO_Thread_Pool_Manager &tp_manager (void) const;
-
-  /**
-   * This method changes the scheduling policy of the calling thread
-   * to match the scheduling policy specified in the svc.conf file.
-   * The priority of the calling thread will be set to the minimum
-   * priority supported by that scheduling policy.
-   *
-   * This method make sense on those platform (e.g., Linux) where
-   * PTHREAD_SCOPE_SYSTEM is the only scheduling scope supported.  On
-   * other platforms, this method is a no-op since the only way to get
-   * the real-time threading behavior is to setup the
-   * PTHREAD_SCOPE_SYSTEM scheduling scope when a thread is being
-   * created.  On such platforms, one can set the correct scheduling
-   * scope and policy when creating the thread, thus not needing to
-   * use this method.
-   */
-  static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb);
-
-protected:
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_RT_ORB (void);
-
-  /// Reference to our creating ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// mutex_mgr_ manages the names associated with named mutexes.
-  TAO_Named_RT_Mutex_Manager mutex_mgr_;
-
-  /// Thread Pool Manager
-  TAO_Thread_Pool_Manager *tp_manager_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_ORB_H */
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
deleted file mode 100644
index 27dc3ded6c0..00000000000
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-#include "RT_ORBInitializer.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (RTCORBA,
-           RT_ORBInitializer,
-           "$Id$")
-
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "RT_Policy_i.h"
-#include "RT_Protocols_Hooks.h"
-#include "Priority_Mapping_Manager.h"
-#include "Network_Priority_Mapping_Manager.h"
-#include "RT_ORB_Loader.h"
-#include "RT_Stub_Factory.h"
-#include "RT_Endpoint_Selector_Factory.h"
-#include "Continuous_Priority_Mapping.h"
-#include "Linear_Priority_Mapping.h"
-#include "Direct_Priority_Mapping.h"
-#include "Linear_Network_Priority_Mapping.h"
-#include "RT_ORB.h"
-#include "RT_Current.h"
-#include "RT_Thread_Lane_Resources_Manager.h"
-
-#include "tao/Exception.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitInfo.h"
-#include "tao/debug.h"
-
-#include "ace/Service_Repository.h"
-#include "ace/Svc_Conf.h"
-#include "ace/Sched_Params.h"
-
-static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory";
-static const char *rt_poa_factory_directive = "dynamic TAO_RT_Object_Adapter_Factory Service_Object * TAO_RTPortableServer:_make_TAO_RT_Object_Adapter_Factory()";
-
-TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
-                                              int network_priority_mapping_type,
-                                              int ace_sched_policy,
-                                              long sched_policy,
-                                              long scope_policy)
-  : priority_mapping_type_ (priority_mapping_type),
-    network_priority_mapping_type_ (network_priority_mapping_type),
-    ace_sched_policy_ (ace_sched_policy),
-    sched_policy_ (sched_policy),
-    scope_policy_ (scope_policy)
-{
-}
-
-void
-TAO_RT_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //
-  // Register all of the RT related services.
-  //
-
-  // Set the name of the Protocol_Hooks to be RT_Protocols_Hooks.
-  TAO_ORB_Core::set_protocols_hooks ("RT_Protocols_Hooks");
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Protocols_Hooks);
-
-  // Set the name of the stub factory to be RT_Stub_Factory.
-  TAO_ORB_Core::set_stub_factory ("RT_Stub_Factory");
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Stub_Factory);
-
-  // Set the name of the stub factory to be RT_Stub_Factory.
-  TAO_ORB_Core::set_endpoint_selector_factory ("RT_Endpoint_Selector_Factory");
-  ACE_Service_Config::process_directive (ace_svc_desc_RT_Endpoint_Selector_Factory);
-
-  // Set the name of the thread lane resources manager to be RT_Thread_Lane_Resources_Manager.
-  TAO_ORB_Core::set_thread_lane_resources_manager_factory ("RT_Thread_Lane_Resources_Manager_Factory");
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Thread_Lane_Resources_Manager_Factory);
-
-  // If the application resolves the root POA, make sure we load the RT POA.
-  TAO_ORB_Core::set_poa_factory (rt_poa_factory_name,
-                                 rt_poa_factory_directive);
-
-  // Create the initial priority mapping instance.
-  TAO_Priority_Mapping *pm;
-  switch (this->priority_mapping_type_)
-    {
-    case TAO_PRIORITY_MAPPING_CONTINUOUS:
-      ACE_NEW (pm,
-               TAO_Continuous_Priority_Mapping (this->ace_sched_policy_));
-      break;
-    case TAO_PRIORITY_MAPPING_LINEAR:
-      ACE_NEW (pm,
-               TAO_Linear_Priority_Mapping (this->ace_sched_policy_));
-      break;
-    default:
-    case TAO_PRIORITY_MAPPING_DIRECT:
-      ACE_NEW (pm,
-               TAO_Direct_Priority_Mapping (this->ace_sched_policy_));
-      break;
-    }
-
-  // Set the Priority_Mapping_Manager
-  TAO_Priority_Mapping_Manager *manager = 0;
-
-  ACE_NEW_THROW_EX (manager,
-                    TAO_Priority_Mapping_Manager (pm),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-
-  TAO_Priority_Mapping_Manager_var safe_manager = manager;
-
-  info->register_initial_reference ("PriorityMappingManager",
-                                    manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create the initial priority mapping instance.
-  TAO_Network_Priority_Mapping *npm;
-  switch (this->network_priority_mapping_type_)
-    {
-    default:
-    case TAO_NETWORK_PRIORITY_MAPPING_LINEAR:
-      ACE_NEW (npm,
-               TAO_Linear_Network_Priority_Mapping (this->ace_sched_policy_));
-      break;
-    }
-
-  // Set the Priority_Mapping_Manager
-  TAO_Network_Priority_Mapping_Manager * network_manager = 0;
-
-  // @@ There is a potential memory leak here.  If the new() below
-  //    throws an exception, the memory for the network priority
-  //    mapping allocated above will be leaked.  Use an auto_ptr<> or
-  //    the appropriate memory management tool.
-
-  ACE_NEW_THROW_EX (network_manager,
-                    TAO_Network_Priority_Mapping_Manager (npm),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  TAO_Network_Priority_Mapping_Manager_var safe_network_manager =
-    network_manager;
-
-  info->register_initial_reference ("NetworkPriorityMappingManager",
-                                    network_manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Narrow to a TAO_ORBInitInfo object to get access to the
-  // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (tao_info.in ()))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) TAO_RT_ORBInitializer::pre_init:\n"
-                    "(%P|%t)    Unable to narrow "
-                    "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
-                    "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Create the RT_ORB.
-  CORBA::Object_ptr rt_orb = CORBA::Object::_nil ();
-  ACE_NEW_THROW_EX (rt_orb,
-                    TAO_RT_ORB (tao_info->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-  CORBA::Object_var safe_rt_orb = rt_orb;
-
-  info->register_initial_reference (TAO_OBJID_RTORB,
-                                    rt_orb
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create the RT_Current.
-  CORBA::Object_ptr current;
-  ACE_NEW_THROW_EX (current,
-                    TAO_RT_Current (tao_info->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-  CORBA::Object_var safe_rt_current = current;
-
-  info->register_initial_reference (TAO_OBJID_RTCURRENT,
-                                    current
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
-  tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_);
-  tao_info->orb_core ()->orb_params ()->ace_sched_policy (this->ace_sched_policy_);
-}
-
-void
-TAO_RT_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-
-  ACE_CHECK;
-}
-
-void
-TAO_RT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  // Register the RTCORBA policy factories.
-
-  // The RTCORBA policy factory is stateless and reentrant, so share a
-  // single instance between all ORBs.
-  PortableInterceptor::PolicyFactory_ptr policy_factory =
-    &(this->policy_factory_);
-
-  // Bind the same policy factory to all RTCORBA related policy
-  // types since a single policy factory is used to create each of
-  // the different types of RTCORBA policies.
-  CORBA::PolicyType type[] = {
-    RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-    RTCORBA::THREADPOOL_POLICY_TYPE,
-    RTCORBA::SERVER_PROTOCOL_POLICY_TYPE,
-    RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE,
-    RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE,
-    RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
-  };
-
-  const CORBA::PolicyType *end =
-    type + sizeof (type) / sizeof (type[0]);
-
-  for (CORBA::PolicyType *i = type;
-       i != end;
-       ++i)
-    {
-      ACE_TRY
-        {
-          info->register_policy_factory (*i,
-                                         policy_factory
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-        {
-          if (ex.minor () == (CORBA::OMGVMCID | 16))
-            {
-              // The factory is already there, it happens because the
-              // magic initializer in PortableServer.cpp registers
-              // with the ORB multiple times.  This is an indication
-              // that we should do no more work in this
-              // ORBInitializer.
-              return;
-            }
-          ACE_RE_THROW;
-        }
-      ACE_CATCHANY
-        {
-          // Rethrow any other exceptions...
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
deleted file mode 100644
index d64f3a8ccf9..00000000000
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RT_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_ORB_INITIALIZER_H
-#define TAO_RT_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RT_PolicyFactory.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// RTCORBA ORB initializer.
-class TAO_RTCORBA_Export TAO_RT_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Priority mapping types
-  enum
-    {
-      TAO_PRIORITY_MAPPING_CONTINUOUS,
-      TAO_PRIORITY_MAPPING_LINEAR,
-      TAO_PRIORITY_MAPPING_DIRECT
-    };
-
-  enum
-    {
-      TAO_NETWORK_PRIORITY_MAPPING_LINEAR
-    };
-
-  TAO_RT_ORBInitializer (int priority_mapping_type,
-                         int network_priority_mapping_type,
-                         int ace_sched_policy,
-                         long sched_policy,
-                         long scope_policy);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Register RTCORBA policy factories.
-  void register_policy_factories (
-                                  PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
-
-private:
-
-  /// Instance of the RTCORBA policy factory.
-  /// The RTCORBA policy factory is stateless and reentrant, so share
-  /// a single instance between all ORBs.
-  TAO_RT_PolicyFactory policy_factory_;
-
-  /// Priority mapping type.
-  int priority_mapping_type_;
-
-  /// Network Priority mapping type.
-  int network_priority_mapping_type_;
-
-  /// Scheduling policy.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by
-   * functions like ACE_OS::thr_setprio() and
-   * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
-   * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
-   */
-  int ace_sched_policy_;
-
-  /// Scheduling policy flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCHED_RR,
-   * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
-   */
-  long sched_policy_;
-
-  /// Scheduling scope flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBScopePolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
-   * THR_SCOPE_PROCESS.
-   */
-  long scope_policy_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_ORB_INITIALIZER_H */
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
deleted file mode 100644
index f12970f7985..00000000000
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "RT_ORB_Loader.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_ORBInitializer.h"
-
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (RTCORBA,
-           RT_ORB_Loader,
-           "$Id$")
-
-
-TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
-{
-}
-
-TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
-{
-}
-
-int
-TAO_RT_ORB_Loader::init (int argc,
-                         ACE_TCHAR* argv[])
-{
-  ACE_TRACE ("TAO_RT_ORB_Loader::init");
-
-  static int initialized = 0;
-
-  // Only allow initialization once.
-  if (initialized)
-    return 0;
-
-  initialized = 1;
-
-  // Set defaults.
-  int priority_mapping_type =
-    TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
-  int network_priority_mapping_type =
-    TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
-  int ace_sched_policy = ACE_SCHED_OTHER;
-  long sched_policy = THR_SCHED_DEFAULT;
-  long scope_policy = THR_SCOPE_PROCESS;
-  int curarg = 0;
-
-  // Parse any service configurator parameters.
-  for (curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_TEXT("-ORBPriorityMapping")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("continuous")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("direct")) == 0)
-              priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBPriorityMapping\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBSchedPolicy")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("SCHED_OTHER")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_OTHER;
-                sched_policy = THR_SCHED_DEFAULT;
-              }
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("SCHED_FIFO")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_FIFO;
-                sched_policy = THR_SCHED_FIFO;
-              }
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("SCHED_RR")) == 0)
-              {
-                ace_sched_policy = ACE_SCHED_RR;
-                sched_policy = THR_SCHED_RR;
-              }
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBSchedPolicy\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBScopePolicy")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("SYSTEM")) == 0)
-              scope_policy = THR_SCOPE_SYSTEM;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("PROCESS")) == 0)
-              scope_policy = THR_SCOPE_PROCESS;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT("RT_ORB_Loader - unknown argument")
-                          ACE_TEXT(" <%s> for -ORBScopePolicy\n"),
-                          name));
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBNetworkPriorityMapping")) == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("linear")) == 0)
-              network_priority_mapping_type =
-                TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
-          }
-      }
-    else
-      {
-        if (TAO_debug_level > 0)
-          {
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT("RT_ORB_Loader: Unknown option ")
-                        ACE_TEXT("<%s>.\n"),
-                        argv[curarg]));
-          }
-      }
-
-  // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-      PortableInterceptor::ORBInitializer_var orb_initializer;
-
-      /// Register the RTCORBA ORBInitializer.
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_RT_ORBInitializer (priority_mapping_type,
-                                               network_priority_mapping_type,
-                                               ace_sched_policy,
-                                               sched_policy,
-                                               scope_policy),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-      orb_initializer = temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught while "
-                           "initializing the RTORB");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-/////////////////////////////////////////////////////////////////////
-
-ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_ORB_Loader)
-ACE_STATIC_SVC_DEFINE (TAO_RT_ORB_Loader,
-                       ACE_TEXT ("RT_ORB_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_ORB_Loader),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
deleted file mode 100644
index 402c314f403..00000000000
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    RT_ORB_Loader.h
- *
- *  $Id$
- *
- *   Header file for Loading RT_ORB.
- *
- *
- *  @author  Priyanka Gontla <gontla_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_RT_ORB_LOADER_H
-#define TAO_RT_ORB_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-
-class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object
-{
-public:
-  /// Constructor.
-  TAO_RT_ORB_Loader (void);
-
-  /// Destructor.
-  virtual ~TAO_RT_ORB_Loader (void);
-
-  /// Initialize the RT ORB loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_ORB_Loader)
-ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_ORB_Loader)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_ORB_LOADER_H */
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
deleted file mode 100644
index 7e5bd32fd68..00000000000
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "RT_PolicyFactory.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (RTCORBA,
-           RT_PolicyFactory,
-           "$Id$")
-
-#include "RT_Policy_i.h"
-
-#include "tao/PolicyC.h"
-#include "tao/ORB_Constants.h"
-
-CORBA::Policy_ptr
-TAO_RT_PolicyFactory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return TAO_PriorityModelPolicy::create (value
-                                            ACE_ENV_ARG_PARAMETER);
-
-  if (type == RTCORBA::THREADPOOL_POLICY_TYPE)
-    return TAO_ThreadpoolPolicy::create (value
-                                         ACE_ENV_ARG_PARAMETER);
-
-  if (type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
-    return TAO_ServerProtocolPolicy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
-
-  if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return TAO_ClientProtocolPolicy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
-
-  if (type == RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE)
-    return TAO_PrivateConnectionPolicy::create (value
-                                                ACE_ENV_ARG_PARAMETER);
-
-  if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return TAO_PriorityBandedConnectionPolicy::create (value
-                                                       ACE_ENV_ARG_PARAMETER);
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
-CORBA::Policy_ptr
-TAO_RT_PolicyFactory::_create_policy (
-    CORBA::PolicyType type
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
-
-  if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    {
-      ACE_NEW_THROW_EX (policy,
-                        TAO_PriorityModelPolicy,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return policy;
-    }
-
-  if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    {
-      ACE_NEW_THROW_EX (policy,
-                        TAO_PriorityBandedConnectionPolicy,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return policy;
-    }
-
-  if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    {
-      ACE_NEW_THROW_EX (policy,
-                        TAO_ClientProtocolPolicy,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return policy;
-    }
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
deleted file mode 100644
index 078bdfdd440..00000000000
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     RT_PolicyFactory.h
- *
- *  $Id$
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_POLICY_FACTORY_H
-#define TAO_RT_POLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Policy factory for all RTCORBA related policies.
-class TAO_RTCORBA_Export TAO_RT_PolicyFactory
-  : public PortableInterceptor::PolicyFactory,
-    public CORBA::LocalObject
-{
-public:
-
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-
-  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_POLICY_FACTORY_H */
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
deleted file mode 100644
index abcc9239638..00000000000
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ /dev/null
@@ -1,1404 +0,0 @@
-// $Id$
-
-#include "RT_Policy_i.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/ORB_Core.h"
-#include "tao/Policy_Manager.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (RTCORBA,
-           RT_Policy_i,
-           "$Id$")
-
-// ****************************************************************
-
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model,
-                                                  RTCORBA::Priority server_priority)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PriorityModelPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , priority_model_ (priority_model)
-  , server_priority_ (server_priority)
-{
-}
-
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PriorityModelPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , priority_model_ (rhs.priority_model_)
-  , server_priority_ (rhs.server_priority_)
-{
-}
-
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (void)
-  : priority_model_ (RTCORBA::SERVER_DECLARED),
-    server_priority_ (0)
-{
-}
-
-TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_PriorityModelPolicy::create (const CORBA::Any &
-                                 ACE_ENV_ARG_DECL)
-{
-  /*
-   * @@ The following code should be changed once the OMG spec has
-   * been fixed such that a RTCORBA::PriorityModelPolicy can be
-   * created by using the ORB::create_policy interface.
-   */
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                    CORBA::Policy::_nil ());
-}
-
-RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::get_priority_model (void)
-{
-  return this->priority_model_;
-}
-
-RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->priority_model_;
-}
-
-RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->server_priority_;
-}
-
-CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PriorityModelPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PriorityModelPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_PriorityModelPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::Boolean
-TAO_PriorityModelPolicy::_tao_encode (TAO_OutputCDR &out_cdr)
-{
-  // Note: the fields are encoded according to
-  // the order specified in the RTCORBA 1.0 spec (ptc/99-05-03)
-  // section 4.7.3.
-
-  return ((out_cdr << priority_model_) && (out_cdr << server_priority_));
-}
-
-CORBA::Boolean
-TAO_PriorityModelPolicy::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return ((in_cdr >> priority_model_) && (in_cdr >> server_priority_));
-}
-
-TAO_Cached_Policy_Type
-TAO_PriorityModelPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_PRIORITY_MODEL;
-}
-
-TAO_Policy_Scope
-TAO_PriorityModelPolicy::_tao_scope (void) const
-{
-  // Note that this policy is propogated to the client even though
-  // it is not specified here.  The reason for this is that the
-  // server priority field is set dynamically depending on the model
-  // and the servant's priority.  Therefore, it can't be simply
-  // copied to the list of client exposed policies.
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE |
-                          TAO_POLICY_POA_SCOPE);
-}
-
-// ****************************************************************
-
-TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ThreadpoolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , id_ (id)
-{
-}
-
-TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ThreadpoolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , id_ (rhs.id_)
-{
-}
-
-TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::create (const CORBA::Any &val
-                              ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ThreadpoolId value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_ThreadpoolPolicy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ThreadpoolPolicy (value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->id_;
-}
-
-CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::THREADPOOL_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ThreadpoolPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ThreadpoolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_ThreadpoolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_ThreadpoolPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_THREADPOOL;
-}
-
-TAO_Policy_Scope
-TAO_ThreadpoolPolicy::_tao_scope (void) const
-{
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE |
-                          TAO_POLICY_POA_SCOPE);
-}
-
-// ****************************************************************
-
-TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PrivateConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
-{
-}
-
-TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PrivateConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
-{
-}
-
-TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::create (const CORBA::Any &
-                                     ACE_ENV_ARG_DECL)
-{
-  TAO_PrivateConnectionPolicy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PrivateConnectionPolicy (),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PrivateConnectionPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PrivateConnectionPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_PrivateConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_PrivateConnectionPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION;
-}
-
-TAO_Policy_Scope
-TAO_PrivateConnectionPolicy::_tao_scope (void) const
-{
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_OBJECT_SCOPE |
-                          TAO_POLICY_THREAD_SCOPE |
-                          TAO_POLICY_ORB_SCOPE);
-}
-
-// ****************************************************************
-
-TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RTCORBA::PriorityBands &bands)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PriorityBandedConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , priority_bands_ (bands)
-{
-}
-
-TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TAO_PriorityBandedConnectionPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::PriorityBandedConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , priority_bands_ (rhs.priority_bands_)
-{
-}
-
-TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (void)
-{
-}
-
-TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
-                                            ACE_ENV_ARG_DECL)
-{
-  RTCORBA::PriorityBands *value = 0;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_PriorityBandedConnectionPolicy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PriorityBandedConnectionPolicy (*value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::PriorityBands *
-TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RTCORBA::PriorityBands *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    RTCORBA::PriorityBands (this->priority_bands_),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return tmp;
-}
-
-CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_PriorityBandedConnectionPolicy *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_PriorityBandedConnectionPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_PriorityBandedConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::Boolean
-TAO_PriorityBandedConnectionPolicy::_tao_encode (TAO_OutputCDR &out_cdr)
-{
-  return out_cdr << priority_bands_;
-}
-
-CORBA::Boolean
-TAO_PriorityBandedConnectionPolicy::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return in_cdr >> priority_bands_;
-}
-
-TAO_Cached_Policy_Type
-TAO_PriorityBandedConnectionPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION;
-}
-
-TAO_Policy_Scope
-TAO_PriorityBandedConnectionPolicy::_tao_scope (void) const
-{
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE |
-                          TAO_POLICY_CLIENT_EXPOSED);
-}
-
-RTCORBA::PriorityBands &
-TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void)
-{
-  return priority_bands_;
-}
-
-// ****************************************************************
-
-TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList &protocols)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ServerProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , protocols_ (protocols)
-{
-}
-
-TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ServerProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , protocols_ (rhs.protocols_)
-{
-}
-
-TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
-{
-}
-
-CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolList *value = 0;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_ServerProtocolPolicy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ServerProtocolPolicy (*value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RTCORBA::ProtocolList *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    RTCORBA::ProtocolList (this->protocols_),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return tmp;
-}
-
-CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ServerProtocolPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ServerProtocolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_ServerProtocolPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_RT_SERVER_PROTOCOL;
-}
-
-TAO_Policy_Scope
-TAO_ServerProtocolPolicy::_tao_scope (void) const
-{
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE |
-                          TAO_POLICY_POA_SCOPE);
-}
-
-RTCORBA::ProtocolList &
-TAO_ServerProtocolPolicy::protocols_rep (void)
-{
-  return protocols_;
-}
-
-// ****************************************************************
-
-TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void)
-{
-}
-
-
-TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList &protocols)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ClientProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , protocols_ (protocols)
-{
-}
-
-TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , RTCORBA::ClientProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
-  , protocols_ (rhs.protocols_)
-{
-}
-
-TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy ()
-{
-}
-
-CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolList *value = 0;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_ClientProtocolPolicy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ClientProtocolPolicy (*value),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RTCORBA::ProtocolList *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    RTCORBA::ProtocolList (this->protocols_),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return tmp;
-}
-
-CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
-}
-
-CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ClientProtocolPolicy* tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_ClientProtocolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-void
-TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_ClientProtocolPolicy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL;
-}
-
-TAO_Policy_Scope
-TAO_ClientProtocolPolicy::_tao_scope (void) const
-{
-  return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE |
-                          TAO_POLICY_CLIENT_EXPOSED);
-}
-
-CORBA::Boolean
-TAO_ClientProtocolPolicy::_tao_encode (TAO_OutputCDR &out_cdr)
-{
-  CORBA::Boolean is_write_ok = out_cdr << this->protocols_.length ();
-
-  for (CORBA::ULong i = 0;
-       (i < this->protocols_.length ()) && is_write_ok;
-       i++)
-    {
-      is_write_ok =
-        (out_cdr << this->protocols_[i].protocol_type)
-        &&
-        this->protocols_[i].orb_protocol_properties->_tao_encode (out_cdr)
-        &&
-        this->protocols_[i].transport_protocol_properties->_tao_encode (out_cdr);
-    }
-
-  return is_write_ok;
-}
-
-CORBA::Boolean
-TAO_ClientProtocolPolicy::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  CORBA::ULong length;
-  CORBA::Boolean is_read_ok = in_cdr >> length;
-
-  this->protocols_.length (length);
-
-  for (CORBA::ULong i = 0; (i < length) && is_read_ok; i++)
-    {
-      is_read_ok = in_cdr >> this->protocols_[i].protocol_type;
-
-      this->protocols_[i].orb_protocol_properties =
-        TAO_Protocol_Properties_Factory::create_orb_protocol_property
-        (this->protocols_[i].protocol_type);
-
-      this->protocols_[i].transport_protocol_properties =
-        TAO_Protocol_Properties_Factory::create_transport_protocol_property
-        (this->protocols_[i].protocol_type, in_cdr.orb_core ());
-
-      if (is_read_ok
-          && (this->protocols_[i].orb_protocol_properties.ptr () != 0))
-        is_read_ok =
-          this->protocols_[i].orb_protocol_properties->_tao_decode (in_cdr);
-
-      if (is_read_ok
-          && (this->protocols_[i].transport_protocol_properties.ptr () != 0))
-        is_read_ok =
-          this->protocols_[i].transport_protocol_properties->_tao_decode (in_cdr);
-
-    }
-
-  return is_read_ok;
-}
-
-RTCORBA::ProtocolList &
-TAO_ClientProtocolPolicy::protocols_rep (void)
-{
-  return protocols_;
-}
-
-// ****************************************************************
-
-TAO_TCP_Protocol_Properties::TAO_TCP_Protocol_Properties (CORBA::Long send_buffer_size,
-                                                          CORBA::Long recv_buffer_size,
-                                                          CORBA::Boolean keep_alive,
-                                                          CORBA::Boolean dont_route,
-                                                          CORBA::Boolean no_delay,
-                                                          CORBA::Boolean enable_network_priority)
-  : send_buffer_size_ (send_buffer_size),
-    recv_buffer_size_ (recv_buffer_size),
-    keep_alive_ (keep_alive),
-    dont_route_ (dont_route),
-    no_delay_ (no_delay),
-    enable_network_priority_ (enable_network_priority)
-{
-}
-
-TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
-{
-}
-
-CORBA::Long
-TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->send_buffer_size_;
-}
-
-void
-TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->send_buffer_size_ = send_buffer_size;
-}
-
-CORBA::Long
-TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->recv_buffer_size_;
-}
-
-void
-TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->recv_buffer_size_ = recv_buffer_size;
-}
-
-CORBA::Boolean
-TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->keep_alive_;
-}
-
-void
-TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->keep_alive_ = keep_alive;
-}
-
-CORBA::Boolean
-TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->dont_route_;
-}
-
-void
-TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->dont_route_ = dont_route;
-}
-
-CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->no_delay_;
-}
-
-void
-TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                       ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->no_delay_ = no_delay;
-}
-
-CORBA::Boolean
-TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->enable_network_priority_;
-}
-
-void
-TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->enable_network_priority_ = enable;
-}
-
-CORBA::Boolean
-TAO_TCP_Protocol_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
-{
-  return ((out_cdr << this->send_buffer_size_)
-          &&
-          (out_cdr << this->recv_buffer_size_)
-          &&
-          (out_cdr.write_boolean (this->keep_alive_))
-          &&
-          (out_cdr.write_boolean (this->dont_route_))
-          &&
-          (out_cdr.write_boolean (this->no_delay_)));
-}
-
-CORBA::Boolean
-TAO_TCP_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return ((in_cdr >> this->send_buffer_size_)
-          &&
-          (in_cdr >> this->recv_buffer_size_)
-          &&
-          (in_cdr.read_boolean (this->keep_alive_))
-          &&
-          (in_cdr.read_boolean (this->dont_route_))
-          &&
-          (in_cdr.read_boolean (this->no_delay_)));
-}
-
-// ****************************************************************
-
-TAO_UnixDomain_Protocol_Properties::TAO_UnixDomain_Protocol_Properties
-(CORBA::Long send_buffer_size,
- CORBA::Long recv_buffer_size)
-  : send_buffer_size_ (send_buffer_size),
-    recv_buffer_size_ (recv_buffer_size)
-{
-}
-
-TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
-{
-}
-
-CORBA::Long
-TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->send_buffer_size_;
-}
-
-void
-TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->send_buffer_size_ = send_buffer_size;
-}
-
-CORBA::Long
-TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->recv_buffer_size_;
-}
-
-void
-TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->recv_buffer_size_ = recv_buffer_size;
-}
-
-CORBA::Boolean
-TAO_UnixDomain_Protocol_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
-{
-  return ((out_cdr << this->send_buffer_size_)
-          && (out_cdr << this->recv_buffer_size_));
-}
-
-CORBA::Boolean
-TAO_UnixDomain_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return ((in_cdr >> this->send_buffer_size_)
-          && (in_cdr >> this->recv_buffer_size_));
-}
-
-// ****************************************************************
-
-TAO_SharedMemory_Protocol_Properties::TAO_SharedMemory_Protocol_Properties (CORBA::Long send_buffer_size,
-                                                                            CORBA::Long recv_buffer_size,
-                                                                            CORBA::Boolean keep_alive,
-                                                                            CORBA::Boolean dont_route,
-                                                                            CORBA::Boolean no_delay,
-                                                                            CORBA::Long preallocate_buffer_size,
-                                                                            const char *mmap_filename,
-                                                                            const char *mmap_lockname)
-  : send_buffer_size_ (send_buffer_size),
-    recv_buffer_size_ (recv_buffer_size),
-    keep_alive_ (keep_alive),
-    dont_route_ (dont_route),
-    no_delay_ (no_delay),
-    preallocate_buffer_size_ (preallocate_buffer_size),
-    mmap_filename_ (mmap_filename),
-    mmap_lockname_ (mmap_lockname)
-{
-}
-
-TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (void)
-{
-}
-
-
-CORBA::Long
-TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->send_buffer_size_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->send_buffer_size_ = send_buffer_size;
-}
-
-CORBA::Long
-TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->recv_buffer_size_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->recv_buffer_size_ = recv_buffer_size;
-}
-
-CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->keep_alive_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->keep_alive_ = keep_alive;
-}
-
-CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->dont_route_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->dont_route_ = dont_route;
-}
-
-CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->no_delay_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->no_delay_ = no_delay;
-}
-
-CORBA::Long
-TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->preallocate_buffer_size_;
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->preallocate_buffer_size_ = preallocate_buffer_size;
-}
-
-char *
-TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->mmap_filename_.rep ();
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->mmap_filename_.set (mmap_filename);
-}
-
-char *
-TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->mmap_lockname_.rep ();
-}
-
-void
-TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->mmap_lockname_.set (mmap_lockname);
-}
-
-CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::_tao_encode (TAO_OutputCDR &out_cdr)
-{
-  return ((out_cdr << this->send_buffer_size_)
-          &&
-          (out_cdr << this->recv_buffer_size_)
-          &&
-          (out_cdr.write_boolean (this->keep_alive_))
-          &&
-          (out_cdr.write_boolean (this->dont_route_))
-          &&
-          (out_cdr.write_boolean (this->no_delay_))
-          &&
-          (out_cdr << this->preallocate_buffer_size_)
-          &&
-          (out_cdr << this->mmap_filename_)
-          &&
-          (out_cdr << this->mmap_lockname_));
-}
-
-CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return ((in_cdr >> this->send_buffer_size_)
-          &&
-          (in_cdr >> this->recv_buffer_size_)
-          &&
-          (in_cdr.read_boolean (this->keep_alive_))
-          &&
-          (in_cdr.read_boolean (this->dont_route_))
-          &&
-          (in_cdr.read_boolean (this->no_delay_))
-          &&
-          (in_cdr >> this->preallocate_buffer_size_)
-          &&
-          (in_cdr >> this->mmap_filename_)
-          &&
-          (in_cdr >> this->mmap_lockname_));
-}
-
-// ****************************************************************
-
-TAO_UserDatagram_Protocol_Properties::TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority)
-  : enable_network_priority_ (enable_network_priority)
-{
-}
-
-TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (void)
-{
-}
-
-CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->enable_network_priority_;
-}
-
-void
-TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->enable_network_priority_ = enable;
-}
-
-CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::_tao_encode (TAO_OutputCDR &)
-{
-  return true;
-}
-
-CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::_tao_decode (TAO_InputCDR &)
-{
-  return true;
-}
-
-// ****************************************************************
-
-TAO_StreamControl_Protocol_Properties::TAO_StreamControl_Protocol_Properties (CORBA::Long send_buffer_size,
-                                                                              CORBA::Long recv_buffer_size,
-                                                                              CORBA::Boolean keep_alive,
-                                                                              CORBA::Boolean dont_route,
-                                                                              CORBA::Boolean no_delay,
-                                                                              CORBA::Boolean enable_network_priority)
-  : send_buffer_size_ (send_buffer_size),
-    recv_buffer_size_ (recv_buffer_size),
-    keep_alive_ (keep_alive),
-    dont_route_ (dont_route),
-    no_delay_ (no_delay),
-    enable_network_priority_ (enable_network_priority)
-{
-}
-
-TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (void)
-{
-}
-
-CORBA::Long
-TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->send_buffer_size_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->send_buffer_size_ = send_buffer_size;
-}
-
-CORBA::Long
-TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->recv_buffer_size_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->recv_buffer_size_ = recv_buffer_size;
-}
-
-CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->keep_alive_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->keep_alive_ = keep_alive;
-}
-
-CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->dont_route_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->dont_route_ = dont_route;
-}
-
-CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->no_delay_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->no_delay_ = no_delay;
-}
-
-CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->enable_network_priority_;
-}
-
-void
-TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->enable_network_priority_ = enable;
-}
-
-CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::_tao_encode (TAO_OutputCDR & out_cdr)
-{
-  return ((out_cdr << this->send_buffer_size_)
-          &&
-          (out_cdr << this->recv_buffer_size_)
-          &&
-          (out_cdr.write_boolean (this->keep_alive_))
-          &&
-          (out_cdr.write_boolean (this->dont_route_))
-          &&
-          (out_cdr.write_boolean (this->no_delay_)));
-}
-
-CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::_tao_decode (TAO_InputCDR &in_cdr)
-{
-  return ((in_cdr >> this->send_buffer_size_)
-          &&
-          (in_cdr >> this->recv_buffer_size_)
-          &&
-          (in_cdr.read_boolean (this->keep_alive_))
-          &&
-          (in_cdr.read_boolean (this->dont_route_))
-          &&
-          (in_cdr.read_boolean (this->no_delay_)));
-}
-
-// ****************************************************************
-
-TAO_GIOP_Protocol_Properties::TAO_GIOP_Protocol_Properties (void)
-{
-}
-
-TAO_GIOP_Protocol_Properties::~TAO_GIOP_Protocol_Properties (void)
-{
-}
-
-CORBA::Boolean
-TAO_GIOP_Protocol_Properties::_tao_encode (TAO_OutputCDR &)
-{
-  return 1;
-}
-
-CORBA::Boolean
-TAO_GIOP_Protocol_Properties::_tao_decode (TAO_InputCDR &)
-{
-  return 1;
-}
-
-// ****************************************************************
-
-RTCORBA::ProtocolProperties *
-TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::ProfileId id,
-                                                                     TAO_ORB_Core *orb_core)
-{
-  RTCORBA::ProtocolProperties* property = 0;
-
-  if (id == IOP::TAG_INTERNET_IOP)
-    {
-      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
-      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
-      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Boolean enable_network_priority = 0;
-
-      ACE_NEW_RETURN (property,
-                      TAO_TCP_Protocol_Properties (send_buffer_size,
-                                                   recv_buffer_size,
-                                                   keep_alive,
-                                                   dont_route,
-                                                   no_delay,
-                                                   enable_network_priority),
-                      0);
-    }
-
-  else if (id == TAO_TAG_SHMEM_PROFILE)
-    {
-      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
-      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
-      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Long preallocate_buffer_size = 0;
-      const char *mmap_filename = "";
-      const char *mmap_lockname = "";
-
-      ACE_NEW_RETURN (property,
-                      TAO_SharedMemory_Protocol_Properties (send_buffer_size,
-                                                            recv_buffer_size,
-                                                            keep_alive,
-                                                            dont_route,
-                                                            no_delay,
-                                                            preallocate_buffer_size,
-                                                            mmap_filename,
-                                                            mmap_lockname),
-                      0);
-    }
-
-  else if (id == TAO_TAG_UIOP_PROFILE)
-    {
-      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
-      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
-
-      ACE_NEW_RETURN (property,
-                      TAO_UnixDomain_Protocol_Properties (send_buffer_size,
-                                                          recv_buffer_size),
-                      0);
-    }
-
-  else if (id == TAO_TAG_DIOP_PROFILE)
-    {
-      CORBA::Boolean enable_network_priority = 0;
-
-      ACE_NEW_RETURN (property,
-                      TAO_UserDatagram_Protocol_Properties (enable_network_priority),
-                      0);
-    }
-
-  else if (id == TAO_TAG_SCIOP_PROFILE)
-    {
-      int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0;
-      int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0;
-      int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0;
-      CORBA::Boolean keep_alive = 1;
-      CORBA::Boolean dont_route = 0;
-      CORBA::Boolean enable_network_priority = 0;
-
-      ACE_NEW_RETURN (property,
-                      TAO_StreamControl_Protocol_Properties (send_buffer_size,
-                                                             recv_buffer_size,
-                                                             keep_alive,
-                                                             dont_route,
-                                                             no_delay,
-                                                             enable_network_priority),
-                      0);
-    }
-
-  return property;
-}
-
-RTCORBA::ProtocolProperties*
-TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id)
-{
-  RTCORBA::ProtocolProperties* property = 0;
-
-  if (id == IOP::TAG_INTERNET_IOP)
-    ACE_NEW_RETURN (property,
-                    TAO_GIOP_Protocol_Properties,
-                    0);
-
-  // Right now the only supported ORB protocol is GIOP
-  // so we couple this with every protocol property.
-  // The else statement is not necessary, but it
-  // is here just to make clear that as soon as
-  // new ORB protocol are supported other case
-  // should be considered.
-  else
-    ACE_NEW_RETURN (property,
-                    TAO_GIOP_Protocol_Properties,
-                    0);
-  return property;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
deleted file mode 100644
index 689ee8e961e..00000000000
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ /dev/null
@@ -1,907 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   RT_Policy_i.h
- *
- *  $Id$
- *
- *  @author Marina Spivak (marina@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_POLICY_I_H
-#define TAO_RT_POLICY_I_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "tao/LocalObject.h"
-#include "tao/Basic_Types.h"
-
-#include "ace/SString.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_PriorityModelPolicy
- *
- * @brief RTCORBA::PriorityModelPolicy implementation
- *
- * This policy controls how the priority at which a server handles
- * requests from clients is determined.
- */
-class TAO_RTCORBA_Export TAO_PriorityModelPolicy
-  : public RTCORBA::PriorityModelPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model,
-                           RTCORBA::Priority server_priority);
-
-  /// Copy constructor.
-  TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs);
-
-  /**
-   * Accessor for the <priority_model_> attribute.  This method is
-   * used internally by the orb.  This is a more efficient
-   * (non-virtual, no exception handling) relative of the idl interface
-   * implementation <priority_model> below.
-   */
-  RTCORBA::PriorityModel get_priority_model (void);
-
-  RTCORBA::PriorityModel priority_model (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::Priority server_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method writes a CDR representation of the object state.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PriorityModelPolicy (void);
-
-  /// This constructor is used by TAO_RT_PolicyFactory when decoding
-  /// policies from tagged components in an IOR.
-  friend class TAO_RT_PolicyFactory;
-  TAO_PriorityModelPolicy (void);
-
-private:
-
-  /// Attributes.
-  RTCORBA::PriorityModel priority_model_;
-  RTCORBA::Priority server_priority_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_ThreadpoolPolicy
- *
- * @brief RTCORBA::ThreadpoolPolicy implementation
- *
- * This policy controls which threadpool is associated with a POA.
- */
-class TAO_RTCORBA_Export TAO_ThreadpoolPolicy
-  : public RTCORBA::ThreadpoolPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id);
-
-  /// Copy constructor.
-  TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
-
-  RTCORBA::ThreadpoolId threadpool (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ThreadpoolPolicy (void);
-
-private:
-
-  /// Attribute.
-  RTCORBA::ThreadpoolId id_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_PrivateConnectionPolicy
- *
- * @brief RTCORBA::PrivateConnectionPolicy implementation
- *
- * This policy controls whether the transport connection for the
- * Object is private, i.e., not available for carrying out invocations on
- * other objects.
- */
-class TAO_RTCORBA_Export TAO_PrivateConnectionPolicy
-  : public RTCORBA::PrivateConnectionPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_PrivateConnectionPolicy (void);
-
-  /// Copy constructor.
-  TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PrivateConnectionPolicy (void);
-
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_PriorityBandedConnectionPolicy
- *
- * @brief RTCORBA::PriorityBandedConnectionPolicy implementation
- *
- * RT CORBA provides facility for a client to communicate with a
- * server via multiple connections, aka bands, with each connection handling
- * invocations that are made at a different CORBA priority.
- * This policy allows the specification of the number of such
- * bands and their priorities.
- */
-class TAO_RTCORBA_Export TAO_PriorityBandedConnectionPolicy
-  : public RTCORBA::PriorityBandedConnectionPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_PriorityBandedConnectionPolicy (const RTCORBA::PriorityBands &bands);
-
-  /// Copy constructor.
-  TAO_PriorityBandedConnectionPolicy (const TAO_PriorityBandedConnectionPolicy &rhs);
-
-  /**
-   * Accessor to the underlying priority bands of the policy (does not
-   * make a copy like the idl accessor <priority_bands> implementation
-   * below.)
-   */
-  RTCORBA::PriorityBands &priority_bands_rep (void);
-
-  RTCORBA::PriorityBands *priority_bands (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method writes a CDR representation of the current object.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PriorityBandedConnectionPolicy (void);
-
-  /// This constructor is used by TAO_RT_PolicyFactory when decoding
-  /// policies from tagged components in an IOR.
-  friend class TAO_RT_PolicyFactory;
-  TAO_PriorityBandedConnectionPolicy (void);
-
-private:
-
-  /// Attribute.
-  RTCORBA::PriorityBands priority_bands_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_ServerProtocolPolicy
- *
- * @brief RTCORBA::ServerProtocolPolicy implementation
- *
- * This policy controls selection and configuration of
- * communication protocols on the server-side of the RT ORB.
- */
-class TAO_RTCORBA_Export TAO_ServerProtocolPolicy
-  : public RTCORBA::ServerProtocolPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList &protocols);
-
-  /// Copy constructor.
-  TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs);
-
-  /**
-   * Accessor to the underlying protocols list of the policy (does not
-   * make a copy like the idl accessor <protocols> implementation
-   * below.)
-   */
-  RTCORBA::ProtocolList & protocols_rep (void);
-
-  RTCORBA::ProtocolList *protocols
-  (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ServerProtocolPolicy (void);
-
-private:
-
-  /// Attribute.
-  RTCORBA::ProtocolList protocols_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_ClientProtocolPolicy
- *
- * @brief RTCORBA::ClientProtocolPolicy implementation
- *
- * This policy controls selection and configuration of
- * communication protocols on the client-side of the RT ORB.
- */
-class TAO_RTCORBA_Export TAO_ClientProtocolPolicy
-  : public RTCORBA::ClientProtocolPolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList &protocols);
-
-  /// Copy constructor.
-  TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs);
-
-  /**
-   * Accessor to the underlying protocols list of the policy (does not
-   * make a copy like the idl accessor <protocols> implementation
-   * below.)
-   */
-  RTCORBA::ProtocolList & protocols_rep (void);
-
-  RTCORBA::ProtocolList *protocols
-  (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // = CDR Encoder/Decoder.
-
-  /// This method writes a CDR representation of the current object.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-  // Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  // Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ClientProtocolPolicy (void);
-
-  /// This constructor is used by TAO_RT_PolicyFactory when decoding
-  /// policies from tagged components in an IOR.
-  friend class TAO_RT_PolicyFactory;
-  TAO_ClientProtocolPolicy (void);
-
-private:
-
-  /// Attribute.
-  RTCORBA::ProtocolList protocols_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_TCP_Protocol_Properties
- *
- * @brief RTCORBA::TCPProtocolProperties implementation
- *
- * Stores TCP Protocol configuration properties.
- */
-class TAO_RTCORBA_Export TAO_TCP_Protocol_Properties
-  : public RTCORBA::TCPProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_TCP_Protocol_Properties (CORBA::Long send_buffer_size,
-                               CORBA::Long recv_buffer_size,
-                               CORBA::Boolean keep_alive,
-                               CORBA::Boolean dont_route,
-                               CORBA::Boolean no_delay,
-                               CORBA::Boolean enable_network_priority);
-
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method writes a CDR representation of TCPProtocolProperties.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_TCP_Protocol_Properties (void);
-
-private:
-  // = Attributes.
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  CORBA::Boolean keep_alive_;
-  CORBA::Boolean dont_route_;
-  CORBA::Boolean no_delay_;
-  CORBA::Boolean enable_network_priority_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_UnixDomain_Protocol_Properties
- *
- * @brief RTCORBA::UnixDomainProtocolProperties implementation.
- *
- * Stores Unix Domain Sockets (Local IPC) Protocol configuration
- * properties.
- */
-class TAO_RTCORBA_Export TAO_UnixDomain_Protocol_Properties
-  : public RTCORBA::UnixDomainProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor
-  TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
-                                      CORBA::Long recv_buffer_size);
-
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * This method writes the CDR encapsulation of an instance of
-   * UnixDomainProperties. This Protocol Property in TAO specific,
-   * so there is no order of encapsulation specified in the
-   * RT CORBA Spec. The current implementation encodes the field
-   * according to the order of declaration (i.e. first is encoded
-   * send_buffer_size and then recv_buffer_size).
-   */
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /**
-   * This method reads an instance of UnixDomainProperties from
-   * a CDR encapsulation. This Protocol Property in TAO specific,
-   * so there is no order of encapsulation specified in the
-   * RT CORBA Spec. The current implementation expect the field
-   * according to the order of declaration.
-   */
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_UnixDomain_Protocol_Properties (void);
-
-private:
-
-  // = Attributes.
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_SharedMemory_Protocol_Properties
- *
- * @brief RTCORBA::SharedMemoryProtocolProperties implementation.
- *
- * Stores Shared Memory Protocol configuration
- * properties.
- */
-class TAO_RTCORBA_Export TAO_SharedMemory_Protocol_Properties
-  : public RTCORBA::SharedMemoryProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_SharedMemory_Protocol_Properties (CORBA::Long send_buffer_size,
-                                        CORBA::Long recv_buffer_size,
-                                        CORBA::Boolean keep_alive,
-                                        CORBA::Boolean dont_route,
-                                        CORBA::Boolean no_delay,
-                                        CORBA::Long preallocate_buffer_size,
-                                        const char *mmap_filename,
-                                        const char *mmap_lockname);
-
-  // = IDL interface methods.
-
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  char *mmap_filename (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void mmap_filename (const char *mmap_filename
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  char *mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void mmap_lockname (const char *mmap_lockname
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * This method writes the CDR encapsulation of an instance of
-   * SharedMemoryProperties. This Protocol Property in TAO specific,
-   * so there is no order of encapsulation specified in the
-   * RT CORBA Spec. The current implementation encodes the field
-   * according to the order of declaration.
-   */
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /**
-   * This method reads an instance of SharedMemoryProperties from
-   * a CDR encapsulation. This Protocol Property in TAO specific,
-   * so there is no order of encapsulation specified in the
-   * RT CORBA Spec. The current implementation expect the field
-   * according to the order of declaration.
-   */
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_SharedMemory_Protocol_Properties (void);
-
-private:
-
-  // = Attributes.
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  CORBA::Boolean keep_alive_;
-  CORBA::Boolean dont_route_;
-  CORBA::Boolean no_delay_;
-  CORBA::Long preallocate_buffer_size_;
-  ACE_CString mmap_filename_;
-  ACE_CString mmap_lockname_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_UserDatagram_Protocol_Properties
- *
- * @brief RTCORBA::UserDatagramProtocolProperties implementation
- *
- * Stores UserDatagram Protocol configuration properties.
- */
-class TAO_RTCORBA_Export TAO_UserDatagram_Protocol_Properties
-  : public RTCORBA::UserDatagramProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority);
-
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method writes a CDR representation of UserDatagramProtocolProperties.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_UserDatagram_Protocol_Properties (void);
-
-private:
-  // = Attributes.
-
-  CORBA::Boolean enable_network_priority_;
-};
-
-//*************************************************************************
-
-/**
- * @class TAO_StreamControl_Protocol_Properties
- *
- * @brief RTCORBA::StreamControlProtocolProperties implementation
- *
- * Stores StreamControl Protocol configuration properties.
- */
-class TAO_RTCORBA_Export TAO_StreamControl_Protocol_Properties
-  : public RTCORBA::StreamControlProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_StreamControl_Protocol_Properties (CORBA::Long send_buffer_size,
-                                         CORBA::Long recv_buffer_size,
-                                         CORBA::Boolean keep_alive,
-                                         CORBA::Boolean dont_route,
-                                         CORBA::Boolean no_delay,
-                                         CORBA::Boolean enable_network_priority);
-
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// This method writes a CDR representation of StreamControlProtocolProperties.
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-
-  /// This method reads the object state from a CDR representation.
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_StreamControl_Protocol_Properties (void);
-
-private:
-  // = Attributes.
-
-  CORBA::Long send_buffer_size_;
-  CORBA::Long recv_buffer_size_;
-  CORBA::Boolean keep_alive_;
-  CORBA::Boolean dont_route_;
-  CORBA::Boolean no_delay_;
-  CORBA::Boolean enable_network_priority_;
-};
-
-//*************************************************************************
-
-class TAO_RTCORBA_Export TAO_GIOP_Protocol_Properties
-  : public RTCORBA::GIOPProtocolProperties,
-    public TAO_Local_RefCounted_Object
-{
-public:
-
-  // = CDR encoding methods
-  CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-  CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_GIOP_Protocol_Properties ();
-
-  friend class TAO_Protocol_Properties_Factory;
-  TAO_GIOP_Protocol_Properties (void);
-};
-
-//*************************************************************************
-
-class TAO_RTCORBA_Export TAO_Protocol_Properties_Factory
-{
-public:
-
-  /**
-   * Creates the proper transport ProtocolProperties subclass that matches
-   * the IOP::ProfileId.
-   * NOTE: Each IOP::ProfileId corresponds to two sets of protocol
-   * properties: one describes the transport protocol and the other
-   * describes the ORB messaging protocol.
-   */
-  static RTCORBA::ProtocolProperties *create_transport_protocol_property (
-      IOP::ProfileId id,
-      TAO_ORB_Core *orb_core);
-
-  /**
-   * Creates the proper orb ProtocolProperties subclass for
-   * IOP::ProfileId.
-   * NOTE: Each IOP::ProfileId corresponds to two sets of protocol
-   * properties: one describes the transport protocol and the other
-   * describes the ORB messaging protocol.
-   */
-  static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
-
-protected:
-  TAO_Protocol_Properties_Factory (void);
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_POLICY_I_H */
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
deleted file mode 100644
index b6d22045983..00000000000
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ /dev/null
@@ -1,832 +0,0 @@
-#include "RT_Protocols_Hooks.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Policy_i.h"
-#include "Priority_Mapping_Manager.h"
-#include "RT_Stub.h"
-
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/MProfile.h"
-#include "tao/Service_Context.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Protocol_Factory.h"
-#include "tao/Transport_Acceptor.h"
-#include "tao/Transport_Connector.h"
-#include "tao/Policy_Set.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (RTCORBA,
-           RT_Protocols_Hooks,
-           "$Id$")
-
-
-TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void)
-{
-}
-
-TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
-{
-}
-
-void
-TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
-                                    ACE_ENV_ARG_DECL)
-{
-  this->orb_core_ = orb_core;
-
-  // Save a reference to the priority mapping manager.
-  CORBA::Object_var obj =
-    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->mapping_manager_ =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Save a reference to the priority mapping manager.
-  CORBA::Object_var object =
-    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->network_mapping_manager_ =
-    TAO_Network_Priority_Mapping_Manager::_narrow (object.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  object =
-    this->orb_core_->object_ref_table ().resolve_initial_references ("RTCurrent"
-                                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->current_ =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
-                                                    CORBA::Policy_ptr policy
-                                                    ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (policy))
-    return 0;
-
-  RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (policy
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (CORBA::is_nil (server_protocol_policy.in ()))
-    return 0;
-
-  TAO_ServerProtocolPolicy *server_protocols =
-    dynamic_cast<TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
-
-  if (server_protocols == 0)
-    return 0;
-
-  // TAO_ServerProtocolPolicy
-  RTCORBA::ProtocolList &protocols =
-    server_protocols->protocols_rep ();
-
-  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-    {
-      if (protocols[j].protocol_type == protocol_tag)
-        {
-          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
-        }
-    }
-
-  return 0;
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag,
-                                                    CORBA::Policy_ptr policy
-                                                    ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (policy))
-    return 0;
-
-  RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-    RTCORBA::ClientProtocolPolicy::_narrow (policy
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (CORBA::is_nil (client_protocol_policy.in ()))
-    return 0;
-
-  TAO_ClientProtocolPolicy *client_protocols =
-    dynamic_cast<TAO_ClientProtocolPolicy *> (client_protocol_policy.in ());
-
-  if (client_protocols == 0)
-    return 0;
-
-  // TAO_ClientProtocolPolicy
-  RTCORBA::ProtocolList &protocols =
-    client_protocols->protocols_rep ();
-
-  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-    {
-      if (protocols[j].protocol_type == protocol_tag)
-        {
-          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
-        }
-    }
-
-  return 0;
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var policy =
-    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->server_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                 ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var policy =
-    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->client_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
-                                                                    TAO_Stub *stub
-                                                                    ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var policy =
-    stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->client_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
-{
-  RTCORBA::TCPProtocolProperties_var protocol_properties =
-    RTCORBA::TCPProtocolProperties::_narrow (from
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
-  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
-  to.keep_alive_ = protocol_properties->keep_alive ();
-  to.dont_route_ = protocol_properties->dont_route ();
-  to.no_delay_ = protocol_properties->no_delay ();
-  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
-}
-
-void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
-{
-  RTCORBA::UnixDomainProtocolProperties_var protocol_properties =
-    RTCORBA::UnixDomainProtocolProperties::_narrow (from
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
-  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
-}
-
-void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
-{
-  RTCORBA::SharedMemoryProtocolProperties_var protocol_properties =
-    RTCORBA::SharedMemoryProtocolProperties::_narrow (from
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  to.preallocate_buffer_size_ = protocol_properties->preallocate_buffer_size ();
-  to.mmap_filename_ = protocol_properties->mmap_filename ();
-  to.mmap_lockname_ = protocol_properties->mmap_lockname ();
-}
-
-void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
-{
-  RTCORBA::UserDatagramProtocolProperties_var protocol_properties =
-    RTCORBA::UserDatagramProtocolProperties::_narrow (from
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
-}
-
-void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
-{
-  RTCORBA::StreamControlProtocolProperties_var protocol_properties =
-    RTCORBA::StreamControlProtocolProperties::_narrow (from
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  to.send_buffer_size_ = protocol_properties->send_buffer_size ();
-  to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
-  to.keep_alive_ = protocol_properties->keep_alive ();
-  to.dont_route_ = protocol_properties->dont_route ();
-  to.no_delay_ = protocol_properties->no_delay ();
-  to.enable_network_priority_ = protocol_properties->enable_network_priority ();
-}
-
-void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
-{
-  RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
-                                              RTCORBA::ProtocolProperties_ptr protocol_properties
-                                              ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (protocol_properties))
-      return false;
-
-  if (protocol_tag == IOP::TAG_INTERNET_IOP)
-    {
-      RTCORBA::TCPProtocolProperties_var tcp_protocol_properties =
-        RTCORBA::TCPProtocolProperties::_narrow (protocol_properties
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      return tcp_protocol_properties->enable_network_priority ();
-    }
-
-  if (protocol_tag == TAO_TAG_DIOP_PROFILE)
-    {
-      RTCORBA::UserDatagramProtocolProperties_var udp_protocol_properties =
-        RTCORBA::UserDatagramProtocolProperties::_narrow (protocol_properties
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      return udp_protocol_properties->enable_network_priority ();
-    }
-
-  if (protocol_tag == TAO_TAG_SCIOP_PROFILE)
-    {
-      RTCORBA::StreamControlProtocolProperties_var sctp_protocol_properties =
-        RTCORBA::StreamControlProtocolProperties::_narrow (protocol_properties
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      return sctp_protocol_properties->enable_network_priority ();
-    }
-
-  return false;
-}
-
-CORBA::Boolean
-TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag,
-                                                     TAO_Stub *stub
-                                                     ACE_ENV_ARG_DECL)
-{
-  if (protocol_tag != IOP::TAG_INTERNET_IOP &&
-      protocol_tag != TAO_TAG_DIOP_PROFILE &&
-      protocol_tag != TAO_TAG_SCIOP_PROFILE)
-    return false;
-
-  RTCORBA::ProtocolProperties_var protocol_properties =
-    this->client_protocol_properties_at_object_level (protocol_tag,
-                                                      stub
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return this->set_network_priority (protocol_tag,
-                                     protocol_properties.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag,
-                                                     CORBA::Policy *policy
-                                                     ACE_ENV_ARG_DECL)
-{
-  if (protocol_tag != IOP::TAG_INTERNET_IOP &&
-      protocol_tag != TAO_TAG_DIOP_PROFILE &&
-      protocol_tag != TAO_TAG_SCIOP_PROFILE)
-    return false;
-
-  RTCORBA::ProtocolProperties_var protocol_properties =
-    this->server_protocol_properties (protocol_tag,
-                                      policy
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return this->set_network_priority (protocol_tag,
-                                     protocol_properties.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Long
-TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
-{
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_RT_Protocols_Hooks::get_dscp_codepoint\n"));
-
-  CORBA::Long codepoint = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Make several invocation, changing the priority of this thread
-      // for each.
-
-      RTCORBA::NetworkPriorityMapping *pm =
-        this->network_mapping_manager_->mapping ();
-
-      const CORBA::Short priority =
-        this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (pm->to_network (priority, codepoint) == 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "Cannot convert corba priority %d "
-                          "to network priority\n",
-                          priority));
-            }
-
-          return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_RT_Protocols_Hooks::get_dscp_codepoint");
-        }
-
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return codepoint;
-}
-
-void
-TAO_RT_Protocols_Hooks::rt_service_context (
-    TAO_Stub *stub,
-    TAO_Service_Context &service_context,
-    CORBA::Boolean restart
-    ACE_ENV_ARG_DECL
-  )
-{
-  // If the restart flag is true, then this call for a
-  // reinvocation. We need not prepare the Service Context List once
-  // again. We can use the already existing one.
-  if (!restart)
-    {
-      TAO_RT_Stub *rt_stub =
-        dynamic_cast<TAO_RT_Stub *> (stub);
-
-      CORBA::Policy_var priority_model_policy =
-        rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (priority_model_policy.in ()))
-        {
-          CORBA::Short client_priority;
-
-          int status =
-            this->get_thread_CORBA_priority (client_priority
-                                             ACE_ENV_ARG_PARAMETER);
-          if (status == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
-
-          this->add_rt_service_context_hook (service_context,
-                                             priority_model_policy.in (),
-                                             client_priority
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          // The Object does not contain PriorityModel policy in its IOR.
-          // We must be talking to a non-RT ORB.  Do nothing.
-        }
-    }
-}
-
-void
-TAO_RT_Protocols_Hooks::add_rt_service_context_hook (
-    TAO_Service_Context &service_context,
-    CORBA::Policy *model_policy,
-    CORBA::Short &client_priority
-    ACE_ENV_ARG_DECL
-  )
-{
-
-  RTCORBA::PriorityModelPolicy_var model_policy_ptr =
-    RTCORBA::PriorityModelPolicy::_narrow (model_policy
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_PriorityModelPolicy *priority_model =
-    static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ());
-
-  if (priority_model->get_priority_model () == RTCORBA::CLIENT_PROPAGATED)
-    {
-      // Encapsulate the priority of the current thread into
-      // a service context.
-      TAO_OutputCDR cdr;
-      if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
-          || (cdr << client_priority) == 0)
-        {
-          ACE_THROW (CORBA::MARSHAL ());
-        }
-
-      service_context.set_context (IOP::RTCorbaPriority, cdr);
-    }
-}
-
-void
-TAO_RT_Protocols_Hooks::get_selector_hook (
-    CORBA::Policy *model_policy,
-    CORBA::Boolean &is_client_propagated,
-    CORBA::Short &server_priority
-  )
-{
-
-  RTCORBA::PriorityModelPolicy_var model_policy_ptr =
-    RTCORBA::PriorityModelPolicy::_narrow (model_policy);
-
-  TAO_PriorityModelPolicy *priority_model_policy =
-    static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ());
-
-  if (priority_model_policy->get_priority_model ()
-        == RTCORBA::CLIENT_PROPAGATED)
-    {
-      is_client_propagated = 1;
-    }
-
-  if (!is_client_propagated)
-    {
-      server_priority = priority_model_policy->server_priority ();
-    }
-
-  return;
-}
-
-void
-TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
-    CORBA::Policy *bands_policy,
-    CORBA::Short priority,
-    CORBA::Short &min_priority,
-    CORBA::Short &max_priority,
-    int &in_range
-  )
-{
-  RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands_policy);
-
-  TAO_PriorityBandedConnectionPolicy *priority_bands_policy =
-    static_cast<TAO_PriorityBandedConnectionPolicy *> (bands_policy_ptr.in ());
-
-  // Find the band with the range covering our target priority.
-  RTCORBA::PriorityBands &bands =
-    priority_bands_policy->priority_bands_rep ();
-
-  for (CORBA::ULong i = 0; i < bands.length (); ++i)
-    {
-      if (bands[i].low <= priority && bands[i].high >= priority)
-        {
-          min_priority = bands[i].low;
-          max_priority = bands[i].high;
-
-          in_range = 1;
-          break;
-        }
-    }
-}
-
-int
-TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
-                                                   ACE_ENV_ARG_DECL)
-{
-  CORBA::Short native_priority = 0;
-  int result =
-    this->get_thread_CORBA_and_native_priority (priority,
-                                                native_priority
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (result == -1)
-    {
-      return result;
-    }
-
-  return 0;
-}
-
-int
-TAO_RT_Protocols_Hooks::get_thread_native_priority (
-    CORBA::Short &native_priority
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  ACE_hthread_t current;
-  ACE_Thread::self (current);
-
-  int priority;
-
-  if (ACE_Thread::getprio (current, priority) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ")
-                  ACE_TEXT ("RT_Protocols_Hooks::get_thread_priority: ")
-                  ACE_TEXT (" ACE_Thread::get_prio\n")));
-
-      return -1;
-    }
-
-  native_priority = CORBA::Short (priority);
-  return 0;
-}
-
-int
-TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
-    CORBA::Short &priority,
-    CORBA::Short &native_priority
-    ACE_ENV_ARG_DECL
-  )
-{
-  int result =
-    this->get_thread_native_priority (native_priority
-                                      ACE_ENV_ARG_PARAMETER);
-  if (result == -1)
-    {
-      return result;
-    }
-
-  TAO_Priority_Mapping *priority_mapping =
-    this->mapping_manager_.in ()->mapping ();
-
-  if (priority_mapping->to_CORBA (native_priority, priority) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - ")
-                  ACE_TEXT ("RT_Protocols_Hooks::get_thread_priority: ")
-                  ACE_TEXT ("Priority_Mapping::to_CORBA\n")));
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
-                                                   ACE_ENV_ARG_DECL)
-{
-  TAO_Priority_Mapping *priority_mapping =
-    this->mapping_manager_.in ()->mapping ();
-
-  CORBA::Short native_priority;
-
-  if (priority_mapping->to_native (priority, native_priority) == 0)
-    {
-      return -1;
-    }
-
-  return this->set_thread_native_priority (native_priority
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-int
-TAO_RT_Protocols_Hooks::set_thread_native_priority (
-    CORBA::Short native_priority
-    ACE_ENV_ARG_DECL_NOT_USED
-   )
-{
-  ACE_hthread_t current;
-  ACE_Thread::self (current);
-
-  if (ACE_Thread::setprio (current, native_priority) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%N,%l) Error setting thread ")
-                         ACE_TEXT ("priority to %d, errno %d %m\n"),
-                         native_priority,
-                         errno ),
-                       -1);
-    }
-
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks,
-                       ACE_TEXT ("RT_Protocols_Hooks"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_Protocols_Hooks),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
-  ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
deleted file mode 100644
index f5bc260e298..00000000000
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ /dev/null
@@ -1,192 +0,0 @@
-
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   RT_Protocols_Hooks.h
- *
- *  $Id$
- *
- *  @author Priyanka Gontla <pgontla@ece.uci.edu>
- *
- */
-// ===================================================================
-
-#ifndef TAO_RT_PROTOCOLS_HOOKS_H
-#define TAO_RT_PROTOCOLS_HOOKS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "Priority_Mapping_Manager.h"
-#include "Network_Priority_Mapping_Manager.h"
-
-#include "tao/Protocols_Hooks.h"
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks
-{
-public:
-  /// Constructor
-  TAO_RT_Protocols_Hooks (void);
-
-  /// Destructor
-  virtual ~TAO_RT_Protocols_Hooks (void);
-
-  /// Initialize the protocols hooks instance.
-  void init_hooks (TAO_ORB_Core *orb_core
-                   ACE_ENV_ARG_DECL);
-
-  CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                              TAO_Stub *stub
-                                              ACE_ENV_ARG_DECL);
-
-  CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                              CORBA::Policy *policy
-                                              ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
-
-  CORBA::Long get_dscp_codepoint (void);
-
-  void rt_service_context (TAO_Stub *stub,
-                           TAO_Service_Context &service_context,
-                           CORBA::Boolean restart
-                           ACE_ENV_ARG_DECL);
-
-  void add_rt_service_context_hook (TAO_Service_Context &service_context,
-                                    CORBA::Policy *model_policy,
-                                    CORBA::Short &client_priority
-                                    ACE_ENV_ARG_DECL);
-
-  void get_selector_hook (CORBA::Policy *model_policy,
-                          CORBA::Boolean
-                          &is_client_propagated,
-                          CORBA::Short &server_priority);
-
-  void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
-                                       CORBA::Short priority,
-                                       CORBA::Short &min_priority,
-                                       CORBA::Short &max_priority,
-                                       int &in_range);
-
-  /**
-   * Accessor and modifier to the current thread priority, used to
-   * implement the RTCORBA::Current interface, but it is faster for
-   * some critical components.
-   */
-  //@{
-  int get_thread_CORBA_priority (CORBA::Short &
-                                 ACE_ENV_ARG_DECL);
-
-  int get_thread_native_priority (CORBA::Short &
-                                  ACE_ENV_ARG_DECL);
-
-  int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                            CORBA::Short &
-                                            ACE_ENV_ARG_DECL);
-
-  int set_thread_CORBA_priority (CORBA::Short
-                                 ACE_ENV_ARG_DECL);
-
-  int set_thread_native_priority (CORBA::Short
-                                  ACE_ENV_ARG_DECL);
-
-  //@}
-
-protected:
-
-  RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag,
-                                                              CORBA::Policy_ptr policy
-                                                              ACE_ENV_ARG_DECL);
-
-  RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag,
-                                                              CORBA::Policy_ptr policy
-                                                              ACE_ENV_ARG_DECL);
-
-  RTCORBA::ProtocolProperties_ptr server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                           ACE_ENV_ARG_DECL);
-
-  RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                           ACE_ENV_ARG_DECL);
-
-  RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
-                                                                              TAO_Stub *stub
-                                                                              ACE_ENV_ARG_DECL);
-
-  void extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
-
-  void extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
-
-  void extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
-
-  void extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
-
-  void extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
-
-  CORBA::Boolean set_network_priority (IOP::ProfileId protocol_tag,
-                                       RTCORBA::ProtocolProperties_ptr protocol_properties
-                                       ACE_ENV_ARG_DECL);
-
-  TAO_ORB_Core *orb_core_;
-
-  // Save a reference to the priority mapping manager.
-  TAO_Priority_Mapping_Manager_var mapping_manager_;
-  TAO_Network_Priority_Mapping_Manager_var network_mapping_manager_;
-
-  RTCORBA::Current_var current_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
-ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_PROTOCOLS_HOOKS_H */
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
deleted file mode 100644
index 6804f192d18..00000000000
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-// $Id$
-
-#include "RT_Stub.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Policy_i.h"
-#include "tao/ORB_Core.h"
-#include "tao/Policy_Set.h"
-#include "tao/Policy_Manager.h"
-
-
-ACE_RCSID (RTCORBA,
-           RT_Stub,
-           "$Id$")
-
-
-TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
-                          const TAO_MProfile &profiles,
-                          TAO_ORB_Core *orb_core)
-  : TAO_Stub (repository_id,
-              profiles,
-              orb_core),
-    priority_model_policy_ (0),
-    priority_banded_connection_policy_ (0),
-    client_protocol_policy_ (0),
-    are_policies_parsed_ (0)
-{
-}
-
-TAO_RT_Stub::~TAO_RT_Stub (void)
-{
-  if (this->priority_model_policy_.in ())
-    this->priority_model_policy_->destroy ();
-
-  if (this->priority_banded_connection_policy_.in ())
-    this->priority_banded_connection_policy_->destroy ();
-
-  if (this->client_protocol_policy_.in ())
-    this->client_protocol_policy_->destroy ();
-}
-
-void
-TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::PolicyList_var policy_list
-    = this->base_profiles_.policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ULong length = policy_list->length ();
-
-  // Cache away the policies that we'll need later.
-  for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      if (policy_list[i]->policy_type () ==
-           RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-        this->exposed_priority_model (policy_list[i].in ());
-
-      else if (policy_list[i]->policy_type () ==
-                RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-        this->exposed_priority_banded_connection (policy_list[i].in ());
-
-      else if (policy_list[i]->policy_type () ==
-                RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-        this->exposed_client_protocol (policy_list[i].in ());
-    }
-
-  this->are_policies_parsed_ = 1;
-}
-
-CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return CORBA::Policy::_duplicate (this->priority_model_policy_.in ());
-}
-
-void
-TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
-{
-  this->priority_model_policy_ = CORBA::Policy::_duplicate (policy);
-}
-
-CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return CORBA::Policy::_duplicate (this->priority_banded_connection_policy_.in ());
-}
-
-void
-TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
-{
-  this->priority_banded_connection_policy_ =
-    CORBA::Policy::_duplicate (policy);
-}
-
-CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return CORBA::Policy::_duplicate (this->client_protocol_policy_.in ());
-}
-
-void
-TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
-{
-  this->client_protocol_policy_ = CORBA::Policy::_duplicate (policy);
-}
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-CORBA::Policy_ptr
-TAO_RT_Stub::get_policy (CORBA::PolicyType type
-                         ACE_ENV_ARG_DECL)
-{
-  // If we are dealing with a client exposed policy, check if any
-  // value came in the IOR/reconcile IOR value and overrides.
-  if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  return this->TAO_Stub::get_policy (type ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-TAO_RT_Stub::get_cached_policy (TAO_Cached_Policy_Type type
-                                ACE_ENV_ARG_DECL)
-{
-  // If we are dealing with a client exposed policy, check if any
-  // value came in the IOR/reconcile IOR value and overrides.
-  if (type == TAO_CACHED_POLICY_PRIORITY_MODEL)
-    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (type == TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION)
-    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (type == TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL)
-    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  return this->TAO_Stub::get_cached_policy (type ACE_ENV_ARG_PARAMETER);
-}
-
-
-TAO_Stub *
-TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                   CORBA::SetOverrideType set_add
-                                   ACE_ENV_ARG_DECL)
-{
-  // Validity check.  Make sure requested policies are allowed to be
-  // set at this scope.
-  for (CORBA::ULong i = 0; i < policies.length ();  ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      if (CORBA::is_nil (policy))
-        continue;
-
-      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
-          type == RTCORBA::THREADPOOL_POLICY_TYPE ||
-          type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
-        ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0);
-
-    }
-
-  // We are not required to check for consistency of <policies> with
-  // overrides at other levels or with policies exported in the IOR.
-  return this->TAO_Stub::set_policy_overrides(policies, set_add ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-CORBA::Policy *
-TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Get effective override.
-  CORBA::Policy_var override =
-    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Get the value from the ior.
-  CORBA::Policy_var exposed =
-    this->exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Reconcile client-exposed and locally set values.
-  if (CORBA::is_nil (exposed.in ()))
-    return override._retn ();
-
-  if (CORBA::is_nil (override.in ()))
-    return exposed._retn ();
-
-  RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  TAO_PriorityBandedConnectionPolicy *override_policy =
-    static_cast<TAO_PriorityBandedConnectionPolicy *> (override_policy_var.in ());
-
-  RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  TAO_PriorityBandedConnectionPolicy *exposed_policy =
-    static_cast<TAO_PriorityBandedConnectionPolicy *> (exposed_policy_var.in ());
-
-  // Both override and exposed have been set.
-  // See if either of them has empty priority bands.
-  if (exposed_policy->priority_bands_rep ().length () == 0)
-    return override._retn ();
-
-  if (override_policy->priority_bands_rep ().length () == 0)
-    return exposed._retn ();
-
-  // Both override and exposed have been set and neither has empty
-  // priority bands.  This is illegal (ptc/99-05-03, sec. 4.12.1).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                    0);
-}
-
-CORBA::Policy *
-TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Get effective override.
-  CORBA::Policy_var override =
-    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Get the value from the ior.
-  CORBA::Policy_var exposed =
-    this->exposed_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Reconcile client-exposed and locally set values.
-  if (CORBA::is_nil (exposed.in ()))
-    return override._retn ();
-
-  if (CORBA::is_nil (override.in ()))
-    return exposed._retn ();
-
-  RTCORBA::ClientProtocolPolicy_var override_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (override.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  TAO_ClientProtocolPolicy *override_policy =
-    static_cast<TAO_ClientProtocolPolicy *> (override_policy_var.in ());
-
-  RTCORBA::ClientProtocolPolicy_var exposed_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (exposed.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  TAO_ClientProtocolPolicy *exposed_policy =
-    static_cast<TAO_ClientProtocolPolicy *> (exposed_policy_var.in ());
-
-  // Both override and exposed have been set.
-  // See if either of them has empty priority bands.
-  RTCORBA::ProtocolList &protocols_rep_var =
-    exposed_policy->protocols_rep ();
-
-  if (protocols_rep_var.length () == 0)
-    return override._retn ();
-
-  if (override_policy->protocols_rep ().length () == 0)
-    return exposed._retn ();
-
-  // Both override and exposed have been set and neither has empty
-  // protocols.  This is illegal (ptc/99-05-03, sec. 4.15.4).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                    0);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING  && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
deleted file mode 100644
index a2c18299ba6..00000000000
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//=============================================================================
-/**
- *  @file    RT_Stub.h
- *
- *  $Id$
- *
- *  This file contains the declaration for the RTCORBA Stub.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RT_STUB_H_
-#define TAO_RT_STUB_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtcorba_export.h"
-
-#include "tao/Stub.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward references.
-class TAO_PriorityModelPolicy;
-class TAO_PriorityBandedConnectionPolicy;
-class TAO_ClientProtocolPolicy;
-class TAO_PrivateConnectionPolicy;
-
-
-
-/**
- * @class TAO_RT_Stub
- *
- * This class represent a stub with extended functionality, which are needed
- * for RTCORBA.
- */
-class TAO_RTCORBA_Export TAO_RT_Stub : public TAO_Stub
-{
-public:
-
-  TAO_RT_Stub (const char *repository_id,
-               const TAO_MProfile &profiles,
-               TAO_ORB_Core *orb_core);
-
-  virtual ~TAO_RT_Stub (void);
-
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /**
-   * Returns the effective policy if <type> is a known client-exposed
-   * policy type.  Returns the effective override for all other policy
-   * types.
-   */
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                ACE_ENV_ARG_DECL);
-
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
-
-  TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                  CORBA::SetOverrideType set_add
-                                  ACE_ENV_ARG_DECL);
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-private:
-
-  /// Helper method used to parse the policies.
-  void parse_policies (ACE_ENV_SINGLE_ARG_DECL);
-
-  void exposed_priority_model (CORBA::Policy_ptr policy);
-
-  void exposed_priority_banded_connection (CORBA::Policy_ptr policy);
-
-  void exposed_client_protocol (CORBA::Policy_ptr policy);
-
-  /// Returns the CORBA::Policy (which will be narrowed to be
-  /// used as RTCORBA::PriorityModelPolicy) exported
-  /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Returns the CORBA::Policy (which will be narrowed and used
-  /// as RTCORBA::PriorityBandedConnectionPolicy) exported
-  /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Returns the CORBA::Policy (which will be narrowed and used
-  /// as RTCORBA::ClientProtocolPolicy) exported
-  /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
-
-  // = Methods for obtaining effective policies.
-  //
-  //   Effective policy is the one that would be used if a request
-  //   were made.  The policy is determined by obtaining the effective
-  //   override for a given policy type, and then reconciling it with
-  //   the policy value exported in the Object's IOR.
-
-  CORBA::Policy *effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
-  CORBA::Policy *effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
-
-  // The following attribute are used to cache
-  // the different kind of policies and avoid to
-  // parse the MProfile's policy list each time we
-  // are asked about a given policy.
-
-  CORBA::Policy_var priority_model_policy_;
-
-  CORBA::Policy_var priority_banded_connection_policy_;
-
-  CORBA::Policy_var client_protocol_policy_;
-
-  CORBA::Boolean are_policies_parsed_;
-
-private:
-  // = Disallow copy constructor and assignment operator.
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &))
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_STUB_FACTORY_H_ */
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
deleted file mode 100644
index b28965a7891..00000000000
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-#include "RT_Stub_Factory.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Stub.h"
-
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
-
-#include "ace/Log_Msg.h"
-
-
-ACE_RCSID (RTCORBA,
-           RT_TAO_Stub_Factory,
-           "$Id$")
-
-
-TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
-{
-}
-
-TAO_Stub *
-TAO_RT_Stub_Factory::create_stub (const char *repository_id,
-                                  const TAO_MProfile &profiles,
-                                  TAO_ORB_Core *orb_core
-                                  ACE_ENV_ARG_DECL)
-{
-  // @@ TODO: As soon as the RT_STUB is done change this to
-  // create an RT_STUB
-  TAO_Stub *retval = 0;
-
-  ACE_NEW_THROW_EX (retval,
-                    TAO_RT_Stub (repository_id, profiles, orb_core),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_MAYBE));
-
-  ACE_CHECK_RETURN (retval);
-
-  return retval;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_RT_Stub_Factory,
-                       ACE_TEXT ("RT_Stub_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_Stub_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Stub_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
deleted file mode 100644
index 213f88bab1f..00000000000
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//=============================================================================
-/**
- *  @file    RT_Stub_Factory.h
- *
- *  $Id$
- *
- *   Defines the a factory interface for creating Stubs.
- *   This class creates the default stub, that is used in
- *   plain CORBA.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RT_STUB_FACTORY_H_
-#define TAO_RT_STUB_FACTORY_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Stub_Factory.h"
-
-#include "ace/Service_Config.h"
-
-/**
- * @class TAO_RT_Stub_Factory
- *
- * This class is a factory whose product is the TAO_RT_Stub used by
- * TAO.  This factory, or one of its subclasses is dynamically
- * plugged into the ORB_Core, and is used by the ORB_Core to create
- * Stub Objects.
- */
-class TAO_RTCORBA_Export TAO_RT_Stub_Factory : public TAO_Stub_Factory
-{
-public:
-  // -- Ctor/Dtor --
-  virtual ~TAO_RT_Stub_Factory (void);
-
-  /// Creates a Stub Object.
-  virtual TAO_Stub *create_stub (const char *repository_id,
-                                 const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL);
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory)
-ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Stub_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RT_STUB_FACTORY_H_ */
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
deleted file mode 100644
index 496092041c2..00000000000
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (RTCORBA,
-           RT_Thread_Lane_Resources_Manager,
-           "$Id$")
-
-#include "tao/ORB_Core.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-
-TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
-  : TAO_Thread_Lane_Resources_Manager (orb_core),
-    default_lane_resources_ (0),
-    tp_manager_ (0)
-{
-  // Create the default resources.
-  ACE_NEW (this->default_lane_resources_,
-           TAO_Thread_Lane_Resources (orb_core));
-
-  // Create the thread-pool manager.
-  ACE_NEW (this->tp_manager_,
-           TAO_Thread_Pool_Manager (orb_core));
-
-}
-
-TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void)
-{
-  // Delete the default resources.
-  delete this->default_lane_resources_;
-
-  // Delete the thread-pool manager.
-  delete this->tp_manager_;
-}
-
-int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_ORB_Parameters *params =
-    this->orb_core_->orb_params ();
-
-  TAO_EndpointSet endpoint_set;
-
-  params->get_endpoint_set (TAO_DEFAULT_LANE,
-                            endpoint_set);
-
-  bool ignore_address = false;
-
-  int result =
-    this->default_lane_resources_->open_acceptor_registry (endpoint_set,
-                                                           ignore_address
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-void
-TAO_RT_Thread_Lane_Resources_Manager::finalize (void)
-{
-  // Finalize default resources.
-  this->default_lane_resources_->finalize ();
-
-  // Finalize resources managed by the thread-pool manager.
-  this->tp_manager_->finalize ();
-}
-
-void
-TAO_RT_Thread_Lane_Resources_Manager::shutdown_reactor (void)
-{
-  // Shutdown default reactors.
-  this->default_lane_resources_->shutdown_reactor ();
-
-  // Shutdown reactors managed by the thread-pool manager.
-  this->tp_manager_->shutdown_reactor ();
-}
-
-void
-TAO_RT_Thread_Lane_Resources_Manager::cleanup_rw_transports (void)
-{
-  // Shutdown default reactors.
-  this->default_lane_resources_->cleanup_rw_transports ();
-}
-
-int
-TAO_RT_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofile)
-{
-  int result =
-    this->default_lane_resources_->is_collocated (mprofile);
-
-  if (result)
-    return result;
-
-  return this->tp_manager_->is_collocated (mprofile);
-}
-
-TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
-{
-  // Get the ORB_Core's TSS resources.
-  TAO_ORB_Core_TSS_Resources &tss =
-    *this->orb_core_->get_tss_resources ();
-
-  // Get the lane for this thread.
-  TAO_Thread_Lane *lane =
-    (TAO_Thread_Lane *) tss.lane_;
-
-  // If we have a valid lane, use that lane's resources.
-  if (lane)
-    return lane->resources ();
-  else
-    // Otherwise, return the default resources.
-    return *this->default_lane_resources_;
-}
-
-TAO_Thread_Lane_Resources &
-TAO_RT_Thread_Lane_Resources_Manager::default_lane_resources (void)
-{
-  return *this->default_lane_resources_;
-}
-
-TAO_Thread_Pool_Manager &
-TAO_RT_Thread_Lane_Resources_Manager::tp_manager (void)
-{
-  return *this->tp_manager_;
-}
-
-TAO_Thread_Lane_Resources_Manager *
-TAO_RT_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core)
-{
-  TAO_Thread_Lane_Resources_Manager *manager = 0;
-
-  /// Create the RT Thread Lane Resources Manager.
-  ACE_NEW_RETURN (manager,
-                  TAO_RT_Thread_Lane_Resources_Manager (core),
-                  0);
-
-  return manager;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory,
-                       ACE_TEXT ("RT_Thread_Lane_Resources_Manager_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_Thread_Lane_Resources_Manager_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
deleted file mode 100644
index ef95981c8be..00000000000
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//=============================================================================
-/**
- *  @file    RT_Thread_Lane_Resources_Manager.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H
-#define TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/RTCORBA/rtcorba_export.h"
-#include "tao/Thread_Lane_Resources_Manager.h"
-#include "ace/Service_Config.h"
-
-class TAO_Thread_Pool_Manager;
-
-/**
- * @class TAO_RT_Thread_Lane_Resources_Manager
- *
- * @brief Manager for thread lane resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager :
-  public TAO_Thread_Lane_Resources_Manager
-{
-public:
-
-  /// Constructor.
-  TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_RT_Thread_Lane_Resources_Manager (void);
-
-  /// Finalize resources.
-  void finalize (void);
-
-  /// Open default resources.
-  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Shutdown reactor.
-  void shutdown_reactor (void);
-
-  /// Certain ORB policies such as dropping replies on shutdown with
-  /// RW connection handlers would need cleanup of transports to wake
-  /// threads up.
-  void cleanup_rw_transports (void);
-
-  /// Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// @name Accessors
-  // @{
-
-  TAO_Thread_Lane_Resources &lane_resources (void);
-
-  TAO_Thread_Lane_Resources &default_lane_resources (void);
-
-  TAO_Thread_Pool_Manager &tp_manager (void);
-
-  // @}
-
-protected:
-
-  /// Default lane resources.
-  TAO_Thread_Lane_Resources *default_lane_resources_;
-
-  /// Thread Pool Manager.
-  TAO_Thread_Pool_Manager *tp_manager_;
-};
-
-/**
- * @class TAO_RT_Thread_Lane_Resources_Manager_Factory
- *
- * @brief This class is a factory for managers of thread resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager_Factory
-  : public TAO_Thread_Lane_Resources_Manager_Factory
-{
-public:
-
-  /// Factory method.
-  TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core);
-
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
-ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
deleted file mode 100644
index 8eb6ded878a..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-
-#include "RT_Transport_Descriptor.h"
-#include "ace/OS_Memory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$")
-
-#include "RT_Transport_Descriptor_Property.h"
-#include "tao/Endpoint.h"
-
-TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor ()
-{
-  if (this->delete_properties_ == 1)
-    {
-      TAO_RT_Transport_Descriptor_Property *current =
-        this->property_list_;
-
-      while (current)
-        {
-          TAO_RT_Transport_Descriptor_Property *next =
-            current->next_;
-
-          delete current;
-
-          current = next;
-        }
-    }
-}
-
-TAO_Transport_Descriptor_Interface *
-TAO_RT_Transport_Descriptor::duplicate (void)
-{
-  // Get a copy of the underlying endpoint
-  TAO_Endpoint *endpoint =
-    this->endpoint_->duplicate ();
-  if (endpoint == 0)
-    return 0;
-
-  TAO_RT_Transport_Descriptor *new_descriptor = 0;
-
-  ACE_NEW_RETURN (new_descriptor,
-                  TAO_RT_Transport_Descriptor (endpoint, 1),
-                  0);
-
-  // Copy the Properties.
-  TAO_RT_Transport_Descriptor_Property *current_property =
-    this->property_list_;
-
-  TAO_RT_Transport_Descriptor_Property *current_new_property = 0;
-  TAO_RT_Transport_Descriptor_Property *new_property = 0;
-
-  while (current_property)
-    {
-      new_property =
-        current_property->duplicate ();
-
-      // Note that we cannot use <insert> because that will reverse the stack.
-      if (new_descriptor->property_list_ == 0)
-        new_descriptor->property_list_ = new_property;
-      else
-        current_new_property->next_ = new_property;
-
-      current_new_property = new_property;
-      current_property = current_property->next_;
-    }
-
-  return new_descriptor;
-}
-
-CORBA::Boolean
-TAO_RT_Transport_Descriptor::is_equivalent (const TAO_Transport_Descriptor_Interface *other_prop)
-{
-  const TAO_RT_Transport_Descriptor *rhs =
-    dynamic_cast<const TAO_RT_Transport_Descriptor*> (other_prop);
-
-  if (rhs == 0)
-    return 0;
-
-  // Check if endpoint is equivalent.
-  if (this->endpoint_->is_equivalent (rhs->endpoint_) == 0)
-    return 0;
-
-  // Check the property_list_.
-  TAO_RT_Transport_Descriptor_Property *current =
-    this->property_list_;
-
-  TAO_RT_Transport_Descriptor_Property *rhs_current =
-    rhs->property_list_;
-
-  while (current || rhs_current)
-    {
-      if (rhs_current == 0 ||
-          current == 0)
-        return 0;
-
-      if (current->is_equivalent (rhs_current) == 0)
-        return 0;
-
-      current = current->next_;
-      rhs_current = rhs_current->next_;
-    }
-
-  return 1;
-}
-
-u_long
-TAO_RT_Transport_Descriptor::hash (void) const
-{
-  return this->endpoint_->hash ();
-}
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
deleted file mode 100644
index b485d8484a5..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file RT_Transport_Descriptor.h
- *
- *  $Id$
- *
- *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
- */
-
-#ifndef TAO_RT_TRANSPORT_DESCRIPTOR_H
-#define TAO_RT_TRANSPORT_DESCRIPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RT_Transport_Descriptor_Property.h"
-
-#include "tao/Transport_Descriptor_Interface.h"
-
-/**
- * @class TAO_RT_Transport_Descriptor
- *
- * @brief Transport Descriptor for RTCORBA.
- *
- * The TAO_RT_Transport_Descriptor contains Descriptor Properties.
- * It uses the "Chain of Command" pattern in the implementation of the <_is_equivalent> method.
- *
- */
-class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor
-  : public TAO_Transport_Descriptor_Interface
-{
-public:
-  /// Constuctor
-  TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
-                               CORBA::Boolean flag = 0);
-
-  /// Destructor
-  ~TAO_RT_Transport_Descriptor ();
-
-  /// Insert Properties.
-  void insert (TAO_RT_Transport_Descriptor_Property *descriptor_property);
-
-  /// = TAO_Transport_Descriptor_Interface methods
-
-  /// This call allocates and copies the contents of this class and
-  /// returns the pointer
-  virtual TAO_Transport_Descriptor_Interface *duplicate (void);
-
-  /// Try to determine if this object is same as the <other_prop>.
-  virtual CORBA::Boolean is_equivalent (
-      const TAO_Transport_Descriptor_Interface *other_prop);
-
-  /// Generate hash value for our class
-  virtual u_long hash (void) const;
-
-private:
-  /// Stack of properties.
-  TAO_RT_Transport_Descriptor_Property *property_list_;
-
-  /// Flag to delete properties.
-  int delete_properties_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_TRANSPORT_DESCRIPTOR_H */
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
deleted file mode 100644
index 0c158812e9f..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
-                                                          CORBA::Boolean flag)
-  : TAO_Transport_Descriptor_Interface (endpoint, flag)
-  , property_list_ (0)
-  , delete_properties_ (flag)
-{
-}
-
-ACE_INLINE void
-TAO_RT_Transport_Descriptor::insert (TAO_RT_Transport_Descriptor_Property *descriptor_property)
-{
-  descriptor_property->next_ = this->property_list_;
-
-  this->property_list_ = descriptor_property;
-}
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
deleted file mode 100644
index bc59aab60d0..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-#include "RT_Transport_Descriptor_Property.h"
-
-#include "ace/OS_Memory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor_Property.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (RTCORBA,
-           TAO_RT_Transport_Descriptor_Property,
-           "$Id$")
-
-TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void)
-{
-}
-
-/*************************************************************************************************/
-
-TAO_RT_Transport_Descriptor_Private_Connection_Property::~TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
-{
-}
-
-TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Private_Connection_Property::duplicate (void)
-{
-  // Construct a copy of our class
-  TAO_RT_Transport_Descriptor_Private_Connection_Property *desc_prop = 0;
-
-  ACE_NEW_RETURN (desc_prop,
-                  TAO_RT_Transport_Descriptor_Private_Connection_Property (this->object_id_),
-                  0);
-
-  return desc_prop;
-}
-
-CORBA::Boolean
-TAO_RT_Transport_Descriptor_Private_Connection_Property::is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop)
-{
-  const TAO_RT_Transport_Descriptor_Private_Connection_Property *rhs =
-    dynamic_cast<const TAO_RT_Transport_Descriptor_Private_Connection_Property*> (other_prop);
-  return (rhs != 0 &&
-          this->object_id_ == rhs->object_id_);
-}
-
-/*************************************************************************************************/
-
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::~TAO_RT_Transport_Descriptor_Banded_Connection_Property ()
-{
-}
-
-TAO_RT_Transport_Descriptor_Property*
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::duplicate (void)
-{
-  // Construct a copy of our class
-  TAO_RT_Transport_Descriptor_Banded_Connection_Property *desc_prop = 0;
-
-  ACE_NEW_RETURN (desc_prop,
-                  TAO_RT_Transport_Descriptor_Banded_Connection_Property (this->low_priority_,
-                                  this->high_priority_),
-                  0);
-
-  return desc_prop;
-}
-
-CORBA::Boolean
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop)
-{
-  const TAO_RT_Transport_Descriptor_Banded_Connection_Property *rhs =
-    dynamic_cast<const TAO_RT_Transport_Descriptor_Banded_Connection_Property*> (other_prop);
-
-  return (rhs != 0 &&
-          this->low_priority_ == rhs->low_priority_ &&
-          this->high_priority_ == rhs->high_priority_);
-}
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
deleted file mode 100644
index b0645d68e9f..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file RT_Transport_Descriptor_Property.h
- *
- *  $Id$
- *
- *  @author Pradeep Gore <pradeep@oomworks.com>
- *
- *
- */
-
-#ifndef TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H
-#define TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtcorba_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-#include "ace/Global_Macros.h"
-
-/**
- * @class TAO_RT_Transport_Descriptor_Property
- *
- * @brief Base RT Transport Descriptor Property that can be <insert> ed into the TAO_RT_Transport_Descriptor class.
- *
- */
-class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Property
-{
-  friend class TAO_RT_Transport_Descriptor;
-
-public:
-  /// Constuctor
-  TAO_RT_Transport_Descriptor_Property (void);
-
-  /// Destructor
-  virtual ~TAO_RT_Transport_Descriptor_Property (void);
-
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0;
-
-  virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) = 0;
-
-protected:
-  /// Properties can be chanined using the <next_> pointer;
-  TAO_RT_Transport_Descriptor_Property* next_;
-
-private:
-  // = Disallow copy constructor and assignment operator.
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property &operator = (const TAO_RT_Transport_Descriptor_Property &))
-};
-
-/**
- * @class TAO_RT_Transport_Descriptor_Private_Connection_Property
- *
- * @brief Descriptor Property for Private Connections.
- *
- * Holds info necessary to identify private connections and
- * store/look them up in the Transport Cache.  (For description
- * of private connections see RTCORBA::PrivateTransportPolicy.)
- *
- */
-class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Private_Connection_Property
-  : public TAO_RT_Transport_Descriptor_Property
-{
-public:
-  /// Constuctor
-  TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
-  TAO_RT_Transport_Descriptor_Private_Connection_Property (long object_id);
-
-  /// Destructor
-  ~TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
-
-  /// Init
-  void init (long object_id);
-
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
-
-  virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
-
-private:
-  /**
-   * Unique identifier of the object to which private connection
-   * identified with this descriptor belongs.  The value of
-   * @c object_id_ is the @c TAO_Stub* of the object.
-   */
-  long object_id_;
-
-};
-
-/*************************************************************************************************/
-
-/**
- * @class TAO_RT_Transport_Descriptor_Banded_Connection_Property
- *
- * @brief Descriptor Property for Banded Connections.
- *
- * This property holds the Band information necessary to identify a banded connection.
- *
- */
-class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Banded_Connection_Property
-  : public TAO_RT_Transport_Descriptor_Property
-{
-public:
-  /// Constuctor
-  TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
-  TAO_RT_Transport_Descriptor_Banded_Connection_Property (CORBA::Short low_priority,
-                                                          CORBA::Short high_priority);
-
-  /// Destructor
-  ~TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
-
-  /// Init
-  void init (CORBA::Short low_priority, CORBA::Short high_priority);
-
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void);
-
-  virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop);
-
-protected:
-  /// The low priority of the Band.
-  CORBA::Short low_priority_;
-
-  /// The high priority of the Band.
-  CORBA::Short high_priority_;
-};
-
-/*************************************************************************************************/
-
-#if defined (__ACE_INLINE__)
-#include "RT_Transport_Descriptor_Property.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H */
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
deleted file mode 100644
index c6646a943fb..00000000000
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
-  : next_ (0)
-{
-}
-
-/*************************************************************************************************/
-ACE_INLINE
-TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
-  : object_id_ (-1)
-{
-}
-
-ACE_INLINE
-TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (long object_id)
-  : object_id_ (object_id)
-{
-}
-
-ACE_INLINE void
-TAO_RT_Transport_Descriptor_Private_Connection_Property::init (long object_id)
-{
-  this->object_id_ = object_id;
-}
-
-/*************************************************************************************************/
-
-ACE_INLINE
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (void)
-  : low_priority_ (-1)
-  , high_priority_ (-1)
-{
-}
-
-ACE_INLINE
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (CORBA::Short low_priority,
-                                                                                                                CORBA::Short high_priority)
-  : low_priority_ (low_priority)
-  , high_priority_ (high_priority)
-{
-}
-
-ACE_INLINE void
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::init (CORBA::Short low_priority,
-                                                              CORBA::Short high_priority)
-{
-  this->low_priority_ = low_priority;
-  this->high_priority_ = high_priority;
-}
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.pc.in b/TAO/tao/RTCORBA/TAO_RTCORBA.pc.in
deleted file mode 100644
index e378cc22662..00000000000
--- a/TAO/tao/RTCORBA/TAO_RTCORBA.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTCORBA
-Description: TAO Real-Time CORBA Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTCORBA
-Cflags: -I${includedir}
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.rc b/TAO/tao/RTCORBA/TAO_RTCORBA.rc
deleted file mode 100644
index c4c1b19b422..00000000000
--- a/TAO/tao/RTCORBA/TAO_RTCORBA.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "RTCORBA\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_RTCORBADLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_RTCORBA.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
deleted file mode 100644
index ce5cc9e5721..00000000000
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ /dev/null
@@ -1,969 +0,0 @@
-#include "Thread_Pool.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (RTCORBA,
-           Thread_Pool,
-           "$Id$")
-
-#include "tao/Exception.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/debug.h"
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "ace/Auto_Ptr.h"
-
-TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
-  TAO_Thread_Lane &lane)
-  : lane_ (lane)
-{
-}
-
-void
-TAO_RT_New_Leader_Generator::no_leaders_available (void)
-{
-  // Note that we are checking this condition below without the lock
-  // held.  The value of <static_threads> and <dynamic_threads> does
-  // not change, but <current_threads> increases when new dynamic
-  // threads are created.  Even if we catch <current_threads> in an
-  // inconsistent state, we will double check later with the lock
-  // held.  Therefore, this check should not cause any big problems.
-  if (this->lane_.current_threads () ==
-      this->lane_.static_threads () +
-      this->lane_.dynamic_threads ())
-    return;
-
-  TAO_Thread_Pool_Manager &manager =
-    this->lane_.pool ().manager ();
-
-  ACE_GUARD (ACE_SYNCH_MUTEX,
-             mon,
-             manager.lock ());
-
-  if (this->lane_.current_threads () <
-      (this->lane_.static_threads () +
-       this->lane_.dynamic_threads ()) &&
-      !manager.orb_core ().has_shutdown ())
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n")
-                    ACE_TEXT ("Current number of threads = %d; ")
-                    ACE_TEXT ("static threads = %d; dynamic threads = %d\n")
-                    ACE_TEXT ("No leaders available; creating new leader!\n"),
-                    this->lane_.pool ().id (),
-                    this->lane_.id (),
-                    this->lane_.current_threads (),
-                    this->lane_.static_threads (),
-                    this->lane_.dynamic_threads ()));
-
-      int result =
-        this->lane_.create_dynamic_threads (1);
-
-      if (result != 0)
-        ACE_ERROR ((LM_ERROR,
-                    "Pool %d Lane %d Thread %t: cannot create dynamic thread\n",
-                    this->lane_.pool ().id (),
-                    this->lane_.id ()));
-    }
-}
-
-TAO_Thread_Pool_Threads::TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane)
-  : ACE_Task_Base (lane.pool ().manager ().orb_core ().thr_mgr ()),
-    lane_ (lane)
-{
-}
-
-TAO_Thread_Lane &
-TAO_Thread_Pool_Threads::lane (void) const
-{
-  return this->lane_;
-}
-
-int
-TAO_Thread_Pool_Threads::svc (void)
-{
-  TAO_ORB_Core &orb_core =
-    this->lane ().pool ().manager ().orb_core ();
-
-  if (orb_core.has_shutdown ())
-    return 0;
-
-  // Set TSS resources for this thread.
-  TAO_Thread_Pool_Threads::set_tss_resources (orb_core,
-                                              this->lane_);
-
-  CORBA::ORB_ptr orb =
-    orb_core.orb ();
-
-  ACE_TRY_NEW_ENV
-    {
-      // Run the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // No point propagating this exception.  Print it out.
-      ACE_ERROR ((LM_ERROR,
-                  "orb->run() raised exception for thread %t\n"));
-
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core,
-                                            TAO_Thread_Lane &thread_lane)
-{
-  /// Get the ORB_Core's TSS resources.
-  TAO_ORB_Core_TSS_Resources &tss =
-    *orb_core.get_tss_resources ();
-
-  /// Set the lane attribute in TSS.
-  tss.lane_ = &thread_lane;
-}
-
-TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
-                                  CORBA::ULong id,
-                                  CORBA::Short lane_priority,
-                                  CORBA::ULong static_threads,
-                                  CORBA::ULong dynamic_threads
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-  : pool_ (pool),
-    id_ (id),
-    lane_priority_ (lane_priority),
-    static_threads_ (static_threads),
-    dynamic_threads_ (dynamic_threads),
-    current_threads_ (0),
-    threads_ (*this),
-    new_thread_generator_ (*this),
-    resources_ (pool.manager ().orb_core (),
-                &new_thread_generator_),
-    native_priority_ (TAO_INVALID_PRIORITY)
-{
-}
-
-void
-TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Make sure that <static_threads_> is not zero.
-  if (this->static_threads_ == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  // Check that the priority is in bounds.
-  if (this->lane_priority_ < RTCORBA::minPriority
-           // The line below will always be false unless the value of
-           // RTCORBA::maxPriority, which is now assigned the value of
-           // 32767, is changed in RTCORBA.pidl.
-//      || this->lane_priority_ > RTCORBA::maxPriority
-     )
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  CORBA::ORB_ptr orb =
-    this->pool_.manager ().orb_core ().orb ();
-
-  // Get the priority mapping manager.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_Priority_Mapping_Manager_var mapping_manager =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  RTCORBA::PriorityMapping *pm =
-    mapping_manager.in ()->mapping ();
-
-  // Map CORBA priority to native priority.
-  CORBA::Boolean result =
-    pm->to_native (this->lane_priority_,
-                   this->native_priority_);
-
-  if (!result)
-    ACE_THROW (CORBA::DATA_CONVERSION ());
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - creating thread at ")
-                  ACE_TEXT ("(corba:native) priority %d:%d\n"),
-                  this->lane_priority_,
-                  this->native_priority_));
-    }
-}
-
-void
-TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Validate and map priority.
-  this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create a string with the pool:thread id.
-  char pool_lane_id[10];
-  ACE_OS::sprintf (pool_lane_id,
-                   "%d:%d",
-                   this->pool ().id (),
-                   this->id ());
-
-  TAO_ORB_Parameters *params =
-    this->pool ().manager ().orb_core ().orb_params ();
-
-  TAO_EndpointSet endpoint_set;
-  bool ignore_address;
-
-  // Get the endpoints for this lane.
-  params->get_endpoint_set (pool_lane_id,
-                            endpoint_set);
-
-  if (endpoint_set.is_empty ())
-    {
-      // If endpoints are not specified for this lane, use the
-      // endpoints specified for the default lane but ignore their
-      // addresses.
-      params->get_endpoint_set (TAO_DEFAULT_LANE,
-                                endpoint_set);
-
-      ignore_address = true;
-    }
-  else
-    {
-      // If endpoints are specified for this lane, use them with thier
-      // addresses.
-      ignore_address = false;
-    }
-
-  // Open the acceptor registry.
-  int result = 0;
-  result =
-    this->resources_.open_acceptor_registry (endpoint_set,
-                                             ignore_address
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (result == -1)
-    ACE_THROW (CORBA::INTERNAL (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                   0),
-                 CORBA::COMPLETED_NO));
-}
-
-TAO_Thread_Lane::~TAO_Thread_Lane (void)
-{
-}
-
-void
-TAO_Thread_Lane::finalize (void)
-{
-  // Finalize resources.
-  this->resources_.finalize ();
-}
-
-void
-TAO_Thread_Lane::shutdown_reactor (void)
-{
-  this->resources_.shutdown_reactor ();
-}
-
-void
-TAO_Thread_Lane::wait (void)
-{
-  this->threads_.wait ();
-}
-
-int
-TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile)
-{
-  return this->resources_.is_collocated (mprofile);
-}
-
-int
-TAO_Thread_Lane::create_static_threads (void)
-{
-  // Create static threads.
-  return this->create_dynamic_threads (this->static_threads_);
-}
-
-
-int
-TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads)
-{
-  // Overwritten parameters.
-  int force_active = 1;
-
-  // Default parameters.
-  long default_flags = THR_NEW_LWP | THR_JOINABLE;
-  int default_grp_id = -1;
-  ACE_Task_Base *default_task = 0;
-  ACE_hthread_t *default_thread_handles = 0;
-  void **default_stack = 0;
-
-  // Setting stack size.
-  size_t *stack_size_array = 0;
-  ACE_NEW_RETURN (stack_size_array,
-                  size_t[number_of_threads],
-                  -1);
-  size_t index;
-  for (index = 0;
-       index != number_of_threads;
-       ++index)
-    stack_size_array[index] =
-      this->pool ().stack_size_;
-
-  // Make sure the dynamically created stack size array is properly
-  // deleted.
-  ACE_Auto_Basic_Array_Ptr<size_t> auto_stack_size_array (stack_size_array);
-
-  TAO_ORB_Core &orb_core =
-    this->pool ().manager ().orb_core ();
-
-  long flags =
-    default_flags |
-    orb_core.orb_params ()->thread_creation_flags ();
-
-  // Activate the threads.
-  int result =
-    this->threads_.activate (flags,
-                             number_of_threads,
-                             force_active,
-                             this->native_priority_,
-                             default_grp_id,
-                             default_task,
-                             default_thread_handles,
-                             default_stack,
-                             stack_size_array);
-
-  if (result != 0)
-    return result;
-
-  this->current_threads_ +=
-    number_of_threads;
-
-  return result;
-}
-
-CORBA::ULong
-TAO_Thread_Lane::id (void) const
-{
-  return this->id_;
-}
-
-TAO_Thread_Pool &
-TAO_Thread_Lane::pool (void) const
-{
-  return this->pool_;
-}
-
-CORBA::Short
-TAO_Thread_Lane::lane_priority (void) const
-{
-  return this->lane_priority_;
-}
-
-CORBA::Short
-TAO_Thread_Lane::native_priority (void) const
-{
-  return this->native_priority_;
-}
-
-CORBA::ULong
-TAO_Thread_Lane::static_threads (void) const
-{
-  return this->static_threads_;
-}
-
-CORBA::ULong
-TAO_Thread_Lane::dynamic_threads (void) const
-{
-  return this->dynamic_threads_;
-}
-
-CORBA::ULong
-TAO_Thread_Lane::current_threads (void) const
-{
-  return this->current_threads_;
-}
-
-void
-TAO_Thread_Lane::current_threads (CORBA::ULong current_threads)
-{
-  this->current_threads_ = current_threads;
-}
-
-TAO_Thread_Pool_Threads &
-TAO_Thread_Lane::threads (void)
-{
-  return this->threads_;
-}
-
-TAO_Thread_Lane_Resources &
-TAO_Thread_Lane::resources (void)
-{
-  return this->resources_;
-}
-
-TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
-                                  CORBA::ULong id,
-                                  CORBA::ULong stack_size,
-                                  CORBA::ULong static_threads,
-                                  CORBA::ULong dynamic_threads,
-                                  CORBA::Short default_priority,
-                                  CORBA::Boolean allow_request_buffering,
-                                  CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
-                                  ACE_ENV_ARG_DECL)
-  : manager_ (manager),
-    id_ (id),
-    stack_size_ (stack_size),
-    allow_borrowing_ (0),
-    allow_request_buffering_ (allow_request_buffering),
-    max_buffered_requests_ (max_buffered_requests),
-    max_request_buffer_size_ (max_request_buffer_size),
-    lanes_ (0),
-    number_of_lanes_ (1),
-    with_lanes_ (0)
-{
-  // No support for buffering.
-  if (allow_request_buffering)
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
-
-  // Create one lane.
-  this->lanes_ = new TAO_Thread_Lane *[this->number_of_lanes_];
-  this->lanes_[0] =
-    new TAO_Thread_Lane (*this,
-                         0,
-                         default_priority,
-                         static_threads,
-                         dynamic_threads
-                         ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
-                                  CORBA::ULong id,
-                                  CORBA::ULong stack_size,
-                                  const RTCORBA::ThreadpoolLanes &lanes,
-                                  CORBA::Boolean allow_borrowing,
-                                  CORBA::Boolean allow_request_buffering,
-                                  CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
-                                  ACE_ENV_ARG_DECL)
-  : manager_ (manager),
-    id_ (id),
-    stack_size_ (stack_size),
-    allow_borrowing_ (allow_borrowing),
-    allow_request_buffering_ (allow_request_buffering),
-    max_buffered_requests_ (max_buffered_requests),
-    max_request_buffer_size_ (max_request_buffer_size),
-    lanes_ (0),
-    number_of_lanes_ (lanes.length ()),
-    with_lanes_ (1)
-{
-  // No support for buffering or borrowing.
-  if (allow_borrowing ||
-      allow_request_buffering)
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
-
-  // Create multiple lane.
-  this->lanes_ = new TAO_Thread_Lane *[this->number_of_lanes_];
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    this->lanes_[i] =
-      new TAO_Thread_Lane (*this,
-                           i,
-                           lanes[i].lane_priority,
-                           lanes[i].static_threads,
-                           lanes[i].dynamic_threads
-                           ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Thread_Pool::open (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Open all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    {
-      this->lanes_[i]->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-TAO_Thread_Pool::~TAO_Thread_Pool (void)
-{
-  // Delete all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    delete this->lanes_[i];
-
-  delete[] this->lanes_;
-}
-
-void
-TAO_Thread_Pool::finalize (void)
-{
-  // Finalize all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    this->lanes_[i]->finalize ();
-}
-
-void
-TAO_Thread_Pool::shutdown_reactor (void)
-{
-  // Finalize all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    this->lanes_[i]->shutdown_reactor ();
-}
-
-void
-TAO_Thread_Pool::wait (void)
-{
-  // Finalize all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    this->lanes_[i]->wait ();
-}
-
-int
-TAO_Thread_Pool::is_collocated (const TAO_MProfile &mprofile)
-{
-  // Finalize all the lanes.
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    {
-      int result =
-        this->lanes_[i]->is_collocated (mprofile);
-
-      if (result)
-        return result;
-    }
-
-  return 0;
-}
-
-int
-TAO_Thread_Pool::create_static_threads (void)
-{
-  for (CORBA::ULong i = 0;
-       i != this->number_of_lanes_;
-       ++i)
-    {
-      // Ask each lane to create its set of static threads.
-      int result = this->lanes_[i]->create_static_threads ();
-
-      // Return on failure.
-      if (result != 0)
-        return result;
-    }
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Thread_Pool::with_lanes (void) const
-{
-  return this->with_lanes_;
-}
-
-TAO_Thread_Pool_Manager &
-TAO_Thread_Pool::manager (void) const
-{
-  return this->manager_;
-}
-
-CORBA::ULong
-TAO_Thread_Pool::id (void) const
-{
-  return this->id_;
-}
-
-CORBA::ULong
-TAO_Thread_Pool::stack_size (void) const
-{
-  return this->stack_size_;
-}
-
-CORBA::Boolean
-TAO_Thread_Pool::allow_borrowing (void) const
-{
-  return this->allow_borrowing_;
-}
-
-CORBA::Boolean
-TAO_Thread_Pool::allow_request_buffering (void) const
-{
-  return this->allow_request_buffering_;
-}
-
-CORBA::ULong
-TAO_Thread_Pool::max_buffered_requests (void) const
-{
-  return this->max_buffered_requests_;
-}
-
-CORBA::ULong
-TAO_Thread_Pool::max_request_buffer_size (void) const
-{
-  return this->max_request_buffer_size_;
-}
-
-TAO_Thread_Lane **
-TAO_Thread_Pool::lanes (void)
-{
-  return this->lanes_;
-}
-
-CORBA::ULong
-TAO_Thread_Pool::number_of_lanes (void) const
-{
-  return this->number_of_lanes_;
-}
-
-#define TAO_THREAD_POOL_MANAGER_GUARD \
-  ACE_GUARD_THROW_EX ( \
-    ACE_SYNCH_MUTEX, \
-    mon, \
-    this->lock_, \
-    CORBA::INTERNAL ( \
-      CORBA::SystemException::_tao_minor_code ( \
-        TAO_GUARD_FAILURE, \
-        0), \
-      CORBA::COMPLETED_NO));
-
-TAO_Thread_Pool_Manager::TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core)
-  : orb_core_ (orb_core),
-    thread_pools_ (),
-    thread_pool_id_counter_ (1),
-    lock_ ()
-{
-}
-
-TAO_Thread_Pool_Manager::~TAO_Thread_Pool_Manager (void)
-{
-  // Delete all the pools.
-  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
-       iterator != this->thread_pools_.end ();
-       ++iterator)
-    delete (*iterator).int_id_;
-}
-
-void
-TAO_Thread_Pool_Manager::finalize (void)
-{
-  // Finalize all the pools.
-  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
-       iterator != this->thread_pools_.end ();
-       ++iterator)
-    (*iterator).int_id_->finalize ();
-}
-
-void
-TAO_Thread_Pool_Manager::shutdown_reactor (void)
-{
-  // Finalize all the pools.
-  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
-       iterator != this->thread_pools_.end ();
-       ++iterator)
-    (*iterator).int_id_->shutdown_reactor ();
-}
-
-void
-TAO_Thread_Pool_Manager::wait (void)
-{
-  // Finalize all the pools.
-  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
-       iterator != this->thread_pools_.end ();
-       ++iterator)
-    (*iterator).int_id_->wait ();
-}
-
-int
-TAO_Thread_Pool_Manager::is_collocated (const TAO_MProfile &mprofile)
-{
-  // Finalize all the pools.
-  for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin ();
-       iterator != this->thread_pools_.end ();
-       ++iterator)
-    {
-      int result =
-        (*iterator).int_id_->is_collocated (mprofile);
-
-      if (result)
-        return result;
-    }
-
-  return 0;
-}
-
-RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
-                                            CORBA::ULong static_threads,
-                                            CORBA::ULong dynamic_threads,
-                                            RTCORBA::Priority default_priority,
-                                            CORBA::Boolean allow_request_buffering,
-                                            CORBA::ULong max_buffered_requests,
-                                            CORBA::ULong max_request_buffer_size
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK_RETURN (0);
-
-  return this->create_threadpool_i (stacksize,
-                                    static_threads,
-                                    dynamic_threads,
-                                    default_priority,
-                                    allow_request_buffering,
-                                    max_buffered_requests,
-                                    max_request_buffer_size
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
-                                                       const RTCORBA::ThreadpoolLanes & lanes,
-                                                       CORBA::Boolean allow_borrowing,
-                                                       CORBA::Boolean allow_request_buffering,
-                                                       CORBA::ULong max_buffered_requests,
-                                                       CORBA::ULong max_request_buffer_size
-                                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK_RETURN (0);
-
-  return this->create_threadpool_with_lanes_i (stacksize,
-                                               lanes,
-                                               allow_borrowing,
-                                               allow_request_buffering,
-                                               max_buffered_requests,
-                                               max_request_buffer_size
-                                               ACE_ENV_ARG_PARAMETER);
-}
-
-void
-TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::InvalidThreadpool))
-{
-  TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK;
-
-  this->destroy_threadpool_i (threadpool
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
-                                              CORBA::ULong static_threads,
-                                              CORBA::ULong dynamic_threads,
-                                              RTCORBA::Priority default_priority,
-                                              CORBA::Boolean allow_request_buffering,
-                                              CORBA::ULong max_buffered_requests,
-                                              CORBA::ULong max_request_buffer_size
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create the thread pool.
-  TAO_Thread_Pool *thread_pool = 0;
-
-  ACE_NEW_THROW_EX (thread_pool,
-                    TAO_Thread_Pool (*this,
-                                     this->thread_pool_id_counter_,
-                                     stacksize,
-                                     static_threads,
-                                     dynamic_threads,
-                                     default_priority,
-                                     allow_request_buffering,
-                                     max_buffered_requests,
-                                     max_request_buffer_size
-                                     ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return this->create_threadpool_helper (thread_pool
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
-                                                         const RTCORBA::ThreadpoolLanes &lanes,
-                                                         CORBA::Boolean allow_borrowing,
-                                                         CORBA::Boolean allow_request_buffering,
-                                                         CORBA::ULong max_buffered_requests,
-                                                         CORBA::ULong max_request_buffer_size
-                                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create the thread pool.
-  TAO_Thread_Pool *thread_pool = 0;
-
-  ACE_NEW_THROW_EX (thread_pool,
-                    TAO_Thread_Pool (*this,
-                                     this->thread_pool_id_counter_,
-                                     stacksize,
-                                     lanes,
-                                     allow_borrowing,
-                                     allow_request_buffering,
-                                     max_buffered_requests,
-                                     max_request_buffer_size
-                                     ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return this->create_threadpool_helper (thread_pool
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Make sure of safe deletion in case of errors.
-  auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
-
-  // Open the pool.
-  thread_pool->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Create the static threads.
-  int result =
-    thread_pool->create_static_threads ();
-
-  // Throw exception in case of errors.
-  if (result != 0)
-    {
-      // Finalize thread pool related resources.
-      thread_pool->finalize ();
-
-      ACE_THROW_RETURN (
-        CORBA::INTERNAL (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE,
-            errno),
-          CORBA::COMPLETED_NO),
-        result);
-    }
-
-  // Bind thread to internal table.
-  result =
-    this->thread_pools_.bind (this->thread_pool_id_counter_,
-                              thread_pool);
-
-  // Throw exceptin in case of errors.
-  if (result != 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      result);
-
-  //
-  // Success.
-  //
-
-  // No need to delete thread pool.
-  safe_thread_pool.release ();
-
-  // Return current counter and perform post-increment.
-  return this->thread_pool_id_counter_++;
-}
-
-void
-TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::InvalidThreadpool))
-{
-  TAO_Thread_Pool *thread_pool = 0;
-
-  // Unbind the thread pool from the map.
-  int result =
-    this->thread_pools_.unbind (thread_pool_id,
-                                thread_pool);
-
-  // If the thread pool is not found in our map.
-  if (result != 0)
-    ACE_THROW (RTCORBA::RTORB::InvalidThreadpool ());
-
-  // Shutdown reactor.
-  thread_pool->shutdown_reactor ();
-
-  // Wait for the threads.
-  thread_pool->wait ();
-
-  // Finalize resources.
-  thread_pool->finalize ();
-
-  // Delete the thread pool.
-  delete thread_pool;
-}
-
-TAO_ORB_Core &
-TAO_Thread_Pool_Manager::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_SYNCH_MUTEX &
-TAO_Thread_Pool_Manager::lock (void)
-{
-  return this->lock_;
-}
-
-TAO_Thread_Pool_Manager::THREAD_POOLS &
-TAO_Thread_Pool_Manager::thread_pools (void)
-{
-  return this->thread_pools_;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<RTCORBA::ThreadpoolId, TAO_Thread_Pool *>;
-template class ACE_Hash_Map_Iterator_Base_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Thread_Pool>;
-template class ACE_Auto_Basic_Array_Ptr<size_t>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<RTCORBA::ThreadpoolId, TAO_Thread_Pool *>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Pool>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<size_t>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
deleted file mode 100644
index 557a68613fc..00000000000
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ /dev/null
@@ -1,406 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Thread_Pool.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_THREAD_POOL_H
-#define TAO_THREAD_POOL_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#include "ace/Hash_Map_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/New_Leader_Generator.h"
-#include "ace/Task.h"
-#include "ace/Null_Mutex.h"
-
-class TAO_Thread_Lane;
-
-/**
- * @class TAO_RT_New_Leader_Generator
- *
- * @brief Class for creating dynamic threads.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_RT_New_Leader_Generator
-  : public TAO_New_Leader_Generator
-{
-public:
-
-  /// Constructor.
-  TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane);
-
-  /// Leader/Follower class uses this method to notify the system that
-  /// we are out of leaders.
-  void no_leaders_available (void);
-
-private:
-
-  /// Lane associated with this leader generator.
-  TAO_Thread_Lane &lane_;
-};
-
-/**
- * @class TAO_Thread_Pool_Threads
- *
- * @brief Class representing a thread running in a thread lane.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_Thread_Pool_Threads : public ACE_Task_Base
-{
-public:
-
-  /// Constructor.
-  TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane);
-
-  /// Method executed when a thread is spawned.
-  int svc (void);
-
-  /// Accessor to the lane to which this thread belongs to.
-  TAO_Thread_Lane &lane (void) const;
-
-  /// Set TSS resources for the current thread.
-  static void set_tss_resources (TAO_ORB_Core &orb_core,
-                                 TAO_Thread_Lane &thread_lane);
-
-private:
-
-  /// Lane to which this thread belongs to.
-  TAO_Thread_Lane &lane_;
-};
-
-class TAO_Thread_Pool;
-
-/**
- * @class TAO_Thread_Lane
- *
- * @brief Class representing the thread lane inside a thread pool.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_Thread_Lane
-{
-public:
-
-  /// Constructor.
-  TAO_Thread_Lane (TAO_Thread_Pool &pool,
-                   CORBA::ULong id,
-                   CORBA::Short lane_priority,
-                   CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads
-                   ACE_ENV_ARG_DECL);
-
-  /// Destructor.
-  ~TAO_Thread_Lane (void);
-
-  /// Open the lane.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Finalize the resources.
-  void finalize (void);
-
-  /// Shutdown the reactor.
-  void shutdown_reactor (void);
-
-  /// Wait for threads to exit.
-  void wait (void);
-
-  /// Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// Create the static threads - only called once.
-  int create_static_threads (void);
-
-  /// Create @a number_of_threads of dynamic threads.  Can be called
-  /// multiple times.
-  int create_dynamic_threads (CORBA::ULong number_of_threads);
-
-  /// @name Accessors
-  // @{
-
-  TAO_Thread_Pool &pool (void) const;
-  CORBA::ULong id (void) const;
-
-  CORBA::Short lane_priority (void) const;
-  CORBA::ULong static_threads (void) const;
-  CORBA::ULong dynamic_threads (void) const;
-
-  CORBA::ULong current_threads (void) const;
-  void current_threads (CORBA::ULong);
-
-  CORBA::Short native_priority (void) const;
-
-  TAO_Thread_Pool_Threads &threads (void);
-
-  TAO_Thread_Lane_Resources &resources (void);
-
-  // @}
-
-private:
-
-  /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
-
-  TAO_Thread_Pool &pool_;
-  CORBA::ULong id_;
-
-  CORBA::Short lane_priority_;
-  CORBA::ULong static_threads_;
-  CORBA::ULong dynamic_threads_;
-
-  CORBA::ULong current_threads_;
-
-  TAO_Thread_Pool_Threads threads_;
-
-  TAO_RT_New_Leader_Generator new_thread_generator_;
-
-  TAO_Thread_Lane_Resources resources_;
-
-  CORBA::Short native_priority_;
-};
-
-class TAO_Thread_Pool_Manager;
-
-/**
- * @class TAO_Thread_Pool
- *
- * @brief Class representing the thread pool inside a thread pool
- * manager.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_Thread_Pool
-{
-  friend class TAO_Thread_Lane;
-
-public:
-
-  /// Constructor (for pools without lanes).
-  TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
-                   CORBA::ULong id,
-                   CORBA::ULong stack_size,
-                   CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads,
-                   CORBA::Short default_priority,
-                   CORBA::Boolean allow_request_buffering,
-                   CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size
-                   ACE_ENV_ARG_DECL);
-
-  /// Constructor (for pools with lanes).
-  TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
-                   CORBA::ULong id,
-                   CORBA::ULong stack_size,
-                   const RTCORBA::ThreadpoolLanes &lanes,
-                   CORBA::Boolean allow_borrowing,
-                   CORBA::Boolean allow_request_buffering,
-                   CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size
-                   ACE_ENV_ARG_DECL);
-
-  /// Destructor.
-  ~TAO_Thread_Pool (void);
-
-  /// Open the pool.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Finalize the resources.
-  void finalize (void);
-
-  /// Shutdown the reactor.
-  void shutdown_reactor (void);
-
-  /// Wait for threads to exit.
-  void wait (void);
-
-  /// Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// Create the static threads - only called once.
-  int create_static_threads (void);
-
-  /// Check if this thread pool has (explicit) lanes.
-  int with_lanes (void) const;
-
-  /// @name Accessors
-  // @{
-
-  TAO_Thread_Pool_Manager &manager (void) const;
-  CORBA::ULong id (void) const;
-
-  CORBA::ULong stack_size (void) const;
-  CORBA::Boolean allow_borrowing (void) const;
-  CORBA::Boolean allow_request_buffering (void) const;
-  CORBA::ULong max_buffered_requests (void) const;
-  CORBA::ULong max_request_buffer_size (void) const;
-
-  TAO_Thread_Lane **lanes (void);
-  CORBA::ULong number_of_lanes (void) const;
-
-  // @}
-
-private:
-
-  TAO_Thread_Pool_Manager &manager_;
-  CORBA::ULong id_;
-
-  CORBA::ULong stack_size_;
-  CORBA::Boolean allow_borrowing_;
-  CORBA::Boolean allow_request_buffering_;
-  CORBA::ULong max_buffered_requests_;
-  CORBA::ULong max_request_buffer_size_;
-
-  TAO_Thread_Lane **lanes_;
-  CORBA::ULong number_of_lanes_;
-  int with_lanes_;
-};
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_Thread_Pool_Manager
- *
- * @brief Class for managing thread pools.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTCORBA_Export TAO_Thread_Pool_Manager
-{
-public:
-
-  /// Constructor.
-  TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_Thread_Pool_Manager (void);
-
-  /// Finalize the resources.
-  void finalize (void);
-
-  /// Shutdown the reactor.
-  void shutdown_reactor (void);
-
-  /// Wait for threads to exit.
-  void wait (void);
-
-  /// Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// Create a threadpool without lanes.
-  RTCORBA::ThreadpoolId
-  create_threadpool (CORBA::ULong stacksize,
-                     CORBA::ULong static_threads,
-                     CORBA::ULong dynamic_threads,
-                     RTCORBA::Priority default_priority,
-                     CORBA::Boolean allow_request_buffering,
-                     CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size
-                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Create a threadpool with lanes.
-  RTCORBA::ThreadpoolId
-  create_threadpool_with_lanes (CORBA::ULong stacksize,
-                                const RTCORBA::ThreadpoolLanes & lanes,
-                                CORBA::Boolean allow_borrowing,
-                                CORBA::Boolean allow_request_buffering,
-                                CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Destroy a threadpool.
-  void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::InvalidThreadpool));
-
-  /// Collection of thread pools.
-  typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS;
-
-  /// @name Accessors
-  // @{
-
-  ACE_SYNCH_MUTEX &lock (void);
-
-  TAO_ORB_Core &orb_core (void) const;
-
-  THREAD_POOLS &thread_pools (void);
-
-  // @}
-
-private:
-
-  /// @name Helpers
-  // @{
-
-  RTCORBA::ThreadpoolId
-  create_threadpool_i (CORBA::ULong stacksize,
-                       CORBA::ULong static_threads,
-                       CORBA::ULong dynamic_threads,
-                       RTCORBA::Priority default_priority,
-                       CORBA::Boolean allow_request_buffering,
-                       CORBA::ULong max_buffered_requests,
-                       CORBA::ULong max_request_buffer_size
-                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  RTCORBA::ThreadpoolId
-  create_threadpool_with_lanes_i (CORBA::ULong stacksize,
-                                  const RTCORBA::ThreadpoolLanes & lanes,
-                                  CORBA::Boolean allow_borrowing,
-                                  CORBA::Boolean allow_request_buffering,
-                                  CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy_threadpool_i (RTCORBA::ThreadpoolId threadpool
-                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::InvalidThreadpool));
-
-  RTCORBA::ThreadpoolId
-  create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                            ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // @}
-
-  TAO_ORB_Core &orb_core_;
-
-  THREAD_POOLS thread_pools_;
-  RTCORBA::ThreadpoolId thread_pool_id_counter_;
-  ACE_SYNCH_MUTEX lock_;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_THREAD_POOL_H */
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
deleted file mode 100644
index 5cf8a35e1c8..00000000000
--- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff
+++ /dev/null
@@ -1,93 +0,0 @@
---- orig/RTCORBAC.h	2005-03-25 19:39:53.847483200 +0100
-+++ RTCORBAC.h	2005-03-25 19:41:00.863848000 +0100
-@@ -36,12 +36,18 @@
- 
- #include "ace/config-all.h"
- 
-+#ifndef TAO_RTCORBA_SAFE_INCLUDE
-+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
-+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
-+
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "rtcorba_export.h"
-+#include "rtcorba_typedefs.h"
- #include "tao/ORB.h"
-+#include "tao/TimeBaseC.h"
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
- #include "tao/Object.h"
-@@ -55,6 +61,8 @@
- #include "tao/TimeBaseC.h"
- #include "tao/PolicyC.h"
- 
-+#include "tao/Encodable.h"
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
-@@ -538,6 +546,7 @@
-   
-   class TAO_RTCORBA_Export ProtocolProperties
-     : public virtual CORBA::Object
-+    , public virtual TAO_Encodable
-   {
-   public:
-     typedef ProtocolProperties_ptr _ptr_type;
-@@ -576,6 +585,9 @@
-     virtual const char* _interface_repository_id (void) const;
-     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-   
-+    // CDR Encoder/Decoder methods. (handcrafted)
-+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-   protected:
-     // Abstract or local interface only.
-     ProtocolProperties (void);
---- orig/RTCORBAC.cpp	2005-03-25 19:39:53.847483200 +0100
-+++ RTCORBAC.cpp	2005-03-25 19:39:54.318160000 +0100
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "RTCORBAC.h"
-+#include "RTCORBA.h"
- #include "tao/CDR.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
-@@ -61,6 +61,22 @@
- {
- }
- 
-+//////////////////////////////////////////////////////
-+// CDR Encoding Support hand crafted
-+
-+CORBA::Boolean
-+RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
-+{
-+  return 1;
-+}
-+// TAO_IDL - Generated from
-+// be/be_visitor_arg_traits.cpp:60
-+
-+CORBA::Boolean
-+RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
-+{
-+  return 1;
-+}
- 
- // TAO_IDL - Generated from 
- // be\be_visitor_structure/structure_cs.cpp:68
---- orig/RTCORBAA.cpp	2005-03-25 19:39:53.857497600 +0100
-+++ RTCORBAA.cpp	2005-03-25 19:40:06.796102400 +0100
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "RTCORBAC.h"
-+#include "RTCORBA.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/RTCORBA/rtcorba_export.h b/TAO/tao/RTCORBA/rtcorba_export.h
deleted file mode 100644
index d6393088876..00000000000
--- a/TAO/tao/RTCORBA/rtcorba_export.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_RTCORBA_EXPORT_H
-#define TAO_RTCORBA_EXPORT_H
-
-#include "ace/config-all.h"
-
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_RTCORBA_HAS_DLL)
-#    define TAO_RTCORBA_HAS_DLL 0
-#  endif /* ! TAO_RTCORBA_HAS_DLL */
-#else
-#  if !defined (TAO_RTCORBA_HAS_DLL)
-#    define TAO_RTCORBA_HAS_DLL 1
-#  endif /* ! TAO_RTCORBA_HAS_DLL */
-#endif
-
-#if defined (TAO_RTCORBA_HAS_DLL) && (TAO_RTCORBA_HAS_DLL == 1)
-#  if defined (TAO_RTCORBA_BUILD_DLL)
-#    define TAO_RTCORBA_Export ACE_Proper_Export_Flag
-#    define TAO_RTCORBA_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTCORBA_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_RTCORBA_BUILD_DLL */
-#    define TAO_RTCORBA_Export ACE_Proper_Import_Flag
-#    define TAO_RTCORBA_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTCORBA_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_RTCORBA_BUILD_DLL */
-#else /* TAO_RTCORBA_HAS_DLL == 1 */
-#  define TAO_RTCORBA_Export
-#  define TAO_RTCORBA_SINGLETON_DECLARATION(T)
-#  define TAO_RTCORBA_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_RTCORBA_HAS_DLL == 1 */
-
-#endif /* TAO_RTCORBA_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/RTCORBA/rtcorba_typedefs.h b/TAO/tao/RTCORBA/rtcorba_typedefs.h
deleted file mode 100644
index 844486f5a77..00000000000
--- a/TAO/tao/RTCORBA/rtcorba_typedefs.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file rtcorba_typedefs.h
- *
- *  $Id$
- *
- *  TAO specific typedef's moved away from the generated code.
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RTCORBA_TYPEDEFS_H
-#define TAO_RTCORBA_TYPEDEFS_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward references.
-class TAO_Priority_Mapping_Manager;
-class TAO_Priority_Mapping_Manager_var;
-class TAO_Priority_Mapping_Manager_out;
-class TAO_Priority_Mapping;
-class TAO_Network_Priority_Mapping_Manager;
-class TAO_Network_Priority_Mapping_Manager_var;
-class TAO_Network_Priority_Mapping_Manager_out;
-class TAO_Network_Priority_Mapping;
-
-namespace RTCORBA
-{
-  // TAO-specific typedefs
-  typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
-  typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
-  typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
-  typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
-
-  typedef TAO_Network_Priority_Mapping_Manager NetworkPriorityMappingManager;
-  typedef TAO_Network_Priority_Mapping_Manager *NetworkPriorityMappingManager_ptr;
-  typedef TAO_Network_Priority_Mapping_Manager_var NetworkPriorityMappingManager_var;
-  typedef TAO_Network_Priority_Mapping_Manager_out NetworkPriorityMappingManager_out;
-
-  typedef CORBA::Long NetworkPriority;
-
-  typedef TAO_Priority_Mapping PriorityMapping;
-  typedef TAO_Network_Priority_Mapping NetworkPriorityMapping;
-  // End TAO-specific typedef
-}
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_RTCORBA_TYPEDEFS_H*/
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
deleted file mode 100644
index db280bc5b09..00000000000
--- a/TAO/tao/RTPortableServer.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core, rtcorba, portableserver {
-  sharedname   = TAO_RTPortableServer
-  dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
-
-  Source_Files {
-    RTPortableServer
-  }
-
-  Header_Files {
-    RTPortableServer
-  }
-
-  Inline_Files {
-    RTPortableServer
-  }
-
-  Template_Files {
-    RTPortableServer
-  }
-
-  Resource_Files {
-    RTPortableServer
-  }
-
-  PIDL_Files {
-    RTPortableServer
-  }
-
-  Pkgconfig_Files {
-    RTPortableServer/TAO_RTPortableServer.pc.in
-  }
-}
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp
deleted file mode 100644
index a1e3ab95a43..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-// =================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    RTPortableServer.cpp
-//
-// = AUTHOR
-//    Frank Hunleth <fhunleth@cs.wustl.edu>
-//
-// =================================================================
-
-#include "RTPortableServer.h"
-#include "RT_Object_Adapter_Factory.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (RTPortableServer, 
-           RTPortableServer, 
-           "$Id$")
-
-TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
deleted file mode 100644
index 8202b682ad6..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    RTPortableServer.h
- *
- *  $Id$
- *
- *  @author  Frank Hunleth  <fhuntleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RT_PORTABLESERVER_H
-#define TAO_RT_PORTABLESERVER_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtportableserver_export.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/RTCORBA/RTCORBA.h"
-
-class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
-{
-public:
-  /// Constructor.
-  TAO_RTPortableServer_Initializer (void);
-};
-
-static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
-
-#define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "RTPortableServerC.h"
-#undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_PORTABLESERVER_H */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
deleted file mode 100644
index cd06ae858ab..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @file RTPortableServer.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the RTPortableServer module.
- *
- * This file was used to generate the code in RTPortableServerC.{h,cpp}
- * The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl
- *          -o orig -Ge 1 -GA -Sc -Sci
- *          -Wb,export_macro=TAO_RTPortableServer_Export
- *          -Wb,export_include="rtportableserver_export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTPortableServer.pidl
- *
- *   2. The generated files are ready to use
- */
-
-#ifndef _RT_PORTABLE_SERVER_IDL_
-#define _RT_PORTABLE_SERVER_IDL_
-
-#include "tao/PortableServer/PortableServer_include.pidl"
-#include "tao/RTCORBA/RTCORBA_include.pidl"
-
-#pragma prefix "omg.org"
-
-module RTPortableServer
-{
-  local interface POA : PortableServer::POA
-  {
-    Object create_reference_with_priority (in CORBA::RepositoryId intf,
-                                           in RTCORBA::Priority priority)
-    raises (WrongPolicy);
-
-    Object create_reference_with_id_and_priority (in PortableServer::ObjectId oid,
-                                                  in CORBA::RepositoryId intf,
-                                                  in RTCORBA::Priority priority)
-    raises (WrongPolicy);
-
-    PortableServer::ObjectId activate_object_with_priority (in PortableServer::Servant p_servant,
-                                                            in RTCORBA::Priority priority)
-    raises (ServantAlreadyActive, WrongPolicy);
-
-    void activate_object_with_id_and_priority (in PortableServer::ObjectId oid,
-                                               in PortableServer::Servant p_servant,
-                                               in RTCORBA::Priority priority)
-    raises ( ServantAlreadyActive, ObjectAlreadyActive, WrongPolicy );
-  };
-};
-
-#endif /* _RT_PORTABLE_SERVER_IDL_ */
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
deleted file mode 100644
index 268d914e6f7..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RTPortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTPortableServer_POA (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/RTPortableServer/POA:1.0",
-    "POA");
-  
-namespace RTPortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POA =
-    &_tao_tc_RTPortableServer_POA;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTPortableServer::POA>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr _tao_elem
-  )
-{
-  RTPortableServer::POA_ptr _tao_objptr =
-    RTPortableServer::POA::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTPortableServer::POA>::insert (
-      _tao_any,
-      RTPortableServer::POA::_tao_any_destructor,
-      RTPortableServer::_tc_POA,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTPortableServer::POA_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTPortableServer::POA>::extract (
-        _tao_any,
-        RTPortableServer::POA::_tao_any_destructor,
-        RTPortableServer::_tc_POA,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
deleted file mode 100644
index cc437d5e9ba..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "RTPortableServer.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTPortableServer::POA.
-
-RTPortableServer::POA_ptr
-TAO::Objref_Traits<RTPortableServer::POA>::duplicate (
-    RTPortableServer::POA_ptr p
-  )
-{
-  return RTPortableServer::POA::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTPortableServer::POA>::release (
-    RTPortableServer::POA_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTPortableServer::POA_ptr
-TAO::Objref_Traits<RTPortableServer::POA>::nil (void)
-{
-  return RTPortableServer::POA::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTPortableServer::POA>::marshal (
-    RTPortableServer::POA_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTPortableServer::POA::POA (void)
-{}
-
-RTPortableServer::POA::~POA (void)
-{}
-
-void 
-RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POA *_tao_tmp_pointer =
-    static_cast<POA *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-RTPortableServer::POA_ptr
-RTPortableServer::POA::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POA::_nil ();
-    }
-  
-  POA_ptr proxy =
-    dynamic_cast<POA_ptr> (_tao_objref);
-  
-  return POA::_duplicate (proxy);
-}
-
-RTPortableServer::POA_ptr
-RTPortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return POA::_nil ();
-    }
-  
-  POA_ptr proxy =
-    dynamic_cast<POA_ptr> (_tao_objref);
-  
-  return POA::_duplicate (proxy);
-}
-
-RTPortableServer::POA_ptr
-RTPortableServer::POA::_duplicate (POA_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTPortableServer::POA::_tao_release (POA_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTPortableServer::POA::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/POA:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTPortableServer/POA:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTPortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTPortableServer/POA:1.0";
-}
-
-CORBA::Boolean
-RTPortableServer::POA::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
deleted file mode 100644
index c6740079e07..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ /dev/null
@@ -1,279 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
-#define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#ifndef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#error "You should not include RTPortableServerC.h directly, use RTPortableServer.h"
-#endif /* !TAO_RT_PORTABLESERVER_SAFE_INCLUDE */
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "rtportableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableServer/PortableServer_includeC.h"
-#include "tao/RTCORBA/RTCORBA_includeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_RTPortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace RTPortableServer
-{
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
-#define _RTPORTABLESERVER_POA__VAR_OUT_CH_
-
-  class POA;
-  typedef POA *POA_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        POA
-      >
-    POA_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        POA
-      >
-    POA_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTPORTABLESERVER_POA_CH_)
-#define _RTPORTABLESERVER_POA_CH_
-
-  class TAO_RTPortableServer_Export POA
-    : public virtual ::PortableServer::POA
-  {
-  public:
-    typedef POA_ptr _ptr_type;
-    typedef POA_var _var_type;
-
-    // The static operations.
-    static POA_ptr _duplicate (POA_ptr obj);
-
-    static void _tao_release (POA_ptr obj);
-
-    static POA_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static POA_ptr _nil (void)
-    {
-      return static_cast<POA_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr create_reference_with_priority (
-        const char * intf,
-        ::RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Object_ptr create_reference_with_id_and_priority (
-        const ::PortableServer::ObjectId & oid,
-        const char * intf,
-        ::RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::ObjectId * activate_object_with_priority (
-        ::PortableServer::Servant p_servant,
-        ::RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantAlreadyActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void activate_object_with_id_and_priority (
-        const ::PortableServer::ObjectId & oid,
-        ::PortableServer::Servant p_servant,
-        ::RTCORBA::Priority priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableServer::POA::ServantAlreadyActive,
-        ::PortableServer::POA::ObjectAlreadyActive,
-        ::PortableServer::POA::WrongPolicy
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    POA (void);
-    
-    virtual ~POA (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POA (const POA &);
-    
-    void operator= (const POA &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTPortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module RTPortableServer
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_RTPORTABLESERVER_POA__TRAITS_CH_)
-#define _RTPORTABLESERVER_POA__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTPortableServer_Export Objref_Traits< ::RTPortableServer::POA>
-  {
-    static ::RTPortableServer::POA_ptr duplicate (
-        ::RTPortableServer::POA_ptr
-      );
-    static void release (
-        ::RTPortableServer::POA_ptr
-      );
-    static ::RTPortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTPortableServer::POA_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr); // copying
-TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::POA_ptr *); // non-copying
-TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServerS.h b/TAO/tao/RTPortableServer/RTPortableServerS.h
deleted file mode 100644
index 253d03db8a3..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServerS.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_ORIG_RTPORTABLESERVERS_H_
-#define _TAO_IDL_ORIG_RTPORTABLESERVERS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RTPortableServerC.h"
-#include "tao/PortableServer/PortableServer_includeS.h"
-#include "tao/RTCORBA/RTCORBA_includeS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
-
-namespace POA_RTPortableServer
-{
-  
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
-
-} // module RTPortableServer
-
-// TAO_IDL - Generated from 
-// be\be_codegen.cpp:995
-
-
-#if defined (__ACE_INLINE__)
-#include "RTPortableServerS.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
deleted file mode 100644
index d67a85927c7..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file RTPortableServer_include.pidl
- *
- * $Id$
- *
- * @brief Include file for use in applications that need RTPortableServer.pidl.
- *
- * This file just includes RTPortableServer.pidl. The *C.h file generated from
- * this is hand-crafted to itself include RTPortableServer.h instead of
- * RTPortableServerC.h (which will produce a compiler error message if
- * included directly). The RTPortableServer_includeC.h file can then be
- * included directly and automatically by the IDL compiler when
- * building the application.
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *     this is:
- *
- *     tao_idl -o orig -St -Sc -Sp -Sci -SS
- *          -Wb,export_macro=TAO_RTPortableServer_Export \
- *          -Wb,export_include="rtportableserver_export.h" \
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTPortableServer_include.pidl
- *
- *   2. Then change this line in RTPortableServer_includeC.h:
- *
- *          #include "RTPortableServerC.h"
- *
- *      to
- *
- *          #include "RTPortableServer.h"
- */
-
-#ifndef _RTPORTABLESERVER_INCLUDE_IDL_
-#define _RTPORTABLESERVER_INCLUDE_IDL_
-
-///FUZZ: disable check_for_include/
-#include <tao/RTPortableServer/RTPortableServer.pidl>
-
-#endif /* _RTPORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
deleted file mode 100644
index 5b6dbc0d6ca..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_RTPORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_RTPORTABLESERVER_INCLUDEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "rtportableserver_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-
-#include "tao/RTPortableServer/RTPortableServer.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_RTPortableServer_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeS.h b/TAO/tao/RTPortableServer/RTPortableServer_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/RTPortableServer/RTPortableServer_includeS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
deleted file mode 100644
index 0ebc6f73ac2..00000000000
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// @(#) $Id$
-
-#include "RT_Acceptor_Filters.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/Transport_Acceptor.h"
-#include "tao/MProfile.h"
-#include "tao/Profile.h"
-
-ACE_RCSID (RTPortableServer,
-           RT_Acceptor_Filter,
-           "$Id$")
-
-TAO_Server_Protocol_Acceptor_Filter::
-TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
-  : protocols_ (protocols)
-{
-}
-
-int
-TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
-                                                   TAO_MProfile &mprofile,
-                                                   TAO_Acceptor **acceptors_begin,
-                                                   TAO_Acceptor **acceptors_end,
-                                                   CORBA::Short priority)
-{
-  // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines
-  // which protocols get included into IOR and in what order.
-  for (CORBA::ULong j = 0; j < this->protocols_.length (); ++j)
-    {
-      CORBA::ULong protocol_type = this->protocols_[j].protocol_type;
-
-      for (TAO_Acceptor** acceptor = acceptors_begin;
-           acceptor != acceptors_end;
-           ++acceptor)
-        if ((*acceptor)->tag () == protocol_type &&
-            ((*acceptor)->create_profile (object_key,
-                                          mprofile,
-                                          priority) == -1))
-          return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
-{
-  // Encode endpoints.
-  for (CORBA::ULong i = 0;
-       i < mprofile.profile_count ();
-       ++i)
-    {
-      TAO_Profile *profile = mprofile.get_profile (i);
-      if (profile->encode_endpoints () == -1)
-        return -1;
-    }
-
-  return 0;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
deleted file mode 100644
index 2a8cfe9fea0..00000000000
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    RT_Acceptor_Filters.h
- *
- *  $Id$
- *
- *  RTCORBA strategies for populating mprofile.
- *
- *  @author  Marina Spivak <marina@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_RT_ACCEPTOR_FILTER_H
-#define TAO_RT_ACCEPTOR_FILTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "rtportableserver_export.h"
-#include "tao/Acceptor_Filter.h"
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-class TAO_Acceptor;
-
-/**
- * @class TAO_Server_Protocol_Acceptor_Filter
- *
- * @brief Populates mprofile with endpoints selected based on the
- * RTCORBA::ServerProtocolPolicy.
- */
-class TAO_RTPortableServer_Export TAO_Server_Protocol_Acceptor_Filter :
-  public TAO_Acceptor_Filter
-{
-public:
-  /// Constructor
-  TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols);
-
-  /// Populate @a mprofile based on what's in <protocols_>.
-  int fill_profile (const TAO::ObjectKey &object_key,
-                    TAO_MProfile &mprofile,
-                    TAO_Acceptor **acceptors_begin,
-                    TAO_Acceptor **acceptors_end,
-                    CORBA::Short priority);
-
-  /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
-  /// tag component of profiles.
-  int encode_endpoints (TAO_MProfile &mprofile);
-
-private:
-  /// Value of the ServerProtocolPolicy used for endpoint
-  /// selection.
-  RTCORBA::ProtocolList &protocols_;
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
deleted file mode 100644
index a97308a22a2..00000000000
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-#include "tao/RTPortableServer/RT_Collocation_Resolver.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID(RTPortableServer,
-          RT_Collocation_Resolver,
-          "$Id$")
-
-#include "tao/ORB_Core.h"
-#include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/PortableServer/Servant_Upcall.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/Profile.h"
-
-CORBA::Boolean
-TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                            ACE_ENV_ARG_DECL) const
-{
-  // Make sure that the servant is in the same ORB that created this
-  // object.
-  if (!object->_is_collocated ())
-    return 0;
-
-  // Get the orb core.
-  TAO_ORB_Core *orb_core =
-    object->_stubobj ()->servant_orb_var ()->orb_core ();
-
-  // Lookup the target POA.  Note that Object Adapter lock is held
-  // until <servant_upcall> dies.
-  TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core);
-  TAO_Root_POA *poa =
-    servant_upcall.lookup_POA (object->_stubobj ()->object_key ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Get the thread pool associated with this POA.
-  TAO_Thread_Pool *target_thread_pool =
-    static_cast <TAO_Thread_Pool *> (poa->thread_pool ());
-
-  // If the target POA does not have a dedicated thread pool, then all
-  // calls to it are collocated.
-  if (target_thread_pool == 0)
-    return 1;
-
-  /// Get the ORB_Core's TSS resources.
-  TAO_ORB_Core_TSS_Resources &tss =
-    *orb_core->get_tss_resources ();
-
-  // Get the lane for this thread.
-  TAO_Thread_Lane *current_thread_lane =
-    static_cast <TAO_Thread_Lane *> (tss.lane_);
-
-  TAO_Thread_Pool *current_thread_pool = 0;
-
-  // If we don't have a lane, we don't have a pool.
-  if (current_thread_lane)
-    current_thread_pool =
-      &current_thread_lane->pool ();
-
-  // If the pools don't match, then the current thread belongs to a
-  // different pool than POA.  Therefore, this object is not
-  // collocated.
-  if (current_thread_pool != target_thread_pool)
-    return 0;
-
-  // If the current thread and the POA are in the default thread pool,
-  // then the object is collocated.
-  if (current_thread_pool == 0)
-    return 1;
-
-  // If the current thread and the POA are in a thread pool without
-  // lanes, then the object is collocated.
-  if (!current_thread_pool->with_lanes ())
-    return 1;
-
-  // Grab the priority model used by the POA.  Note that this cannot
-  // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
-  // pool with lanes.
-  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
-    poa->priority_model ();
-
-  // If the policy is CLIENT_PROPAGATED, then we are collocated
-  // because the current thread is of the correct priority :-) and
-  // we'll simple use the current thread to run the upcall.
-  if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
-    return 1;
-
-  // Locate the target servant.  We are really not interested in the
-  // servant itself but in the priority that this servant will run at.
-  // Note that the operation name is bogus: it is not used because the
-  // IMPLICIT_ACTIVATION policy is not allowed with SERVER_DECLARED
-  // policy.  Similarly, since there is no implicit activation, there
-  // is no chance of waiting on a condition variable and hence the
-  // <wait_occurred_restart_call_ignored> can be ignored.
-  int wait_occurred_restart_call_ignored = 0;
-
-  poa->locate_servant_i ("operation not used",
-                         servant_upcall.system_id_,
-                         servant_upcall,
-                         servant_upcall.current_context_,
-                         wait_occurred_restart_call_ignored
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Get the priority that the servant will run at.
-  CORBA::Short target_priority =
-    servant_upcall.priority ();
-
-  // If it matches the current thread's priority, then we are
-  // collocated.  Otherwise we are not.
-  if (target_priority == current_thread_lane->lane_priority ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver,
-                       ACE_TEXT ("RT_Collocation_Resolver"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_Collocation_Resolver),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
deleted file mode 100644
index 99d89bff36d..00000000000
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//=============================================================================
-/**
- *  @file    RT_Collocation_Resolver.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_RT_COLLOCATION_RESOLVER_H
-#define TAO_RT_COLLOCATION_RESOLVER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/RTPortableServer/rtportableserver_export.h"
-#include "tao/Collocation_Resolver.h"
-#include "ace/Service_Config.h"
-
-/**
- * @class TAO_RT_Collocation_Resolver
- *
- * @brief This class helps decide on collocation among the maze of
- * thread pools and lanes.
- *
- * \nosubgrouping
- *
- **/
-class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver :
-  public TAO_Collocation_Resolver
-{
-public:
-
-  /// Is @a object collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
-ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_COLLOCATION_RESOLVER_H */
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
deleted file mode 100644
index 84338ec2566..00000000000
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "RT_Object_Adapter_Factory.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/POA_Current.h"
-#include "tao/ORB_Core.h"
-#include "RT_Servant_Dispatcher.h"
-#include "RT_Policy_Validator.h"
-#include "RT_Collocation_Resolver.h"
-
-ACE_RCSID (RTPortableServer,
-           RT_Object_Adapter_Factory,
-           "$Id$")
-
-TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
-{
-}
-
-TAO_Adapter*
-TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
-{
-  // Setup the POA_Current object in the ORB
-  CORBA::Object_var current = new TAO::Portable_Server::POA_Current;
-  orb_core->poa_current (current.in ());
-
-  if (!orb_core->orb_params ()->disable_rt_collocation_resolver ())
-    {
-      // Set the name of the collocation resolver to be RT_Collocation_Resolver.
-      TAO_ORB_Core::set_collocation_resolver (
-          "RT_Collocation_Resolver");
-      ACE_Service_Config::process_directive (
-          ace_svc_desc_TAO_RT_Collocation_Resolver);
-    }
-
-  TAO_Object_Adapter *object_adapter = 0;
-  ACE_NEW_RETURN (object_adapter,
-                  TAO_Object_Adapter (orb_core->server_factory ()->
-                                        active_object_map_creation_parameters (),
-                                      *orb_core),
-                  0);
-
-  // Create and register the RT servant dispatcher.
-  TAO_RT_Servant_Dispatcher *rt_servant_dispatcher = 0;
-  ACE_NEW_RETURN (rt_servant_dispatcher,
-                  TAO_RT_Servant_Dispatcher,
-                  0);
-  object_adapter->servant_dispatcher (rt_servant_dispatcher);
-
-  // Create and add the RT policy validator.
-  TAO_POA_RT_Policy_Validator *rt_validator = 0;
-  ACE_NEW_RETURN (rt_validator,
-                  TAO_POA_RT_Policy_Validator (*orb_core),
-                  0);
-  object_adapter->validator ().add_validator (rt_validator);
-
-  return object_adapter;
-}
-
-ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory,
-                       ACE_TEXT ("TAO_RT_Object_Adapter_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RT_Object_Adapter_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
deleted file mode 100644
index 3b682007428..00000000000
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    RT_Object_Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author  Frank Hunleth
- */
-// ===================================================================
-
-#ifndef TAO_RT_OBJECT_ADAPTER_FACTORY_H
-#define TAO_RT_OBJECT_ADAPTER_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "rtportableserver_export.h"
-
-#include "tao/PortableServer/Object_Adapter_Factory.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory : public TAO_Object_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_RT_Object_Adapter_Factory (void);
-
-  /// Create adapter.
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_RT_Object_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory)
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_OBJECT_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
deleted file mode 100644
index 43dd02f08cb..00000000000
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ /dev/null
@@ -1,954 +0,0 @@
-// @(#) $Id$
-
-#include "RT_POA.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_Acceptor_Filters.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-#include "tao/Stub.h"
-#include "tao/Policy_Manager.h"
-#include "tao/debug.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Thread_Lane_Resources_Manager.h"
-
-#include "tao/RTCORBA/RT_Policy_i.h"
-
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/RTPortableServer/RT_Policy_Validator.h"
-
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RT_POA.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (RTPortableServer,
-           RT_POA,
-           "$Id$")
-
-TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
-                        TAO_POA_Manager &poa_manager,
-                        const TAO_POA_Policy_Set &policies,
-                        TAO_Root_POA *parent,
-                        ACE_Lock &lock,
-                        TAO_SYNCH_MUTEX &thread_lock,
-                        TAO_ORB_Core &orb_core,
-                        TAO_Object_Adapter *object_adapter
-                        ACE_ENV_ARG_DECL)
-  : TAO_Regular_POA (name,
-                     poa_manager,
-                     policies,
-                     parent,
-                     lock,
-                     thread_lock,
-                     orb_core,
-                     object_adapter
-                     ACE_ENV_ARG_PARAMETER),
-  thread_pool_ (0)
-{
-  ACE_CHECK;
-
-  // Parse the RT policies and update our policy cache.
-  this->parse_rt_policies (this->policies ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_RT_POA::~TAO_RT_POA (void)
-{
-}
-
-TAO_Root_POA *
-TAO_RT_POA::new_POA (const String &name,
-                     TAO_POA_Manager &poa_manager,
-                     const TAO_POA_Policy_Set &policies,
-                     TAO_Root_POA *parent,
-                     ACE_Lock &lock,
-                     TAO_SYNCH_MUTEX &thread_lock,
-                     TAO_ORB_Core &orb_core,
-                     TAO_Object_Adapter *object_adapter
-                     ACE_ENV_ARG_DECL)
-{
-  TAO_RT_POA *poa;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_RT_POA (name,
-                                poa_manager,
-                                policies,
-                                parent,
-                                lock,
-                                thread_lock,
-                                orb_core,
-                                object_adapter
-                                ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return poa;
-}
-
-void
-TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
-                               ACE_ENV_ARG_DECL)
-{
-  {
-    CORBA::Policy_var policy =
-      policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    RTCORBA::PriorityModelPolicy_var priority_model =
-      RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (!CORBA::is_nil (priority_model.in ()))
-      {
-        RTCORBA::PriorityModel rt_priority_model =
-          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-        this->cached_policies_.priority_model (
-          TAO::Portable_Server::Cached_Policies::PriorityModel (rt_priority_model));
-
-        RTCORBA::Priority priority =
-          priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-        this->cached_policies_.server_priority (priority);
-      }
-  }
-
-  this->thread_pool_ =
-    TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
-                                                      policies.policies ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_POA::validate_priority (RTCORBA::Priority priority
-                               ACE_ENV_ARG_DECL)
-{
-  if (priority < RTCORBA::minPriority
-           // The line below will always be false unless the value of
-           // RTCORBA::maxPriority, which is now assigned the value of
-           // 32767, is changed in RTCORBA.pidl.
-//      || priority > RTCORBA::maxPriority
-     )
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  // If this POA is using a thread pool with lanes, make sure the
-  // priority matches one of the thread lanes.  Note that in this
-  // case, bands do not matter since matching the lanes priority is a
-  // stricter condition than meeting the band ranges.  In addition,
-  // when the POA was created, the bands had to match the lanes.
-  if (this->thread_pool_ != 0 &&
-      this->thread_pool_->with_lanes ())
-    {
-      TAO_Thread_Lane **lanes =
-        this->thread_pool_->lanes ();
-
-      for (CORBA::ULong i = 0;
-           i != this->thread_pool_->number_of_lanes ();
-           ++i)
-        {
-          if (lanes[i]->lane_priority () == priority)
-            return;
-        }
-
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-  else
-    // Else we are dealing with a thread pool without lanes.
-    {
-      // Check if we have bands.
-      CORBA::Policy_var bands =
-        this->policies ().get_cached_policy (
-          TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      TAO_PriorityBandedConnectionPolicy *priority_bands_i =
-        dynamic_cast <TAO_PriorityBandedConnectionPolicy *>
-                          (priority_bands.in ());
-
-      if (priority_bands_i)
-        {
-          // If we do have bands, make sure that the priority is
-          // matching one of the bands.
-          RTCORBA::PriorityBands &bands =
-            priority_bands_i->priority_bands_rep ();
-
-          for (CORBA::ULong i = 0;
-               i < bands.length ();
-               ++i)
-            {
-              if (bands[i].low <= priority &&
-                  bands[i].high >= priority)
-                return;
-            }
-
-          ACE_THROW (CORBA::BAD_PARAM ());
-        }
-    }
-}
-
-void
-TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // For each of the above operations, if the POA supports the
-  // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
-  // the ORB shall raise a WrongPolicy user exception. This relieves
-  // an ORB implementation of the need to retrieve the target object's
-  // priority from "somewhere" when a request arrives for an inactive
-  // object.
-  if (this->cached_policies_.implicit_activation () ==
-      PortableServer::IMPLICIT_ACTIVATION)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // For each of the above operations, if the POA does not support the
-  // SERVER_DECLARED option for the PriorityModelPolicy then the ORB
-  // shall raise a WrongPolicy user exception.
-  if (this->cached_policies_.priority_model () !=
-      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // In all other respects the semantics of the corresponding
-  // (i.e. without the name extensions "_with_priority" and
-  // "_and_priority") PortableServer::POA operations shall be
-  // observed.
-}
-
-TAO_Stub *
-TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
-                           const char *type_id,
-                           CORBA::Short priority
-                           ACE_ENV_ARG_DECL)
-{
-  // Client exposed policies.
-  CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Server protocol policy.
-  CORBA::Policy_var protocol =
-    this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_ServerProtocolPolicy *server_protocol =
-    dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
-
-  // Filter for server protocol.
-  TAO_Server_Protocol_Acceptor_Filter filter (server_protocol->protocols_rep ());
-
-  // If this POA is using the default thread pool or a thread pool
-  // without lanes, create the IOR with the acceptors in the thread
-  // pool.
-  if (this->thread_pool_ == 0 ||
-      !this->thread_pool_->with_lanes ())
-    {
-      TAO_Acceptor_Registry *acceptor_registry = 0;
-
-      if (this->thread_pool_ == 0)
-        {
-          TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
-            this->orb_core_.thread_lane_resources_manager ();
-
-          TAO_Thread_Lane_Resources &resources =
-            thread_lane_resources_manager.default_lane_resources ();
-
-          acceptor_registry =
-            &resources.acceptor_registry ();
-        }
-      else
-        {
-          TAO_Thread_Lane **lanes =
-            this->thread_pool_->lanes ();
-
-          TAO_Thread_Lane_Resources &resources =
-            lanes[0]->resources ();
-
-          acceptor_registry =
-            &resources.acceptor_registry ();
-        }
-
-      return
-        this->TAO_Regular_POA::create_stub_object (object_key,
-                                           type_id,
-                                           client_exposed_policies._retn (),
-                                           &filter,
-                                           *acceptor_registry
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-
-  // If this POA has the SERVER_DECLARED policy, create the IOR with
-  // the acceptors in the only thread lane that matches the priority
-  // of the object.
-  if (this->cached_policies_.priority_model () ==
-      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
-    {
-      TAO_Thread_Lane **lanes =
-        this->thread_pool_->lanes ();
-
-      for (CORBA::ULong i = 0;
-           i != this->thread_pool_->number_of_lanes ();
-           ++i)
-        {
-          if (lanes[i]->lane_priority () == priority)
-            return this->TAO_Regular_POA::create_stub_object (object_key,
-                                                      type_id,
-                                                      client_exposed_policies._retn (),
-                                                      &filter,
-                                                      lanes[i]->resources ().acceptor_registry ()
-                                                      ACE_ENV_ARG_PARAMETER);
-        }
-
-      ACE_ASSERT (0);
-    }
-
-  // If this POA has the CLIENT_PROPAGATED policy, create the IOR with
-  // the acceptors in the thread lanes that matches the bands in this
-  // POA.  If there are no bands, all the thread lanes are used.
-  CORBA::Policy_var bands =
-    this->policies ().get_cached_policy (
-      TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_PriorityBandedConnectionPolicy *priority_bands_i =
-    dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
-
-  return this->create_stub_object (object_key,
-                                   type_id,
-                                   client_exposed_policies._retn (),
-                                   &filter,
-                                   priority_bands_i
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_Stub *
-TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
-                                const char *type_id,
-                                CORBA::PolicyList *policy_list,
-                                TAO_Acceptor_Filter *filter,
-                                TAO_PriorityBandedConnectionPolicy *priority_bands
-                                ACE_ENV_ARG_DECL)
-{
-  int error = 0;
-
-  // Count the number of endpoints.
-  size_t profile_count =
-    this->endpoint_count ();
-
-  // Create a profile container and have acceptor registries populate
-  // it with profiles as appropriate.
-  TAO_MProfile mprofile (0);
-
-  // Allocate space for storing the profiles.  There can never be more
-  // profiles than there are endpoints.  In some cases, there can be
-  // less profiles than endpoints.
-  int result =
-    mprofile.set (static_cast <CORBA::ULong> (profile_count));
-  if (result == -1)
-    error = 1;
-
-  TAO_Thread_Lane **lanes =
-    this->thread_pool_->lanes ();
-
-  // Leave it to the filter to decide which acceptors/in which order
-  // go into the mprofile.
-  for (CORBA::ULong i = 0;
-       i != this->thread_pool_->number_of_lanes () &&
-         !error;
-       ++i)
-    {
-      if (this->lane_required (lanes[i],
-                               priority_bands))
-        {
-          TAO_Acceptor_Registry &acceptor_registry =
-            lanes[i]->resources ().acceptor_registry ();
-
-          result =
-            filter->fill_profile (object_key,
-                                  mprofile,
-                                  acceptor_registry.begin (),
-                                  acceptor_registry.end (),
-                                  lanes[i]->lane_priority ());
-          if (result == -1)
-            error = 1;
-        }
-    }
-
-  if (!error)
-    result = filter->encode_endpoints (mprofile);
-  if (result == -1)
-    error = 1;
-
-  if (error)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  // Make sure we have at least one profile.  <mp> may end up being
-  // empty if none of the acceptor endpoints have the right priority
-  // for this object, for example.
-  if (mprofile.profile_count () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  return
-    this->orb_core_.create_stub_object (mprofile,
-                                        type_id,
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-size_t
-TAO_RT_POA::endpoint_count (void)
-{
-  size_t profile_count = 0;
-
-  TAO_Thread_Lane **lanes =
-    this->thread_pool_->lanes ();
-
-  for (CORBA::ULong i = 0;
-       i != this->thread_pool_->number_of_lanes ();
-       ++i)
-    profile_count +=
-      lanes[i]->resources ().acceptor_registry ().endpoint_count ();
-
-  return profile_count;
-}
-
-int
-TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
-                           TAO_PriorityBandedConnectionPolicy *priority_bands)
-{
-  if (priority_bands == 0)
-    return 1;
-
-  RTCORBA::PriorityBands &bands =
-    priority_bands->priority_bands_rep ();
-
-  for (CORBA::ULong i = 0;
-       i < bands.length ();
-       ++i)
-    {
-      if (bands[i].low <= lane->lane_priority () &&
-          bands[i].high >= lane->lane_priority ())
-        return 1;
-    }
-
-  return 0;
-}
-
-CORBA::PolicyList *
-TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
-                                     ACE_ENV_ARG_DECL)
-{
-  CORBA::PolicyList *client_exposed_policies = 0;
-  ACE_NEW_THROW_EX (client_exposed_policies,
-                    CORBA::PolicyList (),
-                    CORBA::NO_MEMORY (TAO::VMCID,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::PolicyList_var safe_client_exposed_policies = client_exposed_policies;
-
-  // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Check if the priority model policy has been set, and if so, let
-  // the client know about it.
-  CORBA::Short poa_priority =
-    this->cached_policies_.server_priority ();
-
-  if (poa_priority != TAO_INVALID_PRIORITY)
-    {
-      TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
-        this->cached_policies_.priority_model ();
-
-      // If the priority model is client propagated, let the client
-      // about the default server priority (the POA priority).  If
-      // the priority model is server declared, tell the client the
-      // servant's priority.
-      CORBA::Short priority;
-      if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
-        priority = poa_priority;
-      else
-        priority = object_priority;
-
-      const CORBA::ULong current_length =
-        client_exposed_policies->length ();
-      client_exposed_policies->length (current_length + 1);
-
-      TAO_PriorityModelPolicy *priority_model_policy;
-      ACE_NEW_THROW_EX (priority_model_policy,
-                        TAO_PriorityModelPolicy (RTCORBA::PriorityModel (priority_model),
-                                                 priority),
-                        CORBA::NO_MEMORY (TAO::VMCID,
-                                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      (*client_exposed_policies)[current_length] = priority_model_policy;
-    }
-
-  return safe_client_exposed_policies._retn ();
-}
-
-
-// Standard POA interfaces
-PortableServer::POA_ptr
-TAO_RT_POA::create_POA (const char *adapter_name,
-                        PortableServer::POAManager_ptr poa_manager,
-                        const CORBA::PolicyList &policies
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
-                                                           poa_manager,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
-  return poa;
-}
-
-PortableServer::POA_ptr
-TAO_RT_POA::find_POA (const char *adapter_name,
-                      CORBA::Boolean activate_it
-                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
-                                                         activate_it
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
-  return poa;
-}
-
-void
-TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_Regular_POA::destroy (etherealize_objects,
-                          wait_for_completion
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ThreadPolicy_ptr
-TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_Regular_POA::create_thread_policy (value
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-PortableServer::LifespanPolicy_ptr
-TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_Regular_POA::create_lifespan_policy (value
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_uniqueness_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_assignment_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_Regular_POA::create_implicit_activation_policy (value
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_Regular_POA::create_servant_retention_policy (value
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_Regular_POA::create_request_processing_policy (value
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
-  return policy;
-}
-
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-char *
-TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  char * name =
-    this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (name);
-  return name;
-}
-
-PortableServer::POA_ptr
-TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POA_ptr parent =
-    this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (parent);
-  return parent;
-}
-
-PortableServer::POAList *
-TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POAList *children =
-    this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (children);
-  return children;
-}
-
-PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POAManager_ptr poa_manager =
-    this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa_manager);
-  return poa_manager;
-}
-
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::AdapterActivator_ptr activator =
-    this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (activator);
-  return activator;
-}
-
-void
-TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->TAO_Regular_POA::the_activator (adapter_activator
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant_manager);
-  return servant_manager;
-}
-
-void
-TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->TAO_Regular_POA::set_servant_manager (imgr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-PortableServer::Servant
-TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
-  return servant;
-}
-
-void
-TAO_RT_POA::set_servant (PortableServer::Servant servant
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->TAO_Regular_POA::set_servant (servant
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-PortableServer::ObjectId *
-TAO_RT_POA::activate_object (PortableServer::Servant p_servant
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::activate_object (p_servant
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
-  return object_id;
-}
-
-void
-TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                     PortableServer::Servant p_servant
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->TAO_Regular_POA::activate_object_with_id (id,
-                                          p_servant
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->TAO_Regular_POA::deactivate_object (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object_ptr
-TAO_RT_POA::create_reference (const char *intf
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference (intf
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
-  return obj;
-}
-
-CORBA::Object_ptr
-TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                      const char *intf
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference_with_id (oid,
-                                             intf
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
-  return obj;
-}
-
-PortableServer::ObjectId *
-TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::servant_to_id (p_servant
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
-  return object_id;
-}
-
-CORBA::Object_ptr
-TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::servant_to_reference (p_servant
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
-  return obj;
-}
-
-
-PortableServer::Servant
-TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::reference_to_servant (reference
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
-  return servant;
-}
-
-PortableServer::ObjectId *
-TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::reference_to_id (reference
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
-  return object_id;
-}
-
-PortableServer::Servant
-TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  PortableServer::Servant servant =
-    this->TAO_Regular_POA::id_to_servant (oid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
-  return servant;
-}
-
-CORBA::Object_ptr
-TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::id_to_reference (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
-  return obj;
-}
-
-CORBA::OctetSeq *
-TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
deleted file mode 100644
index d3bbb2816d9..00000000000
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    RT_POA.h
- *
- *  $Id$
- *
- *  RT_POA
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_RT_POA_H
-#define TAO_RT_POA_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtportableserver_export.h"
-
-#include "tao/PortableServer/Regular_POA.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "RTPortableServerC.h"
-#undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Thread_Pool;
-class TAO_Thread_Lane;
-class TAO_PriorityBandedConnectionPolicy;
-
-class TAO_RTPortableServer_Export TAO_RT_POA :
-  public virtual RTPortableServer::POA,
-  public virtual TAO_Regular_POA
-{
-public:
-
-  // RTCORBA specific methods
-  CORBA::Object_ptr create_reference_with_priority (const char * intf,
-                                                    RTCORBA::Priority priority
-                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                                           const char * intf,
-                                                           RTCORBA::Priority priority
-                                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
-                                                            RTCORBA::Priority priority
-                                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                             PortableServer::Servant p_servant,
-                                             RTCORBA::Priority priority
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-  // End RTCORBA specific methods
-
-  // Standard POA interface methods
-  PortableServer::POA_ptr create_POA (const char *adapter_name,
-                                      PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterAlreadyExists,
-                     PortableServer::POA::InvalidPolicy));
-
-  PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::AdapterNonExistent));
-
-  void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
-                     PortableServer::POA::ObjectAlreadyActive,
-                     PortableServer::POA::WrongPolicy));
-
-  void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongAdapter,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // End standard POA interface methods.
-
-  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
-                                                      ACE_ENV_ARG_DECL);
-
-  TAO_RT_POA (const String &name,
-              TAO_POA_Manager &poa_manager,
-              const TAO_POA_Policy_Set &policies,
-              TAO_Root_POA *parent,
-              ACE_Lock &lock,
-              TAO_SYNCH_MUTEX &thread_lock,
-              TAO_ORB_Core &orb_core,
-              TAO_Object_Adapter *object_adapter
-              ACE_ENV_ARG_DECL);
-
-  virtual ~TAO_RT_POA (void);
-
-  void *thread_pool (void) const;
-
-protected:
-
-  /// Template method for creating new POA's of this type.
-  virtual TAO_Root_POA *new_POA (const String &name,
-                            TAO_POA_Manager &poa_manager,
-                            const TAO_POA_Policy_Set &policies,
-                            TAO_Root_POA *parent,
-                            ACE_Lock &lock,
-                            TAO_SYNCH_MUTEX &thread_lock,
-                            TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
-
-  virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key,
-                                   const char *type_id,
-                                   CORBA::Short priority
-                                   ACE_ENV_ARG_DECL);
-
-  void validate_priority (RTCORBA::Priority priority
-                          ACE_ENV_ARG_DECL);
-
-  void validate_policies (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Parse the policy list for RT policies and update our
-  /// cached policy instance.
-  void parse_rt_policies (TAO_POA_Policy_Set &policies
-                          ACE_ENV_ARG_DECL);
-
-  size_t endpoint_count (void);
-
-  TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
-                                const char *type_id,
-                                CORBA::PolicyList *policy_list,
-                                TAO_Acceptor_Filter *filter,
-                                TAO_PriorityBandedConnectionPolicy *priority_bands
-                                ACE_ENV_ARG_DECL);
-
-  int lane_required (TAO_Thread_Lane *lane,
-                     TAO_PriorityBandedConnectionPolicy *priority_bands);
-
-  TAO_Thread_Pool *thread_pool_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__ACE_INLINE__)
-# include "RT_POA.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POA_H */
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
deleted file mode 100644
index a0c51ad2e6d..00000000000
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-// Exception macros
-#include "tao/PortableServer/poa_macros.h"
-#include "tao/PortableServer/POA_Guard.h"
-#include "tao/Environment.h"
-
-ACE_INLINE CORBA::Object_ptr
-TAO_RT_POA::create_reference_with_priority (const char * intf,
-                                            RTCORBA::Priority priority
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->create_reference_i (intf,
-                                   priority
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                                   const char * intf,
-                                                   RTCORBA::Priority priority
-                                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->create_reference_with_id_i (oid,
-                                           intf,
-                                           priority
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
-                                           RTCORBA::Priority priority
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (0);
-
-      PortableServer::ObjectId *result =
-        this->activate_object_i (servant,
-                                 priority,
-                                 wait_occurred_restart_call
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return result;
-    }
-}
-
-ACE_INLINE void
-TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
-                                                  PortableServer::Servant servant,
-                                                  RTCORBA::Priority priority
-                                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD;
-
-      this->activate_object_with_id_i (oid,
-                                       servant,
-                                       priority,
-                                       wait_occurred_restart_call
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return;
-    }
-}
-
-ACE_INLINE void *
-TAO_RT_POA::thread_pool (void) const
-{
-  return this->thread_pool_;
-}
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
deleted file mode 100644
index b05334a0dbe..00000000000
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-#include "RT_Policy_Validator.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/PortableServer/POA_Cached_Policies.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/RTCORBA/RT_Policy_i.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/RTCORBA/RT_ORB.h"
-#include "tao/Thread_Lane_Resources_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/ORB_Core.h"
-#include "tao/Policy_Set.h"
-#include "tao/Transport_Acceptor.h"
-
-ACE_RCSID (RTPortableServer,
-           RT_Policy_Validator,
-           "$Id$")
-
-TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core)
-  : TAO_Policy_Validator (orb_core),
-    thread_pool_ (0)
-{
-  // No-Op.
-}
-
-TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
-{
-  // No-Op.
-}
-
-void
-TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                            ACE_ENV_ARG_DECL)
-{
-  this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->validate_priorities (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Boolean
-TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
-{
-  return (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
-          type == RTCORBA::THREADPOOL_POLICY_TYPE ||
-          type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE ||
-          type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE ||
-          type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE);
-}
-
-void
-TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
-                                                       ACE_ENV_ARG_DECL)
-{
-  // Make sure we have an endpoint for at least one of the protocols
-  // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
-  // will be able to create non-nil object references.
-  CORBA::Policy_var protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (protocol.in ()))
-    {
-      // If the server protocol policy has not been specified, then
-      // add a server policy that reflects the protocols supported by
-      // the acceptor registries of the POA's thread pool.
-      protocol =
-        TAO_POA_RT_Policy_Validator::server_protocol_policy_from_thread_pool (this->thread_pool_,
-                                                                              this->orb_core_);
-
-      if (!CORBA::is_nil (protocol.in ()))
-        {
-          // If so, we'll use that policy.
-          policies.set_policy (protocol.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_ServerProtocolPolicy *server_protocol =
-    dynamic_cast <TAO_ServerProtocolPolicy *>
-                      (server_protocol_policy.in ());
-
-  RTCORBA::ProtocolList &protocols =
-    server_protocol->protocols_rep ();
-
-  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-    {
-      int found = 0;
-      CORBA::ULong protocol_type = protocols[j].protocol_type;
-
-      if (this->thread_pool_)
-        {
-          TAO_Thread_Lane **lanes =
-            this->thread_pool_->lanes ();
-
-          for (CORBA::ULong i = 0;
-               i != this->thread_pool_->number_of_lanes ();
-               ++i)
-            {
-              TAO_Thread_Lane_Resources &resources =
-                lanes[i]->resources ();
-
-              TAO_Acceptor_Registry &acceptor_registry =
-                resources.acceptor_registry ();
-
-              for (TAO_AcceptorSetIterator a = acceptor_registry.begin ();
-                   a != acceptor_registry.end ();
-                   ++a)
-                {
-                  if ((*a)->tag () == protocol_type)
-                    {
-                      found = 1;
-                      break;
-                    }
-                }
-            }
-        }
-      else
-        {
-          TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
-            this->orb_core_.thread_lane_resources_manager ();
-
-          TAO_Thread_Lane_Resources &resources =
-            thread_lane_resources_manager.default_lane_resources ();
-
-          TAO_Acceptor_Registry &acceptor_registry =
-            resources.acceptor_registry ();
-
-          for (TAO_AcceptorSetIterator a = acceptor_registry.begin ();
-               a != acceptor_registry.end ();
-               ++a)
-            {
-              if ((*a)->tag () == protocol_type)
-                {
-                  found = 1;
-                  break;
-                }
-            }
-        }
-
-      if (!found)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
-    }
-}
-
-void
-TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
-{
-  // Initialize to the default priority/priority model.
-  CORBA::Short priority =
-    TAO_INVALID_PRIORITY;
-  TAO::Portable_Server::Cached_Policies::PriorityModel rt_priority_model =
-    TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED;
-
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  RTCORBA::PriorityModelPolicy_var priority_model =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (priority_model.in ()))
-    {
-      priority = priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      rt_priority_model =
-        TAO::Portable_Server::Cached_Policies::PriorityModel (
-          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-
-      // Check that the priority is in bounds.
-      if (priority < RTCORBA::minPriority
-               // The line below will always be false unless the value of
-               // RTCORBA::maxPriority, which is now assigned the value of
-               // 32767, is changed in RTCORBA.pidl.
-//          || priority > RTCORBA::maxPriority
-         )
-        {
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        }
-    }
-  else
-    // If priority model was not specified, then we better not have a
-    // thread pool with lanes.
-    {
-      if (this->thread_pool_ != 0 &&
-          this->thread_pool_->with_lanes ())
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
-    }
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_PriorityBandedConnectionPolicy *bands_policy =
-    dynamic_cast<TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
-
-  // If priority banded connections are set, make sure that:
-  //  0. A priority model was specified.
-  //  1. There is at least one band.
-  //  2a. low is not < RTCORBA::minPriority
-  //  2b. low <= high
-  //  2c. high is not > RTCORBA::maxPriority
-  //  3. If priority model is SERVER_DECLARED, server_priority must
-  //  match one of the bands.
-  //  4. If this POA has a thread pool with lanes, then for each band,
-  //  there must be at least one thread lane that can service it,
-  //  i.e., whose priority falls into the band's range.
-  if (bands_policy != 0)
-    {
-      // Checks 0.
-      if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-      RTCORBA::PriorityBands &bands =
-        bands_policy->priority_bands_rep ();
-
-      // Checks 1.
-      if (bands.length () == 0)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-      // Checks 2.
-      for (CORBA::ULong i = 0; i < bands.length (); ++i)
-        {
-          //  2a. low is not < RTCORBA::minPriority
-          //  2b. low is not > high
-          //  2c. high is not > RTCORBA::maxPriority
-          if (bands[i].low < RTCORBA::minPriority
-              || bands[i].low > bands[i].high
-                   // The line below will always be false unless the value of
-                   // RTCORBA::maxPriority, which is now assigned the value of
-                   // 32767, is changed in RTCORBA.pidl.
-//              || bands[i].high > RTCORBA::maxPriority
-             )
-            {
-              ACE_THROW (PortableServer::POA::InvalidPolicy ());
-            }
-        }
-
-      // Check 3.
-      if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
-        {
-          int match = 0;
-          for (CORBA::ULong i = 0; i < bands.length (); ++i)
-            {
-              if (priority <= bands[i].high &&
-                  priority >= bands[i].low)
-                {
-                  match = 1;
-                  break;
-                }
-            }
-
-          if (!match)
-            ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        }
-
-      //
-      // Check 4.
-      //
-
-      // If this POA is using the default thread pool (which doesn't
-      // have lanes) or a thread pool without lanes, we are done with
-      // the checks.
-      if (this->thread_pool_ == 0 ||
-          !this->thread_pool_->with_lanes ())
-        return;
-
-      // If this POA is using a thread pool with lanes, make sure we
-      // have at least one thread lane that corresponds to these
-      // each band.
-      TAO_Thread_Lane **lanes =
-        this->thread_pool_->lanes ();
-
-      for (CORBA::ULong band = 0;
-           band < bands.length ();
-           ++band)
-        {
-          int match = 0;
-          for (CORBA::ULong lane = 0;
-               lane != this->thread_pool_->number_of_lanes () && !match;
-               ++lane)
-            {
-              CORBA::Short lane_priority =
-                lanes[lane]->lane_priority ();
-
-              if (lane_priority <= bands[band].high &&
-                  lane_priority >= bands[band].low)
-                match = 1;
-            }
-          if (!match)
-            ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        }
-
-      // Done with checks.
-      return;
-    }
-
-  // If priority banded connections are not set, and the priority
-  // model is SERVER_DECLARED, make sure we have at least one thread
-  // lane that can provide service for the specified SERVER_DECLARED
-  // priority.
-  if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
-    {
-      // If this POA is using the default thread pool (which doesn't
-      // have lanes) or a thread pool without lanes, we are done with
-      // the checks.
-      if (this->thread_pool_ == 0 ||
-          !this->thread_pool_->with_lanes ())
-        return;
-
-      // If this POA is using a thread pool with lanes, make sure we
-      // have at least one thread lane that can provide service for
-      // the specified SERVER_DECLARED priority.
-      TAO_Thread_Lane **lanes =
-        this->thread_pool_->lanes ();
-
-      int match = 0;
-      for (CORBA::ULong lane = 0;
-           lane != this->thread_pool_->number_of_lanes () && !match;
-           ++lane)
-        {
-          CORBA::Short lane_priority =
-            lanes[lane]->lane_priority ();
-
-          if (lane_priority <= priority &&
-              lane_priority >= priority)
-            match = 1;
-        }
-      if (!match)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-      // Done with checks.
-      return;
-    }
-
-}
-
-void
-TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
-                                                   ACE_ENV_ARG_DECL)
-{
-  this->thread_pool_ =
-    TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
-{
-  // Check if the user has specified the priority model policy.
-  CORBA::Policy_var priority_model =
-    policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (priority_model.in ()))
-    {
-      // If not, check if the priority model policy has been specified
-      // at the ORB level.
-      priority_model =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (priority_model.in ()))
-        {
-          // If so, we'll use that policy.
-          policies.set_policy (priority_model.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  // Check if the user has specified the server protocol policy.
-  CORBA::Policy_var server_protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (server_protocol.in ()))
-    {
-      // If not, check if the server protocol policy has been
-      // specified at the ORB level.
-      server_protocol =
-        this->orb_core_.get_cached_policy (
-          TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (server_protocol.in ()))
-        {
-          // If so, we'll use that policy.
-          policies.set_policy (server_protocol.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  // Check if the user has specified the thread pool policy.
-  CORBA::Policy_var thread_pool =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (thread_pool.in ()))
-    {
-      // If not, check if the thread pool policy has been specified at
-      // the ORB level.
-      thread_pool =
-        this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (!CORBA::is_nil (thread_pool.in ()))
-        {
-          // If so, we'll use that policy.
-          policies.set_policy (thread_pool.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-}
-
-/* static */
-RTCORBA::ServerProtocolPolicy_ptr
-TAO_POA_RT_Policy_Validator::server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool,
-                                                                      TAO_ORB_Core &orb_core)
-{
-  RTCORBA::ProtocolList protocols;
-
-  if (thread_pool)
-    {
-      TAO_Thread_Lane **lanes =
-        thread_pool->lanes ();
-
-      for (CORBA::ULong i = 0;
-           i != thread_pool->number_of_lanes ();
-           ++i)
-        {
-          TAO_Thread_Lane_Resources &resources =
-            lanes[i]->resources ();
-
-          TAO_Acceptor_Registry &acceptor_registry =
-            resources.acceptor_registry ();
-
-          TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (protocols,
-                                                                                      acceptor_registry,
-                                                                                      orb_core);
-        }
-    }
-  else
-    {
-      TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager =
-        orb_core.thread_lane_resources_manager ();
-
-      TAO_Thread_Lane_Resources &resources =
-        thread_lane_resources_manager.default_lane_resources ();
-
-      TAO_Acceptor_Registry &acceptor_registry =
-        resources.acceptor_registry ();
-
-      TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (protocols,
-                                                                                  acceptor_registry,
-                                                                                  orb_core);
-    }
-
-  // Set ServerProtocolPolicy.
-  TAO_ServerProtocolPolicy *server_protocol_policy = 0;
-  ACE_NEW_RETURN (server_protocol_policy,
-                  TAO_ServerProtocolPolicy (protocols),
-                  0);
-
-  return server_protocol_policy;
-}
-
-/* static */
-void
-TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (RTCORBA::ProtocolList &protocols,
-                                                                            TAO_Acceptor_Registry &acceptor_registry,
-                                                                            TAO_ORB_Core &orb_core)
-{
-  TAO_AcceptorSetIterator end =
-    acceptor_registry.end ();
-
-  for (TAO_AcceptorSetIterator acceptor =
-         acceptor_registry.begin ();
-       acceptor != end;
-       ++acceptor)
-    {
-      if (*acceptor == 0)
-        continue;
-
-      CORBA::ULong current_length =
-        protocols.length ();
-
-      // Make sure that this protocol is not already in the protocol
-      // list.
-      bool protocol_already_present = false;
-      for (CORBA::ULong i = 0;
-           i < current_length && !protocol_already_present;
-           ++i)
-        {
-          if (protocols[i].protocol_type == (*acceptor)->tag ())
-            protocol_already_present = true;
-        }
-
-      if (protocol_already_present)
-        continue;
-
-      protocols.length (current_length + 1);
-
-      protocols[current_length].protocol_type =
-        (*acceptor)->tag ();
-
-      protocols[current_length].orb_protocol_properties =
-        RTCORBA::ProtocolProperties::_nil ();
-
-      protocols[current_length].transport_protocol_properties =
-        TAO_Protocol_Properties_Factory::create_transport_protocol_property ((*acceptor)->tag (),
-                                                                             &orb_core);
-    }
-}
-
-/* static */
-TAO_Thread_Pool *
-TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
-                                                  TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
-    RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (CORBA::is_nil (thread_pool_policy.in ()))
-    return 0;
-
-  RTCORBA::ThreadpoolId thread_pool_id =
-    thread_pool_policy->threadpool (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Get the RTORB.
-  CORBA::Object_var object =
-    orb_core.resolve_rt_orb (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_RT_ORB *tao_rt_orb =
-    dynamic_cast <TAO_RT_ORB *> (rt_orb.in ());
-
-  TAO_Thread_Pool_Manager &tp_manager =
-    tao_rt_orb->tp_manager ();
-
-  TAO_Thread_Pool_Manager::THREAD_POOLS &thread_pools =
-    tp_manager.thread_pools ();
-
-  // Check that the thread pool id is valid.
-  TAO_Thread_Pool *thread_pool = 0;
-  int result =
-    thread_pools.find (thread_pool_id,
-                       thread_pool);
-
-  if (result != 0)
-    ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (),
-                      0);
-
-  return thread_pool;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
deleted file mode 100644
index 2c282de4271..00000000000
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//=============================================================================
-/**
- *  @file    RT_Policy_Validator.h
- *
- *  $Id$
- *
- *  This file contains the declaration for the RTCORBA policy validator.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Frank Hunleth  <fhuntleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RT_POLICY_VALIDATOR_H_
-#define TAO_RT_POLICY_VALIDATOR_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "rtportableserver_export.h"
-#include "tao/Policy_Validator.h"
-#include "tao/RTCORBA/RTCORBA.h"
-
-class TAO_ORB_Core;
-class TAO_Acceptor_Registry;
-class TAO_Thread_Pool;
-
-class TAO_RTPortableServer_Export TAO_POA_RT_Policy_Validator
-  : public TAO_Policy_Validator
-{
-public:
-  /// Constructor.
-  TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  ~TAO_POA_RT_Policy_Validator (void);
-
-  static RTCORBA::ServerProtocolPolicy_ptr server_protocol_policy_from_thread_pool (TAO_Thread_Pool *thread_pool,
-                                                                                    TAO_ORB_Core &orb_core);
-
-  static void server_protocol_policy_from_acceptor_registry (RTCORBA::ProtocolList &protocols,
-                                                             TAO_Acceptor_Registry &acceptor_registry,
-                                                             TAO_ORB_Core &orb_core);
-
-  static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
-                                               TAO_Policy_Set &policies
-                                               ACE_ENV_ARG_DECL);
-
-protected:
-
-  /**
-   * Validate that the policies in the specified set
-   * are consistent and legal.  Throw an appropriate exception
-   * if that is not the case.
-   */
-  void validate_impl (TAO_Policy_Set &policies
-                      ACE_ENV_ARG_DECL);
-
-  /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
-
-  /**
-   * Return whether the specified policy type is legal for the
-   * current configuration.  This is needed since the user can
-   * potentially specify policies that are unknown to an
-   * validate () routine, and these need to be caught.
-   */
-  virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
-
-private:
-  void validate_server_protocol (TAO_Policy_Set &policies
-                                 ACE_ENV_ARG_DECL);
-
-  void validate_priorities (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
-
-  void validate_thread_pool (TAO_Policy_Set &policies
-                             ACE_ENV_ARG_DECL);
-
-  TAO_Thread_Pool *thread_pool_;
-
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_POLICY_VALIDATOR_H_ */
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
deleted file mode 100644
index cffae210ea4..00000000000
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-#include "RT_Servant_Dispatcher.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "RT_POA.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/ORB_Core.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Transport.h"
-#include "tao/IIOP_Transport.h"
-#include "tao/IIOP_Connection_Handler.h"
-#include "tao/Service_Context.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (RTPortableServer,
-           RT_Servant_Dispatcher,
-           "$Id$")
-
-TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
-{
-}
-
-void
-TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
-  TAO_Root_POA &poa,
-  CORBA::Short servant_priority,
-  TAO_ServerRequest &req,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-  ACE_ENV_ARG_DECL)
-{
-  TAO_Service_Context &request_service_context =
-    req.request_service_context ();
-  TAO_Service_Context &reply_service_context = req.reply_service_context ();
-
-  TAO_Thread_Pool *thread_pool =
-    static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
-
-  if (thread_pool != 0 &&
-      thread_pool->with_lanes ())
-    {
-      //
-      // We don't mess with the priority of threads in lanes.
-      //
-
-      if (TAO_debug_level > 0)
-        {
-          // Get the ORB_Core's TSS resources.
-          TAO_ORB_Core_TSS_Resources *tss =
-            poa.orb_core ().get_tss_resources ();
-
-          /// Get the lane attribute in TSS.
-          TAO_Thread_Lane *lane =
-            static_cast<TAO_Thread_Lane *> (tss->lane_);
-
-          ACE_ASSERT (lane->pool ().id () ==
-                      thread_pool->id ());
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("Using thread pool with lane ")
-                      ACE_TEXT ("(%P|%t|%d|%d): original thread ")
-                      ACE_TEXT ("CORBA/native priority %d/%d not changed\n"),
-                      lane->pool ().id (),
-                      lane->id (),
-                      lane->lane_priority (),
-                      lane->native_priority ()));
-        }
-
-      return;
-    }
-
-  // Remember current thread's priority.
-  TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks ();
-
-  const char *priority_model;
-  RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
-
-  // NOT_SPECIFIED PriorityModel processing.
-  if (poa.priority_model () ==
-      TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
-    {
-      priority_model = "RTCORBA::NOT_SPECIFIED";
-    }
-
-  // CLIENT_PROPAGATED PriorityModel processing.
-  else if (poa.priority_model () ==
-      TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
-    {
-      priority_model = "RTCORBA::CLIENT_PROPAGATED";
-
-      // Attempt to extract client-propagated priority from the
-      // ServiceContextList of the request.
-      const IOP::ServiceContext *context;
-
-      if (request_service_context.get_context (IOP::RTCorbaPriority,
-                                               &context) == 1)
-        {
-          // Extract the target priority
-          TAO_InputCDR cdr (reinterpret_cast
-                            <const char*>
-                             (context->context_data.get_buffer ()),
-                            context->context_data.length ());
-          CORBA::Boolean byte_order;
-          if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
-          cdr.reset_byte_order (static_cast<int> (byte_order));
-
-          if ((cdr >> target_priority) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
-
-          // Save the target priority in the response service
-          // context to propagate back to the client as specified
-          // by the RTCORBA specification.
-          reply_service_context.set_context (*context);
-        }
-      else
-        {
-          // Use default priority if none came in the request.
-          // (Request must have come from a non-RT ORB.)
-          target_priority = poa.server_priority ();
-        }
-    }
-  else
-    // SERVER_DECLARED PriorityModel processing.
-    {
-      priority_model = "RTCORBA::SERVER_DECLARED";
-
-      // Use the request associated with the servant.
-      target_priority = servant_priority;
-    }
-
-  char thread_pool_id[BUFSIZ];
-  if (TAO_debug_level > 0)
-    {
-      if (thread_pool == 0)
-        ACE_OS::strcpy (thread_pool_id,
-                        "default thread pool");
-      else
-        ACE_OS::sprintf (thread_pool_id,
-                         "thread pool %d",
-                         thread_pool->id ());
-    }
-
-  // Target priority is invalid.
-  if (target_priority == TAO_INVALID_PRIORITY)
-    {
-      if (TAO_debug_level > 0)
-        {
-
-// If we are in a multi-threaded configuration, print out the current
-// thread priority.
-#if defined (ACE_HAS_THREADS)
-
-          if (tph->get_thread_CORBA_and_native_priority (
-                pre_invoke_state.original_CORBA_priority_,
-                pre_invoke_state.original_native_priority_
-                ACE_ENV_ARG_PARAMETER) == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%s processing using %s ")
-                      ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
-                      ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
-                      pre_invoke_state.original_CORBA_priority_,
-                      pre_invoke_state.original_native_priority_));
-
-// If we are in a single-threaded configuration, we cannot get the
-// current thread priority.  Therefore, print out a simpler message.
-#else /* ACE_HAS_THREADS */
-
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%s processing using %s ")
-                      ACE_TEXT ("(%P|%t): original thread CORBA/native priority ")
-                      ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id)));
-
-#endif /* ACE_HAS_THREADS */
-
-        }
-    }
-  else
-    {
-      // Get the current thread's priority.
-
-      if (tph->get_thread_CORBA_and_native_priority (
-            pre_invoke_state.original_CORBA_priority_,
-            pre_invoke_state.original_native_priority_
-            ACE_ENV_ARG_PARAMETER) == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                           CORBA::COMPLETED_NO));
-
-      // Priority needs to be changed temporarily changed for the
-      // duration of request.
-      if (target_priority != pre_invoke_state.original_CORBA_priority_)
-        {
-          if (tph->set_thread_CORBA_priority (target_priority
-                                              ACE_ENV_ARG_PARAMETER)
-              == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
-
-          pre_invoke_state.state_ =
-            TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
-
-          if (TAO_debug_level > 0)
-            {
-              CORBA::Short native_priority;
-              tph->get_thread_native_priority (native_priority
-                                               ACE_ENV_ARG_PARAMETER);
-
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("%s processing using %s ")
-                          ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
-                          ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
-                          pre_invoke_state.original_CORBA_priority_,
-                          pre_invoke_state.original_native_priority_,
-                          target_priority,
-                          native_priority));
-            }
-        }
-      // No change in priority required.
-      else
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("%s processing using %s ")
-                          ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
-                          ACE_TEXT ("is the same as the target priority\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
-                          pre_invoke_state.original_CORBA_priority_,
-                          pre_invoke_state.original_native_priority_));
-            }
-        }
-    }
-
-  CORBA::Policy_var policy =
-    poa.policies ().get_cached_policy (
-      TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Boolean set_server_network_priority =
-    tph->set_server_network_priority (req.transport ()->tag (),
-                                      policy.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_Connection_Handler *connection_handler =
-    req.transport ()->connection_handler ();
-
-  connection_handler->set_dscp_codepoint (set_server_network_priority);
-}
-
-void
-TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
-                                                          CORBA::Short servant_priority,
-                                                          TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                                          ACE_ENV_ARG_DECL)
-{
-  TAO_Thread_Pool *thread_pool =
-    static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
-
-  if (thread_pool == 0 ||
-      thread_pool->with_lanes ())
-    {
-      //
-      // We don't mess with the priority of threads in lanes or for
-      // the default thread pool.
-      //
-      return;
-    }
-
-  if (poa.priority_model () !=
-      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED ||
-      servant_priority == TAO_INVALID_PRIORITY)
-    {
-      //
-      // We either don't have server declared model or servant
-      // priority is invalid.
-      //
-      return;
-    }
-
-  //
-  // SERVER_DECLARED PriorityModel processing.
-  //
-
-  // Remember current thread's priority.
-  TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks ();
-
-  if (tph->get_thread_CORBA_and_native_priority (pre_invoke_state.original_CORBA_priority_,
-                                                 pre_invoke_state.original_native_priority_
-                                                 ACE_ENV_ARG_PARAMETER)
-      == -1)
-    ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                       CORBA::COMPLETED_NO));
-
-  // Change the priority of the current thread for the duration of
-  // request.
-  if (servant_priority != pre_invoke_state.original_CORBA_priority_)
-    {
-      if (tph->set_thread_CORBA_priority (servant_priority
-                                          ACE_ENV_ARG_PARAMETER)
-          == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                           CORBA::COMPLETED_NO));
-
-      pre_invoke_state.state_ =
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
-    }
-}
-
-void
-TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
-                                        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state)
-
-{
-  if (pre_invoke_state.state_ ==
-      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED)
-    {
-      pre_invoke_state.state_ =
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      ACE_TRY
-        {
-          // Reset the priority of the current thread back to its original
-          // value.
-          TAO_Protocols_Hooks *tph =
-            poa.orb_core ().get_protocols_hooks ();
-
-          if (tph->set_thread_native_priority (
-                 pre_invoke_state.original_native_priority_
-                                               ACE_ENV_ARG_PARAMETER)
-              == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // Eat up the exception.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught: TAO (%P|%t) - "
-                               "Priority_Model_Processing::"
-                               "~Priority_Model_Processing");
-        }
-      ACE_ENDTRY;
-    }
-}
-
-TAO_Root_POA *
-TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                            TAO_POA_Manager &poa_manager,
-                                            const TAO_POA_Policy_Set &policies,
-                                            ACE_Lock &lock,
-                                            TAO_SYNCH_MUTEX &thread_lock,
-                                            TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter
-                                            ACE_ENV_ARG_DECL)
-{
-  TAO_RT_POA *poa = 0;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_RT_POA (name,
-                                poa_manager,
-                                policies,
-                                0,
-                                lock,
-                                thread_lock,
-                                orb_core,
-                                object_adapter
-                                ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return poa;
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
deleted file mode 100644
index 64c083f008b..00000000000
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    RT_Servant_Dispatcher.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth (fhunleth@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef TAO_RT_SERVANT_DISPATCHER_H
-#define TAO_RT_SERVANT_DISPATCHER_H
-#include /**/ "ace/pre.h"
-
-#include "rtportableserver_export.h"
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
-#undef TAO_RTCORBA_SAFE_INCLUDE
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Servant_Dispatcher.h"
-
-/**
- * @class TAO_RT_Servant_Dispatcher
- *
- * @brief Concrete instantiation of the Servant_Dispatcher strategy.
- *
- *
- */
-class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher
-  : public TAO_Servant_Dispatcher
-{
-public:
-  virtual ~TAO_RT_Servant_Dispatcher (void);
-
-  /// Pre_invoke remote request.
-  void pre_invoke_remote_request (TAO_Root_POA &poa,
-                                  CORBA::Short servant_priority,
-                                  TAO_ServerRequest &req,
-                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                  ACE_ENV_ARG_DECL);
-
-  /// Pre_invoke collocated request.
-  void pre_invoke_collocated_request (TAO_Root_POA &poa,
-                                      CORBA::Short servant_priority,
-                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                      ACE_ENV_ARG_DECL);
-
-  /// Post_invoke request.
-  void post_invoke (TAO_Root_POA &poa,
-                    TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
-
-  /// Factory method for creating new POA's.
-  TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                 TAO_POA_Manager &poa_manager,
-                                 const TAO_POA_Policy_Set &policies,
-                                 ACE_Lock &lock,
-                                 TAO_SYNCH_MUTEX &thread_lock,
-                                 TAO_ORB_Core &orb_core,
-                                 TAO_Object_Adapter *object_adapter
-                                 ACE_ENV_ARG_DECL);
-};
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RT_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.pc.in b/TAO/tao/RTPortableServer/TAO_RTPortableServer.pc.in
deleted file mode 100644
index 992e8a00a96..00000000000
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTPortableServer
-Description: TAO Real-Time PortableServer Library
-Requires: TAO_RTCORBA, TAO_PortableServer, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTPortableServer
-Cflags: -I${includedir}
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc b/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc
deleted file mode 100644
index b0eb456a209..00000000000
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "RTPortableServer\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_RTPortableServerDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_RTPortableServer.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff b/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
deleted file mode 100644
index a0ecbec904f..00000000000
--- a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- orig/RTPortableServerC.h	2005-04-12 10:13:57.316224000 +0200
-+++ RTPortableServerC.h	2005-04-12 10:16:27.251820800 +0200
-@@ -36,6 +36,10 @@
- 
- #include "ace/config-all.h"
- 
-+#ifndef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-+#error "You should not include RTPortableServerC.h directly, use RTPortableServer.h"
-+#endif /* !TAO_RT_PORTABLESERVER_SAFE_INCLUDE */
-+
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
---- orig/RTPortableServerC.cpp	2005-04-12 10:13:57.316224000 +0200
-+++ RTPortableServerC.cpp	2005-04-12 10:14:46.496942400 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:291
- 
- 
--#include "RTPortableServerC.h"
-+#include "RTPortableServer.h"
- #include "tao/CDR.h"
- #include "tao/ORB_Core.h"
- #include "ace/OS_NS_string.h"
---- orig/RTPortableServerA.cpp	2005-04-12 10:13:57.316224000 +0200
-+++ RTPortableServerA.cpp	2005-04-12 10:14:46.506956800 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "RTPortableServerC.h"
-+#include "RTPortableServer.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/RTPortableServer/diffs/RTPortableServer_include.diff b/TAO/tao/RTPortableServer/diffs/RTPortableServer_include.diff
deleted file mode 100644
index 5f7c99cbd30..00000000000
--- a/TAO/tao/RTPortableServer/diffs/RTPortableServer_include.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/RTPortableServer_includeC.h	2005-04-12 10:13:57.566584000 +0200
-+++ RTPortableServer_includeC.h	2005-04-12 10:13:57.726814400 +0200
-@@ -45,7 +45,7 @@
- #include "tao/SystemException.h"
- #include "tao/Environment.h"
- 
--#include "tao/RTPortableServer/RTPortableServerC.h"
-+#include "tao/RTPortableServer/RTPortableServer.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/RTPortableServer/rtportableserver_export.h b/TAO/tao/RTPortableServer/rtportableserver_export.h
deleted file mode 100644
index 94bb07fc254..00000000000
--- a/TAO/tao/RTPortableServer/rtportableserver_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_RTPORTABLESERVER_EXPORT_H
-#define TAO_RTPORTABLESERVER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_RTPORTABLESERVER_HAS_DLL)
-#    define TAO_RTPORTABLESERVER_HAS_DLL 0
-#  endif /* ! TAO_RTPORTABLESERVER_HAS_DLL */
-#else
-#  if !defined (TAO_RTPORTABLESERVER_HAS_DLL)
-#    define TAO_RTPORTABLESERVER_HAS_DLL 1
-#  endif /* ! TAO_RTPORTABLESERVER_HAS_DLL */
-#endif
-
-#if defined (TAO_RTPORTABLESERVER_HAS_DLL) && (TAO_RTPORTABLESERVER_HAS_DLL == 1)
-#  if defined (TAO_RTPORTABLESERVER_BUILD_DLL)
-#    define TAO_RTPortableServer_Export ACE_Proper_Export_Flag
-#    define TAO_RTPORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTPORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_RTPORTABLESERVER_BUILD_DLL */
-#    define TAO_RTPortableServer_Export ACE_Proper_Import_Flag
-#    define TAO_RTPORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTPORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_RTPORTABLESERVER_BUILD_DLL */
-#else /* TAO_RTPORTABLESERVER_HAS_DLL == 1 */
-#  define TAO_RTPortableServer_Export
-#  define TAO_RTPORTABLESERVER_SINGLETON_DECLARATION(T)
-#  define TAO_RTPORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_RTPORTABLESERVER_HAS_DLL == 1 */
-
-#endif /* TAO_RTPORTABLESERVER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
deleted file mode 100644
index 69b42366b9b..00000000000
--- a/TAO/tao/RTScheduler.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, rtcorba, portableserver, core, corba_messaging {
-  sharedname   = TAO_RTScheduler
-  dynamicflags = TAO_RTSCHEDULER_BUILD_DLL
-
-  Source_Files {
-    RTScheduling
-  }
-
-  Header_Files {
-    RTScheduling
-  }
-
-  Inline_Files {
-    RTScheduling
-  }
-
-  Template_Files {
-    RTScheduling
-  }
-
-  Resource_Files {
-    RTScheduling
-  }
-
-  PIDL_Files {
-    RTScheduling
-  }
-
-  Pkgconfig_Files {
-    RTScheduling/TAO_RTScheduler.pc.in
-  }
-}
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
deleted file mode 100644
index 4549fbe90f8..00000000000
--- a/TAO/tao/RTScheduling/Current.cpp
+++ /dev/null
@@ -1,1002 +0,0 @@
-#include "Current.h"
-#include "Distributable_Thread.h"
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "tao/RTCORBA/RT_Current.h"
-#include "tao/ORB_Core.h"
-#include "tao/TSS_Resources.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (RTScheduling,
-           Current,
-           "$Id$")
-
-
-ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
-
-u_long
-TAO_DTId_Hash::operator () (const IdType &id) const
-{
-  return ACE::hash_pjw ((const char *) id.get_buffer (),
-                        id.length ());
-}
-
-TAO_RTScheduler_Current::TAO_RTScheduler_Current (void)
-{
-
-}
-
-
-void
-TAO_RTScheduler_Current::init (TAO_ORB_Core* orb
-                               ACE_ENV_ARG_DECL)
-{
-  this->orb_ = orb;
-
-  // Create the RT_Current.
-  RTCORBA::Current_ptr current;
-  ACE_NEW_THROW_EX (current,
-                    TAO_RT_Current (orb),
-                    CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (
-                                        TAO::VMCID,
-                                        ENOMEM),
-                                      CORBA::COMPLETED_NO));
-  this->rt_current_ = current;
-}
-
-void
-TAO_RTScheduler_Current::rt_current (RTCORBA::Current_ptr rt_current)
-{
-  this->rt_current_ = RTCORBA::Current::_duplicate (rt_current);
-}
-
-TAO_ORB_Core*
-TAO_RTScheduler_Current::orb (void)
-{
-  return this->orb_;
-}
-
-DT_Hash_Map*
-TAO_RTScheduler_Current::dt_hash (void)
-{
-  return &this->dt_hash_;
-}
-
-
-void
-TAO_RTScheduler_Current::begin_scheduling_segment (
-    const char * name,
-    CORBA::Policy_ptr sched_param,
-    CORBA::Policy_ptr implicit_sched_param
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    {
-      ACE_NEW_THROW_EX (impl,
-                        TAO_RTScheduler_Current_i (this->orb_,
-                                                   &this->dt_hash_),
-                        CORBA::NO_MEMORY (
-                                          CORBA::SystemException::_tao_minor_code (
-                                          TAO::VMCID,
-                                          ENOMEM),
-                                          CORBA::COMPLETED_NO));
-      ACE_CHECK;
-
-      this->implementation (impl);
-    }
-
-  impl->begin_scheduling_segment (name,
-                                  sched_param,
-                                  implicit_sched_param
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
-                                                    CORBA::Policy_ptr sched_param,
-                                                    CORBA::Policy_ptr implicit_sched_param
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
-
-  impl->update_scheduling_segment (name,
-                                   sched_param,
-                                   implicit_sched_param
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RTScheduler_Current::end_scheduling_segment (const char * name
-                                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Missing scheduling context OR DT cancelled\n"));
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
-      return;
-    }
-
-  impl->end_scheduling_segment (name
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id
-                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RTScheduling::DistributableThread_var DT;
-  int result = this->dt_hash_.find (id,
-                                    DT);
-  if (result == 0)
-    return DT._retn ();
-  else return RTScheduling::DistributableThread::_nil ();
-}
-
-// returns a null reference if
-// the distributable thread is
-// not known to the local scheduler
-
-RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
-                                CORBA::VoidData data,
-                                const char* name,
-                                CORBA::Policy_ptr sched_param,
-                                CORBA::Policy_ptr implicit_sched_param,
-                                CORBA::ULong stack_size,
-                                RTCORBA::Priority base_priority
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
-
-  return impl->spawn (start,
-                      data,
-                      name,
-                      sched_param,
-                      implicit_sched_param,
-                      stack_size,
-                      base_priority
-                      ACE_ENV_ARG_PARAMETER);
-}
-
-RTScheduling::Current::IdType *
-TAO_RTScheduler_Current::id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
-
-  return impl->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-TAO_RTScheduler_Current::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
-
-  return impl->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Policy_ptr
-TAO_RTScheduler_Current::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
-
-  return impl->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-RTScheduling::Current::NameList *
-TAO_RTScheduler_Current::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RTScheduler_Current_i *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
-
-  return impl->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-RTCORBA::Priority
-TAO_RTScheduler_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->rt_current_->the_priority(the_priority
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_RTScheduler_Current_i*
-TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_RTScheduler_Current_i *old =
-    static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  tss->rtscheduler_current_impl_ = new_current;
-
-  return old;
-}
-
-TAO_RTScheduler_Current_i*
-TAO_RTScheduler_Current::implementation (void)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_RTScheduler_Current_i* impl =
-    static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  return impl;
-}
-
-TAO_ORB_Core*
-TAO_RTScheduler_Current_i::orb (void)
-{
-  return this->orb_;
-}
-
-DT_Hash_Map*
-TAO_RTScheduler_Current_i::dt_hash (void)
-{
-  return this->dt_hash_;
-}
-
- RTScheduling::Scheduler_ptr
-TAO_RTScheduler_Current_i::scheduler (void)
-{
-  return RTScheduling::Scheduler::_duplicate (this->scheduler_.in ());
-}
-
-TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-                                                      DT_Hash_Map* dt_hash
-                                                      ACE_ENV_ARG_DECL)
-  :orb_ (orb),
-   dt_ (RTScheduling::DistributableThread::_nil ()),
-   previous_current_ (0),
-   dt_hash_ (dt_hash)
-{
-  CORBA::Object_ptr scheduler_obj =
-    this->orb_->object_ref_table ().resolve_initial_references (
-      "RTScheduler"
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
-  TAO_ORB_Core* orb,
-  DT_Hash_Map* dt_hash,
-  RTScheduling::Current::IdType guid,
-  const char * name,
-  CORBA::Policy_ptr sched_param,
-  CORBA::Policy_ptr implicit_sched_param,
-  RTScheduling::DistributableThread_ptr dt,
-  TAO_RTScheduler_Current_i* prev_current
-  ACE_ENV_ARG_DECL)
-  : orb_ (orb),
-    guid_ (guid),
-    name_ (CORBA::string_dup (name)),
-    sched_param_ (sched_param),
-    implicit_sched_param_ (implicit_sched_param),
-    dt_ (RTScheduling::DistributableThread::_duplicate (dt)),
-    previous_current_ (prev_current),
-    dt_hash_ (dt_hash)
-{
-  CORBA::Object_ptr scheduler_obj =
-    orb->object_ref_table ().resolve_initial_references (
-      "RTScheduler"
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_RTScheduler_Current_i::begin_scheduling_segment(
-  const char * name,
-  CORBA::Policy_ptr sched_param,
-  CORBA::Policy_ptr implicit_sched_param
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  // Check if it is a new Scheduling Segmnet
-  if (this->guid_.length () == 0)
-    {
-      //Generate GUID
-      size_t temp = ++TAO_RTScheduler_Current::guid_counter;
-      this->guid_.length (sizeof(size_t));
-      ACE_OS::memcpy (this->guid_.get_buffer (),
-                      &temp,
-                      sizeof(size_t));
-
-      size_t guid;
-      ACE_OS::memcpy (&guid,
-                      this->guid_.get_buffer (),
-                      this->guid_.length ());
-
-
-      // Inform the scheduler of the new scheduling segment.
-      this->scheduler_->begin_new_scheduling_segment (this->guid_,
-                                                      name,
-                                                      sched_param,
-                                                      implicit_sched_param
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (this->dt_.in ()))
-        //Create new DT.
-        this->dt_ = TAO_DistributableThread_Factory::create_DT ();
-
-      //Add new DT to map
-      int result = this->dt_hash_->bind (this->guid_,
-                                         this->dt_);
-
-      // Error in binding to the map - cancel thread.
-      if (result != 0)
-        {
-          this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // Remember parameters for the scheduling segment.
-      this->name_ = CORBA::string_dup (name);
-      this->sched_param_ = CORBA::Policy::_duplicate (sched_param);
-      this->implicit_sched_param_ = CORBA::Policy::_duplicate (implicit_sched_param);
-
-    }
-  else //Nested segment
-    {
-      // Check current DT state.
-      if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
-        {
-          this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // Inform scheduler of start of nested scheduling segment.
-      this->scheduler_->begin_nested_scheduling_segment
-        (this->guid_,
-         name,
-         sched_param,
-         implicit_sched_param
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
-
-      TAO_RTScheduler_Current_i* new_current;
-        ACE_NEW_THROW_EX (new_current,
-                          TAO_RTScheduler_Current_i (this->orb_,
-                                                     this->dt_hash_,
-                                                     this->guid_,
-                                                     name,
-                                                     sched_param,
-                                                     implicit_sched_param,
-                                                     this->dt_.in (),
-                                                     this),
-                          CORBA::NO_MEMORY (
-                                            CORBA::SystemException::_tao_minor_code (
-                                          TAO::VMCID,
-                                          ENOMEM),
-                                          CORBA::COMPLETED_NO));
-        ACE_CHECK;
-
-      tss->rtscheduler_current_impl_ = new_current;
-    }
-}
-
-void
-TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
-                                                      CORBA::Policy_ptr sched_param,
-                                                      CORBA::Policy_ptr implicit_sched_param
-                                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  // Check if DT has been cancelled
-  if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
-    {
-      this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  // Let scheduler know of the updates.
-  this->scheduler_->update_scheduling_segment (this->guid_,
-                                               name,
-                                               sched_param,
-                                               implicit_sched_param
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Remember the new values.
-  this->name_ = CORBA::string_dup (name);
-  this->sched_param_ = CORBA::Policy::_duplicate (sched_param);
-  this->implicit_sched_param_ = CORBA::Policy::_duplicate (implicit_sched_param);
-}
-
-void
-TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name
-                                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Check if DT has been cancelled
-  if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
-    {
-      this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (this->previous_current_ == 0)
-    {
-      // Let the scheduler know that the DT is
-      // terminating.
-      this->scheduler_->end_scheduling_segment(this->guid_,
-                                               name
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Cleanup DT.
-      this->cleanup_DT ();
-
-      // Cleanup current.
-      this->cleanup_current ();
-
-      // A Nested segment.
-    } else {
-
-      // Inform scheduler of end of nested
-      // scheduling segment.
-      this->scheduler_->end_nested_scheduling_segment (this->guid_,
-                                                       name,
-                                                       this->previous_current_->sched_param_
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Cleanup current.
-      this->cleanup_current ();
-    }
-}
-
-
-// returns a null reference if
-// the distributable thread is
-// not known to the local scheduler
-RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
-                                  CORBA::VoidData data,
-                                  const char* name,
-                                  CORBA::Policy_ptr sched_param,
-                                  CORBA::Policy_ptr implicit_sched_param,
-                                  CORBA::ULong stack_size,
-                                  RTCORBA::Priority base_priority
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Check if DT has been cancelled.
-  if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
-    this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  // Create new task for new DT.
-  DTTask *dttask;
-
-  // If no scheduling parameter is specified then use the current
-  // implicit scheduling parameter as the scheduling parameter
-  if (sched_param == 0)
-    sched_param = this->implicit_sched_param_;
-
-  RTScheduling::DistributableThread_var dt = TAO_DistributableThread_Factory::create_DT ();
-  TAO_RTScheduler_Current_i *new_current;
-
-  ACE_NEW_RETURN (new_current,
-                  TAO_RTScheduler_Current_i (this->orb_,
-                                             this->dt_hash_),
-                  0);
-
-  new_current->DT (dt.in ());
-
-  ACE_NEW_RETURN (dttask,
-                  DTTask (//thread_manager_,
-                          this->orb_,
-                          this->dt_hash_,
-                          new_current,
-                          start,
-                          data,
-                          name,
-                          sched_param,
-                          implicit_sched_param),
-                  0);
-
-  if (dttask->activate_task (base_priority,
-                             stack_size) == -1)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Unable to activate DistributableThread\n"));
-
-      RTScheduling::DistributableThread::_nil ();
-    }
-
-  return dt._retn ();
-}
-
-int
-DTTask::activate_task (RTCORBA::Priority base_priority,
-                       CORBA::ULong stack_size
-                       ACE_ENV_ARG_DECL)
-{
-  // Activate thread.
-  long default_flags = THR_NEW_LWP | THR_JOINABLE;
-  long flags =
-    default_flags |
-    this->orb_->orb_params ()->scope_policy () |
-    this->orb_->orb_params ()->sched_policy ();
-
-  CORBA::Object_var object = this->orb_->object_ref_table ().resolve_initial_references ("PriorityMappingManager"
-                                                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  RTCORBA::PriorityMapping *pm =
-    mapping_manager->mapping ();
-
-  RTCORBA::NativePriority native_priority;
-  pm->to_native (base_priority,
-                 native_priority);
-
-  size_t stack [1];
-  stack [0] = stack_size;
-  if (this->activate (flags,
-                      1,
-                      0,//force_active
-                      native_priority,//priority
-                      -1,//grp_id
-                      0,//ACE_Task_Base
-                      0,//thread_handles
-                      0,//stack
-                      stack//stack_size
-                      ) == -1)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Insufficient privilege to run this test.\n")),
-                          -1);
-    }
-  return 0;
-}
-
-DTTask::DTTask (//ACE_Thread_Manager *manager,
-                TAO_ORB_Core *orb,
-                DT_Hash_Map *dt_hash,
-                TAO_RTScheduler_Current_i* new_current,
-                RTScheduling::ThreadAction_ptr start,
-                CORBA::VoidData data,
-                const char *name,
-                CORBA::Policy_ptr sched_param,
-                CORBA::Policy_ptr implicit_sched_param)
-  ://manager_ (manager),
-   orb_ (orb),
-   dt_hash_ (dt_hash),
-   current_ (new_current),
-   start_ (RTScheduling::ThreadAction::_duplicate (start)),
-   data_ (data),
-   name_ (CORBA::string_dup (name)),
-   sched_param_ (CORBA::Policy::_duplicate (sched_param)),
-   implicit_sched_param_ (CORBA::Policy::_duplicate (implicit_sched_param))
-{
-}
-
-int
-DTTask::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-
-      TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
-
-      tss->rtscheduler_current_impl_ = this->current_;
-
-      this->current_->begin_scheduling_segment (this->name_.in (),
-                                                this->sched_param_.in (),
-                                                this->implicit_sched_param_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Invoke entry point into new DT.
-      this->start_->_cxx_do (this->data_
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->current_->end_scheduling_segment (this->name_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-RTScheduling::Current::IdType *
-TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  RTScheduling::Current::IdType_var guid = this->guid_;
-  return guid._retn ();
-}
-
-
-CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::Policy::_duplicate (this->sched_param_);
-}
-
-CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::Policy::_duplicate (this->implicit_sched_param_);
-}
-
-RTScheduling::Current::NameList *
-TAO_RTScheduler_Current_i::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RTScheduling::Current::NameList* name_list;
-  ACE_NEW_RETURN (name_list,
-                  RTScheduling::Current::NameList,
-                  0);
-
-  TAO_RTScheduler_Current_i* current = this;
-
-  for (int index = 0; current != 0; index++)
-    {
-      name_list->length (index+1);
-      (*name_list) [index] = current->name ();
-      current = current->previous_current_;
-    }
-
-  return name_list;
-}
-
-const char*
-TAO_RTScheduler_Current_i::name (void)
-{
-  return CORBA::string_dup (this->name_.in ());
-}
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-void
-TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  size_t guid;
-  ACE_OS::memcpy (&guid,
-                  this->guid_.get_buffer (),
-                  this->guid_.length ());
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Distributable Thread - %d is cancelled\n",
-              guid));
-
-  // Let the scheduler know that the thread has
-  // been cancelled.
-  this->scheduler_->cancel (this->guid_
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->cleanup_DT ();
-
-  // Remove all related nested currents.
-  this->delete_all_currents ();
-
-  // Throw exception.
-  ACE_THROW (CORBA::THREAD_CANCELLED ());
-}
-
-void
-TAO_RTScheduler_Current_i::cleanup_DT (void)
-{
-  // Remove DT from map.
-  this->dt_hash_->unbind (this->guid_);
-}
-
-void
-TAO_RTScheduler_Current_i::cleanup_current (void)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  tss->rtscheduler_current_impl_ = this->previous_current_;
-
-  // Delete this current.
-  delete this;
-}
-
-void
-TAO_RTScheduler_Current_i::delete_all_currents (void)
-{
-  TAO_RTScheduler_Current_i* current = this;
-
-  while (current != 0)
-    {
-      TAO_RTScheduler_Current_i* prev_current = current->previous_current_;
-      current->cleanup_current ();
-      current = prev_current;
-    }
-
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  tss->rtscheduler_current_impl_ = tss->rtscheduler_previous_current_impl_;
-}
-
-void
-TAO_RTScheduler_Current_i::id (RTScheduling::Current::IdType guid)
-{
-  this->guid_ = guid;
-}
-
-void
-TAO_RTScheduler_Current_i::name (char * name)
-{
-  this->name_ = CORBA::string_dup (name);
-}
-
-RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current_i::DT (void)
-{
-  return this->dt_._retn ();
-}
-
-void
-TAO_RTScheduler_Current_i::DT (RTScheduling::DistributableThread_ptr dt)
-{
-  this->dt_ = RTScheduling::DistributableThread::_duplicate (dt);
-}
-
-void
-TAO_RTScheduler_Current_i::scheduling_parameter (CORBA::Policy_ptr sched_param)
-{
-  this->sched_param_ = CORBA::Policy::_duplicate (sched_param);
-}
-
-void
-TAO_RTScheduler_Current_i::implicit_scheduling_parameter (CORBA::Policy_ptr implicit_sched_param)
-{
-  this->implicit_sched_param_ = CORBA::Policy::_duplicate (implicit_sched_param);
-}
-
-
-// *************************************************************
-
-// *************************************************************
-// Operations for class TAO_RTScheduler_Current_var
-// *************************************************************
-
-TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (void) // default constructor
-  : ptr_ (TAO_RTScheduler_Current::_nil ())
-{}
-
-::TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (const ::TAO_RTScheduler_Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (TAO_RTScheduler_Current::_duplicate (p.ptr ()))
-{}
-
-TAO_RTScheduler_Current_var::~TAO_RTScheduler_Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO_RTScheduler_Current_var &
-TAO_RTScheduler_Current_var::operator= (TAO_RTScheduler_Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_RTScheduler_Current_var &
-TAO_RTScheduler_Current_var::operator= (const ::TAO_RTScheduler_Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_RTScheduler_Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO_RTScheduler_Current_var::operator const ::TAO_RTScheduler_Current_ptr &() const
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_var::operator ::TAO_RTScheduler_Current_ptr &()
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_ptr &
-TAO_RTScheduler_Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_ptr &
-TAO_RTScheduler_Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_RTScheduler_Current::_nil ();
-  return this->ptr_;
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_RTScheduler_Current_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_RTScheduler_Current::_nil ();
-  return val;
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::duplicate (TAO_RTScheduler_Current_ptr p)
-{
-  return ::TAO_RTScheduler_Current::_duplicate (p);
-}
-
-void
-TAO_RTScheduler_Current_var::release (TAO_RTScheduler_Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::nil (void)
-{
-  return ::TAO_RTScheduler_Current::_nil ();
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_RTScheduler_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO_RTScheduler_Current_var::upcast (void *src)
-{
-  TAO_RTScheduler_Current **tmp =
-    static_cast<TAO_RTScheduler_Current **> (src);
-  return *tmp;
-}
-
-TAO_RTScheduler_Current_ptr TAO_RTScheduler_Current::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return
-    TAO_RTScheduler_Current::_duplicate (
-        dynamic_cast<TAO_RTScheduler_Current *> (obj)
-      );
-}
-
-TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current::_duplicate (TAO_RTScheduler_Current_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
-
-const char* TAO_RTScheduler_Current::_interface_repository_id (void) const
-{
-  return "IDL:TAO_RTScheduler_Current:1.0";
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Equal_To<IdType>;
-template class ACE_Hash_Map_Manager_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Entry<IdType, RTScheduling::DistributableThread_var>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Equal_To<IdType>;
-#pragma instantiate ACE_Hash_Map_Manager_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-#pragma instantiate ACE_Hash_Map_Entry<IdType, RTScheduling::DistributableThread_var>;
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
deleted file mode 100644
index 3486c4bef7c..00000000000
--- a/TAO/tao/RTScheduling/Current.h
+++ /dev/null
@@ -1,388 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Current.h
- *
- *  $Id$
- *
- *  @author
- */
-//=============================================================================
-
-
-#ifndef TAO_RTSCHEDULER_CURRENT_H
-#define TAO_RTSCHEDULER_CURRENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "rtscheduler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RTScheduler.h"
-#include "tao/LocalObject.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Task.h"
-#include "ace/Atomic_Op.h"
-
-
-class TAO_RTScheduler_Current_i;
-class TAO_TSS_Resources;
-
-
-/**
- * @class TAO_DTId_Hash
- *
- * @brief Hashing class for Distributable Thread Ids.
- *
- * Define the hash() method for Object Ids.
- */
-
-typedef TAO_Unbounded_Sequence<CORBA::Octet> IdType;
-
-class TAO_RTScheduler_Export TAO_DTId_Hash
-{
-public:
-
-  /// Returns hash value.
-  u_long operator () (const IdType &id) const;
-};
-
-
-typedef ACE_Hash_Map_Manager_Ex<IdType,
-                                RTScheduling::DistributableThread_var,
-                                TAO_DTId_Hash,
-                                ACE_Equal_To<IdType>,
-                                TAO_SYNCH_MUTEX>
-  DT_Hash_Map;
-
-typedef ACE_Hash_Map_Iterator_Ex<IdType,
-                                 RTScheduling::DistributableThread_var,
-                                 TAO_DTId_Hash,
-                                 ACE_Equal_To<IdType>,
-                                 TAO_SYNCH_MUTEX>
-  DT_Hash_Map_Iterator;
-
-typedef ACE_Hash_Map_Entry<IdType,
-                           RTScheduling::DistributableThread_var>
-  DT_Hash_Map_Entry;
-
-class TAO_RTScheduler_Current;
-class TAO_RTScheduler_Current_var;
-
-typedef TAO_RTScheduler_Current* TAO_RTScheduler_Current_ptr;
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Current
-  : public RTScheduling::Current,
-    public TAO_Local_RefCounted_Object
-{
- public:
-  static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
-
-  TAO_RTScheduler_Current (void);
-
-  void init (TAO_ORB_Core* orb
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void the_priority (RTCORBA::Priority the_priority
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void rt_current (RTCORBA::Current_ptr rt_current);
-
-  virtual void begin_scheduling_segment
-    (const char * name,
-     CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void update_scheduling_segment
-    (const char * name,
-     CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void end_scheduling_segment
-    (const char * name
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual RTScheduling::DistributableThread_ptr
-    lookup(const RTScheduling::Current::IdType & id
-           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // returns a null reference if
-  // the distributable thread is
-  // not known to the local scheduler
-
-  virtual RTScheduling::DistributableThread_ptr
-    spawn (RTScheduling::ThreadAction_ptr start,
-           CORBA::VoidData data,
-           const char* name,
-           CORBA::Policy_ptr sched_param,
-           CORBA::Policy_ptr implicit_sched_param,
-           CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority
-           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::RTScheduling::Current::IdType *
-    id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::CORBA::Policy_ptr
-    scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::CORBA::Policy_ptr
-    implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::RTScheduling::Current::NameList *
-    current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  TAO_RTScheduler_Current_i* implementation (void);
-
-  TAO_RTScheduler_Current_i* implementation (TAO_RTScheduler_Current_i*);
-
-  TAO_ORB_Core* orb (void);
-
-  DT_Hash_Map* dt_hash (void);
-
-  /**
-   * @name Reference Related Methods
-   */
-  //@{
-  typedef TAO_RTScheduler_Current_ptr _ptr_type;
-  typedef TAO_RTScheduler_Current_var _var_type;
-
-  static TAO_RTScheduler_Current_ptr _duplicate (TAO_RTScheduler_Current_ptr obj);
-
-  static TAO_RTScheduler_Current_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-
-  static TAO_RTScheduler_Current_ptr _nil (void)
-    {
-      return (TAO_RTScheduler_Current_ptr)0;
-    }
-
-  virtual const char* _interface_repository_id (void) const;
-  //@}
-
- private:
-  RTCORBA::Current_var rt_current_;
-  TAO_ORB_Core* orb_;
-  DT_Hash_Map dt_hash_;
-
-};
-
-
-
-/**
- * @class TAO_RTScheduler_Current_var
- */
-class TAO_RTScheduler_Export TAO_RTScheduler_Current_var
-  : private TAO_Base_var
-{
-public:
-
-  TAO_RTScheduler_Current_var (void); // default constructor
-  TAO_RTScheduler_Current_var (TAO_RTScheduler_Current_ptr p) : ptr_ (p) {}
-  TAO_RTScheduler_Current_var (const TAO_RTScheduler_Current_var &); // copy constructor
-  ~TAO_RTScheduler_Current_var (void); // destructor
-
-  TAO_RTScheduler_Current_var &operator= (TAO_RTScheduler_Current_ptr);
-  TAO_RTScheduler_Current_var &operator= (const TAO_RTScheduler_Current_var &);
-  TAO_RTScheduler_Current_ptr operator-> (void) const;
-
-  operator const TAO_RTScheduler_Current_ptr &() const;
-  operator TAO_RTScheduler_Current_ptr &();
-  // in, inout, out, _retn
-  TAO_RTScheduler_Current_ptr in (void) const;
-  TAO_RTScheduler_Current_ptr &inout (void);
-  TAO_RTScheduler_Current_ptr &out (void);
-  TAO_RTScheduler_Current_ptr _retn (void);
-  TAO_RTScheduler_Current_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static TAO_RTScheduler_Current_ptr duplicate (TAO_RTScheduler_Current_ptr);
-  static void release (TAO_RTScheduler_Current_ptr);
-  static TAO_RTScheduler_Current_ptr nil (void);
-  static TAO_RTScheduler_Current_ptr narrow (
-      CORBA::Object *
-      ACE_ENV_ARG_DECL_NOT_USED
-    );
-  static CORBA::Object * upcast (void *);
-
-private:
-
-  TAO_RTScheduler_Current_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  TAO_RTScheduler_Current_var (const TAO_Base_var &rhs);
-  TAO_RTScheduler_Current_var &operator= (const TAO_Base_var &rhs);
-
-};
-
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
-{
- public:
-
-  TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-                             DT_Hash_Map* dt_hash
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-                             DT_Hash_Map* dt_hash,
-                             RTScheduling::Current::IdType guid,
-                             const char * name,
-                             CORBA::Policy_ptr sched_param,
-                             CORBA::Policy_ptr implicit_sched_param,
-                             RTScheduling::DistributableThread_ptr dt,
-                             TAO_RTScheduler_Current_i* prev_current
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  virtual ~TAO_RTScheduler_Current_i (void)
-    {
-    };
-
-  virtual RTScheduling::DistributableThread_ptr
-    spawn (RTScheduling::ThreadAction_ptr start,
-           CORBA::VoidData data,
-           const char* name,
-           CORBA::Policy_ptr sched_param,
-           CORBA::Policy_ptr implicit_sched_param,
-           CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void begin_scheduling_segment
-    (const char * name,
-     CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void update_scheduling_segment
-    (const char * name,
-     CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void end_scheduling_segment
-    (const char * name
-     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual RTScheduling::Current::IdType *
-    id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-  void  id (RTScheduling::Current::IdType guid );
-
-  virtual CORBA::Policy_ptr
-    scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr
-    implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-  void scheduling_parameter (CORBA::Policy_ptr);
-
-  void implicit_scheduling_parameter (CORBA::Policy_ptr);
-
-  virtual RTScheduling::Current::NameList *
-    current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void cleanup_DT (void);
-
-  void cleanup_current (void);
-
-  void delete_all_currents (void);
-
-  const char* name (void);
-  void name (char *);
-
-  TAO_ORB_Core* orb (void);
-
-  RTScheduling::Scheduler_ptr scheduler (void);
-
-  DT_Hash_Map* dt_hash (void);
-
-  RTScheduling::DistributableThread_ptr DT (void);
-  void DT (RTScheduling::DistributableThread_ptr);
-
- private:
-  RTScheduling::Scheduler_var scheduler_;
-  TAO_ORB_Core* orb_;
-  RTScheduling::Current::IdType guid_;
-  CORBA::String_var name_;
-  CORBA::Policy_ptr sched_param_;
-  CORBA::Policy_ptr implicit_sched_param_;
-  RTScheduling::DistributableThread_var dt_;
-  TAO_RTScheduler_Current_i* previous_current_;
-  DT_Hash_Map* dt_hash_;
-};
-
-// This class provides an entry point for the// new DT.
-class DTTask : public ACE_Task <ACE_SYNCH>
-{
-public:
-  DTTask (//ACE_Thread_Manager manager,
-          TAO_ORB_Core* orb,
-          DT_Hash_Map* dt_hash,
-          TAO_RTScheduler_Current_i*,
-          RTScheduling::ThreadAction_ptr start,
-          CORBA::VoidData data,
-          const char* name,
-          CORBA::Policy_ptr sched_param,
-          CORBA::Policy_ptr implicit_sched_param);
-
-  int activate_task (RTCORBA::Priority base_priority,
-                     CORBA::ULong stack_size
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  virtual int svc (void);
-
- private:
-  //ACE_Thread_Manager* manager_;
-  TAO_ORB_Core* orb_;
-  DT_Hash_Map* dt_hash_;
-  TAO_RTScheduler_Current_i* current_;
-  RTScheduling::ThreadAction_var start_;
-  CORBA::VoidData data_;
-  RTScheduling::Current::IdType guid_;
-  CORBA::String_var name_;
-  CORBA::Policy_var sched_param_;
-  CORBA::Policy_var implicit_sched_param_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RTSCHEDULER_CURRENT_H*/
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
deleted file mode 100644
index 72b1336d456..00000000000
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//$Id$
-
-#include "Distributable_Thread.h"
-#include "tao/ORB_Constants.h"
-
-TAO_DistributableThread::TAO_DistributableThread (void)
-  :state_ (RTScheduling::DistributableThread::ACTIVE)
-{
-}
-
-TAO_DistributableThread::~TAO_DistributableThread (void)
-{
-}
-
-void
-TAO_DistributableThread::cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->state_ = RTScheduling::DistributableThread::CANCELLED;
-}
-
-RTScheduling::DistributableThread::DT_State
-TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->state_;
-}
-
-RTScheduling::DistributableThread_ptr
-TAO_DistributableThread_Factory::create_DT (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  TAO_DistributableThread* DT;
-
-  ACE_NEW_THROW_EX (DT,
-                    TAO_DistributableThread,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  //RTScheduling::DistributableThread_var dt = RTScheduling::DistributableThread::_narrow (DT
-  //                                                                             ACE_ENV_ARG_PARAMETER);
-  //ACE_CHECK;
-
-  return DT;
-}
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
deleted file mode 100644
index e73799bc15b..00000000000
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//$Id$
-
-#ifndef DISTRIBUTABLE_THREAD_H
-#define DISTRIBUTABLE_THREAD_H
-
-#include "tao/RTScheduling/RTScheduler.h"
-
-class TAO_RTScheduler_Export TAO_DistributableThread
-: public RTScheduling::DistributableThread
-{
- public:
-  
-  TAO_DistributableThread (void);
-
-  ~TAO_DistributableThread (void);
-
-  virtual void cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-   
-  virtual RTScheduling::DistributableThread::DT_State state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
- private:
-  RTScheduling::DistributableThread::DT_State state_;
-};
-
-
-class TAO_DistributableThread_Factory
-{
-public:
-  static RTScheduling::DistributableThread_ptr create_DT (void);
-};
-
-#endif /*DISTRIBUTABLE_THREAD_H*/
diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp
deleted file mode 100644
index 82eb86ac5b2..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "RTScheduler.h"
-#include "RTScheduler_Loader.h"
-
-ACE_RCSID (RTScheduler, RTScheduler, "$Id$")
-
-TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_RTScheduler_Loader);
-}
diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h
deleted file mode 100644
index 92c60b13038..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-//=============================================================================
-/**
- *  @file RTScheduler.h
- *
- *  $Id$
- *
- *   Takes care of the RT Scheduler loading on static build.
- *
- *
- *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
- */
-//=============================================================================
-
-#ifndef TAO_RTSCHEDULER_H_
-#define TAO_RTSCHEDULER_H_
-#include /**/ "ace/pre.h"
-
-#include "rtscheduler_export.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Initializer
-{
-public:
-  // Constructor.
-  TAO_RTScheduler_Initializer (void);
-};
-
-static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer;
-
-#define TAO_RTSCHEDULER_SAFE_INCLUDE
-#include "RTSchedulerC.h"
-#undef TAO_RTSCHEDULER_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RTSCHEDULER_H_ */
diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl
deleted file mode 100644
index ddd19f01bca..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler.pidl
+++ /dev/null
@@ -1,211 +0,0 @@
-//$Id$
-// ================================================================
-//
-// = LIBRARY
-//   TAO_RTScheduling
-//
-// = FILENAME
-//   RTScheduling.pidl
-//
-// = DESCRIPTION
-//   Some new data types included for GIOP 1.2
-//   This file was used to generate the code in
-//   RTScheduler*.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//        -o orig -GA -Sa -Gp -Gd -Ge 1 -Sci
-//          -Wb,export_macro=TAO_RTScheduler_Export
-//          -Wb,export_include="rtscheduler_export.h"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          -I$(TAO_ROOT)
-//          RTScheduler.pidl
-//
-// ================================================================
-#ifndef TAO_RTSCHEDULER_PIDL
-#define TAO_RTSCHEDULER_PIDL
-
-#include "tao/RTCORBA/RTCORBA_include.pidl"
-#include "tao/PortableServer/PortableServer_include.pidl"
-#include "tao/PortableInterceptor.pidl"
-
-
-module CORBA
-{
-    // Extensions by this proposal:
-    native VoidData;
-
-    // Ada:  System.Address
-    // C:    void*
-    // C++:  void*
-    // Java: Object
-
-};
-
-module RTScheduling
-{
-    // ------------------------------------------------------------------
-    // Interfaces that are useful to dynamically schedule applications
-    // ------------------------------------------------------------------
-
-    local interface ThreadAction
-    {
-        void do(in CORBA::VoidData data);
-    };
-
-    local interface DistributableThread
-    {
-        enum DT_State
-        {
-          ACTIVE,
-          CANCELLED
-        };
-
-        void cancel();
-            // raises CORBA::OBJECT_NOT_FOUND if
-            // the distributable thread is
-            // not known to the scheduler
-        readonly attribute DT_State state;
-    };
-
-    local interface Current
-        : RTCORBA::Current
-    {
-        DistributableThread
-            spawn
-                (in ThreadAction      start,
-                in CORBA::VoidData data,
-                in string name,
-                in CORBA::Policy sched_param,
-                in CORBA::Policy implicit_sched_param,
-                in unsigned long     stack_size,
-                    // zero means use the O/S default
-                in RTCORBA::Priority base_priority);
-
-        exception UNSUPPORTED_SCHEDULING_DISCIPLINE {};
-    // The scheduling_parameter argument didn't match the
-    // active scheduling policy.
-
-        void begin_scheduling_segment
-            (in string        name,
-             in CORBA::Policy sched_param,
-             in CORBA::Policy implicit_sched_param)
-            raises (UNSUPPORTED_SCHEDULING_DISCIPLINE );
-
-        void update_scheduling_segment
-            (in string       name,
-             in CORBA::Policy sched_param,
-             in CORBA::Policy implicit_sched_param)
-            raises ( UNSUPPORTED_SCHEDULING_DISCIPLINE );
-
-        void end_scheduling_segment(in string name);
-
-        typedef sequence<octet> IdType;
-
-        readonly attribute IdType id;
-            // a globally unique id
-
-        //IdType get_current_id();
-            // returns id of thread that is running
-
-        DistributableThread lookup(in IdType id);
-            // returns a null reference if
-            // the distributable thread is
-            // not known to the local scheduler
-
-        readonly attribute CORBA::Policy scheduling_parameter;
-        readonly attribute CORBA::Policy implicit_scheduling_parameter;
-
-        typedef sequence<string> NameList;
-
-        readonly attribute NameList      current_scheduling_segment_names;
-            // Ordered from innermost segment name
-            // to outmost segment name
-    };
-
-    local interface ResourceManager
-        : RTCORBA::Mutex
-    {
-    };
-
-    local interface Scheduler
-    {
-        exception INCOMPATIBLE_SCHEDULING_DISCIPLINES {};
-
-        attribute          CORBA::PolicyList scheduling_policies;
-        readonly attribute CORBA::PolicyList poa_policies;
-        readonly attribute string            scheduling_discipline_name;
-
-        ResourceManager
-            create_resource_manager
-                (in string        name,
-                 in CORBA::Policy scheduling_parameter);
-
-        void set_scheduling_parameter
-            (inout PortableServer::Servant resource,
-             in    string         name,
-             in    CORBA::Policy  scheduling_parameter);
-
-        void begin_new_scheduling_segment (in Current::IdType guid,
-                                        in string name,
-                                        in CORBA::Policy sched_param,
-                                        in CORBA::Policy implicit_sched_param)
-        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
-
-        void begin_nested_scheduling_segment (in Current::IdType guid,
-                                        in string name,
-                                        in CORBA::Policy sched_param,
-                                        in CORBA::Policy implicit_sched_param)
-        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
-
-
-        void update_scheduling_segment (in Current::IdType guid,
-                                        in string name,
-                                        in CORBA::Policy sched_param,
-                                        in CORBA::Policy implicit_sched_param)
-        raises (Current::UNSUPPORTED_SCHEDULING_DISCIPLINE);
-
-        void end_scheduling_segment (in Current::IdType guid,
-                                        in string name);
-
-
-        void end_nested_scheduling_segment (in Current::IdType guid,
-                                        in string name,
-                                        in CORBA::Policy outer_sched_param);
-
-        void send_request (in PortableInterceptor::ClientRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void receive_request (in PortableInterceptor::ServerRequestInfo ri,
-                                out Current::IdType guid,
-                                out string name,
-                                out CORBA::Policy sched_param,
-                                out CORBA::Policy implicit_sched_param)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void send_reply (in PortableInterceptor::ServerRequestInfo ri);
-
-        void send_exception (in PortableInterceptor::ServerRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void send_other (in PortableInterceptor::ServerRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void send_poll (in PortableInterceptor::ClientRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void receive_reply (in PortableInterceptor::ClientRequestInfo ri);
-
-        void receive_exception (in PortableInterceptor::ClientRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void receive_other (in PortableInterceptor::ClientRequestInfo ri)
-        raises (PortableInterceptor::ForwardRequest);
-
-        void cancel (in Current::IdType guid);
-    };
-
-};
-
-#endif /*TAO_RTSCHEDULER_PIDL*/
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
deleted file mode 100644
index 5f604f5c9e1..00000000000
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RTScheduler.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_ThreadAction (
-    CORBA::tk_local_interface,
-    "IDL:RTScheduling/ThreadAction:1.0",
-    "ThreadAction");
-  
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr const _tc_ThreadAction =
-    &_tao_tc_RTScheduling_ThreadAction;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_RTScheduling_DistributableThread_DT_State[] =
-  {
-    "ACTIVE",
-    "CANCELLED"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_DistributableThread_DT_State (
-    "IDL:RTScheduling/DistributableThread/DT_State:1.0",
-    "DT_State",
-    _tao_enumerators_RTScheduling_DistributableThread_DT_State,
-    2);
-  
-::CORBA::TypeCode_ptr const RTScheduling::DistributableThread::_tc_DT_State =
-  &_tao_tc_RTScheduling_DistributableThread_DT_State;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_DistributableThread (
-    CORBA::tk_local_interface,
-    "IDL:RTScheduling/DistributableThread:1.0",
-    "DistributableThread");
-  
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr const _tc_DistributableThread =
-    &_tao_tc_RTScheduling_DistributableThread;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE (
-    CORBA::tk_except,
-    "IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0",
-    "UNSUPPORTED_SCHEDULING_DISCIPLINE",
-    _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
-    0);
-  
-::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
-  &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_RTScheduling_Current_IdType_GUARD
-#define _TAO_TYPECODE_RTScheduling_Current_IdType_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      RTScheduling_Current_IdType_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_octet,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_IdType_0 =
-      &RTScheduling_Current_IdType_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_RTScheduling_Current_IdType_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Current_IdType (
-    CORBA::tk_alias,
-    "IDL:RTScheduling/Current/IdType:1.0",
-    "IdType",
-    &TAO::TypeCode::tc_RTScheduling_Current_IdType_0);
-  
-::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_IdType =
-  &_tao_tc_RTScheduling_Current_IdType;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_RTScheduling_Current_NameList_GUARD
-#define _TAO_TYPECODE_RTScheduling_Current_NameList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      RTScheduling_Current_NameList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_string,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_NameList_0 =
-      &RTScheduling_Current_NameList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_RTScheduling_Current_NameList_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Current_NameList (
-    CORBA::tk_alias,
-    "IDL:RTScheduling/Current/NameList:1.0",
-    "NameList",
-    &TAO::TypeCode::tc_RTScheduling_Current_NameList_0);
-  
-::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
-  &_tao_tc_RTScheduling_Current_NameList;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Current (
-    CORBA::tk_local_interface,
-    "IDL:RTScheduling/Current:1.0",
-    "Current");
-  
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_RTScheduling_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_ResourceManager (
-    CORBA::tk_local_interface,
-    "IDL:RTScheduling/ResourceManager:1.0",
-    "ResourceManager");
-  
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr const _tc_ResourceManager =
-    &_tao_tc_RTScheduling_ResourceManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES (
-    CORBA::tk_except,
-    "IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0",
-    "INCOMPATIBLE_SCHEDULING_DISCIPLINES",
-    _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
-    0);
-  
-::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
-  &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_RTScheduling_Scheduler (
-    CORBA::tk_local_interface,
-    "IDL:RTScheduling/Scheduler:1.0",
-    "Scheduler");
-  
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr const _tc_Scheduler =
-    &_tao_tc_RTScheduling_Scheduler;
-}
-
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
deleted file mode 100644
index 142325f3ddd..00000000000
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ /dev/null
@@ -1,1003 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "RTScheduler.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "tao/Var_Size_Argument_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
-
-#if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
-#define _CORBA_POLICYLIST__ARG_TRAITS_CS_
-  
-  template<>
-  class Arg_Traits<CORBA::PolicyList>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::PolicyList,
-            CORBA::PolicyList_var,
-            CORBA::PolicyList_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTScheduling::ThreadAction.
-
-RTScheduling::ThreadAction_ptr
-TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate (
-    RTScheduling::ThreadAction_ptr p
-  )
-{
-  return RTScheduling::ThreadAction::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTScheduling::ThreadAction>::release (
-    RTScheduling::ThreadAction_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTScheduling::ThreadAction_ptr
-TAO::Objref_Traits<RTScheduling::ThreadAction>::nil (void)
-{
-  return RTScheduling::ThreadAction::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::ThreadAction>::marshal (
-    RTScheduling::ThreadAction_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTScheduling::ThreadAction::ThreadAction (void)
-{}
-
-RTScheduling::ThreadAction::~ThreadAction (void)
-{}
-
-RTScheduling::ThreadAction_ptr
-RTScheduling::ThreadAction::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadAction::_nil ();
-    }
-  
-  ThreadAction_ptr proxy =
-    dynamic_cast<ThreadAction_ptr> (_tao_objref);
-  
-  return ThreadAction::_duplicate (proxy);
-}
-
-RTScheduling::ThreadAction_ptr
-RTScheduling::ThreadAction::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadAction::_nil ();
-    }
-  
-  ThreadAction_ptr proxy =
-    dynamic_cast<ThreadAction_ptr> (_tao_objref);
-  
-  return ThreadAction::_duplicate (proxy);
-}
-
-RTScheduling::ThreadAction_ptr
-RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTScheduling::ThreadAction::_tao_release (ThreadAction_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTScheduling::ThreadAction::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:RTScheduling/ThreadAction:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTScheduling::ThreadAction::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/ThreadAction:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::ThreadAction::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTScheduling::DistributableThread.
-
-RTScheduling::DistributableThread_ptr
-TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate (
-    RTScheduling::DistributableThread_ptr p
-  )
-{
-  return RTScheduling::DistributableThread::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTScheduling::DistributableThread>::release (
-    RTScheduling::DistributableThread_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTScheduling::DistributableThread_ptr
-TAO::Objref_Traits<RTScheduling::DistributableThread>::nil (void)
-{
-  return RTScheduling::DistributableThread::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::DistributableThread>::marshal (
-    RTScheduling::DistributableThread_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTScheduling::DistributableThread::DistributableThread (void)
-{}
-
-RTScheduling::DistributableThread::~DistributableThread (void)
-{}
-
-RTScheduling::DistributableThread_ptr
-RTScheduling::DistributableThread::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DistributableThread::_nil ();
-    }
-  
-  DistributableThread_ptr proxy =
-    dynamic_cast<DistributableThread_ptr> (_tao_objref);
-  
-  return DistributableThread::_duplicate (proxy);
-}
-
-RTScheduling::DistributableThread_ptr
-RTScheduling::DistributableThread::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return DistributableThread::_nil ();
-    }
-  
-  DistributableThread_ptr proxy =
-    dynamic_cast<DistributableThread_ptr> (_tao_objref);
-  
-  return DistributableThread::_duplicate (proxy);
-}
-
-RTScheduling::DistributableThread_ptr
-RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTScheduling::DistributableThread::_tao_release (DistributableThread_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTScheduling::DistributableThread::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:RTScheduling/DistributableThread:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTScheduling::DistributableThread::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/DistributableThread:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::DistributableThread::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTScheduling::Current.
-
-RTScheduling::Current_ptr
-TAO::Objref_Traits<RTScheduling::Current>::duplicate (
-    RTScheduling::Current_ptr p
-  )
-{
-  return RTScheduling::Current::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTScheduling::Current>::release (
-    RTScheduling::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTScheduling::Current_ptr
-TAO::Objref_Traits<RTScheduling::Current>::nil (void)
-{
-  return RTScheduling::Current::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::Current>::marshal (
-    RTScheduling::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (void)
-  : CORBA::UserException (
-        "IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0",
-        "UNSUPPORTED_SCHEDULING_DISCIPLINE"
-      )
-{
-}
-
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::~UNSUPPORTED_SCHEDULING_DISCIPLINE (void)
-{
-}
-
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (const ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE&
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::operator= (const ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<UNSUPPORTED_SCHEDULING_DISCIPLINE *> (_tao_excp);
-}
-
-const RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const UNSUPPORTED_SCHEDULING_DISCIPLINE *> (_tao_excp);
-}
-
-CORBA::Exception *RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE, 0);
-  return retval;
-}
-
-CORBA::Exception *
-RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE (*this),
-      0
-    );
-  return result;
-}
-
-void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_type (void) const
-{
-  return ::RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_)
-#define _RTSCHEDULING_CURRENT_IDTYPE_CS_
-
-RTScheduling::Current::IdType::IdType (void)
-{}
-
-RTScheduling::Current::IdType::IdType (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max)
-{}
-
-RTScheduling::Current::IdType::IdType (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Octet * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (max, length, buffer, release)
-{}
-
-RTScheduling::Current::IdType::IdType (
-    const IdType &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Octet
-      >
-    (seq)
-{}
-
-RTScheduling::Current::IdType::~IdType (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_)
-#define _RTSCHEDULING_CURRENT_NAMELIST_CS_
-
-RTScheduling::Current::NameList::NameList (void)
-{}
-
-RTScheduling::Current::NameList::NameList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-RTScheduling::Current::NameList::NameList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-RTScheduling::Current::NameList::NameList (
-    const NameList &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-RTScheduling::Current::NameList::~NameList (void)
-{}
-
-#endif /* end #if !defined */
-
-RTScheduling::Current::Current (void)
-{}
-
-RTScheduling::Current::~Current (void)
-{}
-
-RTScheduling::Current_ptr
-RTScheduling::Current::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-RTScheduling::Current_ptr
-RTScheduling::Current::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Current::_nil ();
-    }
-  
-  Current_ptr proxy =
-    dynamic_cast<Current_ptr> (_tao_objref);
-  
-  return Current::_duplicate (proxy);
-}
-
-RTScheduling::Current_ptr
-RTScheduling::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTScheduling::Current::_tao_release (Current_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTScheduling::Current::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:RTScheduling/Current:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTScheduling::Current::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/Current:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::Current::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTScheduling::ResourceManager.
-
-RTScheduling::ResourceManager_ptr
-TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate (
-    RTScheduling::ResourceManager_ptr p
-  )
-{
-  return RTScheduling::ResourceManager::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTScheduling::ResourceManager>::release (
-    RTScheduling::ResourceManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTScheduling::ResourceManager_ptr
-TAO::Objref_Traits<RTScheduling::ResourceManager>::nil (void)
-{
-  return RTScheduling::ResourceManager::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::ResourceManager>::marshal (
-    RTScheduling::ResourceManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-RTScheduling::ResourceManager::ResourceManager (void)
-{}
-
-RTScheduling::ResourceManager::~ResourceManager (void)
-{}
-
-RTScheduling::ResourceManager_ptr
-RTScheduling::ResourceManager::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ResourceManager::_nil ();
-    }
-  
-  ResourceManager_ptr proxy =
-    dynamic_cast<ResourceManager_ptr> (_tao_objref);
-  
-  return ResourceManager::_duplicate (proxy);
-}
-
-RTScheduling::ResourceManager_ptr
-RTScheduling::ResourceManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ResourceManager::_nil ();
-    }
-  
-  ResourceManager_ptr proxy =
-    dynamic_cast<ResourceManager_ptr> (_tao_objref);
-  
-  return ResourceManager::_duplicate (proxy);
-}
-
-RTScheduling::ResourceManager_ptr
-RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTScheduling::ResourceManager::_tao_release (ResourceManager_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTScheduling::ResourceManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/RTCORBA/Mutex:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:RTScheduling/ResourceManager:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTScheduling::ResourceManager::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/ResourceManager:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::ResourceManager::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for RTScheduling::Scheduler.
-
-RTScheduling::Scheduler_ptr
-TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate (
-    RTScheduling::Scheduler_ptr p
-  )
-{
-  return RTScheduling::Scheduler::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<RTScheduling::Scheduler>::release (
-    RTScheduling::Scheduler_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-RTScheduling::Scheduler_ptr
-TAO::Objref_Traits<RTScheduling::Scheduler>::nil (void)
-{
-  return RTScheduling::Scheduler::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<RTScheduling::Scheduler>::marshal (
-    RTScheduling::Scheduler_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (void)
-  : CORBA::UserException (
-        "IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0",
-        "INCOMPATIBLE_SCHEDULING_DISCIPLINES"
-      )
-{
-}
-
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::~INCOMPATIBLE_SCHEDULING_DISCIPLINES (void)
-{
-}
-
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (const ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES&
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::operator= (const ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<INCOMPATIBLE_SCHEDULING_DISCIPLINES *> (_tao_excp);
-}
-
-const RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const INCOMPATIBLE_SCHEDULING_DISCIPLINES *> (_tao_excp);
-}
-
-CORBA::Exception *RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES, 0);
-  return retval;
-}
-
-CORBA::Exception *
-RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES (*this),
-      0
-    );
-  return result;
-}
-
-void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_type (void) const
-{
-  return ::RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
-}
-
-RTScheduling::Scheduler::Scheduler (void)
-{}
-
-RTScheduling::Scheduler::~Scheduler (void)
-{}
-
-RTScheduling::Scheduler_ptr
-RTScheduling::Scheduler::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Scheduler::_nil ();
-    }
-  
-  Scheduler_ptr proxy =
-    dynamic_cast<Scheduler_ptr> (_tao_objref);
-  
-  return Scheduler::_duplicate (proxy);
-}
-
-RTScheduling::Scheduler_ptr
-RTScheduling::Scheduler::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Scheduler::_nil ();
-    }
-  
-  Scheduler_ptr proxy =
-    dynamic_cast<Scheduler_ptr> (_tao_objref);
-  
-  return Scheduler::_duplicate (proxy);
-}
-
-RTScheduling::Scheduler_ptr
-RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-RTScheduling::Scheduler::_tao_release (Scheduler_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-RTScheduling::Scheduler::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:RTScheduling/Scheduler:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* RTScheduling::Scheduler::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduling/Scheduler:1.0";
-}
-
-CORBA::Boolean
-RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
deleted file mode 100644
index 12f0f991e07..00000000000
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ /dev/null
@@ -1,1288 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_RTSCHEDULERC_H_
-#define _TAO_IDL_ORIG_RTSCHEDULERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "rtscheduler_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/RTCORBA/RTCORBA_includeC.h"
-#include "tao/PortableServer/PortableServer_includeC.h"
-#include "tao/PortableInterceptorC.h"
-
-#ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
-#error "You should not include RTSchedulerC.h directly, use RTScheduler.h"
-#endif /* !TAO_RTSCHEDULER_SAFE_INCLUDE */
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_RTScheduler_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-  // Hand crafted
-  typedef void* VoidData;
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace RTScheduling
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTSCHEDULING_THREADACTION__VAR_OUT_CH_)
-#define _RTSCHEDULING_THREADACTION__VAR_OUT_CH_
-  
-  class ThreadAction;
-  typedef ThreadAction *ThreadAction_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ThreadAction
-      >
-    ThreadAction_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ThreadAction
-      >
-    ThreadAction_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTSCHEDULING_THREADACTION_CH_)
-#define _RTSCHEDULING_THREADACTION_CH_
-  
-  class TAO_RTScheduler_Export ThreadAction
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef ThreadAction_ptr _ptr_type;
-    typedef ThreadAction_var _var_type;
-    
-    // The static operations.
-    static ThreadAction_ptr _duplicate (ThreadAction_ptr obj);
-    
-    static void _tao_release (ThreadAction_ptr obj);
-    
-    static ThreadAction_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ThreadAction_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ThreadAction_ptr _nil (void)
-    {
-      return static_cast<ThreadAction_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void _cxx_do (
-        ::CORBA::VoidData data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ThreadAction (void);
-    
-    virtual ~ThreadAction (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ThreadAction (const ThreadAction &);
-    
-    void operator= (const ThreadAction &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ThreadAction;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_)
-#define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_
-  
-  class DistributableThread;
-  typedef DistributableThread *DistributableThread_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        DistributableThread
-      >
-    DistributableThread_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        DistributableThread
-      >
-    DistributableThread_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_CH_)
-#define _RTSCHEDULING_DISTRIBUTABLETHREAD_CH_
-  
-  class TAO_RTScheduler_Export DistributableThread
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef DistributableThread_ptr _ptr_type;
-    typedef DistributableThread_var _var_type;
-    
-    // The static operations.
-    static DistributableThread_ptr _duplicate (DistributableThread_ptr obj);
-    
-    static void _tao_release (DistributableThread_ptr obj);
-    
-    static DistributableThread_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DistributableThread_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static DistributableThread_ptr _nil (void)
-    {
-      return static_cast<DistributableThread_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_enum/enum_ch.cpp:57
-    
-    enum DT_State
-    {
-      ACTIVE,
-      CANCELLED
-    };
-    
-    typedef DT_State &DT_State_out;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_DT_State;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void cancel (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::DistributableThread::DT_State state (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    DistributableThread (void);
-    
-    virtual ~DistributableThread (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    DistributableThread (const DistributableThread &);
-    
-    void operator= (const DistributableThread &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_DistributableThread;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_)
-#define _RTSCHEDULING_CURRENT__VAR_OUT_CH_
-  
-  class Current;
-  typedef Current *Current_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Current
-      >
-    Current_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Current
-      >
-    Current_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTSCHEDULING_CURRENT_CH_)
-#define _RTSCHEDULING_CURRENT_CH_
-  
-  class TAO_RTScheduler_Export Current
-    : public virtual ::RTCORBA::Current
-  {
-  public:
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-    
-    // The static operations.
-    static Current_ptr _duplicate (Current_ptr obj);
-    
-    static void _tao_release (Current_ptr obj);
-    
-    static Current_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Current_ptr _nil (void)
-    {
-      return static_cast<Current_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::DistributableThread_ptr spawn (
-        ::RTScheduling::ThreadAction_ptr start,
-        ::CORBA::VoidData data,
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param,
-        ::CORBA::ULong stack_size,
-        ::RTCORBA::Priority base_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_)
-#define _RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_
-    
-    class TAO_RTScheduler_Export UNSUPPORTED_SCHEDULING_DISCIPLINE : public CORBA::UserException
-    {
-    public:
-      
-      UNSUPPORTED_SCHEDULING_DISCIPLINE (void);
-      UNSUPPORTED_SCHEDULING_DISCIPLINE (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
-      ~UNSUPPORTED_SCHEDULING_DISCIPLINE (void);
-
-      UNSUPPORTED_SCHEDULING_DISCIPLINE &operator= (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
-      
-      static UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception *);
-      static const UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void begin_scheduling_segment (
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void update_scheduling_segment (
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void end_scheduling_segment (
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CH_)
-#define _RTSCHEDULING_CURRENT_IDTYPE_CH_
-    
-    class IdType;
-    
-    typedef
-      TAO_FixedSeq_Var_T<
-          IdType,
-          CORBA::Octet
-        >
-      IdType_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          IdType,
-          IdType_var,
-          CORBA::Octet
-        >
-      IdType_out;
-    
-    class TAO_RTScheduler_Export IdType
-      : public
-          TAO_Unbounded_Sequence<
-              CORBA::Octet
-            >
-    {
-    public:
-      IdType (void);
-      IdType (CORBA::ULong max);
-      IdType (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::Octet* buffer, 
-          CORBA::Boolean release = 0
-        );
-      IdType (const IdType &);
-      ~IdType (void);
-      
-      typedef IdType_var _var_type;
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      IdType (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_IdType;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::Current::IdType * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::DistributableThread_ptr lookup (
-        const ::RTScheduling::Current::IdType & id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr scheduling_parameter (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CH_)
-#define _RTSCHEDULING_CURRENT_NAMELIST_CH_
-    
-    class NameList;
-    
-    typedef
-      TAO_MngSeq_Var_T<
-          NameList,
-          TAO_SeqElem_String_Manager
-        >
-      NameList_var;
-    
-    typedef
-      TAO_MngSeq_Out_T<
-          NameList,
-          NameList_var,
-          TAO_SeqElem_String_Manager
-        >
-      NameList_out;
-    
-    class TAO_RTScheduler_Export NameList
-      : public
-          TAO_Unbounded_String_Sequence
-    {
-    public:
-      NameList (void);
-      NameList (CORBA::ULong max);
-      NameList (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          char ** buffer, 
-          CORBA::Boolean release = 0
-        );
-      NameList (const NameList &);
-      ~NameList (void);
-      
-      typedef NameList_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_NameList;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::Current::NameList * current_scheduling_segment_names (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Current (void);
-    
-    virtual ~Current (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-    
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Current;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_)
-#define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_
-  
-  class ResourceManager;
-  typedef ResourceManager *ResourceManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ResourceManager
-      >
-    ResourceManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ResourceManager
-      >
-    ResourceManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTSCHEDULING_RESOURCEMANAGER_CH_)
-#define _RTSCHEDULING_RESOURCEMANAGER_CH_
-  
-  class TAO_RTScheduler_Export ResourceManager
-    : public virtual ::RTCORBA::Mutex
-  {
-  public:
-    typedef ResourceManager_ptr _ptr_type;
-    typedef ResourceManager_var _var_type;
-    
-    // The static operations.
-    static ResourceManager_ptr _duplicate (ResourceManager_ptr obj);
-    
-    static void _tao_release (ResourceManager_ptr obj);
-    
-    static ResourceManager_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ResourceManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ResourceManager_ptr _nil (void)
-    {
-      return static_cast<ResourceManager_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ResourceManager (void);
-    
-    virtual ~ResourceManager (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ResourceManager (const ResourceManager &);
-    
-    void operator= (const ResourceManager &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ResourceManager;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_)
-#define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_
-  
-  class Scheduler;
-  typedef Scheduler *Scheduler_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Scheduler
-      >
-    Scheduler_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Scheduler
-      >
-    Scheduler_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_RTSCHEDULING_SCHEDULER_CH_)
-#define _RTSCHEDULING_SCHEDULER_CH_
-  
-  class TAO_RTScheduler_Export Scheduler
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef Scheduler_ptr _ptr_type;
-    typedef Scheduler_var _var_type;
-    
-    // The static operations.
-    static Scheduler_ptr _duplicate (Scheduler_ptr obj);
-    
-    static void _tao_release (Scheduler_ptr obj);
-    
-    static Scheduler_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Scheduler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Scheduler_ptr _nil (void)
-    {
-      return static_cast<Scheduler_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_)
-#define _RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_
-    
-    class TAO_RTScheduler_Export INCOMPATIBLE_SCHEDULING_DISCIPLINES : public CORBA::UserException
-    {
-    public:
-      
-      INCOMPATIBLE_SCHEDULING_DISCIPLINES (void);
-      INCOMPATIBLE_SCHEDULING_DISCIPLINES (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
-      ~INCOMPATIBLE_SCHEDULING_DISCIPLINES (void);
-
-      INCOMPATIBLE_SCHEDULING_DISCIPLINES &operator= (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
-      
-      static INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception *);
-      static const INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PolicyList * scheduling_policies (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void scheduling_policies (
-        const ::CORBA::PolicyList & scheduling_policies
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::PolicyList * poa_policies (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * scheduling_discipline_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::RTScheduling::ResourceManager_ptr create_resource_manager (
-        const char * name,
-        ::CORBA::Policy_ptr scheduling_parameter
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_scheduling_parameter (
-        ::PortableServer::Servant & resource,
-        const char * name,
-        ::CORBA::Policy_ptr scheduling_parameter
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void begin_new_scheduling_segment (
-        const ::RTScheduling::Current::IdType & guid,
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void begin_nested_scheduling_segment (
-        const ::RTScheduling::Current::IdType & guid,
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void update_scheduling_segment (
-        const ::RTScheduling::Current::IdType & guid,
-        const char * name,
-        ::CORBA::Policy_ptr sched_param,
-        ::CORBA::Policy_ptr implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void end_scheduling_segment (
-        const ::RTScheduling::Current::IdType & guid,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void end_nested_scheduling_segment (
-        const ::RTScheduling::Current::IdType & guid,
-        const char * name,
-        ::CORBA::Policy_ptr outer_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_request (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void receive_request (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri,
-        ::RTScheduling::Current::IdType_out guid,
-        CORBA::String_out name,
-        ::CORBA::Policy_out sched_param,
-        ::CORBA::Policy_out implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_reply (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_exception (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_other (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void send_poll (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void receive_reply (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void receive_exception (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void receive_other (
-        ::PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void cancel (
-        const ::RTScheduling::Current::IdType & guid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    Scheduler (void);
-    
-    virtual ~Scheduler (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Scheduler (const Scheduler &);
-    
-    void operator= (const Scheduler &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Scheduler;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module RTScheduling
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_RTSCHEDULING_THREADACTION__TRAITS_CH_)
-#define _RTSCHEDULING_THREADACTION__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ThreadAction>
-  {
-    static ::RTScheduling::ThreadAction_ptr duplicate (
-        ::RTScheduling::ThreadAction_ptr
-      );
-    static void release (
-        ::RTScheduling::ThreadAction_ptr
-      );
-    static ::RTScheduling::ThreadAction_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTScheduling::ThreadAction_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_)
-#define _RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::DistributableThread>
-  {
-    static ::RTScheduling::DistributableThread_ptr duplicate (
-        ::RTScheduling::DistributableThread_ptr
-      );
-    static void release (
-        ::RTScheduling::DistributableThread_ptr
-      );
-    static ::RTScheduling::DistributableThread_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTScheduling::DistributableThread_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTSCHEDULING_CURRENT__TRAITS_CH_)
-#define _RTSCHEDULING_CURRENT__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Current>
-  {
-    static ::RTScheduling::Current_ptr duplicate (
-        ::RTScheduling::Current_ptr
-      );
-    static void release (
-        ::RTScheduling::Current_ptr
-      );
-    static ::RTScheduling::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTScheduling::Current_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_)
-#define _RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ResourceManager>
-  {
-    static ::RTScheduling::ResourceManager_ptr duplicate (
-        ::RTScheduling::ResourceManager_ptr
-      );
-    static void release (
-        ::RTScheduling::ResourceManager_ptr
-      );
-    static ::RTScheduling::ResourceManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTScheduling::ResourceManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTSCHEDULING_SCHEDULER__TRAITS_CH_)
-#define _RTSCHEDULING_SCHEDULER__TRAITS_CH_
-  
-  template<>
-  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Scheduler>
-  {
-    static ::RTScheduling::Scheduler_ptr duplicate (
-        ::RTScheduling::Scheduler_ptr
-      );
-    static void release (
-        ::RTScheduling::Scheduler_ptr
-      );
-    static ::RTScheduling::Scheduler_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::RTScheduling::Scheduler_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
deleted file mode 100644
index e9c18aec522..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "RTScheduler_Initializer.h"
-#include "Request_Interceptor.h"
-
-ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
-
-#include "tao/RTScheduling/RTScheduler.h"
-#include "tao/RTScheduling/Current.h"
-#include "tao/RTScheduling/RTScheduler_Manager.h"
-
-#include "tao/Exception.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitInfo.h"
-#include "tao/debug.h"
-#include "ace/Service_Repository.h"
-#include "ace/Svc_Conf.h"
-
-void
- TAO_RTScheduler_ORB_Initializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //
-  // Register all of the RT related services.
-  //
-
-  // Create the RT_Current.
-
-  // Narrow to a TAO_ORBInitInfo object to get access to the
-  // orb_core() TAO extension.
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "In pre_init\n"));
-
-  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (tao_info.in ()))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) Security_ORBInitializer::pre_init:\n"
-                    "(%P|%t)    Unable to narrow "
-                    "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
-                    "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-
-  ACE_NEW_THROW_EX (this->current_,
-                    TAO_RTScheduler_Current,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  this->current_->init (tao_info->orb_core ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_ptr current_obj = RTScheduling::Current::_narrow (this->current_
-                                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var safe_current = current_obj;
-
-    info->register_initial_reference ("RTScheduler_Current",
-                                      current_obj
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-  Client_Interceptor *client_interceptor;
-  ACE_NEW_THROW_EX (client_interceptor,
-                    Client_Interceptor,
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                        CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
- info->add_client_request_interceptor (client_interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  Server_Interceptor *server_interceptor;
-  ACE_NEW_THROW_EX (server_interceptor,
-                    Server_Interceptor (this->current_),
-                    CORBA::NO_MEMORY (
-                        CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                        CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
- info->add_server_request_interceptor (server_interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Set the RTScheduler_Manager
-  TAO_RTScheduler_Manager *manager = 0;
-
-  ACE_NEW_THROW_EX (manager,
-                    TAO_RTScheduler_Manager (tao_info->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-
-  TAO_RTScheduler_Manager_var safe_manager = manager;
-
-  info->register_initial_reference ("RTSchedulerManager",
-                                    manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-
-}
-
-void
-TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  // @@ This is busted.  TAO_ORBInitInfo should do proper reference
-  //    counting.
-  // Narrow to a TAO_ORBInitInfo object to get access to the
-  // orb_core() TAO extension.
-  //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-  //                                                           ACE_ENV_ARG_PARAMETER);
-  //ACE_CHECK;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "In post_init\n"));
-
-  CORBA::Object_ptr rt_current_obj = info->resolve_initial_references ("RTCurrent"
-                                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-
-  RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (rt_current.in ()))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) ::post_init \n"
-                  "(%P|%t) Unable to narrow to RTCORBA::Current\n"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  this->current_->rt_current (rt_current.in ());
-}
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
deleted file mode 100644
index 15b069094dd..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file RTScheduler_Initializer.h
- *
- *  $Id$
- *
- *  @author Yamuna Krishnamurthy <yamuna@oomworks.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_RTSCHEDULER_INITIALIZER_H
-#define TAO_RTSCHEDULER_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-#include "rtscheduler_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_RTScheduler_Current;
-
-/// RTCORBA ORB initializer.
-class TAO_RTScheduler_Export TAO_RTScheduler_ORB_Initializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-private:
-        TAO_RTScheduler_Current* current_;
-
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RTSCHEDULER__INITIALIZER_H */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
deleted file mode 100644
index 9c9cf4ba0ea..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// $Id$
-
-#include "RTScheduler_Loader.h"
-#include "RTScheduler_Initializer.h"
-
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (TAO, RTScheduler_Loader, "$Id$")
-
-
-TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
-{
-}
-
-TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
-{
-
-}
-
-int
-TAO_RTScheduler_Loader::init (int,
-			      ACE_TCHAR* [])
-{
-  ACE_TRACE ("TAO_RTScheduler_Loader::init");
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-		"In RTScheduler_Loader::init\n"));
-
-  static int initialized = 0;
-
-  // Only allow initialization once.
-  if (initialized)
-    return 0;
-
-  initialized = 1;
-
-  // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-      PortableInterceptor::ORBInitializer_var orb_initializer;
-
-      /// Register the RTCORBA ORBInitializer.
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_RTScheduler_ORB_Initializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                          TAO::VMCID,
-                          ENOMEM),
-					  CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-      orb_initializer = temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught while initializing the RTScheduler:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-/////////////////////////////////////////////////////////////////////
-
-ACE_FACTORY_DEFINE (TAO_RTScheduler, TAO_RTScheduler_Loader)
-ACE_STATIC_SVC_DEFINE (TAO_RTScheduler_Loader,
-                       ACE_TEXT ("RTScheduler_Loader"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_RTScheduler_Loader),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h
deleted file mode 100644
index 3f221ce27dd..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    RTScheduler_Loader.h
- *
- *  $Id$
- *
- *   Header file for Loading RTScheduler.
- *
- *
- *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
- */
-//=============================================================================
-
-#ifndef TAO_RTSCHEDULER_LOADER_H
-#define TAO_RTSCHEDULER_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "rtscheduler_export.h"
-
-
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object
-{
-public:
-  /// Constructor.
-  TAO_RTScheduler_Loader (void);
-
-  /// Destructor.
-  virtual ~TAO_RTScheduler_Loader (void);
-
-  /// Initialize the RTScheduler loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTScheduler, TAO_RTScheduler_Loader)
-ACE_FACTORY_DECLARE (TAO_RTScheduler, TAO_RTScheduler_Loader)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_RTSCHEDULER_LOADER_H */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
deleted file mode 100644
index 506ebde419e..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#include "RTScheduler_Manager.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "RTScheduler_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(TAO, RT_ORB, "$Id$")
-
-TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
-{
- 
-}
-
-TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void)
-{
-}
-
-TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return 
-    TAO_RTScheduler_Manager::_duplicate (
-        dynamic_cast<TAO_RTScheduler_Manager *> (obj)
-      );
-}
-
-TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager::_duplicate (TAO_RTScheduler_Manager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
-
-const char*
-TAO_RTScheduler_Manager::_interface_repository_id (void) const
-{
-  return "IDL:RTScheduler_Manager:1.0";
-}
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
deleted file mode 100644
index ecb45489a13..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   RTScheduler_Manager.h
- *
- *  $Id$
- *
- *  @author Yamuna Krishnmaurthy <yamuna@oomworks.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_PRIORITY_MAPPING_MANAGER_H
-#define TAO_PRIORITY_MAPPING_MANAGER_H
-
-#include "RTScheduler.h"
-#include "tao/LocalObject.h"
-
-
-class TAO_RTScheduler_Manager;
-class TAO_RTScheduler_Manager_var;
-typedef TAO_RTScheduler_Manager *TAO_RTScheduler_Manager_ptr;
-
-
-/**
- * @class TAO_RTScheduler_Manager
- *
- * @brief RTScheduler_Manager pseudo-objref.
- *
- * Allows setting of user-defined RTScheduler at run-time.
- */
-class TAO_RTScheduler_Export TAO_RTScheduler_Manager :
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-        TAO_RTScheduler_Manager (void);
-  /// Constructor.
-  TAO_RTScheduler_Manager (TAO_ORB_Core*);
-
-  ///
-  void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  ///
-  RTScheduling::Scheduler_ptr rtscheduler (void);
-
-public:
-  typedef TAO_RTScheduler_Manager_ptr _ptr_type;
-  typedef TAO_RTScheduler_Manager_var _var_type;
-
-  // the static operations
-  static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj);
-  static TAO_RTScheduler_Manager_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  static TAO_RTScheduler_Manager_ptr _nil (void)
-    {
-      return (TAO_RTScheduler_Manager_ptr)0;
-    }
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  ~TAO_RTScheduler_Manager (void);
-
-private:
-
-  TAO_RTScheduler_Manager (const TAO_RTScheduler_Manager &);
-  void operator= (const TAO_RTScheduler_Manager &);
-  TAO_ORB_Core* orb_;
-
-private:
-  RTScheduling::Scheduler_var rtscheduler_;
-};
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var
-  : private TAO_Base_var
-{
-public:
-  TAO_RTScheduler_Manager_var (void); // default constructor
-  TAO_RTScheduler_Manager_var (TAO_RTScheduler_Manager_ptr);
-  TAO_RTScheduler_Manager_var (const TAO_RTScheduler_Manager_var &); // copy constructor
-  ~TAO_RTScheduler_Manager_var (void); // destructor
-
-  TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr);
-  TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &);
-  TAO_RTScheduler_Manager_ptr operator-> (void) const;
-
-  /// in, inout, out, _retn
-  operator const TAO_RTScheduler_Manager_ptr &() const;
-  operator TAO_RTScheduler_Manager_ptr &();
-  TAO_RTScheduler_Manager_ptr in (void) const;
-  TAO_RTScheduler_Manager_ptr &inout (void);
-  TAO_RTScheduler_Manager_ptr &out (void);
-  TAO_RTScheduler_Manager_ptr _retn (void);
-  TAO_RTScheduler_Manager_ptr ptr (void) const;
-
-  // Hooks used by template sequence and object manager classes
-  // for non-defined forward declared interfaces.
-  static TAO_RTScheduler_Manager_ptr duplicate (TAO_RTScheduler_Manager_ptr);
-  static void release (TAO_RTScheduler_Manager_ptr);
-  static TAO_RTScheduler_Manager_ptr nil (void);
-  static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
-  static CORBA::Object * upcast (void *);
-
-private:
-  /// Unimplemented - prevents widening assignment.
-  TAO_RTScheduler_Manager_ptr ptr_;
-  TAO_RTScheduler_Manager_var (const TAO_Base_var &rhs);
-  TAO_RTScheduler_Manager_var &operator= (const TAO_Base_var &rhs);
-};
-
-class TAO_RTScheduler_Export TAO_RTScheduler_Manager_out
-{
-public:
-  TAO_RTScheduler_Manager_out (TAO_RTScheduler_Manager_ptr &);
-  TAO_RTScheduler_Manager_out (TAO_RTScheduler_Manager_var &);
-  TAO_RTScheduler_Manager_out (const TAO_RTScheduler_Manager_out &);
-  TAO_RTScheduler_Manager_out &operator= (const TAO_RTScheduler_Manager_out &);
-  TAO_RTScheduler_Manager_out &operator= (const TAO_RTScheduler_Manager_var &);
-  TAO_RTScheduler_Manager_out &operator= (TAO_RTScheduler_Manager_ptr);
-  operator TAO_RTScheduler_Manager_ptr &();
-  TAO_RTScheduler_Manager_ptr &ptr (void);
-  TAO_RTScheduler_Manager_ptr operator-> (void);
-
-private:
-  TAO_RTScheduler_Manager_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "RTScheduler_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_PRIORITY_MAPPING_MANAGER_H */
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.i b/TAO/tao/RTScheduling/RTScheduler_Manager.i
deleted file mode 100644
index 6f1009b016d..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.i
+++ /dev/null
@@ -1,227 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class TAO_RTScheduler_Manager_var
-// *************************************************************
-
-#include "tao/ORB_Core.h"
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (void) // default constructor
-  : ptr_ (TAO_RTScheduler_Manager::_nil ())
-{}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (TAO_RTScheduler_Manager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (const ::TAO_RTScheduler_Manager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TAO_RTScheduler_Manager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_RTScheduler_Manager_var &
-TAO_RTScheduler_Manager_var::operator= (TAO_RTScheduler_Manager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_RTScheduler_Manager_var &
-TAO_RTScheduler_Manager_var::operator= (const ::TAO_RTScheduler_Manager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_RTScheduler_Manager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::operator const ::TAO_RTScheduler_Manager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_var::operator ::TAO_RTScheduler_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_RTScheduler_Manager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_RTScheduler_Manager_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_RTScheduler_Manager::_nil ();
-  return val;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::duplicate (TAO_RTScheduler_Manager_ptr p)
-{
-  return ::TAO_RTScheduler_Manager::_duplicate (p);
-}
-
-ACE_INLINE void
-TAO_RTScheduler_Manager_var::release (TAO_RTScheduler_Manager_ptr p)
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::nil (void)
-{
-  return ::TAO_RTScheduler_Manager::_nil ();
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_var::narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_RTScheduler_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object *
-TAO_RTScheduler_Manager_var::upcast (void *src)
-{
-  TAO_RTScheduler_Manager **tmp =
-    static_cast<TAO_RTScheduler_Manager **> (src);
-  return *tmp;
-}
-
-
-// *************************************************************
-// Inline operations for class TAO_RTScheduler_Manager_out
-// *************************************************************
-
-ACE_INLINE
-TAO_RTScheduler_Manager_out::TAO_RTScheduler_Manager_out (TAO_RTScheduler_Manager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_RTScheduler_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_out::TAO_RTScheduler_Manager_out (TAO_RTScheduler_Manager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_RTScheduler_Manager::_nil ();
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_out::TAO_RTScheduler_Manager_out (const ::TAO_RTScheduler_Manager_out &p) // copy constructor
-  : ptr_ (const_cast<TAO_RTScheduler_Manager_out &> (p).ptr_)
-{}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_out &
-TAO_RTScheduler_Manager_out::operator= (const ::TAO_RTScheduler_Manager_out &p)
-{
-  this->ptr_ = const_cast<TAO_RTScheduler_Manager_out&> (p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_RTScheduler_Manager_out &
-TAO_RTScheduler_Manager_out::operator= (const ::TAO_RTScheduler_Manager_var &p)
-{
-  this->ptr_ = ::TAO_RTScheduler_Manager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_RTScheduler_Manager_out &
-TAO_RTScheduler_Manager_out::operator= (TAO_RTScheduler_Manager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_RTScheduler_Manager_out::operator ::TAO_RTScheduler_Manager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr &
-TAO_RTScheduler_Manager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-///////////////////////////////////////////////////////////////////////////
-ACE_INLINE
-TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (TAO_ORB_Core* orb)
-  : orb_ (orb)
-{
-}
-
-ACE_INLINE RTScheduling::Scheduler_ptr
-TAO_RTScheduler_Manager::rtscheduler (void)
-{
-  return RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in());
-}
-
-ACE_INLINE void
-TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
-                                ACE_ENV_ARG_DECL)
-{
- rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler);
- this->orb_->object_ref_table ().register_initial_reference ("RTScheduler",
-						         RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in ())
-							ACE_ENV_ARG_PARAMETER);	
- ACE_CHECK;						
-
-}
-
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl
deleted file mode 100644
index c4bd0ba0195..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_include.pidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @file RTScheduler_include.pidl
- *
- * $Id$
- *
- * @brief Include file for use in applications that need RTScheduler.pidl.
- *
- * This file just includes RTScheduler.pidl. The *C.h file generated from
- * this is hand-crafted to itself include RTScheduler.h instead of
- * RTSchedulerC.h (which will produce a compiler error message if
- * included directly). The RTScheduler_includeC.h file can then be
- * included directly and automatically by the IDL compiler when
- * building the application.
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *     this is:
- *
- *     tao_idl -o orig -St -Sc -Sp
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RTScheduler_include.pidl
- *
- *   2. Then change this line in RTScheduler_includeC.h:
- *
- *          #include "RTSchedulerC.h"
- *
- *      to
- *
- *          #include "RTScheduler.h"
- */
-
-#ifndef _RT_SCHEDULER_INCLUDE_IDL_
-#define _RT_SCHEDULER_INCLUDE_IDL_
-
-#include "../RTScheduling/RTScheduler.pidl"
-
-#endif /* _RT_SCHEDULER_INCLUDE_IDL_ */
-
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h
deleted file mode 100644
index c1624376b4d..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_includeC.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
-
-#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEC_H_
-#define _TAO_IDL_RTSCHEDULER_INCLUDEC_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-
-#include "../RTScheduling/RTScheduler.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
deleted file mode 100644
index fcff3bf6ec9..00000000000
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-//$Id$
-
-#include "Request_Interceptor.h"
-#include "Current.h"
-#include "Distributable_Thread.h"
-#include "tao/TSS_Resources.h"
-#include "tao/debug.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/ORB_Constants.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (RTScheduling,
-           Request_Interceptor,
-           "$Id$")
-
-
-const IOP::ServiceId
-Client_Interceptor::SchedulingInfo = 30;
-
-Client_Interceptor::Client_Interceptor (void)
-{
-}
-
-void
-Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Client_Interceptor::send_request\n"));
-
-  // Temporary current.
-  TAO_RTScheduler_Current_i *new_current = 0;
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-
-  if (current != 0)
-    {
-      // If this is a one way request
-      if (!ri->response_expected ())
-        {
-
-          // Generate GUID.
-          RTScheduling::Current::IdType guid;
-          guid.length (sizeof(long));
-
-          size_t temp = ++TAO_RTScheduler_Current::guid_counter;
-          ACE_OS::memcpy (guid.get_buffer (),
-                          &temp,
-                          sizeof(size_t));
-
-          size_t id;
-          ACE_OS::memcpy (&id,
-                          guid.get_buffer (),
-                          guid.length ());
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "The Guid is %d %d\n",
-                        id,
-                        TAO_RTScheduler_Current::guid_counter.value_i ()));
-
-          // Create new DT.
-          RTScheduling::DistributableThread_var dt =
-            TAO_DistributableThread_Factory::create_DT ();
-
-          // Add new DT to map.
-          int result = current->dt_hash ()->bind (guid, dt);
-          if (result != 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "No Scheduling Segment Context\n"));
-              ACE_THROW (CORBA::INTERNAL ());
-
-            }
-
-          // @@ Store implicit_sched_param in a var
-
-          // Create new temporary current. Note that
-          // the new <sched_param> is the current
-          // <implicit_sched_param> and there is no
-          // segment name.
-          ACE_NEW (new_current,
-                   TAO_RTScheduler_Current_i (current->orb (),
-                                              current->dt_hash (),
-                                              guid,
-                                              0,
-                                              current->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER),
-                                              0,
-                                              dt.in (),
-                                              current));
-
-          // Install new current in the ORB.
-          //current->implementation (new_current);
-          tss->rtscheduler_current_impl_ = new_current;
-
-        }
-
-      // Scheduler populates the service context with
-      // scheduling parameters.
-      current->scheduler ()->send_request (ri);
-
-      // If this is a one way request
-      if (!ri->response_expected ())
-        {
-          // Cleanup temporary DT.
-          new_current->cleanup_DT ();
-
-          //Restore old current
-          new_current->cleanup_current ();
-        }
-    }
-}
-
-void
-Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Client_Interceptor::send_poll\n"));
-
-    TAO_RTScheduler_Current_i *current = 0;
-
-    TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-    current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-    if (current != 0)
-      current->scheduler ()->send_poll (ri);
-
-}
-
-void
-Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Client_Interceptor::receive_reply\n"));
-
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  if (current != 0)
-    current->scheduler ()->receive_reply (ri);
-}
-
-void
-Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Client_Interceptor::receive_exception\n"));
-
-
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-
-  if (current != 0)
-    {
-      if (ri == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "ri = 0\n"));
-          return;
-        }
-
-      CORBA::Any_var ex =
-        ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      CORBA::TypeCode_var type = ex->type ();
-
-      if (CORBA::is_nil (type.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "type = 0 \n"));
-          return;
-        }
-      const char * id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Received Exception %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
-
-
-      // If the remote host threw a THREAD_CANCELLED
-      // exception, make sure to take the appropriate
-      // local action.
-      if (ACE_OS::strstr (id, "CORBA::THREAD_CANCELLED") == 0)
-        {
-          // Perform the necessary cleanup as the
-          // thread was cancelled.
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-        {
-          // Inform scheduler that exception was
-          // received.
-          current->scheduler ()->receive_exception (ri);
-        }
-    }
-}
-
-void
-Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Client_Interceptor::receive_other\n"));
-
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  if (current != 0)
-    current->scheduler ()->receive_other (ri);
-
-}
-
-char*
-Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return  CORBA::string_dup ("RTSchdeuler_Client_Interceptor");
-}
-
-void
-Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-const IOP::ServiceId
-Server_Interceptor::SchedulingInfo = 30;
-
-Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current)
-{
-  this->current_ = TAO_RTScheduler_Current::_duplicate (current);
-}
-
-void
-Server_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Server_Interceptor::receive_request_service_contexts\n"));
-
-}
-
-void
-Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Server_Interceptor::receive_request\n"));
-
-  IOP::ServiceContext_var serv_cxt;
-
-  ACE_TRY
-    {
-      serv_cxt =
-        ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Invalid Service Request\n"));
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Request from Distributable Thread\n"));
-
-  RTScheduling::Current::IdType_var guid_var;
-  char* name = 0;
-  CORBA::Policy_ptr sched_param = 0;
-  CORBA::Policy_ptr implicit_sched_param = 0;
-
-  TAO_RTScheduler_Current_i* new_current;
-  ACE_NEW_THROW_EX (new_current,
-                    TAO_RTScheduler_Current_i (this->current_->orb (),
-                                               this->current_->dt_hash ()),
-                    CORBA::NO_MEMORY (
-                           CORBA::SystemException::_tao_minor_code (
-                             TAO::VMCID,
-                             ENOMEM),
-                           CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  // Scheduler retrieves scheduling parameters
-  // from request and populates the out
-  // parameters.
-  new_current->scheduler()->receive_request (ri,
-                                             guid_var.out (),
-                                             name,
-                                             sched_param,
-                                             implicit_sched_param);
-
-  if (guid_var.in () == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "The scheduler MUST retreive and return the "
-                  "GUID from the service context\n"));
-      return;
-    }
-  RTScheduling::Current::IdType guid;
-  guid.length (sizeof (size_t));
-  ACE_OS::memcpy (guid.get_buffer (),
-                  guid_var->get_buffer (),
-                  sizeof (size_t));
-
-  size_t id;
-  ACE_OS::memcpy (&id,
-                  guid.get_buffer (),
-                  guid.length ());
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "The Guid is %d \n",
-                id));
-
-  // Create new DT.
-  RTScheduling::DistributableThread_var dt = TAO_DistributableThread_Factory::create_DT ();
-
-  // Add new DT to map.
-  int result = new_current->dt_hash ()->bind (guid, dt);
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // Create new temporary current. Note that the new <sched_param> is
-  // the current <implicit_sched_param> and there is no segment name.
-  new_current->id (guid);
-  new_current->name (name);
-  new_current->scheduling_parameter (sched_param);
-  new_current->implicit_scheduling_parameter (implicit_sched_param);
-  new_current->DT (dt.in ());
-
-  // Install new current in the ORB and store the previous current
-  // implementation
-  // current->implementation (new_current)
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  tss->rtscheduler_previous_current_impl_ = this->current_->implementation (new_current);
-}
-
-void
-Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Server_Interceptor::send_reply\n"));
-
-  TAO_RTScheduler_Current_i *current = 0;
-  TAO_RTScheduler_Current_i *prev_current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  if (current != 0)
-    {
-
-      if (current->DT ()->state () == RTScheduling::DistributableThread::CANCELLED)
-        {
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          return;
-        }
-      else ACE_DEBUG ((LM_DEBUG,
-                       "Thread Not Cancelled\n"));
-
-
-      // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_reply (ri
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      current->cleanup_DT ();
-      current->cleanup_current ();
-
-      // Get the previous current if any.
-      prev_current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_previous_current_impl_);
-
-      // Restore the previous current.
-      tss->rtscheduler_current_impl_ = prev_current;
-
-      // Reset the previous current pointer.
-      tss->rtscheduler_previous_current_impl_ = 0;
-
-    }
-  else ACE_DEBUG ((LM_DEBUG,
-                   "Send Reply Current is 0\n"));
-}
-
-void
-Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Server_Interceptor::send_exception\n"));
-
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  if (current != 0)
-    {
-      // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_exception (ri);
-
-      current->cleanup_DT ();
-      current->cleanup_current ();
-    }
-}
-
-void
-Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Server_Interceptor::send_other\n"));
-
-  TAO_RTScheduler_Current_i *current = 0;
-
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
-
-  current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
-  if (current != 0)
-    {
-      // Inform scheduler that upcall is complete.
-      current->scheduler ()->send_other (ri);
-
-      current->cleanup_DT ();
-      current->cleanup_current ();
-    }
-}
-
-char*
-Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-    return  CORBA::string_dup ("RTSchdeuler_Server_Interceptor");
-}
-
-void
-Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
deleted file mode 100644
index 0c92c3b115c..00000000000
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-#ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
-#define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
-
-#include "rtscheduler_export.h"
-#include "tao/PortableInterceptorC.h"
-#include "RTScheduler.h"
-#include "ace/Atomic_Op.h"
-#include "Current.h"
-
-extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
-
-class TAO_RTScheduler_Export Client_Interceptor:
-public  PortableInterceptor::ClientRequestInterceptor
-{
-public:
-
-  Client_Interceptor (void);
-
-  //  Client_Interceptor (RTScheduling::Current_ptr current);
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                          ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  static const IOP::ServiceId SchedulingInfo;
-
-};
-
-class TAO_RTScheduler_Export Server_Interceptor:
-public PortableInterceptor::ServerRequestInterceptor
-{
-
-public:
-  Server_Interceptor (TAO_RTScheduler_Current_ptr current);
-
-  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  static const IOP::ServiceId SchedulingInfo;
-
- private:
-  TAO_RTScheduler_Current_var current_;
-
-};
-
-#endif  /* TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tao/RTScheduling/TAO_RTScheduler.pc.in b/TAO/tao/RTScheduling/TAO_RTScheduler.pc.in
deleted file mode 100644
index 5eaf692286e..00000000000
--- a/TAO/tao/RTScheduling/TAO_RTScheduler.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTScheduler
-Description: TAO Real-Time Scheduler Library
-Requires: TAO_RTCORBA, TAO_PortableServer, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTScheduler
-Cflags: -I${includedir}
diff --git a/TAO/tao/RTScheduling/TAO_RTScheduler.rc b/TAO/tao/RTScheduling/TAO_RTScheduler.rc
deleted file mode 100644
index ab00b88e7fd..00000000000
--- a/TAO/tao/RTScheduling/TAO_RTScheduler.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "RTScheduler\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_RTSchedulerDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_RTScheduler.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
deleted file mode 100644
index a6cc2f54ea3..00000000000
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//$Id$
-#ifndef TAO_ThreadAction_H
-#define TAO_ThreadAction_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "RTSchedulerC.h"
-
-class TAO_RTScheduler_Export TAO_ThreadAction: 
-public RTScheduling::ThreadAction,
-  public TAO_Local_RefCounted_Object
-{
- public:
-  
-  virtual void do (CORBA::VoidData data
-		   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#endif /*TAO_ThreadAction_H*/
diff --git a/TAO/tao/RTScheduling/diffs/RTScheduler.diff b/TAO/tao/RTScheduling/diffs/RTScheduler.diff
deleted file mode 100644
index cce9a2de77b..00000000000
--- a/TAO/tao/RTScheduling/diffs/RTScheduler.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- orig/RTSchedulerC.h	2005-03-29 14:15:37.951680000 +0200
-+++ RTSchedulerC.h	2005-03-29 14:15:38.292169600 +0200
-@@ -54,6 +54,10 @@
- #include "tao/PortableServer/PortableServer_includeC.h"
- #include "tao/PortableInterceptorC.h"
- 
-+#ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
-+#error "You should not include RTSchedulerC.h directly, use RTScheduler.h"
-+#endif /* !TAO_RTSCHEDULER_SAFE_INCLUDE */
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
-@@ -95,6 +99,9 @@
- // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:66
- 
-+  // Hand crafted
-+  typedef void* VoidData;
-+
- } // module CORBA
- 
- // TAO_IDL - Generated from
---- orig/RTSchedulerC.cpp	2005-03-29 14:15:37.951680000 +0200
-+++ RTSchedulerC.cpp	2005-03-29 14:15:38.302184000 +0200
-@@ -29,7 +29,7 @@
- // be\be_codegen.cpp:302
- 
- 
--#include "RTSchedulerC.h"
-+#include "RTScheduler.h"
- #include "tao/CDR.h"
- #include "tao/ORB_Core.h"
- #include "tao/Null_RefCount_Policy.h"
---- orig/RTSchedulerA.cpp	2005-03-29 14:15:37.951680000 +0200
-+++ RTSchedulerA.cpp	2005-03-29 14:15:38.312198400 +0200
-@@ -25,7 +25,7 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#include "RTSchedulerC.h"
-+#include "RTScheduler.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #include "tao/Alias_TypeCode.h"
diff --git a/TAO/tao/RTScheduling/rtscheduler_export.h b/TAO/tao/RTScheduling/rtscheduler_export.h
deleted file mode 100644
index 6ebbee7d77b..00000000000
--- a/TAO/tao/RTScheduling/rtscheduler_export.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TAO_RTScheduler
-// ------------------------------
-#ifndef TAO_RTSCHEDULER_EXPORT_H
-#define TAO_RTSCHEDULER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_RTSCHEDULER_HAS_DLL)
-#    define TAO_RTSCHEDULER_HAS_DLL 0
-#  endif /* ! TAO_RTSCHEDULER_HAS_DLL */
-#else
-#  if !defined (TAO_RTSCHEDULER_HAS_DLL)
-#    define TAO_RTSCHEDULER_HAS_DLL 1
-#  endif /* ! TAO_RTSCHEDULER_HAS_DLL */
-#endif
-
-#if defined (TAO_RTSCHEDULER_HAS_DLL) && (TAO_RTSCHEDULER_HAS_DLL == 1)
-#  if defined (TAO_RTSCHEDULER_BUILD_DLL)
-#    define TAO_RTScheduler_Export ACE_Proper_Export_Flag
-#    define TAO_RTSCHEDULER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTSCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_RTSCHEDULER_BUILD_DLL */
-#    define TAO_RTScheduler_Export ACE_Proper_Import_Flag
-#    define TAO_RTSCHEDULER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTSCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_RTSCHEDULER_BUILD_DLL */
-#else /* TAO_RTSCHEDULER_HAS_DLL == 1 */
-#  define TAO_RTScheduler_Export
-#  define TAO_RTSCHEDULER_SINGLETON_DECLARATION(T)
-#  define TAO_RTSCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_RTSCHEDULER_HAS_DLL == 1 */
-
-// Set TAO_RTSCHEDULER_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_RTSCHEDULER_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_RTSCHEDULER_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_RTSCHEDULER_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_RTSCHEDULER_NTRACE */
-
-#if (TAO_RTSCHEDULER_NTRACE == 1)
-#  define TAO_RTSCHEDULER_TRACE(X)
-#else /* (TAO_RTSCHEDULER_NTRACE == 1) */
-#  define TAO_RTSCHEDULER_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (TAO_RTSCHEDULER_NTRACE == 1) */
-
-#endif /* TAO_RTSCHEDULER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
deleted file mode 100644
index 74bddc34ee6..00000000000
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "Reactive_Connect_Strategy.h"
-#include "Connection_Handler.h"
-#include "ORB_Core.h"
-#include "debug.h"
-#include "Transport.h"
-
-#include "ace/Synch_Options.h"
-
-ACE_RCSID(tao,
-          Reactive_Connect_Strategy,
-          "$Id$")
-
-TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy (
-    TAO_ORB_Core *orb_core)
-  : TAO_Connect_Strategy (orb_core)
-{
-}
-
-TAO_Reactive_Connect_Strategy::~TAO_Reactive_Connect_Strategy (void)
-{
-}
-
-void
-TAO_Reactive_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
-                                             ACE_Synch_Options &options)
-{
-  if (timeout != 0)
-    {
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   *timeout);
-    }
-  else
-    {
-      // Making it sure it is blocking.
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   ACE_Time_Value::zero);
-    }
-}
-
-int
-TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
-                                     ACE_Time_Value *max_wait_time)
-{
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Waiting in the Reactor for ")
-                  ACE_TEXT ("connection completion - wait ()\n")));
-    }
-
-  int result = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      while (ch->keep_waiting ())
-        {
-          result =
-            this->orb_core_->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Did we timeout? If so, stop running the loop.
-          if (result == 0 &&
-              max_wait_time != 0 &&
-              *max_wait_time == ACE_Time_Value::zero)
-            {
-              errno = ETIME;
-              result = -1;
-              break;
-            }
-
-          // Other errors? If so, stop running the loop.
-          if (result == -1)
-            break;
-        }
-    }
-  ACE_CATCHANY
-    {
-      result = -1;
-    }
-  ACE_ENDTRY;
-
-  // Set the result.
-  if (ch->error_detected () && result != -1)
-    {
-      result = -1;
-    }
-
-  return result;
-}
-
-
-int
-TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
-                                     ACE_Time_Value *val)
-{
-  if (t == 0)
-    return -1;
-
-  return this->wait (t->connection_handler (),
-                     val);
-}
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
deleted file mode 100644
index 5550e00380d..00000000000
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Reactive_Connect_Strategy.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REACTIVE_CONNECT_STRATEGY_H
-#define TAO_REACTIVE_CONNECT_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "Connect_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Connector;
-class ACE_Time_Value;
-class ACE_Synch_Options;
-
-/**
- * @class TAO_Reactive_Connect_Strategy
- *
- * @brief Concrete implementation of a connect strategy that waits on
- *  the reactor during asynch connects
- *
- */
-class TAO_Export TAO_Reactive_Connect_Strategy : public TAO_Connect_Strategy
-{
-public:
-  /// Constructor
-  TAO_Reactive_Connect_Strategy (TAO_ORB_Core *orb);
-
-  /// Destructor
-  ~TAO_Reactive_Connect_Strategy (void);
-
-  /*
-   * Concrete implementation for this class. Please see
-   * Connect_Strategy.h for details
-   */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
-
-  virtual int wait (TAO_Connection_Handler *ch,
-                     ACE_Time_Value *val);
-
-
-  virtual int wait (TAO_Transport *t,
-                     ACE_Time_Value *val);
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_REACTIVE_CONNECT_STRATEGY_H*/
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
deleted file mode 100644
index 15761dbcb14..00000000000
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Reactive_Flushing_Strategy.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "Queued_Message.h"
-
-ACE_RCSID (tao, 
-           Reactive_Flushing_Strategy, 
-           "$Id$")
-
-int
-TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport)
-{
-  return transport->schedule_output_i ();
-}
-
-int
-TAO_Reactive_Flushing_Strategy::cancel_output (TAO_Transport *transport)
-{
-  return transport->cancel_output_i ();
-}
-
-int
-TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
-                                               TAO_Queued_Message *msg,
-                                               ACE_Time_Value *max_wait_time)
-{
-  int result = 0;
-
-  // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_ORB_Core *orb_core = transport->orb_core ();
-
-      while (!msg->all_data_sent () && result >= 0)
-        {
-          result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return result;
-}
-
-int
-TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
-{
-  // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO_ORB_Core *orb_core = transport->orb_core ();
-
-      while (!transport->queue_is_empty ())
-        {
-          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (result == -1)
-            return -1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
deleted file mode 100644
index 66b78566556..00000000000
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Reactive_Flushing_Strategy.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REACTIVE_FLUSHING_STRATEGY_H
-#define TAO_REACTIVE_FLUSHING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "Flushing_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Reactive_Flushing_Strategy
- *
- * @brief Implement a flushing strategy that uses the reactor.
- */
-class TAO_Export TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
-{
-public:
-  virtual int schedule_output (TAO_Transport *transport);
-  virtual int cancel_output (TAO_Transport *transport);
-  virtual int flush_message (TAO_Transport *transport,
-                             TAO_Queued_Message *msg,
-                             ACE_Time_Value *max_wait_time);
-  virtual int flush_transport (TAO_Transport *transport);
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_REACTIVE_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Recursive_Type_TypeCode.cpp b/TAO/tao/Recursive_Type_TypeCode.cpp
deleted file mode 100644
index abe5b4df051..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Starting offset should point to the CORBA::TCKind value.
-
-      // Note that this doesn't need to take into account alignment
-      // padding since CORBA::TCKind (encoded as a CORBA::ULong) is
-      // already aligned on the appropriate boundary, and since the
-      // CORBA::TCKind was the last thing marshaled into the CDR
-      // stream before getting here.
-      offset = sizeof (CORBA::ULong);
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // marshaling is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::tao_marshal (cdr, offset);
-    }
-
-  // Recursive/indirected TypeCode case.
-
-//   ACE_ASSERT (offset > 4
-//               && offset < static_cast<CORBA::ULong> (ACE_INT32_MAX));
-
-  return (cdr << -static_cast<CORBA::Long> (offset));
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equality determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equal_i (tc
-                                          ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equivalence determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equivalent_i (tc
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal_kind (
-  TAO_OutputCDR & cdr) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    return this->ACE_NESTED_CLASS (CORBA, TypeCode)::tao_marshal_kind (cdr);
-
-  // Recursive/indirected TypeCode case.
-  CORBA::ULong const indirection_kind = 0xffffffff;
-
-  return (cdr << indirection_kind);
-}
diff --git a/TAO/tao/Recursive_Type_TypeCode.h b/TAO/tao/Recursive_Type_TypeCode.h
deleted file mode 100644
index 742a51c87a0..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Recursive_Type_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a recursive type (@c struct, @c union or
- *  @c valuetype) CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_RECURSIVE_TYPE_TYPECODE_H
-#define TAO_RECURSIVE_TYPE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Recursive_Thread_Mutex.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Recursive_Type
-     *
-     * @brief Recursive type @c TypeCode decorator template.
-     *
-     * This class template decorates the underlying @c TypeCode
-     * implementation @a TypeCodeBase to provide support for IDL
-     * defined recursive types.  Only IDL an @c struct, @c union or
-     * @c valuetype may be recursive, which is why this decorator only
-     * supports constructors for the corresponding @c TypeCode
-     * implementations.
-     */
-    template <class TypeCodeBase,
-              typename TypeCodeType,
-              typename MemberArrayType>
-    class Recursive_Type
-      : public TypeCodeBase
-    {
-    public:
-
-      /// Recursive @c struct constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Recursive @c union constructor.
-      Recursive_Type (char const * id,
-                      char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType discriminant_type,
-#else
-                      TypeCodeType const & discriminant_type,
-#endif
-                      MemberArrayType const & cases,
-                      CORBA::ULong ncases,
-                      CORBA::Long default_index);
-
-      /// Recursive @c valuetype constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType concrete_base,
-#else
-                      TypeCodeType const & concrete_base,
-#endif
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Dynamic @c Recursive_Type TypeCode constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @par
-       *
-       * These are recursive type @c TypeCode marshaling operation
-       * overrides.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      //@}
-
-    protected:
-
-      /**
-       * @name TAO @c CORBA::TypeCode Template Methods
-       *
-       * Recursive type @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      //@}
-
-
-    public:
-
-      /// Set @c struct @c TypeCode parameters.
-      void struct_parameters (char const * name,
-                              MemberArrayType const & fields,
-                              CORBA::ULong nfields);
-
-      /// Set @c union @c TypeCode parameters.
-      void union_parameters (
-                             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                             // Borland C++ currently can't handle a
-                             // reference to const pointer to const
-                             // CORBA::TypeCode_ptr.
-                             TypeCodeType discriminant_type,
-#else
-                             TypeCodeType const & discriminant_type,
-#endif
-                             MemberArrayType const & cases,
-                             CORBA::ULong ncases,
-                             CORBA::Long default_index);
-
-      /// Set @c valuetype or @c eventtype @c TypeCode parameters.
-      void valuetype_parameters (char const * name,
-                                 CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                                 // Borland C++ currently can't handle a
-                                 // reference to const pointer to const
-                                 // CORBA::TypeCode_ptr.
-                                 TypeCodeType concrete_base,
-#else
-                                 TypeCodeType const & concrete_base,
-#endif
-                                 MemberArrayType const & fields,
-                                 CORBA::ULong nfields);
-
-    private:
-
-      /**
-       * @class Reset
-       *
-       * @brief Reset flag to false in an exception-safe manner.
-       *
-       * Reset flag to false in an exception-safe manner.
-       */
-      class Reset
-      {
-      public:
-        Reset (bool & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = false; }
-      private:
-        bool & flag_;
-      };
-
-    private:
-
-      /// Internal state thread synchronization mutex.
-      mutable TAO_SYNCH_RECURSIVE_MUTEX lock_;
-
-      /// @c true if equality or equivalence is being determined
-      /// recursively.
-      /**
-       * This flag is used to prevent @c TypeCode equality and
-       * equivalence operations from recursing indefinitely.
-       */
-      mutable bool in_recursion_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Recursive_Type_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Recursive_Type_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_RECURSIVE_TYPE_TYPECODE_H */
diff --git a/TAO/tao/Recursive_Type_TypeCode.inl b/TAO/tao/Recursive_Type_TypeCode.inl
deleted file mode 100644
index 7f7a5ea6fe8..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.inl
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind, id, name, fields, nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-  // ACE_ASSERT (kind != CORBA::tk_except);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : TypeCodeBase (id,
-                  name,
-                  discriminant_type,
-                  cases,
-                  ncases,
-                  default_index)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind,
-                  id,
-                  name,
-                  modifier,
-                  concrete_base,
-                  fields,
-                  nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id)
-  : TypeCodeBase (kind, id)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-//   ACE_ASSERT (kind == CORBA::tk_struct
-//               || kind == CORBA::tk_union
-//               || kind == CORBA::tk_value
-//               || kind == CORBA::tk_event);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::struct_parameters (
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->fields_  = fields;
-  this->nfields_ = nfields;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::union_parameters (
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-{
-  this->base_attributes_.name (name);
-  this->discriminant_type_ = discriminant_type;
-  this->cases_             = cases;
-  this->ncases_            = ncases;
-  this->default_index_     = default_index;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::valuetype_parameters (
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->type_modifier_ = modifier;
-  this->concrete_base_ = concrete_base;
-  this->fields_        = fields;
-  this->nfields_       = nfields;
-}
diff --git a/TAO/tao/RefCount_Policy_Traits.h b/TAO/tao/RefCount_Policy_Traits.h
deleted file mode 100644
index 6f4ea6a2e00..00000000000
--- a/TAO/tao/RefCount_Policy_Traits.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    RefCount_Policy_Traits.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies) traits.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REFCOUNT_POLICY_TRAITS_H
-#define TAO_REFCOUNT_POLICY_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief Compile-time selection of RefCount_Policy operations,
-   *        etc.
-   *
-   * This primary template is used to select RefCount_Policy
-   * operations, etc at compile-time based on the reference counting
-   * policy and type being operated on.
-   *
-   * @note This merely a forward declaration since we really only care
-   *       about the partial specializations below.
-   */
-  template<class RefCountPolicy, typename TypePtr>
-  struct RefCount_Policy_Traits;
-
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief No-op reference count policy traits.
-   *
-   * This partial specialization performs no-op reference counting
-   * operations on values of type @a TypePtr if the @a RefCountPolicy
-   * first argument is @c Null_RefCount_Policy.
-   */
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy, TypePtr>
-  {
-    /// No-op "release" operation.
-    static void release (TypePtr) { }
-  };
-
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<True_RefCount_Policy, TypePtr>
-  {
-    /// Call actual "release" operation on @a ptr value.
-    static void release (TypePtr ptr)
-    {
-      CORBA::release (ptr);
-    }
-  };
-
-#else
-
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an alternate implementation.
-
-  template<class RefCountPolicy> struct RefCount_Policy_Traits;
-
-  template<>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return false;
-    }
-  };
-
-  template<>
-  struct RefCount_Policy_Traits<True_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return true;
-    }
-  };
-
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REFCOUNT_POLICY_TRAITS_H */
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
deleted file mode 100644
index 7bafb1bc50b..00000000000
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//$Id$
-#include "Refcounted_ObjectKey.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Refcounted_ObjectKey.inl"
-#endif /* defined INLINE */
-
-ACE_RCSID(tao,
-          Refcounted_ObjectKey,
-          "$Id$")
-
-TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key)
-  : object_key_ (key)
-  , ref_count_ (1)
-{
-}
-
-TAO::Refcounted_ObjectKey::~Refcounted_ObjectKey (void)
-{
-}
-
-long
-TAO::Refcounted_ObjectKey::decr_refcount (void)
-{
-  if (--this->ref_count_ > 0)
-    {
-      return this->ref_count_;
-    }
-
-  ACE_ASSERT (this->ref_count_ == 0);
-
-  delete this;
-
-  return 0;
-}
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
deleted file mode 100644
index a001a56f4b5..00000000000
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Refcounted_ObjectKey.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REFCOUNTED_OBJECTKEY_H
-#define TAO_REFCOUNTED_OBJECTKEY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Object_KeyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Refcounted_ObjectKey
-   *
-   * @brief A wrapper class that ties together a refcount to an
-   * ObjectKey.
-   *
-   * The refounts in this class is manipulated within the context of
-   * the lock in the TAO::ObjectKey_Table. Manipulating the refcounts
-   * from anywhere else is strictly forbidden.
-   */
-  class TAO_Export Refcounted_ObjectKey
-  {
-  public:
-    /// Constructor
-    Refcounted_ObjectKey (const ObjectKey &ref);
-
-    /// Accessor for the underlying ObjectKey.
-    const ObjectKey &object_key (void) const;
-
-  protected:
-    friend class ObjectKey_Table;
-
-    /// Protected destructor
-    ~Refcounted_ObjectKey (void);
-
-    /// Methods for incrementing and decrementing refcounts.
-    long incr_refcount (void);
-    long decr_refcount (void);
-
-  private:
-    /// The object key
-    ObjectKey object_key_;
-
-    /// The refcount on the object key..
-    long ref_count_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "Refcounted_ObjectKey.inl"
-#endif /* defined INLINE */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_REFCOUNTED_OBJECTKEY_H*/
diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl
deleted file mode 100644
index c829e6b45b0..00000000000
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-// $Id$
-ACE_INLINE long
-TAO::Refcounted_ObjectKey::incr_refcount (void)
-{
-  return ++this->ref_count_;
-}
-
-
-
-ACE_INLINE const TAO::ObjectKey &
-TAO::Refcounted_ObjectKey::object_key (void) const
-{
-  return this->object_key_;
-}
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
deleted file mode 100644
index c19332acb84..00000000000
--- a/TAO/tao/Remote_Invocation.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//$Id$
-#include "Remote_Invocation.h"
-#include "Profile.h"
-#include "Profile_Transport_Resolver.h"
-#include "Stub.h"
-#include "Transport.h"
-#include "Connection_Handler.h"
-#include "operation_details.h"
-#include "ORB_Core.h"
-#include "Protocols_Hooks.h"
-#include "debug.h"
-
-ACE_RCSID (tao,
-           Remote_Invocation,
-           "$Id$")
-
-namespace TAO
-{
-  Remote_Invocation::Remote_Invocation (
-    CORBA::Object_ptr otarget,
-    Profile_Transport_Resolver &resolver,
-    TAO_Operation_Details &detail,
-    bool response_expected)
-    : Invocation_Base (otarget,
-                       resolver.object (),
-                       resolver.stub (),
-                       detail,
-                       response_expected)
-    , resolver_ (resolver)
-  {
-  }
-
-  void
-  Remote_Invocation::init_target_spec (TAO_Target_Specification &target_spec
-                                       ACE_ENV_ARG_DECL)
-  {
-    /**
-     * Mega hack for RTCORBA start. I don't think that
-     * PortableInterceptor  would work here esp. for RTCORBA. PI needs
-     * to be improved to  help our cause.
-     */
-    this->resolver_.stub ()->orb_core ()->service_context_list (
-      this->resolver_.stub (),
-      this->details_.request_service_context (),
-      0
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-    /**
-     * Mega hack for RTCORBA END
-     */
-
-    TAO_Profile *pfile = this->resolver_.profile ();
-
-    // Set the target specification mode
-    switch (pfile->addressing_mode ())
-      {
-      case TAO_Target_Specification::Key_Addr:
-        target_spec.target_specifier (pfile->object_key ());
-        break;
-      case TAO_Target_Specification::Profile_Addr:
-        {
-          IOP::TaggedProfile *tp =
-            pfile->create_tagged_profile ();
-
-        if (tp)
-          {
-            target_spec.target_specifier (*tp);
-          }
-        }
-        break;
-
-    case TAO_Target_Specification::Reference_Addr:
-      // We need to call the method seperately. If there is no
-      // IOP::IOR info, the call would create the info and return the
-      // index that we need.
-      CORBA::ULong index = 0;
-      IOP::IOR *ior_info = 0;
-      const int retval =
-        this->resolver_.stub ()->create_ior_info (ior_info,
-                                                  index
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (retval == -1)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) - ")
-                          ACE_TEXT ("Remote_Invocation::init_target_spec, ")
-                          ACE_TEXT ("Error in finding index for ")
-                          ACE_TEXT ("IOP::IOR \n")));
-            }
-
-          return;
-        }
-
-      target_spec.target_specifier (*ior_info,
-                                    index);
-      break;
-    }
-
-
-  }
-
-  void
-  Remote_Invocation::write_header (TAO_Target_Specification &spec,
-                                   TAO_OutputCDR &out_stream
-                                   ACE_ENV_ARG_DECL)
-  {
-    this->resolver_.transport ()->clear_translators (0,
-                                                     &out_stream);
-    // Send the request for the header
-    if (this->resolver_.transport ()->generate_request_header (this->details_,
-                                                               spec,
-                                                               out_stream)
-        == -1)
-      {
-        ACE_THROW (CORBA::MARSHAL ());
-      }
-
-    this->resolver_.transport ()->assign_translators (0,
-                                                      &out_stream);
-  }
-
-  void
-  Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream
-                                   ACE_ENV_ARG_DECL)
-  {
-    if (this->details_.marshal_args (out_stream) == false)
-      {
-        ACE_THROW (CORBA::MARSHAL ());
-      }
-
-    return;
-  }
-
-  Invocation_Status
-  Remote_Invocation::send_message (TAO_OutputCDR &cdr,
-                                   short message_semantics,
-                                   ACE_Time_Value *max_wait_time
-                                   ACE_ENV_ARG_DECL)
-  {
-    TAO_Protocols_Hooks *tph =
-      this->resolver_.stub ()->orb_core ()->get_protocols_hooks ();
-
-    CORBA::Boolean set_client_network_priority =
-      tph->set_client_network_priority (this->resolver_.transport ()->tag (),
-                                        this->resolver_.stub ()
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    TAO_Connection_Handler *connection_handler =
-      this->resolver_.transport ()->connection_handler ();
-
-    connection_handler->set_dscp_codepoint (set_client_network_priority);
-
-    const int retval =
-      this->resolver_.transport ()->send_request (
-        this->resolver_.stub (),
-        this->resolver_.stub ()->orb_core (),
-        cdr,
-        message_semantics,
-        max_wait_time);
-
-    if (retval == -1)
-      {
-        if (errno == ETIME)
-          {
-            // We sent a message already and we haven't gotten a
-            // reply.  Just throw TIMEOUT with *COMPLETED_MAYBE*.
-            ACE_THROW_RETURN (
-                CORBA::TIMEOUT (
-                    CORBA::SystemException::_tao_minor_code (
-                        TAO_TIMEOUT_SEND_MINOR_CODE,
-                        errno
-                        ),
-                    CORBA::COMPLETED_MAYBE
-                    ),
-                TAO_INVOKE_FAILURE
-                );
-          }
-
-        if (TAO_debug_level > 2)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - ")
-                        ACE_TEXT ("Remote_Invocation::send_message, ")
-                        ACE_TEXT ("failure while sending message \n")));
-          }
-
-        // Close the transport and all the associated stuff along with
-        // it.
-        this->resolver_.transport ()->close_connection ();
-        this->resolver_.stub ()->reset_profiles ();
-        return TAO_INVOKE_RESTART;
-      }
-
-    this->resolver_.stub ()->set_valid_profile ();
-    return TAO_INVOKE_SUCCESS;
-  }
-}
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
deleted file mode 100644
index 555d198afa7..00000000000
--- a/TAO/tao/Remote_Invocation.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Remote_Invocation.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REMOTE_INVOCATION_H
-#define TAO_REMOTE_INVOCATION_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Invocation_Base.h"
-
-class TAO_Operation_Details;
-class TAO_Target_Specification;
-class TAO_OutputCDR;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-  class Argument;
-
-  /**
-   * @class Remote_Invocation
-   *
-   * @brief Base class for remote invocations.
-   *
-   * This class encapulates some of the common functionalities used by
-   * synchronous, asynchronous, DII and DSI invocations.
-   *
-   */
-  class TAO_Export Remote_Invocation : public Invocation_Base
-  {
-  public:
-    /**
-     * @param otarget The original target on which this invocation
-     * was started. This is there to be passed up to its parent
-     * class.
-     *
-     * @param resolver The profile and transport holder.
-     *
-     * @param detail Pperation details of the invocation on the target
-     *
-     * @param response_expected Flag to indicate whether the
-     * operation encapsulated by @a op returns a response or not.
-     */
-    Remote_Invocation (CORBA::Object_ptr otarget,
-                       Profile_Transport_Resolver &resolver,
-                       TAO_Operation_Details &detail,
-                       bool response_expected);
-
-  protected:
-
-    /// Initialize the @a spec.
-    void init_target_spec (TAO_Target_Specification &spec
-                           ACE_ENV_ARG_DECL);
-
-    /// Write the GIOP header into the stream.
-    void write_header (TAO_Target_Specification &spec,
-                       TAO_OutputCDR &out_stream
-                       ACE_ENV_ARG_DECL);
-
-    /// Marshal the arguments into the stream.
-    void marshal_data (TAO_OutputCDR &cdr
-                       ACE_ENV_ARG_DECL);
-
-    /// Write the message onto the socket
-    Invocation_Status send_message (TAO_OutputCDR &cdr,
-                                    short message_semantics,
-                                    ACE_Time_Value *max_wait_time
-                                    ACE_ENV_ARG_DECL);
-
-  protected:
-    /// Our resolver
-    Profile_Transport_Resolver &resolver_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_REMOTE_INVOCATION_H*/
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
deleted file mode 100644
index 0cb98e0f718..00000000000
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "Remote_Object_Proxy_Broker.h"
-#include "UB_String_Arguments.h"
-#include "Special_Basic_Arguments.h"
-#include "Invocation_Adapter.h"
-#include "IFR_Client_Adapter.h"
-#include "ORB_Core.h"
-#include "SystemException.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           Remote_Object_Proxy_Broker,
-           "$Id$")
-
-namespace TAO
-{
-  CORBA::Boolean
-  Remote_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target,
-                                     const char *type_id
-                                     ACE_ENV_ARG_DECL)
-  {
-    TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-    TAO::Arg_Traits<char *>::in_arg_val _tao_id (type_id);
-
-    TAO::Argument *_tao_signature [] =
-      {
-        &_tao_retval,
-        &_tao_id
-      };
-
-    TAO::Invocation_Adapter tao_call (target,
-                                      _tao_signature,
-                                      2,
-                                      "_is_a",
-                                      5,
-                                      0);
-
-    tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
-
-    return _tao_retval.retn ();
-  }
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  CORBA::Boolean
-  Remote_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target
-                                             ACE_ENV_ARG_DECL)
-  {
-    TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-
-    TAO::Argument *_tao_signature [] =
-      {
-        &_tao_retval
-      };
-
-    TAO::Invocation_Adapter _tao_call (target,
-                                       _tao_signature,
-                                       1,
-                                       "_non_existent",
-                                       13,
-                                       0);
-
-    _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
-
-    return _tao_retval.retn ();
-  }
-
-  CORBA::Object_ptr
-  Remote_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target
-                                              ACE_ENV_ARG_DECL)
-  {
-    TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval;
-
-    TAO::Argument *_tao_signature [] =
-      {
-        &_tao_retval
-      };
-
-    TAO::Invocation_Adapter _tao_call (target,
-                                       _tao_signature,
-                                       1,
-                                       "_component",
-                                       10,
-                                       0);
-
-    _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
-
-    return _tao_retval.retn ();
-}
-
-  CORBA::InterfaceDef_ptr
-  Remote_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target
-                                              ACE_ENV_ARG_DECL)
-  {
-    TAO_IFR_Client_Adapter *adapter =
-      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTF_REPOS (),
-                        0);
-    }
-
-  return adapter->get_interface_remote (target
-                                        ACE_ENV_ARG_PARAMETER);
-  }
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-}
-
-// -----------------------------------------------------
-
-TAO::Remote_Object_Proxy_Broker *
-the_tao_remote_object_proxy_broker (void)
-{
-  static TAO::Remote_Object_Proxy_Broker the_broker;
-  return &the_broker;
-}
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
deleted file mode 100644
index ed94ddd4473..00000000000
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Remote_Object_Proxy_Broker.h
- *
- *  $Id$
- *
- *  This files contains the Remote Proxy Broker implementation
- *  for the CORBA Object.
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- *  @author  Balachandran Natarajan (modified the implementation)
- */
-//=============================================================================
-
-#ifndef TAO_REMOTE_OBJECT_PROXY_BROKER_H
-#define TAO_REMOTE_OBJECT_PROXY_BROKER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Object_Proxy_Broker.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Remote_Object_Proxy_Broker
-   *
-   * @brief Remote_Object_Proxy_Broker
-   *
-   * A broker for standard CORBA::Object calls that needs to be made
-   * on remote objects.
-   */
-
-  class TAO_Export Remote_Object_Proxy_Broker : public Object_Proxy_Broker
-  {
-  public:
-    /// Please see the documentation in Object_Proxy_Broker.h for
-    /// details.
-
-    virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL);
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL);
-
-  virtual CORBA::InterfaceDef * _get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    );
-
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL);
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-  };
-}
-
-// -----------------------------------------------------
-
-TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void);
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REMOTE_OBJECT_PROXY_BROKER_H */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
deleted file mode 100644
index 9f8146c7bd7..00000000000
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "Reply_Dispatcher.h"
-
-ACE_RCSID (tao, 
-           Reply_Dispatcher, 
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
-// Constructor.
-TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
-  // Just an invalid reply status.
-  : reply_status_ (100)
-{
-}
-
-// Destructor.
-TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
-{
-}
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
deleted file mode 100644
index 63cd7683422..00000000000
--- a/TAO/tao/Reply_Dispatcher.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Reply_Dispatcher.h
- *
- *  $Id$
- *
- *   Define the interface for the Reply_Dispatcher strategies.
- *
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REPLY_DISPATCHER_H
-#define TAO_REPLY_DISPATCHER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-// Forward Declarations.
-class TAO_GIOP_Message_State;
-class TAO_GIOP_Message_Version;
-class TAO_Transport;
-class TAO_Pluggable_Reply_Params;
-
-/**
- * @class TAO_Reply_Dispatcher
- *
- *
- * Different invocation modes process the Reply messages in
- * different ways.  Traditional synchronous replies simply receive
- * the message and wake up the waiting thread (if any).
- * Asynchronous Method Invocation (Callbacks) must process the
- * message in the thread that receives it.
- * Deferred Synchronous (DII) and AMI in the Poller mode save the
- * reply for later processing in the application.
- * The lower level components in the ORB only deal with this
- * abstract interface, when the invocation is made the right type
- * of Reply Dispatcher is instantiated and registered with the
- * Transport object.
- */
-class TAO_Export TAO_Reply_Dispatcher
-{
-
-public:
-  /// Constructor.
-  TAO_Reply_Dispatcher (void);
-
-  /// Destructor.
-  virtual ~TAO_Reply_Dispatcher (void);
-
-  /**
-   * Dispatch the reply. Return 1 on sucess, -1 on error.
-   * @todo Pluggable Messaging:  this method has too many arguments,
-   *    the "Right Thing"[tm] is for the Transport Object to create a
-   *    "ClientReply" that encapsulates all we need to process a
-   *    reply.  Naturally it is possible that different messaging
-   *    protocols implement different variants of such ClientReply
-   *    class.
-   */
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params) = 0;
-
-  /**
-   * The used for the pending reply has been closed.
-   * No reply is expected.
-   * @todo If the connection was closed due to a CloseConnection
-   *    message then we could re-issue the request instead of raising
-   *    the exception, it would a matter of simply adding a boolean
-   *    argument to this function.
-   */
-  virtual void connection_closed (void) = 0;
-
-  /// Get the reply status.
-  CORBA::ULong reply_status (void) const;
-
-protected:
-  /// Reply or LocateReply status.
-  CORBA::ULong reply_status_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Reply_Dispatcher.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
deleted file mode 100644
index 549263801ff..00000000000
--- a/TAO/tao/Reply_Dispatcher.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_Reply_Dispatcher::reply_status (void) const
-{
-  return this->reply_status_;
-}
diff --git a/TAO/tao/RequestInfo.pidl b/TAO/tao/RequestInfo.pidl
deleted file mode 100644
index 5714a704de4..00000000000
--- a/TAO/tao/RequestInfo.pidl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file RequestInfo.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled RequestInfo
- *
- * This file was used to generate the code in RequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          RequestInfo.pidl
- */
-
-#ifndef _REQUESTINFO_PIDL_
-#define _REQUESTINFO_PIDL_
-
-#include <PI_Forward.pidl>
-#include <Dynamic.pidl>
-#include <Messaging_SyncScope.pidl>
-#include <InvalidSlot.pidl>
-#include <IOP_IOR.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface RequestInfo
-  {
-    readonly attribute unsigned long request_id;
-    readonly attribute string operation;
-    readonly attribute Dynamic::ParameterList arguments;
-    readonly attribute Dynamic::ExceptionList exceptions;
-    readonly attribute Dynamic::ContextList contexts;
-    readonly attribute Dynamic::RequestContext operation_context;
-    readonly attribute any result;
-    readonly attribute boolean response_expected;
-    readonly attribute Messaging::SyncScope sync_scope;
-    readonly attribute ReplyStatus reply_status;
-    readonly attribute Object forward_reference;
-    any get_slot (in SlotId id) raises (InvalidSlot);
-    IOP::ServiceContext get_request_service_context (in IOP::ServiceId id);
-    IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id);
-  };
-};
-
-#endif  /* _REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/RequestInfoA.cpp b/TAO/tao/RequestInfoA.cpp
deleted file mode 100644
index 78d422c122d..00000000000
--- a/TAO/tao/RequestInfoA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_RequestInfo (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
-    "RequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestInfo =
-    &_tao_tc_PortableInterceptor_RequestInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::RequestInfo_ptr _tao_objptr =
-    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::RequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_RequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::RequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_RequestInfo,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/RequestInfoC.cpp b/TAO/tao/RequestInfoC.cpp
deleted file mode 100644
index fcb51f68945..00000000000
--- a/TAO/tao/RequestInfoC.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "RequestInfoC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::RequestInfo.
-
-PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate (
-    PortableInterceptor::RequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::RequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
-    PortableInterceptor::RequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void)
-{
-  return PortableInterceptor::RequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
-    PortableInterceptor::RequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::RequestInfo::RequestInfo (void)
-{}
-
-PortableInterceptor::RequestInfo::~RequestInfo (void)
-{}
-
-void 
-PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestInfo *_tao_tmp_pointer =
-    static_cast<RequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::RequestInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/RequestInfoC.h b/TAO/tao/RequestInfoC.h
deleted file mode 100644
index eb99d621da1..00000000000
--- a/TAO/tao/RequestInfoC.h
+++ /dev/null
@@ -1,367 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_REQUESTINFOC_H_
-#define _TAO_IDL_ORIG_REQUESTINFOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PI_ForwardC.h"
-#include "tao/DynamicC.h"
-#include "tao/Messaging_SyncScopeC.h"
-#include "tao/InvalidSlotC.h"
-#include "tao/IOP_IORC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-  
-  class RequestInfo;
-  typedef RequestInfo *RequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RequestInfo
-      >
-    RequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RequestInfo
-      >
-    RequestInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-  
-  class TAO_Export RequestInfo
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef RequestInfo_ptr _ptr_type;
-    typedef RequestInfo_var _var_type;
-    
-    // The static operations.
-    static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-    
-    static void _tao_release (RequestInfo_ptr obj);
-    
-    static RequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestInfo_ptr _nil (void)
-    {
-      return static_cast<RequestInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong request_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * operation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ParameterList * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ExceptionList * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ContextList * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::RequestContext * operation_context (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean response_expected (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual Messaging::SyncScope sync_scope (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::ReplyStatus reply_status (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr forward_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * get_slot (
-        ::PortableInterceptor::SlotId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::InvalidSlot
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::ServiceContext * get_request_service_context (
-        ::IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::ServiceContext * get_reply_service_context (
-        ::IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    RequestInfo (void);
-    
-    virtual ~RequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestInfo (const RequestInfo &);
-    
-    void operator= (const RequestInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
-  {
-    static ::PortableInterceptor::RequestInfo_ptr duplicate (
-        ::PortableInterceptor::RequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::RequestInfo_ptr
-      );
-    static ::PortableInterceptor::RequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::RequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/RequestInfoS.h b/TAO/tao/RequestInfoS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/RequestInfoS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp
deleted file mode 100644
index f4ba3e2fedc..00000000000
--- a/TAO/tao/RequestInfo_Util.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "RequestInfo_Util.h"
-#include "TypeCode.h"
-#include "ORB_Constants.h"
-#include "StringSeqC.h"
-#include "DynamicC.h"
-#include "SystemException.h"
-
-
-ACE_RCSID (tao,
-           RequestInfo_Util,
-           "$Id$")
-
-
-Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Dynamic::ParameterList *parameter_list = 0;
-  ACE_NEW_THROW_EX (parameter_list,
-                    Dynamic::ParameterList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Dynamic::ExceptionList *exception_list = 0;
-  ACE_NEW_THROW_EX (exception_list,
-                    Dynamic::ExceptionList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
-  return exception_list;
-}
-
-Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Dynamic::ContextList *context_list = 0;
-  ACE_NEW_THROW_EX (context_list,
-                    Dynamic::ContextList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
-  return context_list;
-}
-
-Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
-{
-  Dynamic::RequestContext *request_context = 0;
-  ACE_NEW_THROW_EX (request_context,
-                    Dynamic::RequestContext,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
-  return request_context;
-}
-
-CORBA::Any *
-TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL)
-{
-  CORBA::Any *any = 0;
-  ACE_NEW_THROW_EX (any,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  if (tk_void_any)
-    {
-      any->_tao_set_typecode (CORBA::_tc_void);
-    }
-
-  // No need to do an ACE_CHECK_RETURN.  The caller should do that.
-
-  return any;
-}
diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/RequestInfo_Util.h
deleted file mode 100644
index bdf4278ed34..00000000000
--- a/TAO/tao/RequestInfo_Util.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   RequestInfo_Util.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@uci.edu>
- */
-// ===================================================================
-
-#ifndef TAO_REQUEST_INFO_UTIL_H
-#define TAO_REQUEST_INFO_UTIL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  class StringSeq;
-  class Any;
-  class Environment;
-}
-
-namespace Dynamic
-{
-  class ParameterList;
-  class ExceptionList;
-  typedef CORBA::StringSeq ContextList;
-  typedef CORBA::StringSeq RequestContext;
-}
-
-/**
- * @class TAO_RequestInfo_Util
- *
- * @brief Helper class that provides methods useful for both
- * PortableInterceptor::ClientRequestInfo and
- * PortableInterceptor::ServerRequestInfo objects.
- */
-class TAO_Export TAO_RequestInfo_Util
-{
-public:
-
-  /**
-   * @name Factory Methods
-   *
-   * These are methods called by TAO_{Client,Server}RequestInfo and
-   * their subclasses.  Rather than having the same factory code in
-   * each subclass, we factor the common code in to this utility
-   * class.
-   */
-  //@{
-  static Dynamic::ParameterList * make_parameter_list (
-    ACE_ENV_SINGLE_ARG_DECL);
-
-  static Dynamic::ExceptionList * make_exception_list (
-    ACE_ENV_SINGLE_ARG_DECL);
-
-  static Dynamic::ContextList * make_context_list (
-    ACE_ENV_SINGLE_ARG_DECL);
-
-  static Dynamic::RequestContext * make_request_context (
-    ACE_ENV_SINGLE_ARG_DECL);
-
-  static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL);
-  //@}
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REQUEST_INFO_UTIL_H */
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
deleted file mode 100644
index 4e1d483a6c3..00000000000
--- a/TAO/tao/Request_Dispatcher.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#include "Request_Dispatcher.h"
-#include "TAO_Server_Request.h"
-#include "ORB_Core.h"
-
-ACE_RCSID (tao, 
-           Request_Dispatcher, 
-           "$Id$")
-
-TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
-{
-}
-
-void
-TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
-                                  TAO_ServerRequest &request,
-                                  CORBA::Object_out forward_to
-                                  ACE_ENV_ARG_DECL)
-{
-  // Dispatch based on object key
-  orb_core->adapter_registry ()->dispatch (request.object_key (),
-                                           request,
-                                           forward_to
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
deleted file mode 100644
index 0c6ebba06f3..00000000000
--- a/TAO/tao/Request_Dispatcher.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Request_Dispatcher.h
- *
- *  $Id$
- *
- *  A class that strategizes the request dispatching procedure.
- *
- *  @author  Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_REQUEST_DISPATCHER_H
-#define TAO_REQUEST_DISPATCHER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/SystemException.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Pseudo_VarOut_T.h"
-
-
-class TAO_ORB_Core;
-class TAO_ServerRequest;
-
-namespace CORBA
-{
-  class Object;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-}
-
-/**
- * @class TAO_Request_Dispatcher
- *
- * @brief A class that strategizes the request dispatching procedure.
- *
- */
-class TAO_Export TAO_Request_Dispatcher
-{
-public:
-  /// Destructor.
-  virtual ~TAO_Request_Dispatcher (void);
-
-  /**
-   * Dispatch a request.
-   */
-  virtual void dispatch (TAO_ORB_Core *orb_core,
-                         TAO_ServerRequest &request,
-                         CORBA::Object_out forward_to
-                         ACE_ENV_ARG_DECL);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REQUEST_DISPATCHER_H */
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
deleted file mode 100644
index 23e714452b3..00000000000
--- a/TAO/tao/Resource_Factory.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-// $Id$
-
-#include "Resource_Factory.h"
-#include "Protocol_Factory.h"
-#include "orbconf.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/ACE.h"
-
-
-ACE_RCSID (tao,
-           Resource_Factory,
-           "$Id$")
-
-
-// ****************************************************************
-
-TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
-  : name_ (name),
-    factory_ (0),
-    factory_owner_ (0)
-{
-}
-
-TAO_Protocol_Item::~TAO_Protocol_Item (void)
-{
-  if (this->factory_owner_ == 1)
-    delete this->factory_;
-}
-
-const ACE_CString &
-TAO_Protocol_Item::protocol_name (void)
-{
-  return this->name_;
-}
-
-TAO_Protocol_Factory *
-TAO_Protocol_Item::factory (void)
-{
-  return this->factory_;
-}
-
-void
-TAO_Protocol_Item::factory (TAO_Protocol_Factory *factory,
-                            int owner)
-{
-  this->factory_ = factory;
-  this->factory_owner_ = owner;
-}
-
-
-TAO_Resource_Factory::TAO_Resource_Factory (void)
-{
-}
-
-TAO_Resource_Factory::~TAO_Resource_Factory (void)
-{
-}
-
-#if 0
-// @@todo: Need to go at a later date!
-int
-TAO_Resource_Factory::use_tss_resources (void) const
-{
-  return 0;
-}
-#endif /*if 0*/
-
-int
-TAO_Resource_Factory::use_locked_data_blocks (void) const
-{
-  return 0;
-}
-
-ACE_Reactor *
-TAO_Resource_Factory::get_reactor (void)
-{
-  return 0;
-}
-
-void
-TAO_Resource_Factory::reclaim_reactor (ACE_Reactor *)
-{
-  return;
-}
-
-TAO_Connector_Registry *
-TAO_Resource_Factory::get_connector_registry (void)
-{
-  return 0;
-}
-
-TAO_Acceptor_Registry *
-TAO_Resource_Factory::get_acceptor_registry (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_msgblock_allocator (void)
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::input_cdr_allocator_type_locked (void)
-{
-  return -1;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_msgblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::amh_response_handler_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::ami_response_handler_allocator (void)
-{
-  return 0;
-}
-
-TAO_ProtocolFactorySet *
-TAO_Resource_Factory::get_protocol_factories (void)
-{
-  return 0;
-}
-
-TAO_Codeset_Manager *
-TAO_Resource_Factory::get_codeset_manager (void)
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::init_protocol_factories (void)
-{
-  return -1;
-}
-
-int
-TAO_Resource_Factory::cache_maximum (void) const
-{
-  return TAO_CONNECTION_CACHE_MAXIMUM;
-}
-
-int
-TAO_Resource_Factory::purge_percentage (void) const
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::max_muxed_connections (void) const
-{
-  return 0;
-}
-
-
-int
-TAO_Resource_Factory::get_parser_names (char **&,
-                                        int &)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Resource_Factory::create_cached_connection_lock (void)
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::locked_transport_cache (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Resource_Factory::create_object_key_table_lock (void)
-{
-  return 0;
-}
-
-ACE_Lock *
-TAO_Resource_Factory::create_corba_object_lock (void)
-{
-  return 0;
-}
-
-int
-TAO_Resource_Factory::load_default_protocols (void)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Resource_Factory>;
-template class ACE_Node<TAO_Protocol_Item*>;
-///
-template class ACE_Unbounded_Set<TAO_Protocol_Item*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>;
-///
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
-#pragma instantiate ACE_Node<TAO_Protocol_Item*>
-///
-#pragma instantiate ACE_Unbounded_Set<TAO_Protocol_Item*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
deleted file mode 100644
index d78937a555c..00000000000
--- a/TAO/tao/Resource_Factory.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Resource_Factory.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_RESOURCE_FACTORY_H
-#define TAO_RESOURCE_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Set.h"
-#include "ace/SString.h"
-
-#include "tao/TAO_Export.h"
-
-class TAO_Protocol_Factory;
-class TAO_Acceptor_Registry;
-class TAO_Connector_Registry;
-
-class TAO_Flushing_Strategy;
-class TAO_Connection_Purging_Strategy;
-class TAO_LF_Strategy;
-
-class TAO_Codeset_Manager;
-class ACE_Lock;
-
-// ****************************************************************
-
-class TAO_Export TAO_Protocol_Item
-{
-public:
-  /// Creator method, the protocol name can only be set when the
-  /// object is created.
-  TAO_Protocol_Item (const ACE_CString &name);
-
-  /// Destructor that deallocates the factory object if the
-  /// Protocol_Item retains ownership.
-  ~TAO_Protocol_Item (void);
-
-  /// Return a reference to the character representation of the protocol
-  /// factories name.
-  const ACE_CString &protocol_name (void);
-
-  /// Return a pointer to the protocol factory.
-  TAO_Protocol_Factory *factory (void);
-
-  /// Set the factory pointer's value.
-  void factory (TAO_Protocol_Factory *factory, int owner = 0);
-
-private:
-  // Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Protocol_Item (const TAO_Protocol_Item&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Protocol_Item&))
-
-private:
-  /// Protocol factory name.
-  ACE_CString name_;
-
-  /// Pointer to factory object.
-  TAO_Protocol_Factory *factory_;
-
-  /// Whether we own (and therefore have to delete) the factory object.
-  int factory_owner_;
-};
-
-// typedefs for containers containing the list of loaded protocol
-// factories.
-typedef ACE_Unbounded_Set<TAO_Protocol_Item*>
-        TAO_ProtocolFactorySet;
-
-typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
-        TAO_ProtocolFactorySetItor;
-
-// ****************************************************************
-
-/**
- * @class TAO_Resource_Factory
- *
- * @brief Factory which manufacturers resources for use by the ORB Core.
- *
- * This class is a factory/repository for critical ORB Core
- * resources.
- */
-class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
-{
-public:
-
-  enum Purging_Strategy
-  {
-    /// Least Recently Used
-    LRU,
-
-    /// Least Frequently Used
-    LFU,
-
-    /// First In First Out
-    FIFO,
-
-    /// Dont use any strategy.
-    NOOP
-  };
-
-  enum Resource_Usage
-    {
-      /// Use resources in an eager fashion
-      TAO_EAGER,
-
-      /// Use resources in a lazy manner
-      TAO_LAZY
-    };
-
-  // = Initialization and termination methods.
-  TAO_Resource_Factory (void);
-  virtual ~TAO_Resource_Factory (void);
-
-  // = Resource Retrieval
-
-  /// @@ Backwards compatibility, return 1 if the ORB core should use
-  ///    Locked_Data_Blocks
-  virtual int use_locked_data_blocks (void) const;
-
-  /// Return an ACE_Reactor to be utilized.
-  virtual ACE_Reactor *get_reactor (void);
-
-  /// Reclaim reactor resources (e.g. deallocate, etc).
-  virtual void reclaim_reactor (ACE_Reactor *reactor);
-
-  /// Return a reference to the acceptor registry.
-  virtual TAO_Acceptor_Registry *get_acceptor_registry (void);
-
-  /// Return a connector to be utilized.
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-
-  /// @name Access the input CDR allocators.
-  //@{
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
-  //@}
-
-  // Return 1 when the input CDR allocator uses a lock else 0.
-  virtual int input_cdr_allocator_type_locked (void);
-
-  /// @name Access the output CDR allocators.
-  //@{
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* output_cdr_msgblock_allocator (void);
-  //@}
-
-  /// Access the AMH response handler allocator
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
-
-  /// Access the AMI response handler allocator
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
-
-  /**
-   * The protocol factory list is implemented in this class since
-   * a) it will be a global resource and
-   * b) it is initialized at start up and then not altered.
-   * Returns a container holding the list of loaded protocols.
-   */
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
-
-  virtual TAO_Codeset_Manager *get_codeset_manager(void);
-
-  /**
-   * This method will loop through the protocol list and
-   * using the protocol name field this method will
-   * retrieve a pointer to the associated protocol factory
-   * from the service configurator.  It is assumed
-   * that only one thread will call this method at ORB initialization.
-   * NON-THREAD-SAFE
-   */
-  virtual int init_protocol_factories (void);
-
-  /// This denotes the maximum number of connections that can be cached.
-  virtual int cache_maximum (void) const;
-
-  /// This denotes the amount of entries to remove from the connection
-  /// cache.
-  virtual int purge_percentage (void) const;
-
-  /// Return the number of muxed connections that are allowed for a
-  /// remote endpoint
-  virtual int max_muxed_connections (void) const;
-
-  virtual int get_parser_names (char **&names,
-                                int &number_of_names);
-
-  /// Creates the lock for the lock needed in the Cache Map
-  /// @deprecated
-  virtual ACE_Lock *create_cached_connection_lock (void);
-
-  /// Should the transport cache have a lock or not? Return 1 if the
-  /// transport cache needs to be locked  else return 0
-  virtual int locked_transport_cache (void);
-
-  /// Creates a lock needed for the table that stores the object keys.
-  virtual ACE_Lock *create_object_key_table_lock (void);
-
-  /// Creates the lock for the CORBA Object
-  virtual ACE_Lock *create_corba_object_lock (void);
-
-  /// Creates the flushing strategy.  The new instance is owned by the
-  /// caller.
-  virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0;
-
-  /// Creates the connection purging strategy.
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void) = 0;
-
-  /// Creates the leader followers strategy.  The new instance is owned by the
-  /// caller.
-  virtual TAO_LF_Strategy *create_lf_strategy (void) = 0;
-
-  /// Disables the factory.  When a new factory is installed and used,
-  /// this function should be called on the previously used (default)
-  /// factory.  This should result in proper error reporting if the
-  /// user attempts to set options on an unused factory.
-  virtual void disable_factory (void) = 0;
-
-  /// Return the resource usage strategy.
-  virtual
-  TAO_Resource_Factory::Resource_Usage
-  resource_usage_strategy (void) const = 0;
-
-  /// Return the value of the strategy that indicates whether
-  /// the ORB should wait for the replies during shutdown or drop
-  /// replies during shutdown.
-  virtual bool drop_replies_during_shutdown () const = 0;
-protected:
-  /**
-   * Loads the default protocols. This method is used so that the
-   * advanced_resource.cpp can call the one in default_resource.cpp
-   * without calling unnecessary functions.
-   */
-  virtual int load_default_protocols (void);
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
deleted file mode 100644
index 836e592e6a1..00000000000
--- a/TAO/tao/Resume_Handle.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "Resume_Handle.h"
-#include "ORB_Core.h"
-
-#include "ace/Reactor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Resume_Handle.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Resume_Handle, 
-           "$Id$")
-
-void
-TAO_Resume_Handle::resume_handle (void)
-{
-  // If we have a complete message, just resume the handler
-  // Resume the handler.
-  if (this->orb_core_ &&
-      this->orb_core_->reactor ()->resumable_handler () &&
-      this->flag_ == TAO_HANDLE_RESUMABLE &&
-      this->handle_ != ACE_INVALID_HANDLE)
-    {
-      this->orb_core_->reactor ()->resume_handler (this->handle_);
-    }
-
-  // Set the flag, so that we dont resume again..
-  this->flag_ = TAO_HANDLE_ALREADY_RESUMED;
-}
diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h
deleted file mode 100644
index 44aed27e266..00000000000
--- a/TAO/tao/Resume_Handle.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Resume_Handle.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_RESUME_HANDLE_H
-#define TAO_RESUME_HANDLE_H
-
-#include /**/ "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORB_Core;
-
-/**
- * @class TAO_Resume_Handle
- *
- * @brief A utility class that helps in resuming handlers if TAO uses
- *  a TP Reactor from ACE.
- *
- * Please read the documentation in the bugzilla #575 in the bugzilla
- * database what we mean by handler resumption.
- *
- * When TAO uses a TP reactor, it takes care of resuming the handler
- * once it makes sure that it has read the whole message out of the
- * socket. During the process of reading the transport object would
- * have to deal with errors in 'read' from the socket, or errors in
- * the messages that has been received. Instead of calling
- * resume_handler () on the reactor at every point in the code, we
- * use this utility class to take care of the resumption.
- */
-
-class TAO_Export TAO_Resume_Handle
-{
-
-public:
-
-  /// Ctor.
-  TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0,
-                     ACE_HANDLE h = ACE_INVALID_HANDLE);
-  /// Dtor
-  ~TAO_Resume_Handle (void);
-
-  enum TAO_Handle_Resume_Flag
-  {
-    TAO_HANDLE_RESUMABLE = 0,
-    TAO_HANDLE_ALREADY_RESUMED,
-    TAO_HANDLE_LEAVE_SUSPENDED
-  };
-
-  /// Allow the users of this class to change the underlying flag.
-  void set_flag (TAO_Handle_Resume_Flag fl);
-
-  /// Equal to operator..
-  TAO_Resume_Handle &operator= (const TAO_Resume_Handle &rhs);
-
-  /// Resume the handle in the reactor only if the ORB uses a TP
-  /// reactor. Else we dont resume the handle.
-  void resume_handle (void);
-
-private:
-
-  /// Our ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// The actual handle that needs resumption..
-  ACE_HANDLE handle_;
-
-  /// The flag for indicating whether the handle has been resumed or
-  /// not. A value of '0' indicates that the handle needs resumption.
-  TAO_Handle_Resume_Flag flag_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Resume_Handle.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_RESUME_HANDLE*/
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
deleted file mode 100644
index 38aae6740f1..00000000000
--- a/TAO/tao/Resume_Handle.inl
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-//$Id$
-
-ACE_INLINE
-TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core,
-                                      ACE_HANDLE h)
-  : orb_core_ (orb_core),
-    handle_ (h),
-    flag_ (TAO_HANDLE_RESUMABLE)
-{
-}
-
-ACE_INLINE
-TAO_Resume_Handle::~TAO_Resume_Handle (void)
-{
-  if (this->flag_ == TAO_HANDLE_RESUMABLE)
-    this->resume_handle ();
-
-  this->orb_core_ = 0;
-  this->handle_ = ACE_INVALID_HANDLE;
-}
-
-
-ACE_INLINE void
-TAO_Resume_Handle::set_flag (TAO_Handle_Resume_Flag fl)
-{
-  this->flag_ = fl;
-}
-
-ACE_INLINE TAO_Resume_Handle &
-TAO_Resume_Handle::operator= (const TAO_Resume_Handle &rhs)
-{
-  this->orb_core_ = rhs.orb_core_;
-  this->handle_ = rhs.handle_;
-  this->flag_ = rhs.flag_;
-
-  return *this;
-}
diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp
deleted file mode 100644
index 89b13ea1890..00000000000
--- a/TAO/tao/Seq_Out_T.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef TAO_SEQ_OUT_T_C
-#define TAO_SEQ_OUT_T_C
-
-#include "Seq_Out_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Seq_Out_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Sequence_Out_T,
-           "$Id$")
-
-#endif /*TAO_SEQUENCE_OUT_T_C*/
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
deleted file mode 100644
index 895c4f9b62b..00000000000
--- a/TAO/tao/Seq_Out_T.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Seq_Out_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_SEQ_OUT_T_H
-#define TAO_SEQ_OUT_T_H
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-/**
- * @class TAO_Seq_Out_T
- *
- * @brief Parametrized implementation of _out class for sequences.
- *
- */
-template <typename T, typename T_var, typename T_elem>
-class TAO_Seq_Out_T
-{
-public:
-  TAO_Seq_Out_T (T *&);
-  TAO_Seq_Out_T (T_var &);
-  TAO_Seq_Out_T (const TAO_Seq_Out_T<T,T_var,T_elem> &);
-
-  TAO_Seq_Out_T &operator= (const TAO_Seq_Out_T<T,T_var,T_elem> &);
-  TAO_Seq_Out_T &operator= (T *);
-
-  operator T *& ();
-  T *& ptr (void);
-  T * operator-> (void);
-
-  T_elem & operator[] (CORBA::ULong index);
-
-private:
-  typedef TAO_Seq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
-  T *& ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const T_var &);
-};
-
-
-/**
- * @class TAO_MngSeq_Out_T
- *
- * @brief Parametrized implementation of _out class for sequences
- * having managed types.
- *
- */
-template <typename T, typename T_var, typename T_elem>
-class TAO_MngSeq_Out_T
-{
-public:
-  TAO_MngSeq_Out_T (T *&);
-  TAO_MngSeq_Out_T (T_var &);
-  TAO_MngSeq_Out_T (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
-
-  TAO_MngSeq_Out_T &operator= (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
-  TAO_MngSeq_Out_T &operator= (T *);
-
-  operator T *& ();
-  T *& ptr (void);
-  T * operator-> (void);
-
-  T_elem operator[] (CORBA::ULong index);
-
-private:
-  typedef TAO_MngSeq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
-  T *& ptr_;
-  // Assignment from T_var not allowed.
-  void operator= (const T_var &);
-};
-
-
-
-#if defined (__ACE_INLINE__)
-#include "Seq_Out_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Seq_Out_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Seq_Out_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SEQ_OUT_T_H */
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
deleted file mode 100644
index c26815ff9cb..00000000000
--- a/TAO/tao/Seq_Out_T.inl
+++ /dev/null
@@ -1,154 +0,0 @@
-// -*- C++ -*-
-//$Id$
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (
-    const TAO_Seq_Out_T<T,T_var,T_elem> & p
-  )
-  : ptr_ (p.ptr_)
-{}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem> &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator= (
-    const TAO_Seq_Out_T<T,T_var,T_elem> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem> &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_Seq_Out_T<T,T_var,T_elem>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *&
-TAO_Seq_Out_T<T,T_var,T_elem>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *
-TAO_Seq_Out_T<T,T_var,T_elem>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T_elem &
-TAO_Seq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// ****************************************************************
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (
-    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
-  )
-  : ptr_ (p.ptr_)
-{}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem> &
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (
-    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem> &
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *&
-TAO_MngSeq_Out_T<T,T_var,T_elem>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T *
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_elem>
-ACE_INLINE
-T_elem
-TAO_MngSeq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp
deleted file mode 100644
index 04d36e7dafa..00000000000
--- a/TAO/tao/Seq_Var_T.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQ_VAR_T_C
-#define TAO_SEQ_VAR_T_C
-
-#include "tao/Seq_Var_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Seq_Var_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Seq_VarOut_T,
-           "$Id$")
-
-
-template<typename T, typename T_elem>
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
-    const TAO_Seq_Var_Base_T<T,T_elem> & p
-  )
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_,
-               T (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// ****************************************************************************
-
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (
-    const TAO_FixedSeq_Var_T<T,T_elem> & p
-  )
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-// Fixed-size types only.
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_,
-                      T (p),
-                      *this);
-    }
-
-  return *this;
-}
-
-// ****************************************************************************
-
-template<typename T, typename T_elem>
-TAO_VarSeq_Var_T<T,T_elem> &
-TAO_VarSeq_Var_T<T,T_elem>::operator= (
-    const TAO_VarSeq_Var_T<T,T_elem> & p
-  )
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-// ****************************************************************************
-
-template<typename T, typename T_elem>
-TAO_MngSeq_Var_T<T,T_elem> &
-TAO_MngSeq_Var_T<T,T_elem>::operator= (
-    const TAO_MngSeq_Var_T<T,T_elem> & p
-  )
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              T (*p.ptr_),
-              *this
-            );
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-#endif /* TAO_SEQ_VAR_T_C */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
deleted file mode 100644
index c5c401f8f5b..00000000000
--- a/TAO/tao/Seq_Var_T.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Seq_Var_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_SEQ_VAR_T_H
-#define TAO_SEQ_VAR_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/OS_Memory.h"
-
-/**
- * @class TAO_Seq_Var_Base_T
- *
- * @brief Parametrized implementation of _var base class for sequences
- *
- */
-template <typename T, typename T_elem>
-class TAO_Seq_Var_Base_T
-{
-public:
-  TAO_Seq_Var_Base_T (void);
-  TAO_Seq_Var_Base_T (T *);
-  TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T,T_elem> &);
-
-  ~TAO_Seq_Var_Base_T (void);
-
-  T *operator-> (void);
-  const T *operator-> (void) const;
-
-  operator const T & () const;
-  operator T & ();
-  operator T & () const;
-
-  typedef const T &   _in_type;
-  typedef       T &   _inout_type;
-  typedef       T *&  _out_type;
-  typedef       T *   _retn_type;
-
-  // in, inout, out, _retn
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-  _out_type     out (void);
-  _retn_type    _retn (void);
-
-  // TAO extension.
-  _retn_type    ptr (void) const;
-
-protected:
-  T * ptr_;
-};
-
-/**
- * @class TAO_FixedSeq_Var_T
- *
- * @brief Parametrized implementation of _var class for sequences
- * whose element is of fixed size..
- *
- */
-template <typename T, typename T_elem>
-class TAO_FixedSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
-{
-public:
-  TAO_FixedSeq_Var_T (void);
-  TAO_FixedSeq_Var_T (T *);
-  TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T,T_elem> &);
-
-  // Fixed-size base types only.
-  TAO_FixedSeq_Var_T (const T &);
-
-  TAO_FixedSeq_Var_T & operator= (T *);
-  TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &);
-
-  T_elem & operator[] (CORBA::ULong index);
-
-  // Fixed-size base types only.
-  TAO_FixedSeq_Var_T & operator= (const T &);
-};
-
-/**
- * @class TAO_VarSeq_Var_T
- *
- * @brief Parametrized implementation of _var class for sequences
- * whose element is of variable size..
- *
- */
-template <typename T, typename T_elem>
-class TAO_VarSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
-{
-public:
-  TAO_VarSeq_Var_T (void);
-  TAO_VarSeq_Var_T (T *);
-  TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T,T_elem> &);
-
-  TAO_VarSeq_Var_T & operator= (T *);
-  TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &);
-
-  T_elem & operator[] (CORBA::ULong index);
-
-  // Variable-size base types only.
-  operator T *& ();
-};
-
-/**
- * @class TAO_MngSeq_Var_T
- *
- * @brief Parametrized implementation of _var class for sequences
- * whose element is of a managed type - string, wstring, valuetype,
- * interface, abstract interface and pseudo object.
- *
- */
-template <typename T, typename T_elem>
-class TAO_MngSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
-{
-public:
-  TAO_MngSeq_Var_T (void);
-  TAO_MngSeq_Var_T (T *);
-  TAO_MngSeq_Var_T (const TAO_MngSeq_Var_T<T,T_elem> &);
-
-  TAO_MngSeq_Var_T & operator= (T *);
-  TAO_MngSeq_Var_T & operator= (const TAO_MngSeq_Var_T<T,T_elem> &);
-
-  // Variable-size base types only.
-  operator T *& ();
-
-  // Managed base types only.
-  T_elem operator[] (CORBA::ULong index);
-};
-
-
-
-#if defined (__ACE_INLINE__)
-#include "Seq_Var_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Seq_Var_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Seq_Var_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQ_VAROUT_T_H */
diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl
deleted file mode 100644
index b625dac9a6e..00000000000
--- a/TAO/tao/Seq_Var_T.inl
+++ /dev/null
@@ -1,241 +0,0 @@
-//$Id$
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (void)
-  : ptr_ (0)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (T * p)
-  : ptr_ (p)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::~TAO_Seq_Var_Base_T (void)
-{
-  delete this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-const T *
-TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T *
-TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator const T & () const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator T & ()
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_Seq_Var_Base_T<T,T_elem>::operator T & () const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-const T &
-TAO_Seq_Var_Base_T<T,T_elem>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T &
-TAO_Seq_Var_Base_T<T,T_elem>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T *&
-TAO_Seq_Var_Base_T<T,T_elem>::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T *
-TAO_Seq_Var_Base_T<T,T_elem>::_retn (void)
-{
-  T * tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T *
-TAO_Seq_Var_Base_T<T,T_elem>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// ***************************************************************
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (void)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (
-    const TAO_FixedSeq_Var_T<T,T_elem> & p
-  )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{
-}
-
-// Fixed-size base types only.
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (const T & p)
-{
-  ACE_NEW (this->ptr_,
-           T (p));
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_FixedSeq_Var_T<T,T_elem> &
-TAO_FixedSeq_Var_T<T,T_elem>::operator= (T * p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T_elem &
-TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// ***************************************************************
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (void)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (
-    const TAO_VarSeq_Var_T<T,T_elem> & p
-  )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem> &
-TAO_VarSeq_Var_T<T,T_elem>::operator= (T * p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-// Variable-size types only.
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_VarSeq_Var_T<T,T_elem>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T_elem &
-TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// ***************************************************************
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (void)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p)
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (
-    const TAO_MngSeq_Var_T<T,T_elem> & p
-  )
-  : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem> &
-TAO_MngSeq_Var_T<T,T_elem>::operator= (T * p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-// Variable-size types only.
-template<typename T, typename T_elem>
-ACE_INLINE
-TAO_MngSeq_Var_T<T,T_elem>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_elem>
-ACE_INLINE
-T_elem
-TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
deleted file mode 100644
index 50b11409ea4..00000000000
--- a/TAO/tao/Sequence.cpp
+++ /dev/null
@@ -1,1112 +0,0 @@
-// $Id$
-
-#include "Sequence.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-#include "SystemException.h"
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-# include "ace/Message_Block.h"
-#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 1) */
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_Memory.h"
-
-
-ACE_RCSID (tao,
-           Sequence,
-           "$Id$")
-
-
-// *************************************************************
-// Operations for class TAO_Base_Sequence
-// *************************************************************
-
-TAO_Base_Sequence::~TAO_Base_Sequence (void)
-{
-}
-
-void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
-{
-
-  // default is no op.
-}
-
-void
-TAO_Base_Sequence::_downcast (void *,
-                              CORBA::Object *
-                              ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // default is no op.
-  // @@ TODO Maybe throw an exception?
-}
-
-CORBA::Object *
-TAO_Base_Sequence::_upcast (void *) const
-{
-  return 0;
-}
-
-void
-TAO_Base_Sequence::check_bounds (char const * filename,
-                                 unsigned long lineno,
-                                 CORBA::ULong tao_idx,
-                                 CORBA::ULong tao_max) const
-{
-  // TODO use hook
-  if (tao_idx >= tao_max)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Access error in TAO_Base_Sequence file=%s, line=%u, "
-                  "idx=%u, max=%u\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (filename),
-                  lineno,
-                  tao_idx,
-                  tao_max));
-
-      // @todo When we have a hook setup, we can totally ignore this or
-      //       even remove this.
-#if defined (ACE_HAS_EXCEPTIONS)
-      ACE_THROW (CORBA::BAD_PARAM ());
-#else
-      ACE_OS::abort ();
-#endif /* ACE_HAS_EXCEPTIONS */
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Base_Sequence
-// *************************************************************
-
-TAO_Unbounded_Base_Sequence::~TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Base_Sequence
-// *************************************************************
-
-TAO_Bounded_Base_Sequence::~TAO_Bounded_Base_Sequence (void)
-{
-}
-
-// *************************************************************
-
-// constructor for unbounded string seq
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_String_Sequence::allocbuf (maximum)
-      )
-{
-}
-
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
-    const TAO_Unbounded_String_Sequence & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      char* *tmp1 =
-        TAO_Unbounded_String_Sequence::allocbuf (this->maximum_);
-
-      char ** const tmp2 =
-        reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::string_dup (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-TAO_Unbounded_String_Sequence::~TAO_Unbounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-TAO_Unbounded_String_Sequence &
-TAO_Unbounded_String_Sequence::operator= (
-    const TAO_Unbounded_String_Sequence & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      char ** tmp = reinterpret_cast<char **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the older buffer.
-          TAO_Unbounded_String_Sequence::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  char ** tmp1 = reinterpret_cast <char **> (this->buffer_);
-  char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::string_dup (tmp2[i]);
-    }
-
-  return *this;
-}
-
-TAO_SeqElem_String_Manager
-TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  char ** const tmp =
-    reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_SeqElem_String_Manager (tmp + slot,
-                                     this->release_);
-}
-
-char **
-TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
-{
-  char ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  char * [nelems],
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-void
-TAO_Unbounded_String_Sequence::freebuf (char ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using string_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  //  Mark the length in the first four bytes? For the moment we let
-  //  that be.
-
-  delete [] buffer;
-}
-
-void
-TAO_Unbounded_String_Sequence::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  TAO_Unbounded_String_Sequence * tmp =
-    static_cast <TAO_Unbounded_String_Sequence *> (_tao_void_pointer);
-  delete tmp;
-}
-
-char **
-TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
-{
-  char ** result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result = allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result = reinterpret_cast <char **> (this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = reinterpret_cast <char **> (this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-const char **
-TAO_Unbounded_String_Sequence::get_buffer (void) const
-{
-  return reinterpret_cast<const char ** ACE_CAST_CONST> (this->buffer_);
-}
-
-void
-TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
-{
-  char ** tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      char ** old = reinterpret_cast <char **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          // Only call duplicate when we did not own the previous
-          // buffer, since after this method we own it we must also
-          // own the objects.  If we already own the objects there is
-          // no need to copy them, if we did we would also have to
-          // remove the old instances.
-          if (!this->release_)
-            {
-              tmp [i] = CORBA::string_dup (old[i]);
-            }
-          else
-            {
-              tmp [i] = old[i];
-            }
-        }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-void
-TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  char ** tmp = reinterpret_cast <char **> (this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_String_Sequence::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_ = 0;
-  this->release_ = 0;
-  this->maximum_ = 0;
-}
-
-void
-TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
-                                               CORBA::ULong ol)
-{
-  char ** tmp = reinterpret_cast <char **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-void
-TAO_Unbounded_String_Sequence::replace (CORBA::ULong maximum,
-                                        CORBA::ULong length,
-                                        char ** data,
-                                        CORBA::Boolean release)
-{
-  if (this->release_ == 1)
-    {
-      char ** tmp = reinterpret_cast <char **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-    }
-
-  this->maximum_ = maximum;
-  this->length_ = length;
-
-  // If 'release' is 1, it is the caller's responsibility to allocate
-  // 'data' with CORBA::string_alloc.
-  this->buffer_ = data;
-  this->release_ = release;
-}
-// *************************************************************
-
-// constructor for unbounded wide string seq
-TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_WString_Sequence::allocbuf (maximum)
-      )
-{
-}
-
-TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
-    const TAO_Unbounded_WString_Sequence & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::WChar ** tmp1 =
-        TAO_Unbounded_WString_Sequence::allocbuf (this->maximum_);
-
-      CORBA::WChar ** const tmp2 =
-        reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::wstring_dup (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-TAO_Unbounded_WString_Sequence::~TAO_Unbounded_WString_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-TAO_Unbounded_WString_Sequence &
-TAO_Unbounded_WString_Sequence::operator= (
-    const TAO_Unbounded_WString_Sequence & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      CORBA::WChar ** tmp = reinterpret_cast <CORBA::WChar **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::wstring_free (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the older buffer
-          TAO_Unbounded_WString_Sequence::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::WChar ** tmp1 = reinterpret_cast <CORBA::WChar **> (this->buffer_);
-  CORBA::WChar ** const tmp2 =
-    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::wstring_dup (tmp2[i]);
-    }
-
-  return *this;
-}
-
-TAO_SeqElem_WString_Manager
-TAO_Unbounded_WString_Sequence::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  CORBA::WChar ** const tmp =
-    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_SeqElem_WString_Manager (tmp + slot,
-                                      this->release_);
-}
-
-CORBA::WChar **
-TAO_Unbounded_WString_Sequence::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::WChar ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  CORBA::WChar * [nelems],
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-void
-TAO_Unbounded_WString_Sequence::freebuf (CORBA::WChar ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11}
-  // The freebuf function ensures that the destructor for each element
-  // is called before the buffer is destroyed, except for string
-  // elements, which are freed using wstring_free(), and object
-  // reference elements, which are freed using release(). The freebuf
-  // function will ignore null pointers passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  //  Mark the length in the first four bytes? For the moment we let
-  //  that be.
-
-  delete [] buffer;
-}
-
-void
-TAO_Unbounded_WString_Sequence::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  TAO_Unbounded_WString_Sequence * tmp =
-    static_cast<TAO_Unbounded_WString_Sequence *> (_tao_void_pointer);
-  delete tmp;
-}
-
-CORBA::WChar **
-TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::WChar ** result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result = allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-const CORBA::WChar **
-TAO_Unbounded_WString_Sequence::get_buffer (void) const
-{
-  return reinterpret_cast<const CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
-}
-
-void
-TAO_Unbounded_WString_Sequence::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::WChar ** tmp = TAO_Unbounded_WString_Sequence::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      CORBA::WChar ** old = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          // Only call duplicate when we did not own the previous
-          // buffer, since after this method we own it we must also
-          // own the objects.  If we already own the objects there is
-          // no need to copy them, if we did we would also have to
-          // remove the old instances.
-          if (!this->release_)
-            {
-              tmp [i] = CORBA::wstring_dup (old[i]);
-            }
-          else
-            {
-              tmp [i] = old[i];
-            }
-        }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-void
-TAO_Unbounded_WString_Sequence::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::wstring_free (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_WString_Sequence::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_ = 0;
-  this->release_ = 0;
-  this->maximum_ = 0;
-}
-
-void
-TAO_Unbounded_WString_Sequence::_shrink_buffer (CORBA::ULong nl,
-                                                CORBA::ULong ol)
-{
-  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::wstring_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-void
-TAO_Unbounded_WString_Sequence::replace (CORBA::ULong maximum,
-                                         CORBA::ULong length,
-                                         CORBA::WChar* *data,
-                                         CORBA::Boolean release)
-{
-  if (this->release_ == 1)
-    {
-      CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::wstring_free (tmp[i]);
-          tmp[i] = 0;
-        }
-    }
-
-  this->maximum_ = maximum;
-  this->length_ = length;
-
-  // If 'release' is 1, it is the caller's responsibility to allocate
-  // 'data' with CORBA::wstring_alloc.
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// ****************************************************************
-
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
-    const TAO_Unbounded_Sequence<CORBA::Octet> &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  , mb_ (0)
-#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Octet * tmp1 =
-       TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->maximum_);
-
-
-      CORBA::Octet * const tmp2 =
-        reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_);
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (rhs.mb_ == 0)
-        {
-          ACE_OS::memcpy (tmp1,
-                          tmp2,
-                          this->length_);
-        }
-      else
-        {
-          size_t offset = 0;
-
-          for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
-            {
-              ACE_OS::memcpy (tmp1 + offset,
-                              i->rd_ptr (),
-                              i->length ());
-
-              offset += i->length ();
-            }
-        }
-#else /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
-      ACE_OS::memcpy (tmp1, tmp2, this->length_);
-#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 1) */
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-TAO_Unbounded_Sequence<CORBA::Octet> &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
-    const TAO_Unbounded_Sequence<CORBA::Octet> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  if (this->mb_ != 0)
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-      this->buffer_ =
-        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
-    }
-  else
-#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.length_)
-        {
-          // free the old buffer
-          CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::Octet * tmp1 = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-  CORBA::Octet * const tmp2 =
-    reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_);
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  // for (CORBA::ULong i = 0; i < this->length_; ++i)
-  // tmp1[i] = tmp2[i];
-  if (rhs.mb_ == 0)
-    {
-      ACE_OS::memcpy (tmp1,
-                      tmp2,
-                      this->length_);
-    }
-  else
-    {
-      size_t offset = 0;
-
-      for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
-        {
-          ACE_OS::memcpy (tmp1 + offset,
-                          i->rd_ptr (),
-                          i->length ());
-          offset += i->length ();
-        }
-    }
-#else /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
-  ACE_OS::memcpy (tmp1, tmp2, this->length_);
-#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
-
-  return *this;
-}
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
-    CORBA::ULong length,
-    const ACE_Message_Block * mb
-  )
-  :  TAO_Unbounded_Base_Sequence (length,
-                                  length,
-                                  mb->rd_ptr (),
-                                  0),
-     mb_ (0)
-{
-  // Get the message block flags.
-  ACE_Message_Block::Message_Flags flg = mb->self_flags ();
-
-  // If the DONT_DELETE flag is disabled just a duplicate would
-  // help. If the DONT_DELETE flag is enabled a deep copy is needed as
-  // the contents would be on stack. Just incrementing the ref count
-  // on the stack based data block would only crash the program when
-  // the stack unwinds
-  if (ACE_BIT_DISABLED (flg,
-                        ACE_Message_Block::DONT_DELETE))
-    {
-      this->mb_ = ACE_Message_Block::duplicate (mb);
-    }
-  else
-    {
-      // As we are in CORBA mode, all the data blocks would be aligned
-      // on an 8 byte boundary
-      ACE_Message_Block msgb (*mb,
-                              ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the base pointer of the incoming message block
-      char *start = ACE_ptr_align_binary (mb->base (),
-                                          ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the read and write displacements in the incoming stream
-      size_t rd_pos = mb->rd_ptr () - start;
-      size_t wr_pos = mb->wr_ptr () - start;
-
-      this->mb_ = ACE_Message_Block::duplicate (&msgb);
-
-      this->mb_->rd_ptr (rd_pos);
-      this->mb_->wr_ptr (wr_pos);
-    }
-}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-TAO_Unbounded_Sequence<CORBA::Octet>::~TAO_Unbounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-// This function is a little too big to be inlined, but some compilers
-// (Sun/CC 4.1?) die if it isn't :-(
-CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Octet * result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          // The buffer was not allocated, we must allocate it now.
-          result =
-            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            reinterpret_cast<CORBA::Octet*> (this->buffer_);
-        }
-    }
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  else if (this->mb_ != 0) // (orphan == 1)
-    {
-      // We must create a copy anyway:
-      //   the user is supposed to call freebuf() to release the
-      //   buffer, but the buffer is inside a Message_Block...
-      //   We thought about storing the pointer to the Message_Block
-      //   somewhere at the beginning of the buffer (before the actual
-      //   data), but that will not work in 64 bit machines when the
-      //   buffer comes from a CDR stream.
-      //
-      result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
-      ACE_OS::memcpy (result, this->buffer_, this->length_);
-    }
-  else if (this->release_ != 0)
-    {
-      // We set the state back to default and relinquish
-      // ownership.
-      result = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-      this->maximum_ = 0;
-      this->length_ = 0;
-      this->buffer_ = 0;
-      this->release_ = 0;
-    }
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  else
-    {
-      result = reinterpret_cast<CORBA::Octet*> (this->buffer_);
-
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-  /* else
-     // Oops, it's not our buffer to relinquish...
-     return 0;
-  */
-  return result;
-}
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
-                                               const ACE_Message_Block * mb)
-{
-  this->_deallocate_buffer ();
-
-  // Get the message block flags.
-  ACE_Message_Block::Message_Flags flg = mb->self_flags ();
-
-  // If the DONT_DELETE flag is disabled just a duplicate would
-  // help. If the DONT_DELETE flag is enabled a deep copy is needed as
-  // the contents would be on stack. Just incrementing the ref count
-  // on the stack based data block would only crash the program when
-  // the stack unwinds
-  if (ACE_BIT_DISABLED (flg,
-                        ACE_Message_Block::DONT_DELETE))
-    {
-      this->mb_ = ACE_Message_Block::duplicate (mb);
-    }
-  else
-    {
-      // As we are in CORBA mode, all the data blocks would be aligned
-      // on an 8 byte boundary
-      ACE_Message_Block msgb (*mb,
-                              ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the base pointer of the incoming message block
-      char * start = ACE_ptr_align_binary (mb->base (),
-                                           ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the read and write displacements in the incoming stream
-      size_t rd_pos = mb->rd_ptr () - start;
-      size_t wr_pos = mb->wr_ptr () - start;
-
-      this->mb_ = ACE_Message_Block::duplicate (&msgb);
-
-      this->mb_->rd_ptr (rd_pos);
-      this->mb_->wr_ptr (wr_pos);
-    }
-
-  this->buffer_ = this->mb_->rd_ptr ();
-  this->maximum_ = length;
-  this->length_ = length;
-  this->release_ = 0;
-}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::_tao_any_destructor (void * x)
-{
-  TAO_Unbounded_Sequence<CORBA::Octet> * tmp =
-    static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (x);
-  delete tmp;
-}
-
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Octet *tmp = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      CORBA::Octet * old = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (this->mb_ != 0)
-        {
-          ACE_Message_Block::release (this->mb_);
-          this->mb_ = 0;
-        }
-      else
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-        if (this->release_)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (old);
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
-{
-  if (this->buffer_ != 0
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      && this->mb_ == 0
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-      && this->release_ != 0)
-    {
-      CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-    }
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  else
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-    }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  this->buffer_ = 0;
-  this->length_ = 0;
-  this->release_ = 0;
-  this->maximum_ = 0;
-}
-
-
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
-                                               CORBA::ULong length,
-                                               CORBA::Octet * data,
-                                               CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  if (this->mb_ != 0)
-    {
-      ACE_Message_Block::release (this->mb_);
-      this->mb_ = 0;
-    }
-  else
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Octet * tmp =
-        reinterpret_cast<CORBA::Octet *> (this->buffer_);
-      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// ****************************************************************
-
-bool
-operator== (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
-{
-  const CORBA::ULong rlen = rhs.length ();
-
-  if (rlen != lhs.length ())
-    {
-      return false;
-    }
-
-  for (CORBA::ULong i = 0; i < rlen; ++i)
-    {
-      if (rhs[i] != lhs[i])
-        {
-          return false;
-        }
-    }
-
-  return true;
-}
-
-bool
-operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
-{
-  return !(lhs == rhs);
-}
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
deleted file mode 100644
index 2059d108820..00000000000
--- a/TAO/tao/Sequence.h
+++ /dev/null
@@ -1,675 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_H
-#define TAO_SEQUENCE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Managed_Types.h"
-#include "tao/orbconf.h"
-#include "tao/default_environment.h"
-
-namespace CORBA
-{
-  class Object;
-}
-
-class ACE_Message_Block;
-
-/**
- * @class TAO_Base_Sequence
- *
- * @brief Base class for TAO sequences.
- *
- * This class provides a common interface for all IDL sequences,
- * hence the interpreted marshal engine can manipulate them in a
- * type safe manner.
- */
-class TAO_Export TAO_Base_Sequence
-{
-public:
-  /// We give access to TAO_Marshal_Sequence, this allows a safe yet
-  /// small footprint implementation of the marshal engine.
-  friend class TAO_Marshal_Sequence;
-
-  /// Destructor.
-  virtual ~TAO_Base_Sequence (void);
-
-  /// Return the maximum length of the sequence
-  CORBA::ULong maximum (void) const;
-
-  /**
-   * Ensure that the buffer contains space for at least <length>
-   * elements.  The constructor must be called for any new elements,
-   * the old ones (if any) must be copied into the buffer using
-   * operator= and then their destructors must be called.  Finally the
-   * old buffer must be released.
-   */
-  virtual void _allocate_buffer (CORBA::ULong length) = 0;
-
-  /// Must deallocate the buffer and then set it to zero.
-  virtual void _deallocate_buffer (void) = 0;
-
-  /**
-   * Some sequences (of objects and strings) require some cleanup if
-   * the sequence is shrunk. The spec requires the destructor to
-   * release the objects only from position <0> to <length-1>; so
-   * shrink and then delete could result in a memory leak.
-   */
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  /// Used for sequences of objects to downcast a recently demarshalled
-  /// object reference into the right type.
-  virtual void _downcast (void *target,
-                          CORBA::Object *src
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Used for sequences of object to convert from the derived type
-  /// into the Object class.
-  virtual CORBA::Object *_upcast (void *src) const;
-
-  // = orbos/98-01-11 proposed extensions.
-  /// Returns the state of the sequence release flag.
-  CORBA::Boolean release (void) const;
-
-protected:
-  /// Default constructor.
-  TAO_Base_Sequence (void);
-
-  /// Constructor with control of ownership.
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     CORBA::ULong length,
-                     void *buffer,
-                     CORBA::Boolean release = 0);
-
-  /// Assume ownership and set length to 0.
-  TAO_Base_Sequence (CORBA::ULong maximum,
-                     void *buffer);
-
-  void check_bounds(
-      char const * filename, unsigned long lineno,
-      CORBA::ULong tao_idx, CORBA::ULong tao_max) const;
-
-public:
-
-  // = The following two functions should be protected but we made it
-  // public because it breaks some compilers.
-
-  // Copy constructor and assignment operator are protected, the
-  // derived classes must provided the right semantics for the buffer
-  // copy, only the static fields are actually copy.
-  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
-  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
-
-protected:
-
-  /// The maximum number of elements the buffer can contain.
-  CORBA::ULong maximum_;
-
-  /// The current number of elements in the buffer.
-  CORBA::ULong length_;
-
-  /// The buffer with all the elements, casting must be done in derived
-  /// classes.
-  void *buffer_;
-
-  /// If true then the sequence should release the buffer when it is
-  /// destroyed.
-  CORBA::Boolean release_;
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Unbounded_Base_Sequence
- *
- * @brief Base class for all bounded sequences.
- *
- * This class implements part of the funcionality common to all
- * bounded sequences, using this intermediate class instead of
- * virtual methods on TAO_Base_Sequence give us a slight
- * improvement of performance, but also reduces the amount of
- * generated code in the templates.
- */
-class TAO_Export TAO_Unbounded_Base_Sequence : public TAO_Base_Sequence
-{
-public:
-  /**
-   * = SPEC {16.11.2}
-   * For an unbounded sequence, setting the length to a larger value
-   * than the current length may reallocate the sequence
-   * data. Reallocation is conceptually equivalent to creating a new
-   * sequence of the desired new length, copying the old sequence
-   * elements zero through length into the new sequence, and then
-   * assigning the old sequence to be the same as the new sequence.
-   */
-  void length (CORBA::ULong length);
-
-  /**
-   * return the current length, it cannot go into the base class due
-   * to the C++ name lookup rules (if you don't know what I'm talking
-   * about, then try moving it there).
-   */
-  CORBA::ULong length (void) const;
-
-  /// destructor.
-  virtual ~TAO_Unbounded_Base_Sequence (void);
-
-protected:
-  /// Default constructor.
-  TAO_Unbounded_Base_Sequence (void);
-
-  /// Constructor with control of ownership.
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               void *buffer,
-                               CORBA::Boolean release = 0);
-
-  /// Assume ownership and set length to 0.
-  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                               void *buffer);
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Bounded_Base_Sequence
- *
- * @brief Base class for all bounded sequences.
- *
- * This class implements part of the funcionality common to all
- * bounded sequences, using this intermediate class instead of
- * virtual methods on TAO_Base_Sequence give us a slight
- * improvement of performance, but also reduces the amount of
- * generated code in the templates.
- */
-class TAO_Export TAO_Bounded_Base_Sequence : public TAO_Base_Sequence
-{
-public:
-  /// Set the length, for this sequences this call is ignored if the
-  /// new length is greater that the maximum.
-  void length (CORBA::ULong length);
-
-  /**
-   * Return the current length, it cannot go into the base class due
-   * to the C++ name lookup rules (if you don't know what I'm talking
-   * about, then try moving it there).
-   */
-  CORBA::ULong length (void) const;
-
-  /// Destructor.
-  virtual ~TAO_Bounded_Base_Sequence (void);
-
-protected:
-  /// Default constructor.
-  TAO_Bounded_Base_Sequence (void);
-
-  /// Constructor with control of ownership.
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void *buffer,
-                             CORBA::Boolean release = 0);
-
-  /// Assume ownership and set length to 0.
-  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                             void *buffer);
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Unbounded_String_Sequence
- *
- * @brief Unbounded sequence of strings.
- *
- * IDL sequences of strings must automatically duplicate and
- * release their members based on some global <release> flag.
- */
-class TAO_Export TAO_Unbounded_String_Sequence
-  : public TAO_Unbounded_Base_Sequence
-{
-
-  // = SPEC
-  // 16.8 Mapping for Structured Types
-  // The mapping for struct, union, and sequence (but not array) is a
-  // C++ struct or class with a default constructor, a copy
-  // constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Operations for the Unbounded_ObjectSequence
-
-  /**
-   * {orbos/97-05-15:16.8}
-   * The default constructor initializes object reference members to
-   * appropriately typed nil object references and string members to
-   * NULL; all other members are initialized via their default
-   * constructors.
-   *
-   * {orbos/97-05-15:16.11}
-   * For both bounded and unbounded sequences, the default constructor
-   * (as shown in the example above) sets the sequence length equal to
-   * 0.
-   */
-  TAO_Unbounded_String_Sequence (void);
-
-  /**
-   * Unbounded sequences provide a constructor that allows only the
-   * initial value of the maximum length to be set (the ``maximum
-   * constructor'' shown in the example above). This allows
-   * applications to control how much buffer space is initially
-   * allocated by the sequence. This constructor also sets the length
-   * to 0 and the release flag to TRUE.
-   */
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum);
-
-  /**
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the content's vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   * If release is TRUE, the content's vector must have been allocated
-   * using the sequence allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 char ** data,
-                                 CORBA::Boolean release = 0);
-
-  /**
-   * The copy constructor performs a deep copy from the existing
-   * structure to create a new structure, including calling _duplicate
-   * on all object  reference members and performing the necessary
-   * heap allocations for all string members.
-   *
-   * The copy constructor creates a new sequence with the same maximum
-   * and length as the given sequence, copies each of its current
-   * elements (items zero through length-1), and sets the release
-   * flag to TRUE.
-   */
-  TAO_Unbounded_String_Sequence(const TAO_Unbounded_String_Sequence&);
-
-  /// The destructor releases all object reference members and frees
-  /// all string members.
-  ~TAO_Unbounded_String_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string  members, and then performs a
-   * deep­copy to create a new structure.
-   *
-   * The assignment operator deep­copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor. If release=TRUE, the
-   * destructor destroys each of the current elements (items zero
-   * through length--1).
-   * For an unbounded sequence, if a reallocation is necessary due to
-   * a change in the length and the sequence was created using the
-   * release=TRUE parameter in its constructor, the sequence will
-   * deallocate the old storage. If release is FALSE under these
-   * circumstances, old storage will not be freed before the
-   * reallocation is performed. After reallocation, the release flag
-   * is always set to TRUE.
-   */
-  TAO_Unbounded_String_Sequence & operator= (
-      const TAO_Unbounded_String_Sequence &
-    );
-
-  /// read-write accessor
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static char ** allocbuf (CORBA::ULong);
-
-  /**
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using string_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (char **);
-
-  static void _tao_any_destructor (void *);
-
-  // = Fast buffer accessors.
-  char ** get_buffer (CORBA::Boolean orphan = 0);
-  const char ** get_buffer (void) const;
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong maximum,
-                CORBA::ULong length,
-                char ** data,
-                CORBA::Boolean release = 0);
-};
-
-// ****************************************************************
-
-/**
- * @class TAO_Unbounded_WString_Sequence
- *
- * @brief Unbounded sequence of wstrings.
- *
- * IDL sequences of wstrings must automatically duplicate and
- * release their members based on some global <release> flag.
- */
-class TAO_Export TAO_Unbounded_WString_Sequence
-  : public TAO_Unbounded_Base_Sequence
-{
-
-  // = SPEC
-  // 16.8 Mapping for Structured Types
-  // The mapping for struct, union, and sequence (but not array) is a
-  // C++ struct or class with a default constructor, a copy
-  // constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Operations for the Unbounded_ObjectSequence
-
-  /**
-   * {orbos/97-05-15:16.8}
-   * The default constructor initializes object reference members to
-   * appropriately typed nil object references and wstring members to
-   * NULL; all other members are initialized via their default
-   * constructors.
-   *
-   * {orbos/97-05-15:16.11}
-   * For both bounded and unbounded sequences, the default constructor
-   * (as shown in the example above) sets the sequence length equal to
-   * 0.
-   */
-  TAO_Unbounded_WString_Sequence (void);
-
-  /**
-   * Unbounded sequences provide a constructor that allows only the
-   * initial value of the maximum length to be set (the ``maximum
-   * constructor'' shown in the example above). This allows
-   * applications to control how much buffer space is initially
-   * allocated by the sequence. This constructor also sets the length
-   * to 0 and the release flag to TRUE.
-   */
-  TAO_Unbounded_WString_Sequence (CORBA::ULong maximum);
-
-  /**
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Unbounded_WString_Sequence (CORBA::ULong maximum,
-                                  CORBA::ULong length,
-                                  CORBA::WChar ** data,
-                                  CORBA::Boolean release = 0);
-
-  /**
-   * The copy constructor performs a deep copy from the existing
-   * structure to create a new structure, including calling _duplicate
-   * on all object  reference members and performing the necessary
-   * heap allocations for all string members.
-   *
-   * The copy constructor creates a new sequence with the same maximum
-   * and length as the given sequence, copies each of its current
-   * elements (items zero through length-1), and sets the release
-   * flag to TRUE.
-   */
-  TAO_Unbounded_WString_Sequence (const TAO_Unbounded_WString_Sequence &);
-
-  /// The destructor releases all object reference members and frees
-  /// all string members.
-  ~TAO_Unbounded_WString_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all wstring  members, and then performs a
-   * deep­copy to create a new structure.
-   *
-   * The assignment operator deep­copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor. If release=TRUE, the
-   * destructor destroys each of the current elements (items zero
-   * through length--1).
-   * For an unbounded sequence, if a reallocation is necessary due to
-   * a change in the length and the sequence was created using the
-   * release=TRUE parameter in its constructor, the sequence will
-   * deallocate the old storage. If release is FALSE under these
-   * circumstances, old storage will not be freed before the
-   * reallocation is performed. After reallocation, the release flag
-   * is always set to TRUE.
-   */
-  TAO_Unbounded_WString_Sequence & operator= (
-      const TAO_Unbounded_WString_Sequence &
-    );
-
-  /// Read-write accessor
-  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static CORBA::WChar ** allocbuf (CORBA::ULong);
-
-  /**
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using wstring_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (CORBA::WChar **);
-
-  static void _tao_any_destructor (void *);
-
-  // = Fast buffer accessors.
-  CORBA::WChar ** get_buffer (CORBA::Boolean orphan = 0);
-  const CORBA::WChar ** get_buffer (void) const;
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong maximum,
-                CORBA::ULong length,
-                CORBA::WChar ** data,
-                CORBA::Boolean release = 0);
-};
-
-// ****************************************************************
-
-template<class T> class TAO_Unbounded_Sequence;
-// forward declaration, we are going to specialize that template
-// here.
-// The template itself requires this file so every user of the
-// template should also see the specialization.
-
-/**
- * @class TAO_Unbounded_Sequence<CORBA::Octet>
- *
- * @brief An unbounded sequence of Octets
- *
- * Marshalling and demarshalling octet sequences can be highly
- * optimize, for instance at demarshalling we don't require a copy
- * from the CDR buffer to the octet sequence buffer, we can simply
- * hold a duplicate of the underlying ACE_Message_Block.
- * Specializing the TAO_Unbounded_Sequence<T> parametric
- * class, is an excellent way to achieve this optimizations.
- */
-template<>
-class TAO_Export TAO_Unbounded_Sequence<CORBA::Octet>
-  : public TAO_Unbounded_Base_Sequence
-{
-public:
-  /// For efficient marshalling and demarshalling.
-  friend class TAO_Marshal_Sequence;
-
-  /// see TAO_Unbounded_Sequence in "Sequence_T.h"
-  TAO_Unbounded_Sequence (void);
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-                          CORBA::ULong length,
-                          CORBA::Octet *data,
-                          CORBA::Boolean release = 0);
-  virtual ~TAO_Unbounded_Sequence (void);
-
-  /// Use in the implementation of insertion and extraction operators
-  /// from CORBA::Any
-  static void _tao_any_destructor (void*);
-
-  /**
-   * The copy constructor and assignment operators *do* copy the data,
-   * though we could simply duplicate the ref count in the
-   * ACE_Message_Block this will change the semantics for this
-   * operations.
-   */
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<CORBA::Octet> &);
-  TAO_Unbounded_Sequence<CORBA::Octet>& operator= (
-      const TAO_Unbounded_Sequence<CORBA::Octet> &
-    );
-
-  /**
-   * See the general description in "Sequence_T.h"
-   * NOTE: This last two methods can be rendered useless in certain
-   * cases, see below.
-   */
-  CORBA::Octet &operator[] (CORBA::ULong);
-  const CORBA::Octet &operator[] (CORBA::ULong) const;
-
-  // = Static operations.
-
-  /// Allocate storage for the sequence, please note that the storage
-  /// is always held in a ACE_Message_Block.
-  static CORBA::Octet *allocbuf (CORBA::ULong);
-
-  /// Free the storage.
-  static void freebuf (CORBA::Octet *);
-
-  /// Implement the methods for all the sequence, please see
-  /// TAO_Base_Sequence.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-
-  // = Fast buffer accessors.
-  CORBA::Octet *get_buffer (CORBA::Boolean orphan = 0);
-  const CORBA::Octet *get_buffer (void) const;
-
-  // NOTE: This last two methods can be rendered useless in certain
-  // cases, see below.
-  /// See the general description of this methods in "Sequence_T.h".
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                CORBA::Octet *data,
-                CORBA::Boolean release = 0);
-
-  // = TAO extensions
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-
-  /// Returns the underlying message block, the caller must *not*
-  /// release the copy.
-  ACE_Message_Block* mb (void) const;
-
-  /// Create a sequence of octets from a single message block (i.e. it
-  /// ignores any chaining in the meesage block).
-  TAO_Unbounded_Sequence (CORBA::ULong length,
-                          const ACE_Message_Block* mb);
-
-  /// Replaces the current buffer with <mb>, using only <length> bytes.
-  /// It takes a duplicate of <mb> so the user still owns it.
-  void replace (CORBA::ULong length, const ACE_Message_Block* mb);
-
-  //
-  // NOTE:
-  // In the last two methods if the <mb> is the head of a chain then
-  // the following methods are not warranteed to work properly:
-  //    operator[]
-  //    get_buffer ()
-  // the main purpose of this method is to support custom marshaling;
-  // so the complete chain is marshaled when the octet sequence is.
-  //
-
-private:
-  ACE_Message_Block* mb_;
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-};
-
-// ****************************************************************
-
-// Comparison of octet sequence.
-TAO_Export bool operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                            const TAO_Unbounded_Sequence<CORBA::Octet> &r);
-
-TAO_Export bool operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                            const TAO_Unbounded_Sequence<CORBA::Octet> &r);
-
-// ****************************************************************
-
-/**
- * @brief Safe assertions without including Log_Msg.h
- */
-#define TAO_SEQUENCE_ASSERT(TAO_IDX,TAO_MAX) \
-  this->check_bounds(__FILE__, __LINE__, (TAO_IDX), (TAO_MAX))
-
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence.i"
-#endif /* __ACE_INLINE__ */
-
-#include "tao/Sequence_T.h"
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
deleted file mode 100644
index 655bf0f4741..00000000000
--- a/TAO/tao/Sequence.i
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// Operations on the unbounded sequence class.
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (void)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      CORBA::ULong length,
-                                      void * buffer,
-                                      CORBA::Boolean release)
-  : maximum_ (maximum),
-    length_ (length),
-    buffer_ (buffer),
-    release_ (release)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      void * data)
-  : maximum_ (maximum),
-    length_ (0),
-    buffer_ (data),
-    release_ (1)
-{
-}
-
-ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence & rhs)
-  : maximum_ (rhs.maximum_),
-    length_ (rhs.length_),
-    buffer_ (0),
-    release_ (1)
-{
-}
-
-ACE_INLINE
-CORBA::Boolean
-TAO_Base_Sequence::release (void) const
-{
-  return this->release_;
-}
-
-ACE_INLINE
-TAO_Base_Sequence &
-TAO_Base_Sequence::operator= (const TAO_Base_Sequence & rhs)
-{
-  this->maximum_ = rhs.maximum_;
-  this->length_ = rhs.length_;
-  this->release_ = 1;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ULong
-TAO_Base_Sequence::maximum (void) const
-{
-  return this->maximum_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    void * buffer,
-    CORBA::Boolean release
-  )
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
-    CORBA::ULong maximum,
-    void * buffer
-  )
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-TAO_Unbounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE
-void
-TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-    {
-      this->_allocate_buffer (length);
-      this->maximum_ = length;
-      this->release_ = 1;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    void * buffer,
-    CORBA::Boolean release
-  )
-  :  TAO_Base_Sequence (maximum, length, buffer, release)
-{
-}
-
-ACE_INLINE
-TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
-    CORBA::ULong maximum,
-    void * buffer
-  )
-  :  TAO_Base_Sequence (maximum, buffer)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-TAO_Bounded_Base_Sequence::length (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE
-void
-TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
-{
-  if (this->buffer_ == 0)
-    {
-      this->_allocate_buffer (this->maximum_);
-      this->release_ = 1;
-    }
-
-  if (length > this->maximum_)
-    {
-      return;
-    }
-  else if (length < this->length_)
-    {
-      this->_shrink_buffer (length, this->length_);
-    }
-
-  this->length_ = length;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    char ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::WChar ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
-{
-  return new CORBA::Octet[size];
-}
-
-ACE_INLINE
-void
-TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet * buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  :  mb_ (0)
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum)
-      )
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  ,  mb_ (0)
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-{
-}
-
-ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Octet * data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  , mb_ (0)
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-{
-}
-
-ACE_INLINE
-const CORBA::Octet *
-TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
-{
-  return reinterpret_cast<const CORBA::Octet * ACE_CAST_CONST> (this->buffer_);
-}
-
-ACE_INLINE
-CORBA::Octet &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::Octet &
-TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  CORBA::Octet * const tmp =
-    reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (this->buffer_);
-  return tmp[i];
-}
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-ACE_INLINE
-ACE_Message_Block *
-TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
-{
-  return this->mb_;
-}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
deleted file mode 100644
index 2c5d5bea180..00000000000
--- a/TAO/tao/Sequence_T.cpp
+++ /dev/null
@@ -1,2137 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQUENCE_T_C
-#define TAO_SEQUENCE_T_C
-
-#include "Sequence_T.h"
-#include "Array_VarOut_T.h"
-
-#include "ace/OS_Memory.h"
-
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Sequence_T,
-           "$Id$")
-
-template <typename T>
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
-    const TAO_Unbounded_Sequence<T> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T * tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
-      T * const tmp2 =
-        reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T>
-TAO_Unbounded_Sequence<T> &
-TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> & rhs)
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          T * tmp = reinterpret_cast <T *> (this->buffer_);
-          TAO_Unbounded_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
-  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template<typename T>
-TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<typename T>
-void
-TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
-{
-  T * tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T * old = reinterpret_cast <T *> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-
-      if (this->release_)
-        {
-          TAO_Unbounded_Sequence<T>::freebuf (old);
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template<typename T>
-void
-TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T * tmp = reinterpret_cast <T *> (this->buffer_);
-
-  TAO_Unbounded_Sequence<T>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->maximum_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template <typename T>
-T *
-TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
-{
-  T * result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          if (this->length_ > 0)
-            {
-              result = TAO_Unbounded_Sequence<T>::allocbuf (this->length_);
-              this->buffer_ = result;
-              this->release_ = 1;
-            }
-        }
-      else
-        {
-          result = reinterpret_cast <T *> (this->buffer_);
-        }
-    }
-  else
-    {
-      result = reinterpret_cast <T *> (this->buffer_);
-
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-// The following function is not inline, to avoid build (template
-// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <typename T>
-T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  T * tmp = reinterpret_cast <T *> (this->buffer_);
-  return tmp[i];
-}
-
-// The following function is not inline, to avoid build (template
-// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <typename T>
-const T &
-TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  T * const tmp = reinterpret_cast <T * ACE_CAST_CONST> (this->buffer_);
-  return tmp[i];
-}
-
-template <typename T>
-void
-TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
-                                    CORBA::ULong length,
-                                    T * data,
-                                    CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T * tmp = reinterpret_cast <T *> (this->buffer_);
-      TAO_Unbounded_Sequence<T>::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// ****************************************************************
-// Bounded_Sequence
-// ****************************************************************
-
-template <typename T, size_t MAX>
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (
-    const TAO_Bounded_Sequence<T,MAX> &rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T * tmp1 = TAO_Bounded_Sequence<T,MAX>::allocbuf (MAX);
-
-      T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, size_t MAX>
-TAO_Bounded_Sequence<T,MAX> &
-TAO_Bounded_Sequence<T,MAX>::operator= (
-    const TAO_Bounded_Sequence<T,MAX> &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      // We never need to reallocate the buffer because they are
-      // always of size MAX.
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Sequence<T, MAX>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
-  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template<typename T, size_t MAX>
-TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<typename T, size_t MAX>
-void
-TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
-}
-
-template<typename T, size_t MAX>
-void
-TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T * tmp = reinterpret_cast <T *> (this->buffer_);
-  TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template <typename T, size_t MAX>
-T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  T * result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result = TAO_Bounded_Sequence<T,MAX>::allocbuf (this->maximum_);
-          this->buffer_ = result;
-                this->release_ = 1;
-        }
-      else
-        {
-          result = reinterpret_cast <T*> (this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = reinterpret_cast <T*> (this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-template <typename T, size_t MAX>
-void
-TAO_Bounded_Sequence<T,MAX>::replace (CORBA::ULong max,
-                                      CORBA::ULong length,
-                                      T * data,
-                                      CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T * tmp = reinterpret_cast <T *> (this->buffer_);
-      TAO_Bounded_Sequence<T,MAX>::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// *************************************************************
-// class TAO_Object_Manager
-// *************************************************************
-
-template <typename T, typename T_var>
-TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator= (
-    const TAO_Object_Manager<T,T_var> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      TAO::Objref_Traits<T>::release (*this->ptr_);
-      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (*rhs.ptr_);
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator= (T * p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.
-      TAO::Objref_Traits<T>::release (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    {
-      *this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator= (const T_var & p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we duplicate p's
-      // pointer before assigning it to the internal
-      // variable.
-      TAO::Objref_Traits<T>::release (*this->ptr_);
-      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.in ());
-    }
-  else
-    {
-      *this->ptr_ = p.in ();
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-T *&
-TAO_Object_Manager<T,T_var>::out (void)
-{
-  TAO::Objref_Traits<T>::release (*this->ptr_);
-  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-T *
-TAO_Object_Manager<T,T_var>::_retn (void)
-{
-  T *temp = *this->ptr_;
-  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
-  return temp;
-}
-
-// *************************************************************
-// class TAO_Pseudo_Object_Manager
-// *************************************************************
-
-template <typename T>
-TAO_Pseudo_Object_Manager<T> &
-TAO_Pseudo_Object_Manager<T>::operator= (
-    const TAO_Pseudo_Object_Manager<T> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (*rhs.ptr_);
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
-    }
-
-  return *this;
-}
-
-template <typename T>
-TAO_Pseudo_Object_Manager<T> &
-TAO_Pseudo_Object_Manager<T>::operator= (T * p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    {
-      *this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template <typename T>
-TAO_Pseudo_Object_Manager<T> &
-TAO_Pseudo_Object_Manager<T>::operator= (const T_var_type & p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we duplicate p's
-      // pointer before assigning it to the internal
-      // variable.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (p.in ());
-    }
-  else
-    {
-      *this->ptr_ = p.in ();
-    }
-
-  return *this;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-// constructor for unbounded seq
-template <typename T, typename T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-         maximum,
-         TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
-             maximum
-           )
-       )
-{
-}
-
-template <typename T, typename T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
-    const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
-            this->maximum_
-          );
-      T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template<typename T, typename T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-// Assignment operator.
-template <typename T, typename T_var>
-TAO_Unbounded_Object_Sequence<T,T_var> &
-TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
-    const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast <T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          TAO::Objref_Traits<T>::release (tmp[i]);
-          tmp[i] = TAO::Objref_Traits<T>::nil ();
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast <T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-T **
-TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
-    CORBA::ULong nelems
-  )
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [nelems],
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = TAO::Objref_Traits<T>::nil ();
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var>
-void
-TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template<typename T, typename T_var>
-void
-TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  T ** tmp =
-    TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T ** old = reinterpret_cast <T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          {
-            tmp[i] = TAO::Objref_Traits<T>::duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template<typename T, typename T_var>
-void
-TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (
-    void
-  )
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast <T **> (this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
-    }
-
-  TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
-  this->buffer_  = 0;
-  this->maximum_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template<typename T, typename T_var>
-void
-TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = static_cast <T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (MAX)
-      )
-{
-}
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
-    const TAO_Bounded_Object_Sequence<T,T_var,MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (MAX);
-
-      T ** const tmp2 = reinterpret_cast <T** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX> &
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= (
-    const TAO_Bounded_Object_Sequence<T,T_var,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          TAO::Objref_Traits<T>::release (tmp[i]);
-          tmp[i] = TAO::Objref_Traits<T>::nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, size_t MAX>
-T **
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (
-    CORBA::ULong
-  )
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [MAX],
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = TAO::Objref_Traits<T>::nil ();
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var,  size_t MAX>
-void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != TAO::Objref_Traits<T>::nil ())
-        {
-          TAO::Objref_Traits<T>::release (buffer[i]);
-          buffer[i] = TAO::Objref_Traits<T>::nil ();
-        }
-    }
-
-  delete [] buffer;
-}
-
-template<typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (length);
-}
-
-template<typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (
-    void
-  )
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-  TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template<typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      TAO::Objref_Traits<T>::release (tmp[i]);
-      tmp[i] = TAO::Objref_Traits<T>::nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Pseudo_Sequence
-// *************************************************************
-
-template <typename T>
-TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (maximum)
-      )
-{
-}
-
-template <typename T>
-TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
-    const TAO_Unbounded_Pseudo_Sequence<T> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T **tmp1 =
-        TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (this->maximum_);
-
-      T ** const tmp2 =
-        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = T::_duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T>
-TAO_Unbounded_Pseudo_Sequence<T>::~TAO_Unbounded_Pseudo_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T>
-TAO_Unbounded_Pseudo_Sequence<T> &
-TAO_Unbounded_Pseudo_Sequence<T>::operator= (
-    const TAO_Unbounded_Pseudo_Sequence<T> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = T::_duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T>
-T **
-TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (CORBA::ULong nelems)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [nelems],
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = T::_nil ();
-    }
-
-  return buf;
-}
-
-template <typename T>
-void
-TAO_Unbounded_Pseudo_Sequence<T>::freebuf (T ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template <typename T>
-void
-TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length)
-{
-  T ** tmp = TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T ** old = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          {
-            tmp[i] = T::_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template <typename T>
-void
-TAO_Unbounded_Pseudo_Sequence<T>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-
-  TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
-  this->buffer_  = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-  this->maximum_ = 0;
-}
-
-template <typename T>
-void
-TAO_Unbounded_Pseudo_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  T ** tmp = static_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Pseudo_Sequence
-// *************************************************************
-
-template <typename T, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (MAX)
-      )
-{
-}
-
-template <typename T, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (
-    const TAO_Bounded_Pseudo_Sequence<T,MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (MAX);
-
-      T ** const tmp2 =
-       reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = T::_duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T,MAX> &
-TAO_Bounded_Pseudo_Sequence<T,MAX>::operator= (
-    const TAO_Bounded_Pseudo_Sequence<T,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = T::_duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T, size_t MAX>
-T **
-TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (CORBA::ULong)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [MAX],
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = T::_nil ();
-    }
-
-  return buf;
-}
-
-template <typename T, size_t MAX>
-void
-TAO_Bounded_Pseudo_Sequence<T,MAX>::freebuf (T ** buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != T::_nil ())
-        {
-          CORBA::release (buffer[i]);
-          buffer[i] = T::_nil ();
-        }
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, size_t MAX>
-void
-TAO_Bounded_Pseudo_Sequence<T,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (length);
-}
-
-template <typename T, size_t MAX>
-void
-TAO_Bounded_Pseudo_Sequence<T,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-  TAO_Bounded_Pseudo_Sequence<T,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template <typename T, size_t MAX>
-void
-TAO_Bounded_Pseudo_Sequence<T,MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                    CORBA::ULong ol)
-{
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Array_Sequence
-// *************************************************************
-
-template <typename T, typename T_slice, typename TAG>
-T *
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (CORBA::ULong nelems)
-{
-  T * buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T [nelems],
-                  0);
-
-  return buf;
-}
-
-template <typename T, typename T_slice, typename TAG>
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence (
-    const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE;
-      T * tmp1 =
-        reinterpret_cast<T *> (SEQ_TYPE::allocbuf (this->maximum_)
-          );
-
-      const T * tmp2 = reinterpret_cast<const T *> (rhs.buffer_);
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_slice, typename TAG>
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::~TAO_Unbounded_Array_Sequence (
-    void
-  )
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_slice, typename TAG>
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG> &
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= (
-    const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          T * tmp = reinterpret_cast<T *> (this->buffer_);
-          TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
-
-          if (rhs.maximum_ == 0)
-            {
-              this->buffer_ = 0;
-            }
-          else
-            {
-              this->buffer_ =
-                TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
-                    rhs.maximum_
-                  );
-            }
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      TAO::Array_Traits<T,T_slice,TAG>::copy (
-          reinterpret_cast<T *> (this->buffer_)[i],
-          reinterpret_cast<const T *> (rhs.buffer_)[i]
-        );
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_slice, typename TAG>
-T *
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer (
-    CORBA::Boolean orphan
-  )
-{
-  T * result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          if (this->length_ > 0)
-            {
-              result =
-                TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
-                    this->length_
-                  );
-              this->buffer_ = result;
-                    this->release_ = 1;
-            }
-        }
-      else
-        {
-          result =
-            reinterpret_cast<T *> (this->buffer_);
-        }
-    }
-  else
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = reinterpret_cast<T *> (this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-template <typename T, typename T_slice, typename TAG>
-void
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE;
-  T * tmp =
-    reinterpret_cast<T *> (SEQ_TYPE::allocbuf (length)
-      );
-
-  if (this->buffer_ != 0)
-    {
-      T* old = (T *) this->buffer_;
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp[i], old[i]);
-        }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template <typename T, typename T_slice, typename TAG>
-void
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T * tmp = reinterpret_cast<T *> (this->buffer_);
-  TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
-
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-  this->maximum_ = 0;
-}
-
-template <typename T, typename T_slice, typename TAG>
-void
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::replace (CORBA::ULong max,
-                                                      CORBA::ULong length,
-                                                      T * data,
-                                                      CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T * tmp = reinterpret_cast<T *> (this->buffer_);
-      TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Array_Sequence
-// *************************************************************
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-T *
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (CORBA::ULong)
-{
-  T * buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T [MAX],
-                  0);
-
-  return buf;
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence (
-    const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      typedef TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> SEQ_TYPE;
-      T * tmp1 =
-        reinterpret_cast<T *> (SEQ_TYPE::allocbuf (MAX)
-          );
-
-      const T* tmp2 = (const T *) rhs.buffer_;
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::~TAO_Bounded_Array_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator= (
-    const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      // We never need to reallocate the buffer because they are
-      // always of size MAX.
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      TAO::Array_Traits<T,T_slice,TAG>::copy (
-          ((T *) this->buffer_)[i],
-          ((const T *) rhs.buffer_)[i]
-        );
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-T *
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  T * result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result =
-                  TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (
-                this->maximum_
-              );
-          this->buffer_ = result;
-                this->release_ = 1;
-        }
-      else
-        {
-          result =
-            reinterpret_cast<T *> (this->buffer_);
-        }
-    }
-  else
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result = reinterpret_cast<T *> (this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-void
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (T * buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-void
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (length);
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-void
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T * tmp = reinterpret_cast<T *> (this->buffer_);
-
-  TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp);
-
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-void
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::replace (CORBA::ULong max,
-                                                   CORBA::ULong length,
-                                                   T * data,
-                                                   CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T * tmp = reinterpret_cast<T *> (this->buffer_);
-      TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<size_t MAX>
-TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_String_Sequence<MAX>::allocbuf(MAX)
-      )
-{
-}
-
-template<size_t MAX>
-TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (
-    const TAO_Bounded_String_Sequence<MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      char ** tmp1 =
-        TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_);
-
-      char ** const tmp2 =
-        reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::string_dup (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template<size_t MAX>
-TAO_Bounded_String_Sequence<MAX> &
-TAO_Bounded_String_Sequence<MAX>::operator= (
-    const TAO_Bounded_String_Sequence<MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      char ** tmp = reinterpret_cast<char **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::string_free (tmp[i]);
-          tmp[i] = 0;
-        }
-      // No need to reallocate because the buffer is supposed to be of
-      // <MAX> size.
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  char ** tmp1 = reinterpret_cast<char **> (this->buffer_);
-  char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::string_dup (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template<size_t MAX>
-TAO_SeqElem_String_Manager
-TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  char ** const tmp = reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_SeqElem_String_Manager (tmp + slot,
-                                     this->release_);
-}
-
-template<size_t MAX>
-char **
-TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
-{
-  char **buf = 0;
-  ACE_NEW_RETURN (buf,
-                  char * [MAX],
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_String_Sequence<MAX>::freebuf (char ** buffer)
-{
-  // How much do we deallocate? Easy! <allocbuf> always creates MAX
-  // elements and initialize them to 0 (they say NULL, yuck!).  So we
-  // can be complaint and call CORBA::string_free() on each one.
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          CORBA::string_free (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  char ** tmp = reinterpret_cast<char **> (this->buffer_);
-  TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_  = 0;
-  this->release_ = 0;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                  CORBA::ULong ol)
-{
-  char ** tmp = reinterpret_cast<char **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::string_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_String_Sequence<MAX>::replace (CORBA::ULong length,
-                                           char ** data,
-                                           CORBA::Boolean release)
-{
-  TAO_SEQUENCE_ASSERT (length, this->maximum_);
-  this->_deallocate_buffer ();
-  this->length_ = length;
-
-  // If 'release' is 1, caller is responsible for allocating new buffer
-  // with CORBA::string_alloc.
-  this->buffer_ = data;
-  this->release_ = release;
-}
-// *************************************************************
-// Operations for class TAO_Bounded_WString_Sequence
-// *************************************************************
-
-template<size_t MAX>
-TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_WString_Sequence<MAX>::allocbuf(MAX)
-      )
-{
-}
-
-template<size_t MAX>
-TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (
-    const TAO_Bounded_WString_Sequence<MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::WChar ** tmp1 =
-        TAO_Bounded_WString_Sequence<MAX>::allocbuf (this->maximum_);
-
-      CORBA::WChar ** const tmp2 =
-        reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::wstring_dup (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template<size_t MAX>
-TAO_Bounded_WString_Sequence<MAX> &
-TAO_Bounded_WString_Sequence<MAX>::operator= (
-    const TAO_Bounded_WString_Sequence<MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::wstring_free (tmp[i]);
-          tmp[i] = 0;
-        }
-      // No need to reallocate because the buffer is supposed to be of
-      // <MAX> size.
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_WString_Sequence<MAX>::allocbuf (rhs.maximum_);
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  CORBA::WChar ** tmp1 = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-  CORBA::WChar ** const tmp2 =
-    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::wstring_dup (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template<size_t MAX>
-TAO_SeqElem_WString_Manager
-TAO_Bounded_WString_Sequence<MAX>::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  CORBA::WChar ** const tmp =
-    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_SeqElem_WString_Manager (tmp + slot,
-                                      this->release_);
-}
-
-template<size_t MAX>
-CORBA::WChar **
-TAO_Bounded_WString_Sequence<MAX>::allocbuf (CORBA::ULong)
-{
-  CORBA::WChar ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  CORBA::WChar * [MAX],
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_WString_Sequence<MAX>::freebuf (CORBA::WChar* *buffer)
-{
-  // How much do we deallocate? Easy! <allocbuf> always creates MAX
-  // elements and initialize them to 0 (they say NULL, yuck!).  So we
-  // can be complaint and call CORBA::wstring_free() on each one.
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          CORBA::wstring_free (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer (
-    CORBA::ULong /* length */
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_WString_Sequence<MAX>::allocbuf (MAX);
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_WString_Sequence<MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-  TAO_Bounded_WString_Sequence<MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-  this->length_ = 0;
-  this->release_ = 0;
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_WString_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                   CORBA::ULong ol)
-{
-  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::wstring_free (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-template<size_t MAX>
-void
-TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
-                                            CORBA::WChar ** data,
-                                            CORBA::Boolean release)
-{
-  TAO_SEQUENCE_ASSERT (length, this->maximum_);
-
-  this->_deallocate_buffer ();
-  this->length_ = length;
-
-  // If 'release' is 1, caller is responsible for allocating new buffer
-  // with CORBA::wstring_alloc.
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* TAO_SEQUENCE_T_C */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
deleted file mode 100644
index c3fe5f797e2..00000000000
--- a/TAO/tao/Sequence_T.h
+++ /dev/null
@@ -1,1222 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_T.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan and Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_T_H
-#define TAO_SEQUENCE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Objref_VarOut_T.h"
-
-/**
- * @class TAO_Unbounded_Sequence
- *
- * @brief Parametrized implementation of IDL unbounded sequences.
- *
- * This class completes the implementation for TAO_Base_Sequence
- * for the unbounded case.
- */
-template <typename T>
-class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_Unbounded_Sequence (void);
-
-  /// Constructor using a maximum length value.
-  TAO_Unbounded_Sequence (CORBA::ULong max);
-
-  /**
-   * Constructor using the data and memory management flag.  Memory
-   * *must* be allocated using the ::allocbuf static method, since in
-   * the future this classes may use a global ACE_Allocator.
-   */
-  TAO_Unbounded_Sequence (CORBA::ULong max,
-                          CORBA::ULong length,
-                          T * data,
-                          CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &);
-
-  /// Assignment operator.
-  TAO_Unbounded_Sequence<T> & operator= (const TAO_Unbounded_Sequence<T> &);
-
-  /// Dtor.
-  ~TAO_Unbounded_Sequence (void);
-
-  // = Accessors.
-
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  // = Static operations.
-
-  /// Allocate storage for the sequence.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Free the sequence.
-  static void freebuf (T *);
-
-
-  /// Implement the TAO_Base_Sequence methods (see Sequence.h)
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.  For
-   * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide straings,
-   * and object references, respective) before being directly assigned
-   * to.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Sequence
- *
- * @brief Parametric bounded sequence.
- *
- * This class completes the implementation for TAO_Base_Sequence
- * for the bounded case.
- */
-template <typename T, size_t MAX>
-class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-  /// Default constructor.
-  TAO_Bounded_Sequence (void);
-
-  /// Constructor using the data and memory management flag.
-  TAO_Bounded_Sequence (CORBA::ULong length,
-                        T *data,
-                        CORBA::Boolean release=0);
-
-  /// Copy constructor.
-  TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
-
-  /// Assignment operator.
-  TAO_Bounded_Sequence<T,MAX> & operator= (
-      const TAO_Bounded_Sequence<T,MAX> &
-    );
-
-  /// Dtor.
-  ~TAO_Bounded_Sequence (void);
-
-  // = Accessors.
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  // = Static operations.
-
-  /// Allocate storage for the sequence.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Free the sequence.
-  static void freebuf (T *);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for
-  /// the right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The size of the returned buffer
-   * is equal to the sequence bound, which can be determined with the
-   * <maximum> accessor.  The number of elements in the buffer can be
-   * determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.  For
-   * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide straings,
-   * and object references, respective) before being directly assigned
-   * to.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-template<typename T, typename T_var>
-  class TAO_Unbounded_Object_Sequence;
-template<class T> class TAO_Unbounded_Pseudo_Sequence;
-template<typename T, typename T_var, size_t MAX>
-  class TAO_Bounded_Object_Sequence;
-template<size_t MAX> class TAO_Bounded_String_Sequence;
-
-  /**
-   * @class TAO_Object_Manager
-   *
-   * @brief Manager for Objects.
-   *
-   * The mapping for sequences of objects (and other pseudo objects)
-   * requires an auxiliar class or <Manager> to handle the reference
-   * count on the object, (a kind of smart pointer).
-   * The main difference with respect to T_var classes is that
-   * automatic release is not controlled on a per-item basis, but
-   * for the sequence as a whole.
-   * Further the class must implement "transparent" assignment into
-   * the sequence, for instance, operator[] returns a managed
-   * object, but:
-   * object_sequence[i] = foo;
-   * must change the state of the sequence.
-   * This class implements the generic object manager and is used to
-   * instantiate the proper sequence types.
-   * = NOTES
-   * It has been proposed that the class should be parametric on
-   * both T and T_ptr, IMHO this is no necesary: though the IDL spec
-   * says that T_ptr *could* map to a type different to T* in the
-   * particular case of TAO it does map to <T*>.
-   */
-template<typename T, typename T_var>
-class TAO_Object_Manager
-{
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Object_Manager (const TAO_Object_Manager<T,T_var> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Object_Manager (T **, CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Object_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Object_Manager<T,T_var> & operator= (
-      const TAO_Object_Manager<T,T_var> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Object_Manager<T,T_var> & operator= (T *);
-
-  /// Assignment from T_life.
-  TAO_Object_Manager<T,T_var> & operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var () const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T *& out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-  /**
-   * @class TAO_Pseudo_Object_Manager
-   *
-   * @brief Manager for Pseudo Objects.
-   *
-   */
-template<typename T>
-class TAO_Pseudo_Object_Manager
-{
-  friend class TAO_Unbounded_Pseudo_Sequence<T>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Object_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Pseudo_Object_Manager (T **, CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Pseudo_Object_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Pseudo_Object_Manager<T> & operator= (
-      const TAO_Pseudo_Object_Manager<T> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Pseudo_Object_Manager<T> & operator= (T *);
-
-  /// Workaround for MSVC 6.
-  typedef typename T::_var_type T_var_type;
-
-  /// Assignment from T_var.
-  TAO_Pseudo_Object_Manager<T> & operator= (const T_var_type &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T *& out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Object_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Some IDL types require that sequences on them have a "manager"
- * class, in charge of handling the object lifetime, examples are
- * pseudo objects, object references, valuetypes, and strings.
- */
-template<typename T, typename T_var>
-class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
-{
-
-  // = SPEC
-  //   16.8 Mapping for Structured Types
-  //   The mapping for struct, union, and sequence (but not array) is a
-  //   C++ struct or class with a default constructor, a copy
-  //   constructor, an assignment operator, and a destructor.
-  //
-public:
-  // = Initialization and termination methods.
-
-  /**
-   * {orbos/97-05-15:16.8}
-   * The default constructor initializes object reference members to
-   * appropriately typed nil object references and string members to
-   * NULL; all other members are initialized via their default
-   * constructors.
-   *
-   * {orbos/97-05-15:16.11}
-   * For both bounded and unbounded sequences, the default constructor
-   * (as shown in the example above) sets the sequence length equal to
-   * 0.
-   */
-  TAO_Unbounded_Object_Sequence (void);
-
-  /**
-   * Unbounded sequences provide a constructor that allows only the
-   * initial value of the maximum length to be set (the ``maximum
-   * constructor'' shown in the example above). This allows
-   * applications to control how much buffer space is initially
-   * allocated by the sequence. This constructor also sets the length
-   * to 0 and the release flag to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence (CORBA::ULong max);
-
-  /**
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T ** data,
-                                 CORBA::Boolean release = 0);
-
-  /**
-   * The copy constructor performs a deep copy from the existing
-   * structure to create a new structure, including calling _duplicate
-   * on all object  reference members and performing the necessary
-   * heap allocations for all string members.
-   *
-   * The copy constructor creates a new sequence with the same maximum
-   * and length as the given sequence, copies each of its current
-   * elements (items zero through length-1), and sets the release
-   * flag to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence (
-      const TAO_Unbounded_Object_Sequence<T,T_var> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Object_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   *
-   * The assignment operator deepcopies its parameter, releasing old
-   * storage if necessary. It behaves as if the original sequence is
-   * destroyed via its destructor and then the source sequence copied
-   * using the copy constructor. If release=TRUE, the destructor
-   * destroys each of the current elements (items zero through
-   * length--1).  For an unbounded sequence, if a reallocation is
-   * necessary due to a change in the length and the sequence was
-   * created using the release=TRUE parameter in its constructor, the
-   * sequence will deallocate the old storage. If release is FALSE
-   * under these circumstances, old storage will not be freed before
-   * the reallocation is performed. After reallocation, the release
-   * flag is always set to TRUE.
-   */
-  TAO_Unbounded_Object_Sequence<T,T_var> &operator= (
-      const TAO_Unbounded_Object_Sequence <T,T_var> &
-    );
-
-  /// read-write accessor
-  TAO_Object_Manager<T,T_var> operator[] (
-      CORBA::ULong slot
-    ) const;
-
-  /**
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static T ** allocbuf (CORBA::ULong);
-
-  /**
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using string_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Object_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, size_t MAX>
-class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /**
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_Object_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                               T ** value,
-                               CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Object_Sequence (
-      const TAO_Bounded_Object_Sequence<T,T_var,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Object_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Object_Sequence<T,T_var,MAX> &operator= (
-      const TAO_Bounded_Object_Sequence<T,T_var,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Object_Manager<T,T_var> operator[] (
-      CORBA::ULong slot
-    ) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Pseudo_Sequence
- *
- * @brief Parametric sequence for pseudo objects.
- *
- * Some IDL types (including pseudo objects) require that
- * sequences on them have a "manager" class, in charge of handling
- * the object lifetime.
- * This parametric class implements those sequences. In general
- * the sequence is similar to Object_Sequente, except for some
- * TAO internal details. The complete documentation of each method
- * is provided in TAO_Unbounded_Object_Sequece
- */
-template<typename T>
-class TAO_Unbounded_Pseudo_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor
-  TAO_Unbounded_Pseudo_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-                                 CORBA::ULong length,
-                                 T ** data,
-                                 CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Pseudo_Sequence (
-      const TAO_Unbounded_Pseudo_Sequence<T> &
-    );
-
-  /// dtor releases all the contained elements.
-  ~TAO_Unbounded_Pseudo_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Pseudo_Sequence<T> & operator= (
-      const TAO_Unbounded_Pseudo_Sequence <T> &
-    );
-
-  /// read-write accessor
-  TAO_Pseudo_Object_Manager<T> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Pseudo_Sequence
- *
- * @brief Bounded version of TAO_Unbounded_Pseudo_Sequence.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, size_t MAX>
-class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor.
-  TAO_Bounded_Pseudo_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                               T ** value,
-                               CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Pseudo_Sequence (
-      const TAO_Bounded_Pseudo_Sequence<T,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Pseudo_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Pseudo_Sequence & operator= (
-      const TAO_Bounded_Pseudo_Sequence<T,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Pseudo_Object_Manager<T> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Array_Sequence
- *
- * @brief Parametric sequence for arrays.
- *
- * The IDL mapping for arrays includes some unique allocation,
- * deallocation, and copying functions, and precludes
- * direct assignment of one array to another. Also, the
- * Any and CDR operators use a special class derived from
- * the array. For these reasons, we use a special class for
- * sequences of arrays.
- */
-template <typename T, typename T_slice, typename TAG>
-class TAO_Unbounded_Array_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor
-  TAO_Unbounded_Array_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Array_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
-                                CORBA::ULong length,
-                                T * data,
-                                CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Array_Sequence (
-      const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> &
-    );
-
-  /// dtor releases all the contained elements.
-  ~TAO_Unbounded_Array_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & operator= (
-      const TAO_Unbounded_Array_Sequence <T,T_slice,TAG> &
-    );
-
-  // = Accessors.
-  /// operator []
-  T & operator[] (CORBA::ULong);
-
-  /// operator []
-  const T & operator[] (CORBA::ULong) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T * allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T *);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for the
-  /// right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T * data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Array_Sequence
- *
- * @brief Bounded version of TAO_Unbounded_Array_Sequence.
- *
- * Please see the documentation for the unbounded case.
- */
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-class TAO_Bounded_Array_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  /// default ctor.
-  TAO_Bounded_Array_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Array_Sequence (CORBA::ULong length,
-                              T *value,
-                              CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Array_Sequence (
-      const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Array_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Array_Sequence &operator= (
-      const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
-    );
-
-  // = Accessors.
-  /// operator []
-  T &operator[] (CORBA::ULong);
-
-  /// operator []
-  const T &operator[] (CORBA::ULong) const;
-
-  /// Allocate storage for a sequence..
-  static T * allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T * buffer);
-
-  /// allocate a buffer of the requested length. The buffer is allocated for the
-  /// right type
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  /// deallocate the buffer
-  virtual void _deallocate_buffer (void);
-
-  // = orbos/98-01-11 proposed extensions.
-  /**
-   * Allows read-write access to the underlying buffer.  If <orphan>
-   * is FALSE the sequence returns a pointer to its buffer, allocating
-   * one if it has not yet done so.  The number of elements in the
-   * buffer can be determined from the sequence <length> accessor.
-   *
-   * If the <orphan> argument to <get_buffer> is FALSE, the sequence
-   * maintains ownership of the underlying buffer.  Elements in the
-   * returned buffer may be directly replaced by the caller.
-   *
-   * If the <orphan> argument to <get_buffer> is TRUE, the sequence
-   * yields ownership of the buffer to the caller.  If <orphan> is
-   * TRUE and the sequence does not own its buffer (i.e., its
-   * <release> flag is FALSE), the return value is a null pointer.  If
-   * the buffer is taken from the sequence using this form of
-   * <get_buffer>, the sequence reverts to the same state it would
-   * have if constructed using its default constructor.  The caller
-   * becomes responsible for eventually freeing each element of the
-   * returned buffer (for strings, wide string, and object
-   * references), and then freeing the returned buffer itself using
-   * <freebuf>.
-   */
-  T * get_buffer (CORBA::Boolean orphan = 0);
-
-  /**
-   * This function allows read-only access to the sequence buffer.
-   * The sequence returns its buffer, allocating one of one has not
-   * yet been allocated.  No direct modification of the returned
-   * buffer by the caller is permitted.
-   */
-  const T * get_buffer (void) const;
-
-  /**
-   * Allows the buffer underlying a sequence to be replaced.  The
-   * parameters to <replace> are identical in type, order, and purpose
-   * to those for the <T *data> constructor for the sequence.
-   */
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                T *data,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_String_Sequence
- *
- * @brief Bounded sequence of strings.
- *
- * As its unbounded counterpart it duplicates and releases strings
- * (via CORBA::string_dup and CORBA::string_free) under the
- * control of a per sequence flag, but the capacity of the
- * sequence is bound on the type.
- */
-template<size_t MAX>
-class TAO_Bounded_String_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  /**
-   * {SPEC}
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded  sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_String_Sequence (void);
-
-  /**
-   * {SPEC}
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   *
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence  allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Bounded_String_Sequence (CORBA::ULong length,
-                               char ** value,
-                               CORBA::Boolean release = 0);
-
-  /**
-   * {SPEC}
-   * Management Functions'' on page 16. The copy constructor creates a
-   * new sequence with the same maximum and length as the given
-   * sequence, copies each of its current elements (items zero through
-   * length--1), and sets the release flag to TRUE.
-   */
-  TAO_Bounded_String_Sequence (const TAO_Bounded_String_Sequence<MAX> &);
-
-  /**
-   * {SPEC}
-   * The assignment operator deep copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor.
-   */
-  TAO_Bounded_String_Sequence & operator= (
-      const TAO_Bounded_String_Sequence<MAX> &
-    );
-
-  /**
-   * {SPEC}
-   * If release=TRUE, the destructor destroys each of the current
-   * elements (items zero through length-1).
-   */
-  ~TAO_Bounded_String_Sequence (void);
-
-  /// read-write accessor
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * {SPEC}
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static char ** allocbuf (CORBA::ULong length);
-
-  /**
-   * {SPEC}
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using string_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (char ** buffer);
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong length,
-                char ** value,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_WString_Sequence
- *
- * @brief Bounded sequence of wstrings.
- *
- * As its unbounded counterpart it duplicates and releases strings
- * (via CORBA::wstring_dup and CORBA::wstring_free) under the
- * control of a per sequence flag, but the capacity of the
- * sequence is bound on the type.
- */
-template<size_t MAX>
-class TAO_Bounded_WString_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  /**
-   * {SPEC}
-   * For bounded sequences, the maximum length is part of the type and
-   * cannot be set or modified, while for unbounded  sequences, the
-   * default constructor also sets the maximum length to 0. The
-   * default constructor for a bounded sequence always allocates a
-   * contents vector, so it always sets the release flag to TRUE.
-   */
-  TAO_Bounded_WString_Sequence (void);
-
-  /**
-   * {SPEC}
-   * The ``T *data'' constructor (as shown in the example above)
-   * allows the length and contents of a bounded or unbounded sequence
-   * to be set. For unbounded sequences, it also allows the initial
-   * value of the maximum length to be set. For this constructor,
-   * ownership of the contents vector is determined by the release
-   * parameter---FALSE means the caller owns the storage, while TRUE
-   * means that the sequence assumes ownership of the storage.
-   *
-   * If release is TRUE, the contents vector must have been allocated
-   * using the sequence  allocbuf function, and the sequence will pass
-   * it to freebuf when finished with it.
-   */
-  TAO_Bounded_WString_Sequence (CORBA::ULong length,
-                                CORBA::WChar ** value,
-                                CORBA::Boolean release = 0);
-
-  /**
-   * {SPEC}
-   * Management Functions'' on page 16. The copy constructor creates a
-   * new sequence with the same maximum and length as the given
-   * sequence, copies each of its current elements (items zero through
-   * length--1), and sets the release flag to TRUE.
-   */
-  TAO_Bounded_WString_Sequence (const TAO_Bounded_WString_Sequence<MAX> &);
-
-  /**
-   * {SPEC}
-   * The assignment operator deep copies its parameter, releasing
-   * old storage if necessary. It behaves as if the original sequence
-   * is destroyed via its destructor and then the source sequence
-   * copied using the copy constructor.
-   */
-  TAO_Bounded_WString_Sequence &operator= (
-      const TAO_Bounded_WString_Sequence<MAX> &
-    );
-
-  /**
-   * {SPEC}
-   * If release=TRUE, the destructor destroys each of the current
-   * elements (items zero through length-1).
-   */
-  ~TAO_Bounded_WString_Sequence (void);
-
-  /// read-write accessor
-  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong slot) const;
-
-  /**
-   * {SPEC}
-   * The allocbuf function allocates a vector of T elements that can
-   * be passed to the T *data constructor. The length of the vector is
-   * given by the nelems function argument.  The allocbuf function
-   * initializes each element using its default constructor, except
-   * for (w)strings, which are initialized to null pointers, and object
-   * references, which are initialized to suitably typed nil object
-   * references. A null pointer is returned if allocbuf for some
-   * reason cannot allocate the requested vector. Vectors allocated by
-   * allocbuf should be freed using the freebuf function.
-   */
-  static CORBA::WChar ** allocbuf (CORBA::ULong length);
-
-  /**
-   * {SPEC}
-   * The freebuf function ensures that the destructor for each element
-   * is called before the buffer is destroyed, except for string
-   * elements, which are freed using wstring_free(), and object
-   * reference elements, which are freed using release(). The freebuf
-   * function will ignore null pointers passed to it.
-   */
-  static void freebuf (CORBA::WChar ** buffer);
-
-  // Functions to create, destroy, and adjust the underlying buffer.
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
-  // Parameters work the same as in constructor of the same signature.
-  void replace (CORBA::ULong length,
-                CORBA::WChar ** value,
-                CORBA::Boolean release = 0);
-};
-
-// *************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "tao/Sequence_T.i"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_T_H */
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
deleted file mode 100644
index c1ecd508680..00000000000
--- a/TAO/tao/Sequence_T.i
+++ /dev/null
@@ -1,602 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ***************************************************
-// Operations on the generic unbounded sequence class.
-// ***************************************************
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
-{
-  return new T[size];
-}
-
-template <typename T>
-ACE_INLINE
-void
-TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Sequence<T>::allocbuf (maximum))
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
-                                                   CORBA::ULong length,
-                                                   T * data,
-                                                   CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-template <typename T>
-ACE_INLINE
-const T *
-TAO_Unbounded_Sequence<T>::get_buffer (void) const
-{
-  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
-}
-
-// ***************************************************
-// operations on the generic Bounded sequence class
-// ***************************************************
-
-template <typename T, size_t MAX>
-ACE_INLINE
-T *
-TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
-{
-  return new T[MAX];
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-void
-TAO_Bounded_Sequence<T, MAX>::freebuf (T * buffer)
-{
-  delete [] buffer;
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
-{
-  this->maximum_ = MAX;
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
-                                                    T * data,
-                                                    CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, data, release)
-{
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-const T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
-{
-  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
-}
-
-template <class T, size_t MAX>
-ACE_INLINE
-T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  T * tmp = reinterpret_cast<T *> (this->buffer_);
-  return tmp[i];
-}
-
-template <class T, size_t MAX>
-ACE_INLINE
-const T &
-TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  const T * tmp = reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
-  return tmp[i];
-}
-
-// *************************************************************
-// Inline operations for class TAO_Object_Manager<T>
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager (
-    const TAO_Object_Manager<T,T_var> & rhs
-  )
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager (
-    T ** buffer,
-    CORBA::Boolean release
-  )
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T_var () const
-{
-  return TAO::Objref_Traits<T>::duplicate (*this->ptr_);
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T *() const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator T *&()
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Object_Manager<T,T_var>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Object_Manager<T,T_var>::inout (void)
-{
-  return *this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TAO_Pseudo_Object_Manager<T>
-// *************************************************************
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>::~TAO_Pseudo_Object_Manager (void)
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>::TAO_Pseudo_Object_Manager (
-    const TAO_Pseudo_Object_Manager<T> & rhs
-  )
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>::TAO_Pseudo_Object_Manager(
-    T ** buffer,
-    CORBA::Boolean release
-  )
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Object_Manager<T>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>::operator const T * () const
-{
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>::operator T *& ()
-{
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Object_Manager<T>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Object_Manager<T>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Object_Manager<T>::out (void)
-{
-  CORBA::release (*this->ptr_);
-  *this->ptr_ = T::_nil ();
-  return *this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Object_Manager<T>::_retn (void)
-{
-  T * temp = *this->ptr_;
-  *this->ptr_ = T::_nil ();
-  return temp;
-}
-
-// *************************************************************
-// class TAO_Unbounded_Object_Sequence
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    T* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return
-    TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Object_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_var, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template <typename T, typename T_var, size_t MAX>
-ACE_INLINE
-TAO_Object_Manager<T,T_var>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return
-    TAO_Object_Manager<T,T_var> (tmp + slot, this->release_ );
-}
-
-// *************************************************************
-// class TAO_Unbounded_Pseudo_Sequence
-// *************************************************************
-
-template <typename T>
-ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (void)
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>
-TAO_Unbounded_Pseudo_Sequence<T>::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_Pseudo_Object_Manager<T> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Pseudo_Sequence
-// *************************************************************
-
-template <typename T, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template <typename T, size_t MAX>
-ACE_INLINE
-TAO_Pseudo_Object_Manager<T>
-TAO_Bounded_Pseudo_Sequence<T,MAX>::operator[] (CORBA::ULong slot) const
-{
-  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_Pseudo_Object_Manager<T> (tmp + slot,
-                                       this->release_);
-}
-
-// *************************************************************
-// class TAO_Unbounded_Array_Sequence
-// *************************************************************
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-void
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (T * buffer)
-{
-  if (buffer == 0)
-    {
-        return;
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence (
-    void
-  )
-{
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::
-TAO_Unbounded_Array_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (maximum)
-      )
-{
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::
-TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
-                              CORBA::ULong length,
-                              T * value,
-                              CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-T &
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i)
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-
-#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((T *) this->buffer_)[i];
-#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (reinterpret_cast<T *> (this->buffer_))[i];
-#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-const T &
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i) const
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-
-#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
-#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i];
-#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-}
-
-template <typename T, typename T_slice, typename TAG>
-ACE_INLINE
-const T *
-TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer (void) const
-{
-  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Array_Sequence
-// *************************************************************
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::
-TAO_Bounded_Array_Sequence (void)
-  : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
-{
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::
-TAO_Bounded_Array_Sequence (CORBA::ULong length,
-                            T * data,
-                            CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, data, release)
-{
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-ACE_INLINE
-T &
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] (CORBA::ULong i)
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-
-#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((T *) this->buffer_)[i];
-#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (reinterpret_cast<T *> (this->buffer_))[i];
-#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-ACE_INLINE
-const T &
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] (
-    CORBA::ULong i
-  ) const
-{
-  TAO_SEQUENCE_ASSERT (i, this->maximum_);
-
-#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
-#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i];
-#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-}
-
-template <typename T, typename T_slice, typename TAG, size_t MAX>
-ACE_INLINE
-const T *
-TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (void) const
-{
-  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
-}
-
-// *************************************************************
-// class TAO_Bounded_String_Sequence
-// *************************************************************
-
-template<size_t MAX>
-ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<size_t MAX>
-ACE_INLINE
-TAO_Bounded_String_Sequence<MAX>::
-TAO_Bounded_String_Sequence (CORBA::ULong length,
-                             char ** value,
-                             CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-// *************************************************************
-// class TAO_Bounded_WString_Sequence
-// *************************************************************
-
-template<size_t MAX>
-ACE_INLINE
-TAO_Bounded_WString_Sequence<MAX>::~TAO_Bounded_WString_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<size_t MAX>
-ACE_INLINE
-TAO_Bounded_WString_Sequence<MAX>::
-TAO_Bounded_WString_Sequence (CORBA::ULong length,
-                              CORBA::WChar ** value,
-                              CORBA::Boolean release)
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
diff --git a/TAO/tao/Sequence_TypeCode.cpp b/TAO/tao/Sequence_TypeCode.cpp
deleted file mode 100644
index dcf7b3d72ca..00000000000
--- a/TAO/tao/Sequence_TypeCode.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQUENCE_TYPECODE_CPP
-#define TAO_SEQUENCE_TYPECODE_CPP
-
-#include "tao/Sequence_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename TypeCodeType, class RefCountPolicy>
-bool
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<TypeCodeType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                       ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<TypeCodeType>::get_typecode (this->content_type_));
-}
-
-
-#endif  /* TAO_SEQUENCE_TYPECODE_CPP */
diff --git a/TAO/tao/Sequence_TypeCode.h b/TAO/tao/Sequence_TypeCode.h
deleted file mode 100644
index 63b576bd216..00000000000
--- a/TAO/tao/Sequence_TypeCode.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c tk_sequence and @c tk_array @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_H
-#define TAO_SEQUENCE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template <typename TypeCodeType, class RefCountPolicy>
-    class Sequence
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                // Borland C++ currently can't handle a reference to
-                // const pointer to const CORBA::TypeCode_ptr
-                TypeCodeType content_type,
-#else
-                TypeCodeType const & content_type,
-#endif
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      TypeCodeType const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Sequence_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Sequence_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_H */
diff --git a/TAO/tao/Sequence_TypeCode.inl b/TAO/tao/Sequence_TypeCode.inl
deleted file mode 100644
index 81e7add5646..00000000000
--- a/TAO/tao/Sequence_TypeCode.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename TypeCodeType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
-  CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType content_type,
-#else
-  TypeCodeType const & content_type,
-#endif
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence);
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.cpp b/TAO/tao/Sequence_TypeCode_Static.cpp
deleted file mode 100644
index c9548ddf64f..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Sequence_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<CORBA::TypeCode_ptr const *>::get_typecode (
-                  this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-    TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.h b/TAO/tao/Sequence_TypeCode_Static.h
deleted file mode 100644
index 43219b335fe..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_sequence and @c tk_array
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_STATIC_H
-#define TAO_SEQUENCE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename TypeCodeType, class RefCountPolicy> class Sequence;
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template<>
-    class TAO_Export Sequence<CORBA::TypeCode_ptr const *,
-                              TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode
-      , private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-                CORBA::TypeCode_ptr const * content_type,
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      CORBA::TypeCode_ptr const * const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Sequence_TypeCode_Static.inl b/TAO/tao/Sequence_TypeCode_Static.inl
deleted file mode 100644
index 27e98729656..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::Sequence (
-  CORBA::TCKind kind,
-  CORBA::TypeCode_ptr const * content_type,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-}
diff --git a/TAO/tao/ServerRequestInfo.pidl b/TAO/tao/ServerRequestInfo.pidl
deleted file mode 100644
index f4f99d380a1..00000000000
--- a/TAO/tao/ServerRequestInfo.pidl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ServerRequestInfo.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled RequestInfo
- *
- * This file was used to generate the code in ServerRequestInfoC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ServerRequestInfo.pidl
- */
-
-#ifndef _SERVER_REQUESTINFO_PIDL_
-#define _SERVER_REQUESTINFO_PIDL_
-
-#include <RequestInfo.pidl>
-#include <orb_types.pidl>
-#include <Policy_Forward.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ServerRequestInfo : RequestInfo
-  {
-    readonly attribute any sending_exception;
-    readonly attribute ServerId server_id;
-    readonly attribute ORBId orb_id;
-    readonly attribute AdapterName adapter_name;
-    readonly attribute ObjectId object_id;
-    readonly attribute CORBA::OctetSeq adapter_id;
-    readonly attribute CORBA::RepositoryId target_most_derived_interface;
-    CORBA::Policy get_server_policy (in CORBA::PolicyType type);
-    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
-    boolean target_is_a (in CORBA::RepositoryId id);
-    void add_reply_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-};
-
-#endif  /* _SERVER_REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/ServerRequestInfoA.cpp b/TAO/tao/ServerRequestInfoA.cpp
deleted file mode 100644
index 330d5563081..00000000000
--- a/TAO/tao/ServerRequestInfoA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServerRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ServerRequestInfo (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
-    "ServerRequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
-    &_tao_tc_PortableInterceptor_ServerRequestInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInfo,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ServerRequestInfoC.cpp b/TAO/tao/ServerRequestInfoC.cpp
deleted file mode 100644
index 5a0669c22f0..00000000000
--- a/TAO/tao/ServerRequestInfoC.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
-#include "ServerRequestInfoC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ServerRequestInfo.
-
-PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate (
-    PortableInterceptor::ServerRequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::ServerRequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
-    PortableInterceptor::ServerRequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
-{
-  return PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
-    PortableInterceptor::ServerRequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
-{}
-
-PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
-{}
-
-void 
-PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInfo *_tao_tmp_pointer =
-    static_cast<ServerRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ServerRequestInfoC.h b/TAO/tao/ServerRequestInfoC.h
deleted file mode 100644
index 43ecdf8bb84..00000000000
--- a/TAO/tao/ServerRequestInfoC.h
+++ /dev/null
@@ -1,338 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/RequestInfoC.h"
-#include "tao/orb_typesC.h"
-#include "tao/Policy_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-  
-  class ServerRequestInfo;
-  typedef ServerRequestInfo *ServerRequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-  
-  class TAO_Export ServerRequestInfo
-    : public virtual ::PortableInterceptor::RequestInfo
-  {
-  public:
-    typedef ServerRequestInfo_ptr _ptr_type;
-    typedef ServerRequestInfo_var _var_type;
-    
-    // The static operations.
-    static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-    
-    static void _tao_release (ServerRequestInfo_ptr obj);
-    
-    static ServerRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerRequestInfo_ptr _nil (void)
-    {
-      return static_cast<ServerRequestInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * sending_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * server_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * orb_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectId * object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::OctetSeq * adapter_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * target_most_derived_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr get_server_policy (
-        ::CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_slot (
-        ::PortableInterceptor::SlotId id,
-        const ::CORBA::Any & data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::InvalidSlot
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean target_is_a (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_reply_service_context (
-        const ::IOP::ServiceContext & service_context,
-        ::CORBA::Boolean replace
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ServerRequestInfo (void);
-    
-    virtual ~ServerRequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerRequestInfo (const ServerRequestInfo &);
-    
-    void operator= (const ServerRequestInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
-  {
-    static ::PortableInterceptor::ServerRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ServerRequestInfoS.h b/TAO/tao/ServerRequestInfoS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ServerRequestInfoS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ServerRequestInterceptor.pidl b/TAO/tao/ServerRequestInterceptor.pidl
deleted file mode 100644
index 6015fcb8214..00000000000
--- a/TAO/tao/ServerRequestInterceptor.pidl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- IDL -*-
-
-/**
- * @file ServerRequestInterceptor.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableInterceptor
- * components in the ORB.
- *
- * This file was used to generate the code in ServerRequestInterceptorC.*
- * The command used to generate code is:
- *
- *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ServerRequestInterceptor.pidl
- *
- * Patches for changes to the generated code are available in the
- * `diffs' directory.
- */
-
-#ifndef _SERVER_REQUEST_INTERCEPTOR_IDL_
-#define _SERVER_REQUEST_INTERCEPTOR_IDL_
-
-#include <Interceptor.pidl>
-#include <OctetSeq.pidl>
-#include <PIForwardRequest.pidl>
-
-module PortableInterceptor {
-
-  typeprefix PortableInterceptor "omg.org";
-
-  local interface ServerRequestInfo;
-
-  local interface ServerRequestInterceptor : Interceptor
-  {
-    /// Proprietary method in TAO for fault tolerance
-    void tao_ft_interception_point (in ServerRequestInfo ri, out CORBA::OctetSeq os) raises (ForwardRequest);
-    void receive_request_service_contexts (in ServerRequestInfo ri) raises (ForwardRequest);
-    void receive_request (in ServerRequestInfo ri) raises (ForwardRequest);
-    void send_reply (in ServerRequestInfo ri);
-    void send_exception (in ServerRequestInfo ri) raises (ForwardRequest);
-    void send_other (in ServerRequestInfo ri) raises (ForwardRequest);
-  };
-};
-
-#endif  /* _SERVER_REQUEST_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/ServerRequestInterceptorA.cpp b/TAO/tao/ServerRequestInterceptorA.cpp
deleted file mode 100644
index 7ff84e2a730..00000000000
--- a/TAO/tao/ServerRequestInterceptorA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServerRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ServerRequestInterceptor (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
-    "ServerRequestInterceptor");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
-    &_tao_tc_PortableInterceptor_ServerRequestInterceptor;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInterceptor,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ServerRequestInterceptorC.cpp b/TAO/tao/ServerRequestInterceptorC.cpp
deleted file mode 100644
index 641919d9d98..00000000000
--- a/TAO/tao/ServerRequestInterceptorC.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServerRequestInterceptorC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ServerRequestInterceptor.
-
-PortableInterceptor::ServerRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate (
-    PortableInterceptor::ServerRequestInterceptor_ptr p
-  )
-{
-  return PortableInterceptor::ServerRequestInterceptor::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release (
-    PortableInterceptor::ServerRequestInterceptor_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ServerRequestInterceptor_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void)
-{
-  return PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal (
-    PortableInterceptor::ServerRequestInterceptor_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
-{}
-
-PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
-{}
-
-void 
-PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInterceptor *_tao_tmp_pointer =
-    static_cast<ServerRequestInterceptor *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInterceptor::_nil ();
-    }
-  
-  ServerRequestInterceptor_ptr proxy =
-    dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
-  return ServerRequestInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInterceptor::_nil ();
-    }
-  
-  ServerRequestInterceptor_ptr proxy =
-    dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
-  return ServerRequestInterceptor::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestInterceptor_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterceptor_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInterceptor::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/ServerRequestInterceptorC.h b/TAO/tao/ServerRequestInterceptorC.h
deleted file mode 100644
index 82367517fca..00000000000
--- a/TAO/tao/ServerRequestInterceptorC.h
+++ /dev/null
@@ -1,339 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/InterceptorC.h"
-#include "tao/OctetSeqC.h"
-#include "tao/PIForwardRequestC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-
-  class ServerRequestInfo;
-  typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-
-  class ServerRequestInterceptor;
-  typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        ServerRequestInterceptor
-      >
-    ServerRequestInterceptor_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        ServerRequestInterceptor
-      >
-    ServerRequestInterceptor_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-
-  class TAO_Export ServerRequestInterceptor
-    : public virtual ::PortableInterceptor::Interceptor
-  {
-  public:
-    typedef ServerRequestInterceptor_ptr _ptr_type;
-    typedef ServerRequestInterceptor_var _var_type;
-
-    // The static operations.
-    static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-
-    static void _tao_release (ServerRequestInterceptor_ptr obj);
-
-    static ServerRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ServerRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static ServerRequestInterceptor_ptr _nil (void)
-    {
-      return static_cast<ServerRequestInterceptor_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-
-    virtual void tao_ft_interception_point (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri,
-        ::CORBA::OctetSeq_out os
-        ACE_ENV_ARG_DECL_NOT_USED
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) {}
-
-#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void receive_request_service_contexts (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void receive_request (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void send_reply (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void send_exception (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void send_other (
-        ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ForwardRequest
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-  protected:
-    // Abstract or local interface only.
-    ServerRequestInterceptor (void);
-
-    virtual ~ServerRequestInterceptor (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerRequestInterceptor (const ServerRequestInterceptor &);
-
-    void operator= (const ServerRequestInterceptor &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
-  {
-    static ::PortableInterceptor::ServerRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
-  {
-    static ::PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr
-      );
-    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ServerRequestInterceptorS.h b/TAO/tao/ServerRequestInterceptorS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ServerRequestInterceptorS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
deleted file mode 100644
index 504b67b6224..00000000000
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/orbconf.h"
-
-ACE_RCSID (tao, 
-           Server_Strategy_Factory, 
-           "$Id$")
-
-TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
-  : active_object_map_creation_parameters_ ()
-{
-}
-
-TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
-{
-}
-
-int
-TAO_Server_Strategy_Factory::open (TAO_ORB_Core*)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  return -1;
-}
-
-int
-TAO_Server_Strategy_Factory::activate_server_connections (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::thread_per_connection_timeout (ACE_Time_Value &)
-{
-  return -1;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_flags (void)
-{
-  return 0;
-}
-
-int
-TAO_Server_Strategy_Factory::server_connection_thread_count (void)
-{
-  return 0;
-}
-
-const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &
-TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const
-{
-  return this->active_object_map_creation_parameters_;
-}
-
-TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters (void)
-  : active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE),
-    object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH),
-    object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX),
-    reverse_object_lookup_strategy_for_unique_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_ids_ (1),
-    allow_reactivation_of_system_ids_ (1),
-    poa_map_size_ (TAO_DEFAULT_SERVER_POA_MAP_SIZE),
-    poa_lookup_strategy_for_transient_id_policy_ (TAO_ACTIVE_DEMUX),
-    poa_lookup_strategy_for_persistent_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_poa_names_ (1)
-{
-}
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
deleted file mode 100644
index 4ba7d599e9f..00000000000
--- a/TAO/tao/Server_Strategy_Factory.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     Server_Strategy_Factory.h
- *
- *  $Id$
- *
- *  @author  Chris Cleeland
- */
-//=============================================================================
-
-#ifndef TAO_SERVER_STRATEGY_FACTORY_H
-#define TAO_SERVER_STRATEGY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TAO_Export.h"
-#include "Basic_Types.h"
-
-class TAO_Active_Object_Map_Impl;
-class TAO_Reverse_Active_Object_Map_Impl;
-class TAO_ORB_Core;
-
-enum TAO_Demux_Strategy
-{
-  TAO_LINEAR,
-  TAO_DYNAMIC_HASH,
-  TAO_ACTIVE_DEMUX,
-  TAO_USER_DEFINED
-};
-
-/**
- * @class TAO_Server_Strategy_Factory
- *
- * @brief Base class for the server's abstract factory that manufactures
- * various strategies of special utility to it.  This simply
- * serves as an interface to a subclass that REALLY gets
- * specified and loaded by the Service Configurator.
- */
-class TAO_Export TAO_Server_Strategy_Factory : public ACE_Service_Object
-{
-public:
-
-  struct Active_Object_Map_Creation_Parameters
-  {
-    /// Constructor.
-    Active_Object_Map_Creation_Parameters (void);
-
-    /// Default size of object lookup table.
-    CORBA::ULong active_object_map_size_;
-
-    /// The type of lookup/demultiplexing strategy being used for user
-    /// id policy
-    TAO_Demux_Strategy object_lookup_strategy_for_user_id_policy_;
-
-    /// The type of lookup/demultiplexing strategy being used for
-    /// system id policy
-    TAO_Demux_Strategy object_lookup_strategy_for_system_id_policy_;
-
-    /// The type of reverse lookup/demultiplexing strategy being used
-    /// for the UNIQUE_ID policy
-    TAO_Demux_Strategy reverse_object_lookup_strategy_for_unique_id_policy_;
-
-    /// Flag to indicate whether the active hint should be used with
-    /// the IOR.
-    int use_active_hint_in_ids_;
-
-    /// Flag to indicate whether reactivations of servants was required
-    /// (under the system id policy).  If not, certain resources may
-    /// not be required.
-    int allow_reactivation_of_system_ids_;
-
-    CORBA::ULong poa_map_size_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_transient_id_policy_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_persistent_id_policy_;
-
-    int use_active_hint_in_poa_names_;
-  };
-
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_Server_Strategy_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_Server_Strategy_Factory(void);
-
-  /**
-   * Call <open> on various strategies.  This is not performed in
-   * <init> so that the other portions of the ORB have a chance to
-   * "settle" in their initialization since the streategies herein
-   * might need some of that information.
-   */
-  virtual int open (TAO_ORB_Core* orb_core);
-
-  /// Enable POA locking?
-  virtual int enable_poa_locking (void);
-
-  /// Are server connections active (i.e. run in their own thread)
-  virtual int activate_server_connections (void);
-
-  /**
-   * Obtain the timeout value used by the thread-per-connection server
-   * threads to poll the shutdown flag in the ORB.
-   * Return -1 if the ORB should use the compile-time defaults.
-   * If the return value is zero then the threads block without
-   * timeouts.
-   */
-  virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
-
-  /// The thread activation parameters
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
-
-  /// Return the active object map creation parameters.
-  virtual
-  const Active_Object_Map_Creation_Parameters &
-  active_object_map_creation_parameters (void) const;
-
-protected:
-  /// Active object map creation parameters.
-  Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
deleted file mode 100644
index dbfbeb51b7d..00000000000
--- a/TAO/tao/Service_Callbacks.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "Service_Callbacks.h"
-#include "ORB_Constants.h"
-#include "SystemException.h"
-#include "Environment.h"
-#include "Invocation_Utils.h"
-
-ACE_RCSID (tao,
-           Service_Callbacks,
-           "$Id$")
-
-TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
-{
-}
-
-CORBA::Boolean
-TAO_Service_Callbacks::select_profile (TAO_MProfile * /*mprofile*/,
-                                       TAO_Profile *& /*pfile*/)
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO_Service_Callbacks::reselect_profile (TAO_Stub * /*stub*/,
-                                         TAO_Profile *& /*pfile*/)
-{
-  return 0;
-}
-
-
-CORBA::Boolean
-TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
-{
-  // We shouldn't be here at all. But in case if we are here,
-  // something is wrong. So, we send a true for a is_nil () call
-  return 1;
-}
-
-void
-TAO_Service_Callbacks::reset_profile_flags (void)
-{
-  return;
-}
-
-
-CORBA::Boolean
-TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *,
-                                              const TAO_Profile *)
-{
-  return 0;
-}
-
-CORBA::ULong
-TAO_Service_Callbacks::hash_ft (TAO_Profile *,
-                                CORBA::ULong )
-{
-  return 0;
-}
-
-TAO::Invocation_Status
-TAO_Service_Callbacks::raise_comm_failure (
-    IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          -1),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_FAILURE);
-}
-
-TAO::Invocation_Status
-TAO_Service_Callbacks::raise_transient_failure (
-    IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::TRANSIENT (
-      CORBA::SystemException::_tao_minor_code (
-          TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
-          -1),
-      CORBA::COMPLETED_MAYBE),
-      TAO::TAO_INVOKE_FAILURE);
-}
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
deleted file mode 100644
index 546d0fd117e..00000000000
--- a/TAO/tao/Service_Callbacks.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//=============================================================================
-/**
- *  @file    Service_Callbacks.h
- *
- *  $Id$
- *
- * This is a generic interface that would be used to override many
- * of the default functionalities that the ORB provides by the
- * services if they have been loaded in to the ORB_Core
- *
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SERVICE_CALLBACK_H
-#define TAO_SERVICE_CALLBACK_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/Invocation_Utils.h"
-
-class TAO_Profile;
-class TAO_MProfile;
-class TAO_Stub;
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class Environment;
-}
-
-namespace IOP
-{
-  class ServiceContextList;
-}
-
-/**
- * @class TAO_Service_Callbacks
- *
- * @brief An Abstract Base class for the hooks in the ORB.
- *
- * This class (would) define all the hooks that may be needed by
- * the ORB to override some of its default behaviour. The methods
- * can be potentially used to call service level specific
- * processing that may be required.
- */
-class TAO_Export TAO_Service_Callbacks
-{
-
-public:
-
-  /// Dtor
-  virtual ~TAO_Service_Callbacks (void);
-
-  /// Select the profile from MProfile as the needs of the services
-  /// may be. Return the profile in <pfile>
-  virtual CORBA::Boolean select_profile (TAO_MProfile *mprofile,
-                                         TAO_Profile *&pfile);
-
-  /// Select the profile from MProfile as the needs of the services
-  /// may be. Return the profile in <pfile>
-  virtual CORBA::Boolean reselect_profile (TAO_Stub *stub,
-                                           TAO_Profile *&pfile);
-
-  /// Reset the profile flags that the services could have
-  virtual void reset_profile_flags (void);
-
-  /// Check whether <obj> is nil or not.
-  virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
-
-
-  /// Check for equivalency of the two profiles
-  virtual CORBA::Boolean is_profile_equivalent (const TAO_Profile *,
-                                                const TAO_Profile *);
-
-  /// Calculate the hash value..
-  virtual CORBA::ULong hash_ft (TAO_Profile *p,
-                                CORBA::ULong m);
-
-  /// Allow the service layer to decide whether the COMM_FAILURE
-  /// exception should be thrown or a reinvocation is needed
-  virtual TAO::Invocation_Status raise_comm_failure (
-      IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
-
-  /// Allow the service layer to decide whether the TRANSIENT
-  /// exception should be thrown or a reinvocation is needed
-  virtual TAO::Invocation_Status raise_transient_failure (
-      IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_SERVICE_CALLBACK_H*/
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
deleted file mode 100644
index b2708c3f4ce..00000000000
--- a/TAO/tao/Service_Context.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// $Id$
-//
-
-#include "tao/Service_Context.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Service_Context.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Service_Context,
-           "$Id$")
-
-void
-TAO_Service_Context::set_context_i (IOP::ServiceId id,
-                                    TAO_OutputCDR &cdr)
-{
-  IOP::ServiceContext context;
-  context.context_id = id;
-
-  // Make a *copy* of the CDR stream...
-  size_t length = cdr.total_length ();
-  context.context_data.length (static_cast<CORBA::ULong> (length));
-  CORBA::Octet *buf = context.context_data.get_buffer ();
-
-  for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
-      buf += i->length ();
-    }
-
-  this->set_context_i (context);
-}
-
-void
-TAO_Service_Context::set_context_i (IOP::ServiceContext &context,
-                                    TAO_OutputCDR &cdr)
-{
-  // Make a *copy* of the CDR stream...
-  size_t length = cdr.total_length ();
-  context.context_data.length (static_cast<CORBA::ULong> (length));
-  CORBA::Octet *buf = context.context_data.get_buffer ();
-
-  for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
-      buf += i->length ();
-    }
-}
-
-void
-TAO_Service_Context::set_context (const IOP::ServiceContext &context)
-{
-  this->add_context_i (context);
-}
-
-int
-TAO_Service_Context::set_context (const IOP::ServiceContext &context,
-                                  CORBA::Boolean replace)
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (context.context_id == this->service_context_[i].context_id)
-        {
-          if (replace)
-            {
-              this->service_context_[i] = context;
-              return 1;
-            }
-          else
-            {
-              return 0;
-            }
-        }
-    }
-
-  this->add_context_i (context);
-  return 1;
-}
-
-void
-TAO_Service_Context::set_context (IOP::ServiceContext &context)
-{
-  this->add_context_i (context);
-}
-
-void
-TAO_Service_Context::set_context_i (const IOP::ServiceContext& context)
-{
-  // @@ TODO Some contexts can show up multiple times, others
-  //    can't find out and take appropiate action.
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (context.context_id == this->service_context_[i].context_id)
-        {
-          this->service_context_[i] = context;
-          return;
-        }
-    }
-
-  this->add_context_i (context);
-}
-
-void
-TAO_Service_Context::set_context_i (IOP::ServiceContext& context)
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (context.context_id == this->service_context_[i].context_id)
-        {
-          CORBA::ULong max = context.context_data.maximum ();
-          CORBA::ULong len = context.context_data.length ();
-          CORBA::Octet* buf = context.context_data.get_buffer (1);
-          this->service_context_[i].context_data.replace (max, len, buf, 1);
-          return;
-        }
-    }
-
-  this->add_context_i (context);
-}
-
-void
-TAO_Service_Context::add_context_i (IOP::ServiceContext& context)
-{
-  // @@ TODO Some contexts can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->service_context_.length ();
-  this->service_context_.length (l + 1);
-  this->service_context_[l].context_id = context.context_id;
-  CORBA::ULong max = context.context_data.maximum ();
-  CORBA::ULong len = context.context_data.length ();
-  CORBA::Octet* buf = context.context_data.get_buffer (1);
-  this->service_context_[l].context_data.replace (max, len, buf, 1);
-}
-
-void
-TAO_Service_Context::add_context_i (const IOP::ServiceContext& context)
-{
-  // @@ TODO Some contexts can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->service_context_.length ();
-  this->service_context_.length (l + 1);
-  this->service_context_[l] = context;
-}
-
-int
-TAO_Service_Context::get_context (IOP::ServiceContext& context) const
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (context.context_id == this->service_context_[i].context_id)
-        {
-          context = this->service_context_[i];
-          return 1;
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Service_Context::get_context (IOP::ServiceId id,
-                                  const IOP::ServiceContext **context) const
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (id == this->service_context_[i].context_id)
-        {
-          *context = &this->service_context_[i];
-          return 1;
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Service_Context::get_context (IOP::ServiceId id,
-                                  IOP::ServiceContext_out context)
-{
-  CORBA::ULong len = this->service_context_.length ();
-
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      if (id == this->service_context_[i].context_id)
-        {
-          ACE_NEW_RETURN (context, IOP::ServiceContext, 0);
-
-          *(context.ptr ()) = this->service_context_[i];
-
-          return 1;
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Service_Context::encode (TAO_OutputCDR& cdr) const
-{
-  return (cdr << this->service_context_);
-}
-
-int
-TAO_Service_Context::decode (TAO_InputCDR& cdr)
-{
-  if ((cdr >> this->service_context_) == 0)
-    {
-      return 0;
-    }
-
-  return 1;
-}
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
deleted file mode 100644
index 348bec7c061..00000000000
--- a/TAO/tao/Service_Context.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Service_Context.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *
- */
-// ===================================================================
-
-#ifndef TAO_SERVICE_CONTEXT_H
-#define TAO_SERVICE_CONTEXT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOPC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Service_Context
- *
- * @brief Helper class for managing the service context list
- *  information.
- *
- * This class is used to manipulate and access the service context
- * list that is passed around with every GIOP request/reply. The
- * definition of the service context list is simply a sequence of the
- * following structures:
- * typedef unsigned long ServiceId;
- * struct ServiceContext
- * {
- *   ServiceId          context_id;
- *   sequence <octet>   context_data;
- * };
- * typedef sequence <ServiceContext> ServiceContextList;
- *
- * the real motivation behind this class is to consolidate all the
- * marshalling and unmarshalling information pertaining to service
- * context list
- *
- * @note Somewhere down the line we may want to use this class for
- * fast access to the info that we need from the Service Context
- * List.
- */
-class TAO_Export TAO_Service_Context
-{
-public:
-  /// Constructor
-  TAO_Service_Context (void);
-
-
-  /// = Generic components
-
-  /// Insert the component into the list, making a copy of the octet
-  /// sequence.
-  void set_context (const IOP::ServiceContext &context);
-
-  /// Insert the component into the list, making a copy of the octet
-  /// sequence.  Search the list before insertion so that the
-  /// insertion does not cause a duplicate context to be in the list.
-  /// If the replace flag is true, update the specified context.
-  /// Return 0 if the component was present and the replace flag
-  /// was not set to true.
-  int set_context (const IOP::ServiceContext &context,
-                   CORBA::Boolean replace);
-
-  /// Insert the component into the list, but efficiently stealing the
-  /// contents of the octet sequence.
-  void set_context (IOP::ServiceContext &context);
-
-  /// Get a copy of the context identified by <context.context_id>, return
-  /// 0 if the component is not present.
-  int get_context (IOP::ServiceContext &context) const;
-
-  /// Get a reference to a context identified by id, return
-  /// 0 if the component is not present.
-  int get_context (IOP::ServiceId id, const IOP::ServiceContext **context) const;
-
-  /// Get a copy of the Service Context corresponding to the given
-  /// ServiceId.  The caller owns the returned Service Context.
-  /**
-   * @return 0 If a Service Context with the given ServiceId doesn't
-   *           exist.
-   */
-  int get_context (IOP::ServiceId id, IOP::ServiceContext_out context);
-
-  /// Set the context from the CDR stream and add that to the service
-  /// Context list
-  void set_context (IOP::ServiceId id, TAO_OutputCDR &cdr);
-
-  /// Set the context from the CDR stream and return the context back
-  /// to the caller. *Does not* modify the underlying service context
-  /// list.
-  void set_context (IOP::ServiceContext &context, TAO_OutputCDR &cdr);
-
-  /// Is the <id> available in the underlying service context list? If
-  /// so return 1, else return 0
-  int is_service_id (IOP::ServiceId id);
-
-  /// = Marshaling and demarshaling the list
-  int encode (TAO_OutputCDR& cdr) const;
-  int decode (TAO_InputCDR& cdr);
-
-  /// Return the underlying service context list
-  IOP::ServiceContextList &service_info (void);
-  const IOP::ServiceContextList &service_info (void) const;
-
-  // @@ Note: The above method is only for backward comptiblity. We
-  // need to get this removed once RT folks have their service
-  // addition info done through this interface
-
-private:
-  /// Helper methods to implement set_context()
-  void set_context_i (const IOP::ServiceContext &context);
-  void set_context_i (IOP::ServiceContext &context);
-  void add_context_i (const IOP::ServiceContext &context);
-  void add_context_i (IOP::ServiceContext &context);
-  void set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr);
-  void set_context_i (IOP::ServiceContext &context, TAO_OutputCDR &cdr);
-
-  /// Helper methods to implement get_context()
-  int get_context_i (IOP::ServiceContext &context) const;
-
-  // Prevent copying
-  TAO_Service_Context (const TAO_Service_Context &);
-  TAO_Service_Context &operator= (const TAO_Service_Context &);
-
-private:
-  /// The ServiceContextList info.
-  IOP::ServiceContextList service_context_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Service_Context.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SERVICE_CONTEXT_H */
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
deleted file mode 100644
index d7540db80b7..00000000000
--- a/TAO/tao/Service_Context.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO_Service_Context::TAO_Service_Context (void)
-  : service_context_ ()
-{
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_Service_Context::service_info (void)
-{
-  return this->service_context_;
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-TAO_Service_Context::service_info (void) const
-{
-  return this->service_context_;
-}
-
-
-ACE_INLINE void
-TAO_Service_Context::set_context (IOP::ServiceId id,
-                                  TAO_OutputCDR &cdr)
-{
-  this->set_context_i (id,
-                       cdr);
-}
-
-ACE_INLINE void
-TAO_Service_Context::set_context (IOP::ServiceContext &context,
-                                  TAO_OutputCDR &cdr)
-{
-  this->set_context_i (context,
-                       cdr);
-}
-
-
-ACE_INLINE int
-TAO_Service_Context::is_service_id (IOP::ServiceId id)
-{
-  for (CORBA::ULong i = 0;
-       i != this->service_context_.length ();
-       ++i)
-    {
-      if (id == this->service_context_[i].context_id)
-        {
-          return 1;
-        }
-    }
-  return 0;
-}
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
deleted file mode 100644
index dece1ce7bbb..00000000000
--- a/TAO/tao/Services.pidl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-//
-//   This file was used to generate the code in ServicesC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -GA -SS -Sci
-//          -Wb,export_macro="tao/TAO_Export"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          Services.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
-
-
-#ifndef TAO_CORBA_SERVICES_IDL
-#define TAO_CORBA_SERVICES_IDL
-
-#include "OctetSeq.pidl"
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef unsigned short ServiceType;
-  typedef unsigned long ServiceOption;
-  typedef unsigned long ServiceDetailType;
-  typedef OctetSeq ServiceDetailData;
-  typedef sequence<ServiceOption> ServiceOptionSeq;
-
-  const ServiceType Security = 1;
-
-  struct ServiceDetail
-  {
-    ServiceDetailType service_detail_type;
-    ServiceDetailData service_detail;
-  };
-
-  typedef sequence<ServiceDetail> ServiceDetailSeq;
-
-  struct ServiceInformation
-  {
-    ServiceOptionSeq service_options;
-    ServiceDetailSeq service_details;
-  };
-};
-
-#endif  /* TAO_CORBA_SERVICES_IDL */
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
deleted file mode 100644
index 31f6421fbdd..00000000000
--- a/TAO/tao/ServicesA.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServicesC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceType:1.0",
-    "ServiceType",
-    &CORBA::_tc_ushort);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceType =
-    &_tao_tc_CORBA_ServiceType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOption (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOption:1.0",
-    "ServiceOption",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOption =
-    &_tao_tc_CORBA_ServiceOption;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailType:1.0",
-    "ServiceDetailType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailType =
-    &_tao_tc_CORBA_ServiceDetailType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailData (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailData:1.0",
-    "ServiceDetailData",
-    &CORBA::_tc_OctetSeq);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailData =
-    &_tao_tc_CORBA_ServiceDetailData;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceOptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceOption,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceOptionSeq_0 =
-      &CORBA_ServiceOptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
-    "ServiceOptionSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq =
-    &_tao_tc_CORBA_ServiceOptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceDetail[] =
-  {
-    { "service_detail_type", &CORBA::_tc_ServiceDetailType },
-    { "service_detail", &CORBA::_tc_ServiceDetailData }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetail (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceDetail:1.0",
-    "ServiceDetail",
-    _tao_fields_CORBA_ServiceDetail,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetail =
-    &_tao_tc_CORBA_ServiceDetail;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceDetailSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceDetail,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceDetailSeq_0 =
-      &CORBA_ServiceDetailSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
-    "ServiceDetailSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq =
-    &_tao_tc_CORBA_ServiceDetailSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceInformation[] =
-  {
-    { "service_options", &CORBA::_tc_ServiceOptionSeq },
-    { "service_details", &CORBA::_tc_ServiceDetailSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceInformation (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceInformation:1.0",
-    "ServiceInformation",
-    _tao_fields_CORBA_ServiceInformation,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceInformation =
-    &_tao_tc_CORBA_ServiceInformation;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceOptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
-        _tao_any,
-        CORBA::ServiceOptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
-      _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
-      _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceDetail *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
-        _tao_any,
-        CORBA::ServiceDetail::_tao_any_destructor,
-        CORBA::_tc_ServiceDetail,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceDetailSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::extract (
-        _tao_any,
-        CORBA::ServiceDetailSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceInformation &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
-      _tao_any,
-      CORBA::ServiceInformation::_tao_any_destructor,
-      CORBA::_tc_ServiceInformation,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceInformation *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
-      _tao_any,
-      CORBA::ServiceInformation::_tao_any_destructor,
-      CORBA::_tc_ServiceInformation,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceInformation *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceInformation *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceInformation *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
-        _tao_any,
-        CORBA::ServiceInformation::_tao_any_destructor,
-        CORBA::_tc_ServiceInformation,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
deleted file mode 100644
index 72cb425a180..00000000000
--- a/TAO/tao/ServicesC.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ServicesC.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_SERVICEOPTIONSEQ_CS_)
-#define _CORBA_SERVICEOPTIONSEQ_CS_
-
-CORBA::ServiceOptionSeq::ServiceOptionSeq (void)
-{}
-
-CORBA::ServiceOptionSeq::ServiceOptionSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
-      >
-    (max)
-{}
-
-CORBA::ServiceOptionSeq::ServiceOptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ServiceOptionSeq::ServiceOptionSeq (
-    const ServiceOptionSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
-      >
-    (seq)
-{}
-
-CORBA::ServiceOptionSeq::~ServiceOptionSeq (void)
-{}
-
-void CORBA::ServiceOptionSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ServiceOptionSeq * _tao_tmp_pointer =
-    static_cast<ServiceOptionSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ServiceDetail::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ServiceDetail *_tao_tmp_pointer =
-    static_cast<ServiceDetail *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_SERVICEDETAILSEQ_CS_)
-#define _CORBA_SERVICEDETAILSEQ_CS_
-
-CORBA::ServiceDetailSeq::ServiceDetailSeq (void)
-{}
-
-CORBA::ServiceDetailSeq::ServiceDetailSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
-      >
-    (max)
-{}
-
-CORBA::ServiceDetailSeq::ServiceDetailSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ServiceDetail * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ServiceDetailSeq::ServiceDetailSeq (
-    const ServiceDetailSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
-      >
-    (seq)
-{}
-
-CORBA::ServiceDetailSeq::~ServiceDetailSeq (void)
-{}
-
-void CORBA::ServiceDetailSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ServiceDetailSeq * _tao_tmp_pointer =
-    static_cast<ServiceDetailSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ServiceInformation::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ServiceInformation *_tao_tmp_pointer =
-    static_cast<ServiceInformation *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceOptionSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceOptionSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceDetail &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.service_detail_type) &&
-    (strm << _tao_aggregate.service_detail);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceDetail &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.service_detail_type) &&
-    (strm >> _tao_aggregate.service_detail);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceDetailSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceDetailSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceInformation &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.service_options) &&
-    (strm << _tao_aggregate.service_details);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceInformation &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.service_options) &&
-    (strm >> _tao_aggregate.service_details);
-}
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
deleted file mode 100644
index 1df591e569d..00000000000
--- a/TAO/tao/ServicesC.h
+++ /dev/null
@@ -1,405 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SERVICESC_H_
-#define _TAO_IDL_ORIG_SERVICESC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/OctetSeqC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::UShort ServiceType;
-  typedef CORBA::UShort_out ServiceType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceType;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ServiceOption;
-  typedef CORBA::ULong_out ServiceOption_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOption;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong ServiceDetailType;
-  typedef CORBA::ULong_out ServiceDetailType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailType;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef OctetSeq ServiceDetailData;
-  typedef OctetSeq_var ServiceDetailData_var;
-  typedef OctetSeq_out ServiceDetailData_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailData;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_SERVICEOPTIONSEQ_CH_)
-#define _CORBA_SERVICEOPTIONSEQ_CH_
-  
-  class ServiceOptionSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ServiceOptionSeq,
-        ServiceOption
-      >
-    ServiceOptionSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ServiceOptionSeq,
-        ServiceOptionSeq_var,
-        ServiceOption
-      >
-    ServiceOptionSeq_out;
-  
-  class TAO_Export ServiceOptionSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ServiceOption
-          >
-  {
-  public:
-    ServiceOptionSeq (void);
-    ServiceOptionSeq (CORBA::ULong max);
-    ServiceOptionSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ServiceOptionSeq (const ServiceOptionSeq &);
-    ~ServiceOptionSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ServiceOptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ServiceType Security = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ServiceDetail;
-  
-  typedef
-    TAO_Var_Var_T<
-        ServiceDetail
-      >
-    ServiceDetail_var;
-  
-  typedef
-    TAO_Out_T<
-        ServiceDetail,
-        ServiceDetail_var
-      >
-    ServiceDetail_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export ServiceDetail
-  {
-    typedef ServiceDetail_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::ServiceDetailType service_detail_type;
-    CORBA::ServiceDetailData service_detail;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetail;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_SERVICEDETAILSEQ_CH_)
-#define _CORBA_SERVICEDETAILSEQ_CH_
-  
-  class ServiceDetailSeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ServiceDetailSeq,
-        ServiceDetail
-      >
-    ServiceDetailSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ServiceDetailSeq,
-        ServiceDetailSeq_var,
-        ServiceDetail
-      >
-    ServiceDetailSeq_out;
-  
-  class TAO_Export ServiceDetailSeq
-    : public
-        TAO_Unbounded_Sequence<
-            ServiceDetail
-          >
-  {
-  public:
-    ServiceDetailSeq (void);
-    ServiceDetailSeq (CORBA::ULong max);
-    ServiceDetailSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServiceDetail* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ServiceDetailSeq (const ServiceDetailSeq &);
-    ~ServiceDetailSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ServiceDetailSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct ServiceInformation;
-  
-  typedef
-    TAO_Var_Var_T<
-        ServiceInformation
-      >
-    ServiceInformation_var;
-  
-  typedef
-    TAO_Out_T<
-        ServiceInformation,
-        ServiceInformation_var
-      >
-    ServiceInformation_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export ServiceInformation
-  {
-    typedef ServiceInformation_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    CORBA::ServiceOptionSeq service_options;
-    CORBA::ServiceDetailSeq service_details;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceInformation;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceOptionSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceOptionSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceOptionSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceOptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetailSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetailSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetailSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetailSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
-#define _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ServiceOptionSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ServiceOptionSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_
-#define _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ServiceDetailSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ServiceDetailSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ServicesS.h b/TAO/tao/ServicesS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ServicesS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ServicesS_T.h b/TAO/tao/ServicesS_T.h
deleted file mode 100644
index d56fe84f45a..00000000000
--- a/TAO/tao/ServicesS_T.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:546
-
-#ifndef _TAO_IDL_ORIG_SERVICESS_T_H_
-#define _TAO_IDL_ORIG_SERVICESS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_CORBA
-{
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1094
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp
deleted file mode 100644
index 89e84c04f22..00000000000
--- a/TAO/tao/Services_Activate.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "tao/Services_Activate.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Services_Activate, 
-           "$Id$")
-
-TAO_Services_Activate::~TAO_Services_Activate (void)
-{
-  //no-op
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Services_Activate>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Services_Activate>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
deleted file mode 100644
index 582d6d3b94a..00000000000
--- a/TAO/tao/Services_Activate.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//=============================================================================
-/**
- *  @file    Services_Activate.h
- *
- *  $Id$
- *
- * This is a generic interface that would be used to activate
- * the services that are loaded through the svc.conf file
- *
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SERVICES_ACTIVATE_H
-#define TAO_SERVICES_ACTIVATE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-class TAO_ORB_Core;
-class TAO_Service_Callbacks;
-
-/**
- * @class TAO_Services_Activate
- *
- * @brief A class to dynamically load callback implementations in to an
- * ORB.
- *
- * Many services and components of the ORB whose default behaviour
- * needs to be changed can use this class to activate the Callback
- * hooks. These hooks can then be called by the ORB at the right
- * points.
- * @@ TODO
- */
-class TAO_Export TAO_Services_Activate : public ACE_Service_Object
-{
-public:
-  /// The destructor
-  virtual ~TAO_Services_Activate (void);
-
-  /**
-   * Create and activate the service callbacks into the orb.
-   * This method cannot throw any exception, but it can return a nil
-   * object to indicate an error condition.
-   */
-  virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_SERVICES_ACTIVATE_H*/
diff --git a/TAO/tao/ShortSeq.pidl b/TAO/tao/ShortSeq.pidl
deleted file mode 100644
index 3dd8dea9f61..00000000000
--- a/TAO/tao/ShortSeq.pidl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in ShortSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ShortSeq.pidl
- *
- * Patches for changes to the generated code are available in the
- * `diffs' directory.
- */
-// ================================================================
-
-#ifndef TAO_CORBA_SHORT_SEQ_IDL
-#define TAO_CORBA_SHORT_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<short> ShortSeq;
-};
-
-#endif  /* TAO_CORBA_SHORT_SEQ_IDL */
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
deleted file mode 100644
index 6d6b87aa1b3..00000000000
--- a/TAO/tao/ShortSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_short,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ShortSeq_0 =
-      &CORBA_ShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ShortSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ShortSeq:1.0",
-    "ShortSeq",
-    &TAO::TypeCode::tc_CORBA_ShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ShortSeq =
-    &_tao_tc_CORBA_ShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::extract (
-        _tao_any,
-        CORBA::ShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
deleted file mode 100644
index 71b2b05f73a..00000000000
--- a/TAO/tao/ShortSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ShortSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_SHORTSEQ_CS_)
-#define _CORBA_SHORTSEQ_CS_
-
-CORBA::ShortSeq::ShortSeq (void)
-{}
-
-CORBA::ShortSeq::ShortSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Short
-      >
-    (max)
-{}
-
-CORBA::ShortSeq::ShortSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Short * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Short
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ShortSeq::ShortSeq (
-    const ShortSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Short
-      >
-    (seq)
-{}
-
-CORBA::ShortSeq::~ShortSeq (void)
-{}
-
-void CORBA::ShortSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ShortSeq * _tao_tmp_pointer =
-    static_cast<ShortSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ShortSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ShortSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ShortSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_short_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ShortSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_short_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
deleted file mode 100644
index 08034a23bc8..00000000000
--- a/TAO/tao/ShortSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SHORTSEQC_H_
-#define _TAO_IDL_ORIG_SHORTSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_SHORTSEQ_CH_)
-#define _CORBA_SHORTSEQ_CH_
-  
-  class ShortSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ShortSeq,
-        CORBA::Short
-      >
-    ShortSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ShortSeq,
-        ShortSeq_var,
-        CORBA::Short
-      >
-    ShortSeq_out;
-  
-  class TAO_Export ShortSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Short
-          >
-  {
-  public:
-    ShortSeq (void);
-    ShortSeq (CORBA::ULong max);
-    ShortSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Short* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ShortSeq (const ShortSeq &);
-    ~ShortSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ShortSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ShortSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ShortSeq_H_
-#define _TAO_CDR_OP_CORBA_ShortSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ShortSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ShortSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ShortSeqS.h b/TAO/tao/ShortSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ShortSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc
deleted file mode 100644
index 4cda4747077..00000000000
--- a/TAO/tao/SmartProxies.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname   = TAO_SmartProxies
-  dynamicflags = TAO_SMARTPROXIES_BUILD_DLL
-
-  Source_Files {
-    SmartProxies
-  }
-
-  Header_Files {
-    SmartProxies
-  }
-
-  Inline_Files {
-    SmartProxies
-  }
-
-  Template_Files {
-    SmartProxies
-  }
-
-  Resource_Files {
-    SmartProxies
-  }
-
-  PIDL_Files {
-  }
-
-  Pkgconfig_Files {
-    SmartProxies/TAO_SmartProxies.pc.in
-  }
-}
diff --git a/TAO/tao/SmartProxies/SmartProxies.rc b/TAO/tao/SmartProxies/SmartProxies.rc
deleted file mode 100644
index 2c2665118ef..00000000000
--- a/TAO/tao/SmartProxies/SmartProxies.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "SmartProxies\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_SmartProxiesDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_SmartProxies.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
deleted file mode 100644
index 91e62e5cafc..00000000000
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#include "Smart_Proxies.h"
-
-ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "Smart_Proxies.inl"
-#endif /* defined INLINE */
-
-// Add this line to please the AIX linker, otherwise it complains
-// "ld: 0711-244 ERROR: No csects or exported symbols have been saved."
-
-#if defined (ACE_NDEBUG) && defined (AIX)
-int the_bogus_value_to_please_linker_to_export_symbol;
-#endif
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
deleted file mode 100644
index 5cd2bde3368..00000000000
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Smart_Proxies.h
- *
- *  $Id$
- *
- * This file contains a base class for the generated smart proxy classes
- * It's purpose is to hold the pointer to the real proxy
- *
- *  @author Brian Wallis <brian.wallis@ot.com.au>
- */
-//=============================================================================
-
-#ifndef TAO_SMARTPROXIES_H
-#define TAO_SMARTPROXIES_H
-#include /**/ "ace/pre.h"
-
-#include "smartproxies_export.h"
-#include "tao/Object.h"
-#include "tao/TAO_Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Smart_Proxy_Base
- *
- * @brief A base class for all TAO_IDL generated smart proxy base classes.
- *
- * Contains the _var pointer to the real proxy.
- */
-class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
-{
-
-public:
-  /// Destructor
-  virtual ~TAO_Smart_Proxy_Base (void);
-
-protected:
-  /// Constructor.
-  TAO_Smart_Proxy_Base (void);
-
-  /// Constructor.
-  TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy);
-
-  /// The proxy to which remote/collocated calls are made.
-  CORBA::Object_var base_proxy_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Smart_Proxies.inl"
-#endif /* defined INLINE */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SMARTPROXIES_H */
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
deleted file mode 100644
index b75c0a5d096..00000000000
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void)
-{
-}
-
-ACE_INLINE
-TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy)
-  : base_proxy_(proxy)
-{
-}
-
-ACE_INLINE
-TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
-{
-}
diff --git a/TAO/tao/SmartProxies/TAO_SmartProxies.pc.in b/TAO/tao/SmartProxies/TAO_SmartProxies.pc.in
deleted file mode 100644
index 59c34f50735..00000000000
--- a/TAO/tao/SmartProxies/TAO_SmartProxies.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_SmartProxies
-Description: TAO Smart Proxies Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_SmartProxies
-Cflags: -I${includedir}
diff --git a/TAO/tao/SmartProxies/smartproxies_export.h b/TAO/tao/SmartProxies/smartproxies_export.h
deleted file mode 100644
index 62fb3430f21..00000000000
--- a/TAO/tao/SmartProxies/smartproxies_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_SMARTPROXIES_EXPORT_H
-#define TAO_SMARTPROXIES_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_SMARTPROXIES_HAS_DLL)
-#    define TAO_SMARTPROXIES_HAS_DLL 0
-#  endif /* ! TAO_SMARTPROXIES_HAS_DLL */
-#else
-#  if !defined (TAO_SMARTPROXIES_HAS_DLL)
-#    define TAO_SMARTPROXIES_HAS_DLL 1
-#  endif /* ! TAO_SMARTPROXIES_HAS_DLL */
-#endif
-
-#if defined (TAO_SMARTPROXIES_HAS_DLL) && (TAO_SMARTPROXIES_HAS_DLL == 1)
-#  if defined (TAO_SMARTPROXIES_BUILD_DLL)
-#    define TAO_SmartProxies_Export ACE_Proper_Export_Flag
-#    define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_SMARTPROXIES_BUILD_DLL */
-#    define TAO_SmartProxies_Export ACE_Proper_Import_Flag
-#    define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_SMARTPROXIES_BUILD_DLL */
-#else /* TAO_SMARTPROXIES_HAS_DLL == 1 */
-#  define TAO_SmartProxies_Export
-#  define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T)
-#  define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_SMARTPROXIES_HAS_DLL == 1 */
-
-#endif /* TAO_SMARTPROXIES_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
deleted file mode 100644
index 3fe67efa366..00000000000
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-
-#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_C
-#define TAO_SPECIAL_BASIC_ARGUMENT_T_C
-
-#include "tao/Special_Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Special_Basic_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Special_Basic_Argument_T,
-           "$Id$")
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << from_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << from_S (this->x_);
-}
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, typename to_S, typename from_S>
-CORBA::Boolean
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> to_S (this->x_);
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename to_S, typename from_S>
-void
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
-{
-  (*any) <<= from_S (this->x_);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
-
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
deleted file mode 100644
index 456e5d9a9d8..00000000000
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Special_Basic_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_H
-#define TAO_SPECIAL_BASIC_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace TAO
-{
-  /**
-   * @class In_Special_Basic_Argument_T
-   *
-   * @brief Template class for IN stub argument of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_Argument_T : public Argument
-  {
-  public:
-    In_Special_Basic_Argument_T (S const &);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
-
-  private:
-    S const & x_;
-  };
-
-  /**
-   * @class Inout_Special_Basic_Argument_T
-   *
-   * @brief Template class for INOUT stub argument of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_Argument_T : public Argument
-  {
-  public:
-    Inout_Special_Basic_Argument_T (S & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S & x_;
-  };
-
-  /**
-   * @class Out_Special_Basic_Argument_T
-   *
-   * @brief Template class for OUT stub argument of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_Argument_T : public Argument
-  {
-  public:
-    Out_Special_Basic_Argument_T (S & x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S & x_;
-  };
-
-  /**
-   * @class Ret_Basic_Argument_T
-   *
-   * @brief Template class for return stub value of (w)char/boolean/octet.
-   *
-   */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_Argument_T : public Argument
-  {
-  public:
-    Ret_Special_Basic_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-    S excp (void);
-    S retn (void);
-
-  private:
-    S x_;
-  };
-
-  /**
-   * @struct Special_Basic_Tag
-   *
-   * @brief Struct for basic IDL type arguments id tag.
-   *
-   */
-  struct TAO_Export Special_Basic_Tag {};
-
-  /**
-   * @struct Special_Basic_Traits_T
-   *
-   * @brief Template class for stub argument traits of (w)char/boolean/octet.
-   *
-   */
-  template<typename T, typename to_T, typename from_T>
-  struct Special_Basic_Arg_Traits_T
-  {
-    typedef T                                               ret_type;
-    typedef T                                               in_type;
-    typedef T &                                             inout_type;
-    typedef T &                                             out_type;
-
-    typedef In_Special_Basic_Argument_T<T,to_T,from_T>      in_arg_val;
-    typedef Inout_Special_Basic_Argument_T<T,to_T,from_T>   inout_arg_val;
-    typedef Out_Special_Basic_Argument_T<T,to_T,from_T>     out_arg_val;
-    typedef Ret_Special_Basic_Argument_T<T,to_T,from_T>     ret_val;
-
-    typedef Special_Basic_Tag                               idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Special_Basic_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Special_Basic_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Special_Basic_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_H */
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
deleted file mode 100644
index 66887ab09a3..00000000000
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::In_Special_Basic_Argument_T (
-     S const & x
-  )
-  : x_ (x)
-{}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S const &
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::
-Inout_Special_Basic_Argument_T (S & x)
-  : x_ (x)
-{}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S &
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::
-Out_Special_Basic_Argument_T (S & x)
-  : x_ (x)
-{}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S &
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
-// ===========================================================================
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::
-Ret_Special_Basic_Argument_T (void)
-{
-}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S &
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
-{
-  return this->x_;
-}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::excp (void)
-{
-  return this->x_;
-}
-
-template<typename S, typename to_S, typename from_S>
-ACE_INLINE
-S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::retn (void)
-{
-  return this->x_;
-}
-
diff --git a/TAO/tao/Special_Basic_Arguments.cpp b/TAO/tao/Special_Basic_Arguments.cpp
deleted file mode 100644
index 717094a1ba6..00000000000
--- a/TAO/tao/Special_Basic_Arguments.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-
-#include "tao/Special_Basic_Arguments.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// Inclusions only if explicit templates are enabled.
-#include "Basic_Types.h"
-#include "CDR.h"
-#endif /*ACE_HAS_TEMPLATE_INSTANTIATION ||
-         ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-ACE_RCSID (tao,
-           Special_Basic_Arguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Arg_Traits<ACE_InputCDR::to_char>;
-template class TAO::Arg_Traits<ACE_InputCDR::to_wchar>;
-template class TAO::Arg_Traits<ACE_InputCDR::to_octet>;
-template class TAO::Arg_Traits<ACE_InputCDR::to_boolean>;
-
-template class TAO::Special_Basic_Arg_Traits_T<CORBA::Char,
-                                               ACE_InputCDR::to_char,
-                                               ACE_OutputCDR::from_char>;
-
-template class TAO::Special_Basic_Arg_Traits_T<CORBA::WChar,
-                                               ACE_InputCDR::to_wchar,
-                                               ACE_OutputCDR::from_wchar>;
-
-template class TAO::Special_Basic_Arg_Traits_T<CORBA::Octet,
-                                               ACE_InputCDR::to_octet,
-                                               ACE_OutputCDR::from_octet>;
-
-template class TAO::Special_Basic_Arg_Traits_T<CORBA::Boolean,
-                                               ACE_InputCDR::to_boolean,
-                                               ACE_OutputCDR::from_boolean>;
-
-template class TAO::In_Special_Basic_Argument_T<CORBA::Boolean,
-                                                ACE_InputCDR::to_boolean,
-                                                ACE_OutputCDR::from_boolean>;
-template class TAO::Inout_Special_Basic_Argument_T<CORBA::Boolean,
-                                                   ACE_InputCDR::to_boolean,
-                                                   ACE_OutputCDR::from_boolean>;
-template class TAO::Out_Special_Basic_Argument_T<CORBA::Boolean,
-                                                 ACE_InputCDR::to_boolean,
-                                                 ACE_OutputCDR::from_boolean>;
-template class TAO::Ret_Special_Basic_Argument_T<CORBA::Boolean,
-                                                 ACE_InputCDR::to_boolean,
-                                                 ACE_OutputCDR::from_boolean>;
-
-template class TAO::In_Special_Basic_Argument_T<CORBA::Char,
-                                                ACE_InputCDR::to_char,
-                                                ACE_OutputCDR::from_char>;
-template class TAO::Inout_Special_Basic_Argument_T<CORBA::Char,
-                                                   ACE_InputCDR::to_char,
-                                                   ACE_OutputCDR::from_char>;
-template class TAO::Out_Special_Basic_Argument_T<CORBA::Char,
-                                                 ACE_InputCDR::to_char,
-                                                 ACE_OutputCDR::from_char>;
-template class TAO::Ret_Special_Basic_Argument_T<CORBA::Char,
-                                                 ACE_InputCDR::to_char,
-                                                 ACE_OutputCDR::from_char>;
-
-template class TAO::In_Special_Basic_Argument_T<CORBA::WChar,
-                                                ACE_InputCDR::to_wchar,
-                                                ACE_OutputCDR::from_wchar>;
-template class TAO::Inout_Special_Basic_Argument_T<CORBA::WChar,
-                                                   ACE_InputCDR::to_wchar,
-                                                   ACE_OutputCDR::from_wchar>;
-template class TAO::Out_Special_Basic_Argument_T<CORBA::WChar,
-                                                 ACE_InputCDR::to_wchar,
-                                                 ACE_OutputCDR::from_wchar>;
-template class TAO::Ret_Special_Basic_Argument_T<CORBA::WChar,
-                                                 ACE_InputCDR::to_wchar,
-                                                 ACE_OutputCDR::from_wchar>;
-
-template class TAO::In_Special_Basic_Argument_T<CORBA::Octet,
-                                                ACE_InputCDR::to_octet,
-                                                ACE_OutputCDR::from_octet>;
-template class TAO::Inout_Special_Basic_Argument_T<CORBA::Octet,
-                                                   ACE_InputCDR::to_octet,
-                                                   ACE_OutputCDR::from_octet>;
-template class TAO::Out_Special_Basic_Argument_T<CORBA::Octet,
-                                                 ACE_InputCDR::to_octet,
-                                                 ACE_OutputCDR::from_octet>;
-template class TAO::Ret_Special_Basic_Argument_T<CORBA::Octet,
-                                                 ACE_InputCDR::to_octet,
-                                                 ACE_OutputCDR::from_octet>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_char>
-#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_wchar>
-#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_octet>
-#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_boolean>
-
-#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
-                              CORBA::Char, \
-                              ACE_InputCDR::to_char, \
-                              ACE_OutputCDR::from_char \
-                            >
-
-#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
-                              CORBA::WChar, \
-                              ACE_InputCDR::to_wchar, \
-                              ACE_OutputCDR::from_wchar \
-                            >
-
-#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
-                              CORBA::Octet, \
-                              ACE_InputCDR::to_octet, \
-                              ACE_OutputCDR::from_octet \
-                            >
-
-#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
-                              CORBA::Boolean, \
-                              ACE_InputCDR::to_boolean, \
-                              ACE_OutputCDR::from_boolean \
-                            >
-
-#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Char, \
-                                                ACE_InputCDR::to_char, \
-                                                ACE_OutputCDR::from_char>
-#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Char, \
-                                                   ACE_InputCDR::to_char, \
-                                                   ACE_OutputCDR::from_char>
-#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Char, \
-                                                 ACE_InputCDR::to_char, \
-                                                 ACE_OutputCDR::from_char>
-#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Char, \
-                                                 ACE_InputCDR::to_char, \
-                                                 ACE_OutputCDR::from_char>
-
-#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::WChar, \
-                                                ACE_InputCDR::to_wchar, \
-                                                ACE_OutputCDR::from_wchar>
-#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::WChar, \
-                                                   ACE_InputCDR::to_wchar, \
-                                                   ACE_OutputCDR::from_wchar>
-#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::WChar, \
-                                                 ACE_InputCDR::to_wchar, \
-                                                 ACE_OutputCDR::from_wchar>
-#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::WChar, \
-                                                 ACE_InputCDR::to_wchar, \
-                                                 ACE_OutputCDR::from_wchar>
-
-#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Octet, \
-                                                ACE_InputCDR::to_octet, \
-                                                ACE_OutputCDR::from_octet>
-#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Octet, \
-                                                   ACE_InputCDR::to_octet, \
-                                                   ACE_OutputCDR::from_octet>
-#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Octet, \
-                                                 ACE_InputCDR::to_octet, \
-                                                 ACE_OutputCDR::from_octet>
-#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Octet, \
-                                                 ACE_InputCDR::to_octet, \
-                                                 ACE_OutputCDR::from_octet>
-
-#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Boolean, \
-                                                ACE_InputCDR::to_boolean, \
-                                                ACE_OutputCDR::from_boolean>
-#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Boolean, \
-                                                   ACE_InputCDR::to_boolean, \
-                                                   ACE_OutputCDR::from_boolean>
-#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Boolean, \
-                                                 ACE_InputCDR::to_boolean, \
-                                                 ACE_OutputCDR::from_boolean>
-#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Boolean, \
-                                                 ACE_InputCDR::to_boolean, \
-                                                 ACE_OutputCDR::from_boolean>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h
deleted file mode 100644
index 487354abb36..00000000000
--- a/TAO/tao/Special_Basic_Arguments.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Special_Basic_Arguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_SPECIAL_BASIC_ARGUMENTS_H
-#define TAO_SPECIAL_BASIC_ARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CDR_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Special_Basic_Argument_T.h"
-#include "Arg_Traits_T.h"
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specializations for (w)char, octet and boolean.
-   *
-   */
-
-  template<>
-  class TAO_Export Arg_Traits<ACE_InputCDR::to_char>
-    : public Special_Basic_Arg_Traits_T<CORBA::Char,
-                                        ACE_InputCDR::to_char,
-                                        ACE_OutputCDR::from_char>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<ACE_InputCDR::to_wchar>
-    : public Special_Basic_Arg_Traits_T<CORBA::WChar,
-                                        ACE_InputCDR::to_wchar,
-                                        ACE_OutputCDR::from_wchar>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<ACE_InputCDR::to_octet>
-    : public Special_Basic_Arg_Traits_T<CORBA::Octet,
-                                        ACE_InputCDR::to_octet,
-                                        ACE_OutputCDR::from_octet>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<ACE_InputCDR::to_boolean>
-    : public Special_Basic_Arg_Traits_T<CORBA::Boolean,
-                                        ACE_InputCDR::to_boolean,
-                                        ACE_OutputCDR::from_boolean>
-  {
-  };
-}
-
-#include /**/"ace/post.h"
-
-#endif /* TAO_SPECIAL_BASIC_ARGUMENTS_H */
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
deleted file mode 100644
index d4ae5aa3c54..00000000000
--- a/TAO/tao/Strategies.mpc
+++ /dev/null
@@ -1,34 +0,0 @@
-//$Id$
-
-project : taolib, core {
-  sharedname   = TAO_Strategies
-  dynamicflags = TAO_STRATEGIES_BUILD_DLL
-
-  Source_Files {
-    Strategies
-  }
-
-  Header_Files {
-    Strategies
-  }
-
-  Inline_Files {
-    Strategies
-  }
-
-  Template_Files {
-    Strategies
-  }
-
-  Resource_Files {
-    Strategies
-  }
-
-  PIDL_Files {
-    Strategies
-  }
-
-  Pkgconfig_Files {
-    Strategies/TAO_Strategies.pc.in
-  }
-}
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
deleted file mode 100644
index ac7765a5f84..00000000000
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ /dev/null
@@ -1,748 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "DIOP_Acceptor.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "DIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/CDR.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (Strategies,
-           DIOP_Acceptor,
-           "$Id$")
-
-TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_DIOP_PROFILE),
-    addrs_ (0),
-    hosts_ (0),
-    endpoint_count_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    lite_flag_ (flag),
-    connection_handler_ (0)
-{
-}
-
-TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete [] this->addrs_;
-
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    CORBA::string_free (this->hosts_[i]);
-
-  delete [] this->hosts_;
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-
-int
-TAO_DIOP_Acceptor::create_profile (const TAO::ObjectKey & object_key,
-                                   TAO_MProfile &mprofile,
-                                   CORBA::Short priority)
-{
-  // Sanity check.
-  if (this->endpoint_count_ == 0)
-    return -1;
-
-  // Check if multiple endpoints should be put in one profile or if
-  // they should be spread across multiple profiles.
-  if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
-  else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
-}
-
-int
-TAO_DIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Short priority)
-{
-  // Adding this->endpoint_count_ to the TAO_MProfile.
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < this->endpoint_count_
-      && mprofile.grow (count + this->endpoint_count_) == -1)
-    return -1;
-
-  // Create a profile for each acceptor endpoint.
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    {
-      TAO_DIOP_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_DIOP_Profile (this->hosts_[i],
-                                        this->addrs_[i].get_port_number (),
-                                        object_key,
-                                        this->addrs_[i],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      pfile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (pfile) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-          return -1;
-        }
-
-      // Do not add any tagged components to the profile if configured
-      // by the user not to do so, or if an IIOP 1.0 endpoint is being
-      // created (IIOP 1.0 did not support tagged components).
-      if (this->orb_core_->orb_params ()->std_profile_components () == 0
-          || (this->version_.major == 1 && this->version_.minor == 0))
-        continue;
-
-      pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-      this->orb_core_->codeset_manager()->
-        set_codeset(pfile->tagged_components());
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                          TAO_MProfile &mprofile,
-                                          CORBA::Short priority)
-{
-  size_t index = 0;
-  TAO_Profile *pfile = 0;
-  TAO_DIOP_Profile *iiop_profile = 0;
-
-  // First see if <mprofile> already contains a DIOP profile.
-  for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
-    {
-      pfile = mprofile.get_profile (i);
-      if (pfile->tag () == TAO_TAG_DIOP_PROFILE)
-      {
-        iiop_profile = dynamic_cast<TAO_DIOP_Profile *> (pfile);
-        break;
-      }
-    }
-
-  // If <mprofile> doesn't contain a DIOP_Profile, we need to create
-  // one.
-  if (iiop_profile == 0)
-    {
-      ACE_NEW_RETURN (iiop_profile,
-                      TAO_DIOP_Profile (this->hosts_[0],
-                                        this->addrs_[0].get_port_number (),
-                                        object_key,
-                                        this->addrs_[0],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      iiop_profile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (iiop_profile) == -1)
-        {
-          iiop_profile->_decr_refcnt ();
-          iiop_profile = 0;
-          return -1;
-        }
-
-      if (this->orb_core_->orb_params ()->std_profile_components () != 0
-          && (this->version_.major >= 1 && this->version_.minor >= 1))
-        {
-          iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-          this->orb_core_->codeset_manager()->
-            set_codeset(iiop_profile->tagged_components());
-        }
-
-      index = 1;
-    }
-
-  // Add any remaining acceptor endpoints to the DIOP_Profile.
-  for (;
-       index < this->endpoint_count_;
-       ++index)
-    {
-      TAO_DIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_DIOP_Endpoint (this->hosts_[index],
-                                         this->addrs_[index].get_port_number (),
-                                         this->addrs_[index]),
-                      -1);
-      endpoint->priority (priority);
-      iiop_profile->add_endpoint (endpoint);
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_DIOP_Endpoint *endp =
-    dynamic_cast<const TAO_DIOP_Endpoint *> (endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    {
-      // compare the port and host name.  Please do *NOT* optimize
-      // this code by comparing the IP address instead.  That would
-      // trigger the following bug:
-      //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
-      //
-      if (endp->port() == this->addrs_[i].get_port_number()
-          && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0)
-        return 1;  // Collocated
-    }
-
-  return 0;  // Not collocated
-}
-
-int
-TAO_DIOP_Acceptor::close (void)
-{
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         ACE_Reactor *reactor,
-                         int major,
-                         int minor,
-                         const char *address,
-                         const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open - ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (address == 0)
-    return -1;
-
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  ACE_INET_Addr addr;
-
-  const char *port_separator_loc = ACE_OS::strchr (address, ':');
-  const char *specified_hostname = 0;
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (port_separator_loc == address)
-    {
-      // The address is a port number or port name.  No hostname was
-      // specified.  The hostname for each network interface and the
-      // fully qualified domain name must be obtained.
-
-      // Check for multiple network interfaces.
-      if (this->probe_interfaces (orb_core) == -1)
-        return -1;
-
-      // First convert the port into a usable form.
-      if (addr.set (address + sizeof (':')) != 0)
-        return -1;
-
-      // Now reset the port and set the host.
-      if (addr.set (addr.get_port_number (),
-                    static_cast<ACE_UINT32> (INADDR_ANY),
-                    1) != 0)
-        return -1;
-      else
-        return this->open_i (addr,
-                             reactor);
-    }
-  else if (port_separator_loc == 0)
-    {
-      // The address is a hostname.  No port was specified, so assume
-      // port zero (port will be chosen for us).
-      if (addr.set ((unsigned short) 0, address) != 0)
-        return -1;
-
-      specified_hostname = address;
-    }
-  else
-    {
-      // Host and port were specified.
-      if (addr.set (address) != 0)
-        return -1;
-
-      // Extract out just the host part of the address.
-      size_t len = port_separator_loc - address;
-      ACE_OS::memcpy (tmp_host, address, len);
-      tmp_host[len] = '\0';
-
-      specified_hostname = tmp_host;
-    }
-
-  this->endpoint_count_ = 1;  // Only one hostname to store
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  this->hosts_[0] = 0;
-
-  if (this->hostname (orb_core,
-                      addr,
-                      this->hosts_[0],
-                      specified_hostname) != 0)
-    return -1;
-
-  // Copy the addr.  The port is (re)set in
-  // TAO_DIOP_Acceptor::open_i().
-  if (this->addrs_[0].set (addr) != 0)
-    return -1;
-
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                 ACE_Reactor *reactor,
-                                 int major,
-                                 int minor,
-                                 const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open_default - ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  // Check for multiple network interfaces.
-  if (this->probe_interfaces (orb_core) == -1)
-    return -1;
-
-  // Now that each network interface's hostname has been cached, open
-  // an endpoint on each network interface using the INADDR_ANY
-  // address.
-  ACE_INET_Addr addr;
-
-  if (addr.set (static_cast<unsigned short> (0),
-                static_cast<ACE_UINT32> (INADDR_ANY),
-                1) != 0)
-    return -1;
-
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
-                           ACE_Reactor *reactor)
-{
-  ACE_NEW_RETURN (this->connection_handler_,
-                  TAO_DIOP_Connection_Handler (this->orb_core_,
-                                               this->lite_flag_),
-                  -1);
-
-  this->connection_handler_->local_addr (addr);
-  this->connection_handler_->open_server ();
-
-  // Register only with a valid handle
-  int result =
-    reactor->register_handler (this->connection_handler_,
-                               ACE_Event_Handler::READ_MASK);
-  if (result == -1)
-    return result;
-
-  // Connection handler ownership now belongs to the Reactor.
-  this->connection_handler_->remove_reference ();
-
-  ACE_INET_Addr address;
-
-  // We do this make sure the port number the endpoint is listening on
-  // gets set in the addr.
-  if (this->connection_handler_->dgram ().get_local_addr (address) != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Acceptor::open_i ")
-                    ACE_TEXT ("- %p"),
-                    ACE_TEXT ("cannot get local addr\n")));
-      return -1;
-    }
-
-  // Set the port for each addr.  If there is more than one network
-  // interface then the endpoint created on each interface will be on
-  // the same port.  This is how a wildcard socket bind() is supposed
-  // to work.
-  u_short port = address.get_port_number ();
-  for (size_t j = 0; j < this->endpoint_count_; ++j)
-    this->addrs_[j].set_port_number (port, 1);
-
-  if (TAO_debug_level > 5)
-    {
-      for (size_t i = 0; i < this->endpoint_count_; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]),
-                      this->addrs_[i].get_port_number ()));
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
-                             ACE_INET_Addr &addr,
-                             char *&host,
-                             const char *specified_hostname)
-{
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // If dotted decimal addresses are enabled,
-      // just return ours.
-      return this->dotted_decimal_address (addr, host);
-    }
-  else
-  if (specified_hostname != 0)
-    {
-      // If the user specified a hostname, pass it back
-      // blindly as it overrides our choice of hostname.
-      host = CORBA::string_dup (specified_hostname);
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN + 1];
-
-      // Get the hostname associated with our address
-      if (addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-        {
-          // On failure, just return the decimal address.
-          return this->dotted_decimal_address (addr, host);
-        }
-      else
-        {
-          host = CORBA::string_dup (tmp_host);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
-                                           char *&host)
-{
-  const char *tmp = addr.get_host_addr ();
-  if (tmp == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) ")
-                    ACE_TEXT ("DIOP_Acceptor::dotted_decimal_address ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot determine hostname")));
-      return -1;
-    }
-
-  host = CORBA::string_dup (tmp);
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
-{
-  // Extract the hostname for each network interface, and then cache
-  // it.  The hostnames will then be used when creating a
-  // TAO_DIOP_Profile for each endpoint setup on the probed
-  // network interfaces.
-  ACE_INET_Addr *if_addrs = 0;
-  size_t if_cnt = 0;
-
-  if (ACE::get_ip_interfaces (if_cnt,
-                              if_addrs) != 0
-      && errno != ENOTSUP)
-    {
-      // In the case where errno == ENOTSUP, if_cnt and if_addrs will
-      // not be modified, and will each remain equal to zero.  This
-      // causes the default interface to be used.
-      return -1;
-    }
-
-  if (if_cnt == 0 || if_addrs == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) Unable to probe network ")
-                      ACE_TEXT ("interfaces.  Using default.")));
-        }
-
-      if_cnt = 1; // Force the network interface count to be one.
-      delete [] if_addrs;
-      ACE_NEW_RETURN (if_addrs,
-                      ACE_INET_Addr[if_cnt],
-                      -1);
-    }
-
-  // Scan for the loopback interface since it shouldn't be included in
-  // the list of cached hostnames unless it is the only interface.
-  size_t lo_cnt = 0;  // Loopback interface count
-  for (size_t j = 0; j < if_cnt; ++j)
-    if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
-      lo_cnt++;
-
-  // The instantiation for this template is in
-  // tao/DIOP_Connector.cpp.
-  ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_if_addrs (if_addrs);
-
-  // If the loopback interface is the only interface then include it
-  // in the list of interfaces to query for a hostname, otherwise
-  // exclude it from the list.
-  if (if_cnt == lo_cnt)
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt);
-  else
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt - lo_cnt);
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  ACE_OS::memset (this->hosts_, 0, sizeof (char*) * this->endpoint_count_);
-
-  // The number of hosts/interfaces we want to cache may not be the
-  // same as the number of detected interfaces so keep a separate
-  // count.
-  size_t host_cnt = 0;
-
-  for (size_t i = 0; i < if_cnt; ++i)
-    {
-      // Ignore any loopback interface if there are other
-      // non-loopback interfaces.
-      if (if_cnt != lo_cnt &&
-          if_addrs[i].get_ip_address() == INADDR_LOOPBACK)
-        continue;
-
-      if (this->hostname (orb_core,
-                          if_addrs[i],
-                          this->hosts_[host_cnt]) != 0)
-        return -1;
-
-      // Copy the addr.  The port is (re)set in
-      // TAO_DIOP_Acceptor::open_i().
-      if (this->addrs_[host_cnt].set (if_addrs[i]) != 0)
-        return -1;
-
-      host_cnt++;
-    }
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_DIOP_Acceptor::endpoint_count (void)
-{
-  return this->endpoint_count_;
-}
-
-int
-TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO::ObjectKey &object_key)
-{
-  // Create the decoding stream from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't*do any*
-  // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
-  {
-    if (TAO_debug_level > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Profile::decode - v%d.%d\n"),
-                    major,
-                    minor));
-      }
-    return -1;
-  }
-
-  CORBA::String_var host;
-  CORBA::UShort port = 0;
-
-  // Get host and port. No processing here too..
-  if (cdr.read_string (host.out ()) == 0
-      || cdr.read_ushort (port) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) TAO_DIOP_Acceptor::object_key - ")
-                      ACE_TEXT ("error while decoding host/port")));
-        }
-      return -1;
-    }
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  // We are NOT bothered about the rest.
-
-  return 1;
-}
-
-
-int
-TAO_DIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  ACE_CString options (str);
-
-  size_t len = options.length ();
-
-  const char option_delimiter = '&';
-
-  // Count the number of options.
-
-  CORBA::ULong option_count = 1;
-  // Number of endpoints in the string  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      option_count++;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  int begin = 0;
-  int end = -1;
-
-  for (CORBA::ULong j = 0; j < option_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < option_count - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = static_cast<int> (len - begin); // Handle last endpoint differently
-
-      if (end == begin)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) Zero length DIOP option.\n")),
-                          -1);
-      else if (end != ACE_CString::npos)
-        {
-          ACE_CString opt = options.substring (begin, end);
-
-          int slot = opt.find ("=");
-
-          if (slot == static_cast<int> (len - 1)
-              || slot == ACE_CString::npos)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ")
-                               ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())),
-                              -1);
-
-          ACE_CString name = opt.substring (0, slot);
-          ACE_CString value = opt.substring (slot + 1);
-
-          if (name.length () == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Zero length DIOP ")
-                               ACE_TEXT ("option name.\n")),
-                              -1);
-
-          if (name == "priority")
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
-                                -1);
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())),
-                              -1);
-        }
-    }
-  return 0;
-}
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h
deleted file mode 100644
index 4ff200dc543..00000000000
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DIOP_Acceptor.h
- *
- *  $Id$
- *
- *  DIOP specific acceptor processing
- *
- *  @author  Michael Kircher
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_ACCEPTOR_H
-#define TAO_DIOP_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Transport_Acceptor.h"
-#include "DIOP_Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-
-#include "tao/GIOP_Message_Version.h"
-
-// TAO DIOP_Acceptor concrete call defination
-
-/**
- * @class TAO_DIOP_Acceptor
- *
- * @brief TAO_DIOP_Acceptor
- *
- * The DIOP-specific bridge class for the concrete acceptor.
- */
-class TAO_Strategies_Export TAO_DIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  /// Constructor.
-  TAO_DIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_DIOP_Acceptor (void);
-
-  /// @@ Helper method for the implementation repository, should go
-  ///    away
-  const ACE_INET_Addr& address (void) const;
-
-  /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
-
-  /**
-   * @name The TAO_Acceptor Methods
-   *
-   * Please check the documentation in Transport_Acceptor.h for details.
-   */
-  //@{
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority);
-
-  virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key);
-  //@}
-
-  /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
-   * is useful if the given address corresponds to more than one
-   * hostname and the desired one cannot be determined in any
-   * other way.
-   */
-  int hostname (TAO_ORB_Core *orb_core,
-                ACE_INET_Addr &addr,
-                char *&host,
-                const char *specified_hostname = 0);
-
-  /**
-   * Set the host name for the given address using the dotted decimal
-   * format.
-   */
-  int dotted_decimal_address (ACE_INET_Addr &addr,
-                              char *&host);
-
-protected:
-
-  /**
-   * Implement the common part of the open*() methods.  This method is
-   * virtual to allow a derived class implementation to be invoked
-   * instead.
-   */
-  virtual int open_i (const ACE_INET_Addr &addr,
-                      ACE_Reactor *reactor);
-
-  /**
-   * Probe the system for available network interfaces, and initialize
-   * the <addrs_> array with an ACE_INET_Addr for each network
-   * interface.  The port for each initialized ACE_INET_Addr will be
-   * set in the open_i() method.  This method only gets invoked when
-   * no explicit hostname is provided in the specified endpoint.
-   */
-  int probe_interfaces (TAO_ORB_Core *orb_core);
-
-  /// Parse protocol specific options.
-  virtual int parse_options (const char *options);
-
-  /// Helper method to add a new profile to the mprofile for
-  /// each endpoint.
-  int create_new_profile (const TAO::ObjectKey &object_key,
-                          TAO_MProfile &mprofile,
-                          CORBA::Short priority);
-
-  /// Helper method to create a profile that contains all of
-  /// our endpoints.
-  int create_shared_profile (const TAO::ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             CORBA::Short priority);
-protected:
-
-  /// Array of ACE_INET_Addr instances, each one corresponding to a
-  /// given network interface.
-  ACE_INET_Addr *addrs_;
-
-  /**
-   * Cache the information about the endpoints serviced by this
-   * acceptor.
-   * There may in fact be multiple hostnames for this endpoint. For
-   * example, if the IP address is INADDR_ANY (0.0.0.0) then there
-   * will be possibly a different hostname for each interface.
-   */
-  char **hosts_;
-
-  /// The number of host names cached in the hosts_ array (equivalent
-  /// to the number of endpoints opened by this Acceptor).
-  CORBA::ULong endpoint_count_;
-
-  /**
-   * The GIOP version for this endpoint
-   * @@ Theoretically they shouldn't be here!! We need to look at a
-   * way to move this out
-   */
-  TAO_GIOP_Message_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// Should we use GIOP lite??
-  CORBA::Boolean lite_flag_;
-
-private:
-  // @@ Frank: From DIOP_Acceptor.h
-  TAO_DIOP_Connection_Handler *connection_handler_;
-
-};
-
-#if defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DIOP_ACCEPTOR_H */
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.i b/TAO/tao/Strategies/DIOP_Acceptor.i
deleted file mode 100644
index 9aaf71a3d41..00000000000
--- a/TAO/tao/Strategies/DIOP_Acceptor.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_DIOP_Acceptor::address (void) const
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  // @@ This is busted.
-  //    The Implementation Repository will have to start supporting
-  //    IORs with multiple profiles.  For now, we just return the
-  //    first addr.
-  //                    -Ossama
-  return this->addrs_[0];
-}
-
-ACE_INLINE const ACE_INET_Addr *
-TAO_DIOP_Acceptor::endpoints (void)
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  return this->addrs_;
-}
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
deleted file mode 100644
index c768a46dc58..00000000000
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-// $Id$
-
-#include "DIOP_Connection_Handler.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Timeprobe.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Resume_Handle.h"
-
-#include "DIOP_Transport.h"
-#include "DIOP_Endpoint.h"
-
-#include "ace/os_include/netinet/os_tcp.h"
-#include "ace/os_include/os_netdb.h"
-
-ACE_RCSID(tao, DIOP_Connect, "$Id$")
-
-TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (0);
-}
-
-
-TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag)
-  : TAO_DIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  TAO_DIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-           TAO_DIOP_Transport(this, orb_core, flag));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-}
-
-
-TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-  this->udp_socket_.close ();
-}
-
-// DIOP Additions - Begin
-ACE_HANDLE
-TAO_DIOP_Connection_Handler::get_handle (void) const
-{
-  return this->udp_socket_.get_handle ();
-}
-
-
-const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::addr (void)
-{
-  return this->addr_;
-}
-
-
-void
-TAO_DIOP_Connection_Handler::addr (const ACE_INET_Addr &addr)
-{
-  this->addr_ = addr;
-}
-
-
-const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::local_addr (void)
-{
-  return local_addr_;
-}
-
-
-void
-TAO_DIOP_Connection_Handler::local_addr (const ACE_INET_Addr &addr)
-{
-  local_addr_ = addr;
-}
-
-
-const ACE_SOCK_Dgram &
-TAO_DIOP_Connection_Handler::dgram (void)
-{
-  return this->udp_socket_;
-}
-// DIOP Additions - End
-
-int
-TAO_DIOP_Connection_Handler::open_handler (void *v)
-{
-  return this->open (v);
-}
-
-int
-TAO_DIOP_Connection_Handler::open (void*)
-{
-  // Currently, the DIOP properties are not used.  This code is here
-  // for consistency with other protocols.
-  TAO_DIOP_Protocol_Properties protocol_properties;
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
-
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (client)
-        {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  this->udp_socket_.open (this->local_addr_);
-
-  if (TAO_debug_level > 5)
-  {
-     ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -")
-                 ACE_TEXT("listening on: <%s:%u>\n"),
-                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
-                 this->local_addr_.get_port_number ()));
-  }
-
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
-
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 0;
-}
-
-int
-TAO_DIOP_Connection_Handler::open_server (void)
-{
-  this->udp_socket_.open (this->local_addr_);
-  if( TAO_debug_level > 5)
-  {
-     ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -")
-                 ACE_TEXT("listening on %s:%d\n"),
-                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
-                 this->local_addr_.get_port_number ()
-               ));
-  }
-
-  this->transport ()->id ((size_t) this->get_handle ());
-
-  return 0;
-}
-
-int
-TAO_DIOP_Connection_Handler::resume_handler (void)
-{
-  return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
-}
-
-int
-TAO_DIOP_Connection_Handler::close_connection (void)
-{
-  return this->close_connection_eh (this);
-}
-
-int
-TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_eh (h, this);
-}
-
-int
-TAO_DIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
-{
-  int result =
-    this->handle_output_eh (handle, this);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_DIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                             const void *)
-{
-  // We don't use this upcall from the Reactor.  However, we should
-  // override this since the base class returns -1 which will result
-  // in handle_close() getting called.
-  return 0;
-}
-
-int
-TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                           ACE_Reactor_Mask)
-{
-  // No asserts here since the handler is registered with the Reactor
-  // and the handler ownership is given to the Reactor.  When the
-  // Reactor closes, it will call handle_close() on the handler.  It
-  // is however important to overwrite handle_close() to do nothing
-  // since the base class does too much.
-  return 0;
-}
-
-int
-TAO_DIOP_Connection_Handler::close (u_long)
-{
-  return this->close_handler ();
-}
-
-int
-TAO_DIOP_Connection_Handler::release_os_resources (void)
-{
-  return this->peer ().close ();
-}
-
-int
-TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
-{
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = (int)(codepoint) << 2;
-    }
-
-  if (tos != this->dscp_codepoint_)
-    {
-      int result = this->dgram ().set_option (IPPROTO_IP,
-                                              IP_TOS,
-                                              (int *) &tos ,
-                                              (int) sizeof (tos));
-
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - DIOP_Connection_Handler::"
-                      "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
-                      tos,
-                      result,
-                      result == -1 ? "try running as superuser" : ""));
-        }
-
-      // On successful setting of TOS field.
-      if (result == 0)
-        this->dscp_codepoint_ = tos;
-
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>;
-template class ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
deleted file mode 100644
index 933a1f4254d..00000000000
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   DIOP_Connection_Handler.h
- *
- *  $Id$
- *
- *  @author  Michael Kircher
- */
-// ===================================================================
-
-#ifndef TAO_DIOP_CONNECTION_HANDLER_H
-#define TAO_DIOP_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-
-#include "tao/Wait_Strategy.h"
-#include "tao/Connection_Handler.h"
-#include "DIOP_Transport.h"
-#include "ace/SOCK_Dgram.h"
-#include "strategies_export.h"
-
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
-// ****************************************************************
-
-/**
- * @class TAO_DIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-
-
-class TAO_Strategies_Export TAO_DIOP_Connection_Handler :
-  public TAO_DIOP_SVC_HANDLER,
-  public TAO_Connection_Handler
-{
-
-public:
-
-  TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
-
-  /// Constructor.
-  TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag);
-
-  /// Destructor.
-  ~TAO_DIOP_Connection_Handler (void);
-
-  /// Called by the <Strategy_Acceptor> when the handler is completely
-  /// connected.  Argument is unused.
-  virtual int open (void *);
-
-  // @@ Frank: Similar to open, but called on server
-  virtual int open_server (void);
-
-  //@{
-  /**
-   * Connection_Handler overloads
-   */
-  virtual int open_handler (void *);
-  //@}
-
-  /// Close called by the Acceptor or Connector when connection
-  /// establishment fails.
-  int close (u_long = 0);
-
-  //@{
-  /** @name Event Handler overloads
-   */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-  // @@ Frank: Not needed
-  /*
-  /// Process the <listen_list>
-  int process_listen_point_list (DIOP::ListenPointList &listen_list);
-  */
-
-  // DIOP Additions - Begin
-  /**
-   * @name The DIOP Additions
-   *
-   */
-  //@{
-  ACE_HANDLE get_handle (void) const;
-
-  const ACE_INET_Addr &addr (void);
-
-  void addr (const ACE_INET_Addr &addr);
-
-  const ACE_INET_Addr &local_addr (void);
-
-  void local_addr (const ACE_INET_Addr &addr);
-
-  const ACE_INET_Addr &server_addr (void);
-
-  void server_addr (const ACE_INET_Addr &addr);
-
-  const ACE_SOCK_Dgram &dgram (void);
-  //@}
-  // DIOP Additions - End
-
-  /// Set Diff-Serv codepoint on outgoing packets.
-  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
-protected:
-
-  //@{
-  /**
-   * @name TAO_Connection Handler overloads
-   */
-  virtual int release_os_resources (void);
-  //@}
-
-  // DIOP Additions - Begin
-  /**
-   * @name The DIOP Additions
-   *
-   */
-  //@{
-  ACE_SOCK_Dgram udp_socket_;
-
-  /// This is always the remote address
-  ACE_INET_Addr addr_;
-
-  /// This is always the local address for the connector
-  ACE_INET_Addr local_addr_;
-  //@}
-  // DIOP Additions - End
-
-private:
-  /// Stores the type of service value.
-  int dscp_codepoint_;
-};
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
deleted file mode 100644
index fddf82d6106..00000000000
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "DIOP_Connector.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "ace/Connector.h"
-
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Environment.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Protocols_Hooks.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-#include "DIOP_Profile.h"
-
-
-ACE_RCSID (Strategies,
-           DIOP_Connector,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-
-template class ACE_NonBlocking_Connect_Handler<TAO_DIOP_Connection_Handler>;
-template class ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>;
-template class ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex >;
-template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_DIOP_Connection_Handler>
-#pragma instantiate ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr,TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex >
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_DIOP_PROFILE),
-    lite_flag_ (flag)
-{
-}
-
-TAO_DIOP_Connector::~TAO_DIOP_Connector (void)
-{
-}
-
-int
-TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core (orb_core);
-
-  // Create our connect strategy
-  if (this->create_connect_strategy () == -1)
-    return -1;
-
-  // @@ Michael: We do not use regular connection management.
-
-  return 0;
-}
-
-int
-TAO_DIOP_Connector::close (void)
-{
-  // The list of service handlers cleans itself??
-  SvcHandlerIterator iter (svc_handler_table_);
-
-  while (!iter.done ())
-    {
-      (*iter).int_id_->remove_reference ();
-      iter++;
-    }
-
-  // @@ Michael: We do not use regular connection management.
-  return 0;
-}
-
-int
-TAO_DIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
-{
-  TAO_DIOP_Endpoint *diop_endpoint =
-    this->remote_endpoint (endpoint);
-
-  if (diop_endpoint == 0)
-    return -1;
-
-  const ACE_INET_Addr &remote_address =
-    diop_endpoint->object_addr ();
-
-  // Verify that the remote ACE_INET_Addr was initialized properly.
-  // Failure can occur if hostname lookup failed when initializing the
-  // remote ACE_INET_Addr.
-  if (remote_address.get_type () != AF_INET)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) DIOP connection failed.\n")
-                      ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                      ACE_TEXT ("due to a hostname lookup ")
-                      ACE_TEXT ("failure.\n")));
-        }
-
-      return -1;
-    }
-
-  return 0;
-}
-
-TAO_Transport *
-TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
-                                     TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value * /*max_wait_time*/)
-{
-  TAO_DIOP_Endpoint *diop_endpoint =
-    this->remote_endpoint (desc.endpoint ());
-
-  if (diop_endpoint == 0)
-    return 0;
-
-  const ACE_INET_Addr &remote_address =
-    diop_endpoint->object_addr ();
-
-  TAO_DIOP_Connection_Handler *svc_handler = 0;
-
-  if (svc_handler_table_.find (remote_address, svc_handler) == -1)
-    {
-      TAO_DIOP_Connection_Handler *svc_handler_i = 0;
-      ACE_NEW_RETURN (svc_handler_i,
-                      TAO_DIOP_Connection_Handler (this->orb_core (),
-                                                   this->lite_flag_),
-                      0);
-
-      svc_handler_i->local_addr (ACE_sap_any_cast (ACE_INET_Addr &));
-      svc_handler_i->addr (remote_address);
-
-      svc_handler_i->open (0);
-
-      svc_handler_table_.bind (remote_address,
-                               svc_handler_i);
-      svc_handler = svc_handler_i;
-
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) DIOP_Connector::connect - ")
-                    ACE_TEXT ("new connection on HANDLE %d\n"),
-                    svc_handler->get_handle ()));
-   }
-
-  // @@ Michael: We do not use regular connection management.
-  svc_handler->add_reference ();
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
-  return transport;
-}
-
-TAO_Profile *
-TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_DIOP_Profile (this->orb_core ()),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-TAO_Profile *
-TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The endpoint should be of the form:
-  //    N.n@host:port/object_key
-  // or:
-  //    host:port/object_key
-
-  TAO_Profile *profile = 0;
-  ACE_NEW_THROW_EX (profile,
-                    TAO_DIOP_Profile (this->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return profile;
-}
-
-int
-TAO_DIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char *protocol[] = { "diop", "dioploc" };
-
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
-  size_t len0 = ACE_OS::strlen (protocol[0]);
-  size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an DIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_DIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_DIOP_Profile::object_key_delimiter_;
-}
-
-TAO_DIOP_Endpoint *
-TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != TAO_TAG_DIOP_PROFILE)
-    return 0;
-
-  TAO_DIOP_Endpoint *diop_endpoint =
-    dynamic_cast<TAO_DIOP_Endpoint *> (endpoint );
-
-  if (diop_endpoint == 0)
-    return 0;
-
-  return diop_endpoint;
-}
-
-int
-TAO_DIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  ACE_UNUSED_ARG(svc_handler);
-
-  // Noop
-  return 0;
-}
-
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash <ACE_INET_Addr>;
-template class ACE_Equal_To <ACE_INET_Addr>;
-template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash <ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash <ACE_INET_Addr>
-#pragma instantiate ACE_Equal_To <ACE_INET_Addr>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash <ACE_INET_Addr>, ACE_Equal_To <ACE_INET_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
deleted file mode 100644
index 5cec9dbd0c8..00000000000
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DIOP_Connector.h
- *
- *  $Id$
- *
- *  DIOP specific connector processing
- *
- *  @author  Michael Kircher
- */
-//=============================================================================
-
-#ifndef TAO_DIOP_CONNECTOR_H
-#define TAO_DIOP_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Transport_Connector.h"
-#include "DIOP_Connection_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Endpoint;
-class TAO_DIOP_Endpoint;
-
-// ****************************************************************
-
-/**
- * @class TAO_DIOP_Connector
- *
- * @brief DIOP-specific Connector bridge for pluggable protocols.
- *
- * Concrete instance of the TAO_Connector class.  Responsible
- * for establishing a connection with a server and is called from the
- * Connector_Registory.
- */
-class TAO_Strategies_Export TAO_DIOP_Connector : public TAO_Connector
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_DIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_DIOP_Connector (void);
-
-  /**
-   * @name The TAO_Connector Methods
-   *
-   * Please check the documentation in Transport_Connector.h for details.
-   */
-  //@{
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-  //@}
-
-protected:
-
-  /**
-   * @name More TAO_Connector Methods
-   *
-   * Please check the documentation in Transport_Connector.h for details.
-   */
-  //@{
-  int set_validate_endpoint (TAO_Endpoint *ep);
-
-  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
-                                  TAO_Transport_Descriptor_Interface &desc,
-                                  ACE_Time_Value *timeout = 0);
-
-  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
-  //@}
-
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
-protected:
-
-  /// Do we need to use a GIOP_Lite for sending messages?
-  CORBA::Boolean lite_flag_;
-
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_DIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
-private:
-  // @@ Michael: UDP Addition
-  ACE_Hash_Map_Manager_Ex < ACE_INET_Addr,
-                            TAO_DIOP_Connection_Handler *,
-                            ACE_Hash < ACE_INET_Addr >,
-                            ACE_Equal_To < ACE_INET_Addr >,
-                            ACE_Null_Mutex > svc_handler_table_;
-
-  typedef ACE_Hash_Map_Iterator_Ex < ACE_INET_Addr,
-                                     TAO_DIOP_Connection_Handler *,
-                                     ACE_Hash < ACE_INET_Addr >,
-                                     ACE_Equal_To < ACE_INET_Addr >,
-                                     ACE_Null_Mutex > SvcHandlerIterator;
-};
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DIOP_CONNECTOR_H */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
deleted file mode 100644
index f10fb9c0f7e..00000000000
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-#include "DIOP_Endpoint.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "DIOP_Connection_Handler.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (Strategies,
-           DIOP_Endpoint,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/os_include/os_netdb.h"
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
-
-  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE)
-    , host_ ()
-    , port_ (0)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  this->set (addr, use_dotted_decimal_addresses);
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      const ACE_INET_Addr &addr,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE,
-                  priority)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
-    host_ (),
-    port_ (0),
-    object_addr_ (),
-    object_addr_set_ (0),
-    next_ (0)
-{
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_DIOP_PROFILE),
-    host_ (),
-    port_ (port),
-    object_addr_ (),
-    object_addr_set_ (0),
-    next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-
-  this->priority (priority);
-}
-
-TAO_DIOP_Endpoint::~TAO_DIOP_Endpoint (void)
-{
-
-}
-
-int
-TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr,
-                        int use_dotted_decimal_addresses)
-{
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (use_dotted_decimal_addresses
-      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-    {
-      const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("DIOP_Endpoint::set ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-          return -1;
-        }
-      else
-        this->host_ = tmp;
-    }
-  else
-    this->host_ = CORBA::string_dup (tmp_host);
-
-  this->port_ = addr.get_port_number();
-
-  return 0;
-}
-
-int
-TAO_DIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_DIOP_Endpoint::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-TAO_Endpoint *
-TAO_DIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_DIOP_Endpoint::duplicate (void)
-{
-  TAO_DIOP_Endpoint *endpoint = 0;
-
-  ACE_NEW_RETURN (endpoint,
-                  TAO_DIOP_Endpoint (this->host_.in (),
-                                     this->port_,
-                                     this->object_addr_,
-                                     this->priority ()),
-                  0);
-
-  return endpoint;
-}
-
-CORBA::Boolean
-TAO_DIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  TAO_Endpoint *endpt = const_cast<TAO_Endpoint *> (other_endpoint);
-
-  TAO_DIOP_Endpoint *endpoint = dynamic_cast<TAO_DIOP_Endpoint *> (endpt);
-  if (endpoint == 0)
-    return 0;
-
-  return (this->port () == endpoint->port ()
-          && ACE_OS::strcmp(this->host (), endpoint->host()) == 0);
-}
-
-CORBA::ULong
-TAO_DIOP_Endpoint::hash (void)
-{
-  if (this->hash_val_ != 0)
-    return this->hash_val_;
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->addr_lookup_lock_,
-                      this->hash_val_);
-    // .. DCL
-    if (this->hash_val_ != 0)
-      return this->hash_val_;
-
-    this->hash_val_ =
-      ACE::hash_pjw (this->host ()) + this->port ();
-  }
-
-  return this->hash_val_;
-}
-
-const ACE_INET_Addr &
-TAO_DIOP_Endpoint::object_addr (void) const
-{
-  // The object_addr_ is initialized here, rather than at IOR decode
-  // time for several reasons:
-  //   1. A request on the object may never be invoked.
-  //   2. The DNS setup may have changed dynamically.
-  //   ...etc..
-
-  // Double checked locking optimization.
-  if (!this->object_addr_set_)
-    {
-      // We need to modify the object_addr_ in this method.  Do so
-      // using a  non-const copy of the <this> pointer.
-      TAO_DIOP_Endpoint *endpoint =
-        const_cast<TAO_DIOP_Endpoint *> (this);
-
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        guard,
-                        endpoint->addr_lookup_lock_,
-                        this->object_addr_ );
-
-      if (!this->object_addr_set_)
-        {
-          if (endpoint->object_addr_.set (this->port_,
-                                          this->host_.in ()) == -1)
-            {
-              // If this call fails, it most likely due a hostname
-              // lookup failure caused by a DNS misconfiguration.  If
-              // a request is made to the object at the given host and
-              // port, then a CORBA::TRANSIENT() exception should be
-              // thrown.
-
-              // Invalidate the ACE_INET_Addr.  This is used as a flag
-              // to denote that ACE_INET_Addr initialization failed.
-              endpoint->object_addr_.set_type (-1);
-            }
-          else
-            {
-              endpoint->object_addr_set_ = 1;
-            }
-        }
-    }
-  return this->object_addr_;
-}
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
deleted file mode 100644
index 01a932546b7..00000000000
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file     DIOP_Endpoint.h
- *
- *  $Id$
- *
- *   DIOP implementation of PP Framework Endpoint interface.
- *
- *  @author  Michael Kircher
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_ENDPOINT_H
-#define TAO_DIOP_ENDPOINT_H
-#include /**/ "ace/pre.h"
-#include "tao/Endpoint.h"
-
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/CORBA_String.h"
-#include "ace/INET_Addr.h"
-#include "strategies_export.h"
-
-
-class TAO_DIOP_Connection_Handler;
-
-/**
- * @class TAO_DIOP_Endpoint
- *
- * @brief TAO_DIOP_Endpoint
- *
- * DIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_Strategies_Export TAO_DIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  friend class TAO_DIOP_Profile;
-  friend class TAO_SSLIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_DIOP_Endpoint (void);
-
-  /// Constructor.  This is the most efficient constructor since it
-  /// does not require any address resolution processing.
-  TAO_DIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     const ACE_INET_Addr &addr,
-                     CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Constructor.
-  TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
-                     int use_dotted_decimal_addresses);
-
-  /// Constructor.  This constructor is used when decoding endpoints.
-  TAO_DIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     CORBA::Short priority);
-
-  /// Destructor.
-  ~TAO_DIOP_Endpoint (void);
-
-  /**
-   * @name TAO_Endpoint Methods
-   *
-   * Please check the documentation in Endpoint.h for details.
-   */
-  //@{
-  virtual TAO_Endpoint *next (void);
-  virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
-  CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  CORBA::ULong hash (void);
-  //@}
-
-  // Allocates memory and returns a copy of <this>
-
-  // = DIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_INET_Addr &object_addr (void) const;
-
-  /// Return a pointer to the host string.  This object maintains
-  /// ownership of this string.
-  const char *host (void) const;
-
-  /// Copy the string <h> into <host_> and return the resulting pointer.
-  /// This object maintains ownership of this string.
-  const char *host (const char *h);
-
-  /// Return the port number.
-  CORBA::UShort port (void) const;
-
-  /// Set the port number.
-  CORBA::UShort port (CORBA::UShort p);
-
-  //TAO_DIOP_Connection_Handler *&hint (void);
-  // Access to our <hint_>.
-
-private:
-
-  /// Helper method for setting INET_Addr.
-  int set (const ACE_INET_Addr &addr,
-           int use_dotted_decimal_addresses);
-
-  /// String representing the host name.
-  CORBA::String_var host_;
-
-  /// TCP port number.
-  CORBA::UShort port_;
-
-  /// Cached instance of <ACE_INET_Addr> for use in making
-  /// invocations, etc.
-  ACE_INET_Addr object_addr_;
-
-  /// Flag to indicate if the address has been resolved and set.
-  int object_addr_set_;
-
-  /// DIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_DIOP_Endpoint *next_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_DIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i
deleted file mode 100644
index 3bd443220b5..00000000000
--- a/TAO/tao/Strategies/DIOP_Endpoint.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const char *
-TAO_DIOP_Endpoint::host (void) const
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_DIOP_Endpoint::port (void) const
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_DIOP_Endpoint::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
deleted file mode 100644
index ef5755dde44..00000000000
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-
-#include "DIOP_Factory.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "DIOP_Acceptor.h"
-#include "DIOP_Connector.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (Strategies,
-           DIOP_Factory,
-           "$Id$")
-
-static const char prefix_[] = "diop";
-
-TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_DIOP_Protocol_Factory::~TAO_DIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_DIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_DIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_DIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_DIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_DIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_DIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_DIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  // This switch is actually meant to distinguish between pluggable
-  // protocols which are able to clean up their endpoints and such
-  // that aren't. E.g. UIOP will leave files, it therefore returns 1,
-  // IIOP cleans up its endpoint resources, which therefore return 0.
-  //
-  // DIOP does clean up endpoint resources, but as DIOP is only
-  // suitable for special environments, e.g. it supports only one-ways,
-  // it returns 1 for an other reason than resource clean-up.
-
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory,
-                       ACE_TEXT ("DIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_DIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_DIOP_Protocol_Factory)
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
deleted file mode 100644
index 5b0313bef84..00000000000
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   DIOP_Factory.h
- *
- *  $Id$
- *
- *  @author  Michael Kircher
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_FACTORY_H
-#define TAO_DIOP_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Protocol_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "strategies_export.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Strategies_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  /// Constructor.
-  TAO_DIOP_Protocol_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_DIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  /**
-   * @name Protocol factory methods
-   *
-   * Check Protocol_Factory.h for a description of these methods.
-   */
-  //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-  //@}
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory)
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DIOP_FACTORY_H */
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
deleted file mode 100644
index af1c9aabad4..00000000000
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-#include "DIOP_Profile.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/IIOP_EndpointsC.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (Strategies,
-           DIOP_Profile,
-           "$Id$")
-
-static const char prefix_[] = "diop";
-
-const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
-
-char
-TAO_DIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_DIOP_Profile::object_key_delimiter_;
-}
-
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO::ObjectKey &object_key,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ()),
-    count_ (1)
-{
-}
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
-                                    CORBA::UShort port,
-                                    const TAO::ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (host, port, addr),
-    count_ (1)
-{
-}
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_DIOP_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1)
-{
-}
-
-TAO_DIOP_Profile::~TAO_DIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-
-int
-TAO_DIOP_Profile::decode_profile (TAO_InputCDR& cdr)
-{
-  // @@ NOTE: This code is repeated thrice. Need to factor out in a
-  // better manner.
-  // Decode host and port into the <endpoint_>.
-  if (cdr.read_string (this->endpoint_.host_.out ()) == 0
-      || cdr.read_ushort (this->endpoint_.port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Profile::decode - ")
-                    ACE_TEXT ("error while decoding host/port")));
-      return -1;
-    }
-
-  if (cdr.good_bit ())
-    {
-      // Invalidate the object_addr_ until first access.
-      this->endpoint_.object_addr_.set_type (-1);
-
-      return 1;
-    }
-
-  return -1;
-}
-
-void
-TAO_DIOP_Profile::parse_string_i (const char *ior
-                                  ACE_ENV_ARG_DECL)
-{
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-  const char *okd =
-    ACE_OS::strchr (ior, this->object_key_delimiter_);
-
-  if (okd == 0 || okd == ior)
-    {
-      // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Length of host string.
-  CORBA::ULong length_host = 0;
-
-  const char *cp_pos = ACE_OS::strchr (ior, ':');  // Look for a port
-
-  if (cp_pos == ior)
-    {
-      // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-  else if (cp_pos != 0)
-    {
-      // A port number or port name was specified.
-      CORBA::ULong length_port = okd - cp_pos - 1;
-
-      CORBA::String_var tmp = CORBA::string_alloc (length_port);
-
-      ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port);
-      tmp[length_port] = '\0';
-
-      this->endpoint_.port_ =
-        static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
-
-      length_host = cp_pos - ior;
-    }
-  else
-    length_host = okd - ior;
-
-  CORBA::String_var tmp = CORBA::string_alloc (length_host);
-
-  // Skip the trailing '/'
-  ACE_OS::strncpy (tmp.inout (), ior, length_host);
-  tmp[length_host] = '\0';
-
-  this->endpoint_.host_ = tmp._retn ();
-
-  if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0)
-    {
-      ACE_INET_Addr host_addr;
-
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host, i.e. the
-      // local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-        {
-          // Can't get the IP address since the INET_Addr wasn't
-          // initialized.  Just throw an exception.
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("IIOP_Profile::parse_string ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-
-          // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
-                       CORBA::SystemException::_tao_minor_code (
-                         TAO::VMCID,
-                         EINVAL),
-                       CORBA::COMPLETED_NO));
-        }
-      else
-        this->endpoint_.host_ = CORBA::string_dup (tmp_host);
-    }
-
-  TAO::ObjectKey ok;
-  TAO::ObjectKey::decode_string_to_sequence (ok,
-                                             okd + 1);
-
-  (void) this->orb_core ()->object_key_table ().bind (ok,
-                                                      this->ref_object_key_);
-}
-
-CORBA::Boolean
-TAO_DIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
-{
-  const TAO_DIOP_Profile *op =
-    dynamic_cast<const TAO_DIOP_Profile *> (other_profile);
-
-  // Check endpoints equivalence.
-  const TAO_DIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_DIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_DIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Get the hashvalue for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_DIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  const TAO::ObjectKey &ok =
-    this->ref_object_key_->object_key ();
-
-  if (ok.length () >= 4)
-    {
-      hashval += ok[1];
-      hashval += ok[3];
-    }
-
-  hashval += this->hash_service_i (max);
-
-  return hashval % max;
-}
-
-TAO_Endpoint*
-TAO_DIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-CORBA::ULong
-TAO_DIOP_Profile::endpoint_count (void) const
-{
-  return this->count_;
-}
-
-void
-TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  this->count_++;
-}
-
-char *
-TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::String_var key;
-  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
-                                            this->ref_object_key_->object_key ());
-
-  size_t buflen = (8 /* "corbaloc" */ +
-                   1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
-                   1 /* colon separator */ +
-                   1 /* major version */ +
-                   1 /* decimal point */ +
-                   1 /* minor version */ +
-                   1 /* `@' character */ +
-                   ACE_OS::strlen (this->endpoint_.host ()) +
-                   1 /* colon separator */ +
-                   5 /* port number */ +
-                   1 /* object key separator */ +
-                   ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
-
-  return buf;
-}
-
-const char *
-TAO_DIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-void
-TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  encap.write_string (this->endpoint_.host ());
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->endpoint_.port ());
-
-  // OCTET SEQUENCE for object key
-  if (this->ref_object_key_)
-    encap << this->ref_object_key_->object_key ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
-    }
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components ().encode (encap);
-}
-
-int
-TAO_DIOP_Profile::encode_endpoints (void)
-{
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-
-  TAO::IIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
-
-  const TAO_DIOP_Endpoint *endpoint = &this->endpoint_;
-  for (CORBA::ULong i = 0;
-       i < this->count_;
-       ++i)
-    {
-      endpoints[i].host = endpoint->host ();
-      endpoints[i].port = endpoint->port ();
-      endpoints[i].priority = endpoint->priority ();
-
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-  size_t length = out_cdr.total_length ();
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-  tagged_component.component_data.length (static_cast<CORBA::ULong> (length));
-  CORBA::Octet *buf =
-    tagged_component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
-       iterator = iterator->cont ())
-    {
-      size_t i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
-
-      buf += i_length;
-    }
-
-  // Add component with encoded endpoint data to this profile's
-  // TaggedComponents.
-  tagged_components_.set_component (tagged_component);
-
-  return  0;
-}
-
-int
-TAO_DIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      // Extract endpoints sequence.
-      TAO::IIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_DIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_DIOP_Endpoint (endpoints[i].host,
-                                             endpoints[i].port,
-                                             endpoints[i].priority),
-                          -1);
-
-          this->add_endpoint (endpoint);
-        }
-    }
-
-  return 0;
-}
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
deleted file mode 100644
index e51bb10e95f..00000000000
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file     DIOP_Profile.h
- *
- *  $Id$
- *
- *   DIOP profile specific processing
- *
- *
- *  @author  Michael Kircher
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_PROFILE_H
-#define TAO_DIOP_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Profile.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "DIOP_Endpoint.h"
-
-
-// TAO DIOP_Profile concrete Profile definitions
-/**
- * @class TAO_DIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating ORBs over a TCP/IP network.
- *
- * This class defines the DIOP profile as specified in the CORBA
- * specification.
- */
-class TAO_Strategies_Export TAO_DIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that DIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.
-  TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO::ObjectKey &object_key,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, this is the most efficient since it
-  /// doesn't require any address resolution processing.
-  TAO_DIOP_Profile (const char *host,
-                    CORBA::UShort port,
-                    const TAO::ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-
-  /// Profile constructor, default.
-  TAO_DIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_DIOP_Profile (void);
-
-
-  /// Template methods. Please tao/Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-  /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
-   */
-  void add_endpoint (TAO_DIOP_Endpoint *endp);
-
-protected:
-
-  /// Template methods. Please see tao/Profile.h for documentation.
-  virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-
-protected:
-
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support TAG_ALTERNATE_DIOP_ADDRESS
-   * feature.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard DIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_DIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  CORBA::ULong count_;
-};
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
deleted file mode 100644
index ed8b55bf661..00000000000
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "DIOP_Transport.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "DIOP_Connection_Handler.h"
-#include "DIOP_Acceptor.h"
-#include "DIOP_Profile.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/operation_details.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Sync_Strategies.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Resume_Handle.h"
-#include "tao/GIOP_Message_Base.h"
-#include "tao/GIOP_Message_Lite.h"
-
-ACE_RCSID (tao, DIOP_Transport, "$Id$")
-
-TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Boolean flag)
-  : TAO_Transport (TAO_TAG_DIOP_PROFILE,
-                   orb_core)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
-{
-  // @@ Michael: Set the input CDR size to ACE_MAX_DGRAM_SIZE so that
-  //             we read the whole UDP packet on a single read.
-  if (flag)
-    {
-      // Use the lite version of the protocol
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Lite (orb_core,
-                                      ACE_MAX_DGRAM_SIZE));
-                                      }
-  else
-    {
-      // Use the normal GIOP object
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core,
-                                      ACE_MAX_DGRAM_SIZE));
-    }
-}
-
-TAO_DIOP_Transport::~TAO_DIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-ACE_Event_Handler *
-TAO_DIOP_Transport::event_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Connection_Handler *
-TAO_DIOP_Transport::connection_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Pluggable_Messaging *
-TAO_DIOP_Transport::messaging_object (void)
-{
-  return this->messaging_object_;
-}
-
-ssize_t
-TAO_DIOP_Transport::send (iovec *iov, int iovcnt,
-                          size_t &bytes_transferred,
-                          const ACE_Time_Value *)
-{
-  const ACE_INET_Addr &addr = this->connection_handler_->addr ();
-
-  ssize_t bytes_to_send = 0;
-  for (int i = 0; i < iovcnt; i++)
-     bytes_to_send += iov[i].iov_len;
-
-  this->connection_handler_->dgram ().send (iov,
-                                            iovcnt,
-                                            addr);
-  // @@ Michael:
-  // Always return a positive number of bytes sent, as we do
-  // not handle sending errors in DIOP.
-
-  bytes_transferred = bytes_to_send;
-
-  return 1;
-}
-
-ssize_t
-TAO_DIOP_Transport::recv (char *buf,
-                          size_t len,
-                          const ACE_Time_Value * /* max_wait_time */)
-{
-  ACE_INET_Addr from_addr;
-
-  ssize_t n = this->connection_handler_->dgram ().recv (buf,
-                                                        len,
-                                                        from_addr);
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n",
-                  n,
-                  ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()),
-                  from_addr.get_port_number (),
-                  errno));
-    }
-
-  // Most of the errors handling is common for
-  // Now the message has been read
-  if (n == -1 && TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - %p \n"),
-                  ACE_TEXT ("TAO - read message failure ")
-                  ACE_TEXT ("recv () \n")));
-    }
-
-  // Error handling
-  if (n == -1)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-
-      return -1;
-    }
-  // @@ What are the other error handling here??
-  else if (n == 0)
-    {
-      return -1;
-    }
-
-  // Remember the from addr to eventually use it as remote
-  // addr for the reply.
-  this->connection_handler_->addr (from_addr);
-
-  return n;
-}
-
-int
-TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
-                                  ACE_Time_Value *max_wait_time,
-                                  int /*block*/)
-{
-  // If there are no messages then we can go ahead to read from the
-  // handle for further reading..
-
-  // The buffer on the stack which will be used to hold the input
-  // messages
-  char buf [ACE_MAX_DGRAM_SIZE];
-
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  (void) ACE_OS::memset (buf,
-                         '\0',
-                         sizeof buf);
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-  // Create a data block
-  ACE_Data_Block db (sizeof (buf),
-                     ACE_Message_Block::MB_DATA,
-                     buf,
-                     this->orb_core_->input_cdr_buffer_allocator (),
-                     this->orb_core_->locking_strategy (),
-                     ACE_Message_Block::DONT_DELETE,
-                     this->orb_core_->input_cdr_dblock_allocator ());
-
-  // Create a message block
-  ACE_Message_Block message_block (&db,
-                                   ACE_Message_Block::DONT_DELETE,
-                                   this->orb_core_->input_cdr_msgblock_allocator ());
-
-
-  // Align the message block
-  ACE_CDR::mb_align (&message_block);
-
-
-  // Read the message into the  message block that we have created on
-  // the stack.
-  ssize_t n = this->recv (message_block.rd_ptr (),
-                          message_block.space (),
-                          max_wait_time);
-
-  // If there is an error return to the reactor..
-  if (n <= 0)
-    {
-      if (n == -1)
-        this->tms_->connection_closed ();
-
-      return n;
-    }
-
-  // Set the write pointer in the stack buffer
-  message_block.wr_ptr (n);
-
-  // Parse the incoming message for validity. The check needs to be
-  // performed by the messaging objects.
-  if (this->parse_incoming_messages (message_block) == -1)
-    return -1;
-
-  // NOTE: We are not performing any queueing nor any checking for
-  // missing data. We are assuming that ALL the data would be got in a
-  // single read.
-
-  // Make a node of the message block..
-  TAO_Queued_Data qd (&message_block);
-
-  // Extract the data for the node..
-  this->messaging_object ()->get_message_data (&qd);
-
-  // Process the message
-  return this->process_parsed_messages (&qd, rh);
-}
-
-
-int
-TAO_DIOP_Transport::register_handler (void)
-{
-  // @@ Michael:
-  //
-  // We do never register register the handler with the reactor
-  // as we never need to be informed about any incoming data,
-  // assuming we only use one-ways.
-  // If we would register and ICMP Messages would arrive, e.g
-  // due to a not reachable server, we would get informed - as this
-  // disturbs the general DIOP assumptions of not being
-  // interested in any network failures, we ignore ICMP messages.
-  return 0;
-}
-
-
-int
-TAO_DIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-
-    return -1;
-
-  this->first_request_sent();
-
-  return 0;
-}
-
-int
-TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_message_shared (stub,
-                                         message_semantics,
-                                         stream.begin (),
-                                         max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) closing transport %d after fault %p\n"),
-                    this->id (),
-                    ACE_TEXT ("send_message ()\n")));
-
-      return -1;
-    }
-
-  return 1;
-}
-
-int
-TAO_DIOP_Transport::send_message_shared (TAO_Stub *stub,
-                                         int message_semantics,
-                                         const ACE_Message_Block *message_block,
-                                         ACE_Time_Value *max_wait_time)
-{
-  int result;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-    result =
-      this->send_message_shared_i (stub, message_semantics,
-                                   message_block, max_wait_time);
-  }
-
-  if (result == -1)
-    {
-      this->close_connection ();
-    }
-
-  return result;
-}
-
-int
-TAO_DIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major,
-                                 minor);
-  return 1;
-}
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
deleted file mode 100644
index 63c79700296..00000000000
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   DIOP_Transport.h
- *
- *  $Id$
- *
- *  @author  Michael Kircher
- */
-// ===================================================================
-
-#ifndef TAO_DIOP_TRANSPORT_H
-#define TAO_DIOP_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
-#include "tao/Transport.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "strategies_export.h"
-
-// Forward decls.
-class TAO_DIOP_Connection_Handler;
-class TAO_ORB_Core;
-class TAO_Operation_Details;
-class TAO_Pluggable_Messaging;
-class TAO_Acceptor;
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_DIOP_SVC_HANDLER;
-
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-/**
- * @class TAO_DIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  DIOP protocol.
- */
-class TAO_Strategies_Export TAO_DIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
-                      TAO_ORB_Core *orb_core,
-                      CORBA::Boolean flag);
-
-  /// Default destructor.
-  ~TAO_DIOP_Transport (void);
-
-  /// Look for the documentation in Transport.h.
-  virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
-protected:
-  /** @name Overridden Template Methods
-   *
-   * These are implementations of template methods declared by TAO_Transport.
-   */
-  //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
-  virtual TAO_Pluggable_Messaging *messaging_object (void);
-
-  /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *max_wait_time);
-
-  /// Read len bytes from into buf.
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-  virtual int send_message_shared (TAO_Stub *stub,
-                                   int message_semantics,
-                                   const ACE_Message_Block *message_block,
-                                   ACE_Time_Value *max_wait_time);
-
-  virtual int register_handler (void);
-
-  ///@}
-public:
-  /// @todo These methods IMHO should have more meaningful names.
-  /// The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int message_semantics,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-private:
-  // @@ Frank : Not needed
-  /*
-  /// Set the Bidirectional context info in the service context list
-  void set_bidir_context_info (TAO_Operation_Details &opdetails);
-
-  /// Add the listen points in <acceptor> to the <listen_point_list>
-  /// if this connection is in the same interface as that of the
-  /// endpoints in the <acceptor>
-  int get_listen_point (DIOP::ListenPointList &listen_point_list,
-                        TAO_Acceptor *acceptor);
-  */
-private:
-
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_DIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-};
-
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_DIOP_TRANSPORT_H */
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
deleted file mode 100644
index d1e9d6940b3..00000000000
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-#include "FIFO_Connection_Purging_Strategy.h"
-#include "tao/Transport.h"
-
-ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
-
-TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
-                                                            int cache_maximum)
- : TAO_Connection_Purging_Strategy (cache_maximum),
-   // Initialized to 1 to insure that the transports purging_order
-   // is only 0 upon initialization.
-   order_ (1)
-{
-}
-
-
-TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void)
-{
-}
-
-
-void
-TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
-{
-  // FIFO, so only update the purging order if this
-  // item has not been cached yet.
-  if (transport->purging_order () == 0)
-    {
-      transport->purging_order (this->order_++);
-    }
-}
-
-
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
deleted file mode 100644
index b69bcff5739..00000000000
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// ================================================================
-/**
- *  @file   FIFO_Connection_Purging_Strategy.h
- *
- *  $Id$
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- */
-// ================================================================
-
-#ifndef TAO_FIFO_PURGING_STRATEGY_H
-#define TAO_FIFO_PURGING_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "strategies_export.h"
-#include "tao/Connection_Purging_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// ****************************************************************
-
-/**
- * @class TAO_FIFO_Connection_Purging_Strategy
- *
- * @brief The First In First Out connection purging strategy
- *
- * This class maintains it's own count which is only applied to the
- * item passed if it has not yet been cached.  This way, each successive
- * transport has a larger ordering number than the previous.  This will
- * cause the first transport to be purged first.
- */
-
-class TAO_Strategies_Export TAO_FIFO_Connection_Purging_Strategy:
-                            public TAO_Connection_Purging_Strategy
-{
-public:
-  /// The constructor
-  TAO_FIFO_Connection_Purging_Strategy (int cache_maximum);
-
-  /// The destructor
-  virtual ~TAO_FIFO_Connection_Purging_Strategy (void);
-
-  /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
-
-private:
-  /// The ordering information for each transport in the cache
-  unsigned long order_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_FIFO_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
deleted file mode 100644
index 961ba767c8e..00000000000
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#include "LFU_Connection_Purging_Strategy.h"
-#include "tao/Transport.h"
-
-ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
-
-TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy (
-                                                           int cache_maximum)
-: TAO_Connection_Purging_Strategy (cache_maximum)
-{
-}
-
-
-TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void)
-{
-}
-
-
-void
-TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
-{
-  transport->purging_order (transport->purging_order () + 1);
-}
-
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
deleted file mode 100644
index b2b390c429f..00000000000
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// ================================================================
-/**
- *  @file   LFU_Connection_Purging_Strategy.h
- *
- *  $Id$
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- */
-// ================================================================
-
-#ifndef TAO_LFU_PURGING_STRATEGY_H
-#define TAO_LFU_PURGING_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "strategies_export.h"
-#include "tao/Connection_Purging_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// ****************************************************************
-
-/**
- * @class TAO_LFU_Connection_Purging_Strategy
- *
- * @brief The Least Frequently Used connection purging strategy
- *
- * This class increments the order information on each item passed
- * in.  This way, the least frequently used transport has the
- * smallest ordering number and will therefore be purged first.
- */
-
-class TAO_Strategies_Export TAO_LFU_Connection_Purging_Strategy:
-                            public TAO_Connection_Purging_Strategy
-{
-public:
-  /// The constructor
-  TAO_LFU_Connection_Purging_Strategy (int cache_maximum);
-
-  /// The destructor
-  virtual ~TAO_LFU_Connection_Purging_Strategy (void);
-
-  /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Transport* transport);
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_LFU_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
deleted file mode 100644
index d3c740cb9de..00000000000
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "LF_Strategy_Null.h"
-
-#if !defined (__ACE_INLINE__)
-# include "LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, LF_Strategy_Null, "$Id$")
-
-TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
-{
-}
-
-void
-TAO_LF_Strategy_Null::set_upcall_thread (TAO_Leader_Follower &)
-{
-}
-
-int
-TAO_LF_Strategy_Null::set_event_loop_thread (ACE_Time_Value *,
-                                             TAO_Leader_Follower &)
-{
-  return 0;
-}
-
-void
-TAO_LF_Strategy_Null::reset_event_loop_thread (int,
-                                               TAO_Leader_Follower &)
-{
-}
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h
deleted file mode 100644
index 746204fd3d0..00000000000
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Strategy_Null.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LF_STRATEGY_NULL_H
-#define TAO_LF_STRATEGY_NULL_H
-#include /**/ "ace/pre.h"
-
-#include "strategies_export.h"
-#include "tao/LF_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_LF_Strategy_Null
- *
- * @brief A concrete TAO_LF_Strategy for ORB configurations that do
- * not use the Leader/Followers event loop.
- */
-class TAO_Strategies_Export TAO_LF_Strategy_Null : public TAO_LF_Strategy
-{
-public:
-  /// Constructor
-  TAO_LF_Strategy_Null (void);
-
-  //@{
-  /** @name Virtual Methods
-   *
-   * Please check the documentation in TAO_LF_Strategy
-   */
-  virtual ~TAO_LF_Strategy_Null (void);
-
-  virtual void set_upcall_thread (TAO_Leader_Follower &);
-  virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
-                                     TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
-  //@}
-};
-
-#if defined (__ACE_INLINE__)
-# include "LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_LF_STRATEGY_NULL_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.inl b/TAO/tao/Strategies/LF_Strategy_Null.inl
deleted file mode 100644
index c073be304e7..00000000000
--- a/TAO/tao/Strategies/LF_Strategy_Null.inl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_LF_Strategy_Null::TAO_LF_Strategy_Null (void)
-{
-}
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
deleted file mode 100644
index 930c9c89053..00000000000
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "NULL_Connection_Purging_Strategy.h"
-#include "tao/Transport.h"
-
-ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
-
-TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy (
-                                                           int cache_maximum)
- : TAO_Connection_Purging_Strategy (cache_maximum)
-{
-}
-
-
-TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void)
-{
-}
-
-
-void
-TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
-{
-  ACE_UNUSED_ARG (transport);
-}
-
-
-int
-TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const
-{
-  return -1;
-}
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
deleted file mode 100644
index 39804305347..00000000000
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// ================================================================
-/**
- *  @file   NULL_Connection_Purging_Strategy.h
- *
- *  $Id$
- *
- *  @author Chad Elliott (elliott_c@ociweb.com)
- */
-// ================================================================
-
-#ifndef TAO_NULL_PURGING_STRATEGY_H
-#define TAO_NULL_PURGING_STRATEGY_H
-#include /**/ "ace/pre.h"
-
-#include "strategies_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Connection_Purging_Strategy.h"
-
-
-/**
- * @class TAO_NULL_Connection_Purging_Strategy
- *
- * @brief The null connection purging strategy
- *
- * This class does not do anything.
- */
-
-class TAO_Strategies_Export TAO_NULL_Connection_Purging_Strategy: public TAO_Connection_Purging_Strategy
-{
-public:
-  /// The constructor
-  TAO_NULL_Connection_Purging_Strategy (int cache_maximum);
-
-  /// The destructor
-  virtual ~TAO_NULL_Connection_Purging_Strategy (void);
-
-  /// Does nothing.
-  virtual void update_item (TAO_Transport* transport);
-
-  /// Returns -1 to signify no maximum
-  virtual int cache_maximum (void) const;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NULL_PURGING_STRATEGY_H */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
deleted file mode 100644
index 80229c24def..00000000000
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ /dev/null
@@ -1,1057 +0,0 @@
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Profile.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "tao/MProfile.h"
-#include "tao/debug.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/Transport.h"
-#include "tao/CDR.h"
-
-#if !defined(__ACE_INLINE__)
-#include "SCIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao,
-          SCIOP_Acceptor,
-          "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
-template class ACE_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_SCIOP_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_SCIOP_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
-#pragma instantiate ACE_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE),
-    addrs_ (0),
-    port_span_ (1),
-    hosts_ (0),
-    endpoint_count_ (0),
-    hostname_in_ior_ (0),
-    version_ (TAO_DEF_SCIOP_MAJOR, TAO_DEF_SCIOP_MINOR),
-    orb_core_ (0),
-    lite_flag_ (flag),
-    base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0)
-{
-}
-
-TAO_SCIOP_Acceptor::~TAO_SCIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-
-  delete [] this->addrs_;
-
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    CORBA::string_free (this->hosts_[i]);
-
-  delete [] this->hosts_;
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-int
-TAO_SCIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
-                                   TAO_MProfile &mprofile,
-                                   CORBA::Short priority)
-{
-  // Sanity check.
-  if (this->endpoint_count_ == 0)
-    return -1;
-
-  // Check if multiple endpoints should be put in one profile or
-  // if they should be spread across multiple profiles.
-  /*
-  if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
-  else
-  */
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
-}
-
-int
-TAO_SCIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                        TAO_MProfile &mprofile,
-                                        CORBA::Short priority)
-{
-  // Adding this->endpoint_count_ to the TAO_MProfile.
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < this->endpoint_count_
-      && mprofile.grow (count + this->endpoint_count_) == -1)
-    return -1;
-
-  // Create a profile for each acceptor endpoint.
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    {
-      TAO_SCIOP_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_SCIOP_Profile (this->hosts_[i],
-                                        this->addrs_[i].get_port_number (),
-                                        object_key,
-                                        this->addrs_[i],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      pfile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (pfile) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-          return -1;
-        }
-
-      pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-      this->orb_core_->codeset_manager()->
-        set_codeset(pfile->tagged_components());
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                           TAO_MProfile &mprofile,
-                                           CORBA::Short priority)
-{
-  CORBA::ULong index = 0;
-  TAO_SCIOP_Profile *sciop_profile = 0;
-
-  // Do not check <mprofile> for the presence of an existing
-  // SCIOP_Profile.  With SCIOP, there is a one-to-one relationship
-  // between Acceptors and Profiles.
-    {
-      ACE_NEW_RETURN (sciop_profile,
-                      TAO_SCIOP_Profile (this->hosts_[0],
-                                        this->addrs_[0].get_port_number (),
-                                        object_key,
-                                        this->addrs_[0],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      sciop_profile->endpoint ()->priority (priority);
-
-      if (mprofile.give_profile (sciop_profile) == -1)
-        {
-          sciop_profile->_decr_refcnt ();
-          sciop_profile = 0;
-          return -1;
-        }
-
-      sciop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-      this->orb_core_->codeset_manager()->
-        set_codeset(sciop_profile->tagged_components());
-
-      index = 1;
-    }
-
-  // Add any remaining acceptor endpoints to the SCIOP_Profile.
-  for (;
-       index < this->endpoint_count_;
-       ++index)
-    {
-      TAO_SCIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_SCIOP_Endpoint (this->hosts_[index],
-                                         this->addrs_[index].get_port_number (),
-                                         this->addrs_[index]),
-                      -1);
-      endpoint->priority (priority);
-      sciop_profile->add_endpoint (endpoint);
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_SCIOP_Endpoint *endp =
-    dynamic_cast<const TAO_SCIOP_Endpoint *> (endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-    {
-      // compare the port and host name.  Please do *NOT* optimize
-      // this code by comparing the IP address instead.  That would
-      // trigger the following bug:
-      //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
-      //
-      if (endp->port() == this->addrs_[i].get_port_number()
-          && ACE_OS::strcmp(endp->host(), this->hosts_[i]) == 0)
-        return 1;
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         ACE_Reactor *reactor,
-                         int major,
-                         int minor,
-                         const char *address,
-                         const char *options)
-{
-
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) - ")
-                         ACE_TEXT ("SCIOP_Acceptor::open, ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (address == 0)
-    return -1;
-
-  ACE_UNUSED_ARG (major);
-  ACE_UNUSED_ARG (minor);
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  ACE_Multihomed_INET_Addr addr;
-
-  const char *port_separator_loc = ACE_OS::strchr (address, ':');
-  ACE_Auto_Basic_Array_Ptr<char> tmp_host_auto;
-
-  if (port_separator_loc == address)
-    {
-      // The address is a port number or port name.  No hostname was
-      // specified.  The hostname for each network interface and the
-      // fully qualified domain name must be obtained.
-
-      // Check for multiple network interfaces.
-      if (this->probe_interfaces (orb_core) == -1)
-        return -1;
-
-      // First convert the port into a usable form.
-      ACE_INET_Addr temp_addr;
-      if (temp_addr.set (address + sizeof (':')) != 0)
-        return -1;
-
-      // Now reset the port and set the host.
-      if (addr.set (temp_addr.get_port_number (),
-                    static_cast<ACE_UINT32> (INADDR_ANY),
-                    1) != 0)
-        return -1;
-      else
-        return this->open_i (addr,
-                             reactor);
-    }
-
-  // If we've reached this point, then the address consists of one or
-  // more hostnames, followed perhaps by a port.
-
-  u_short port_number = 0;
-  char *tmp_host = 0;
-  size_t hostname_length = 0;
-
-  if (port_separator_loc != 0) {
-
-    // Port separator was found.  Check that the next character is
-    // not the terminator.
-    const char *port_loc = port_separator_loc;
-    ++port_loc;
-    if (port_loc == 0) {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("SCIOP_Acceptor::open - ")
-                         ACE_TEXT ("no port number after the ")
-                         ACE_TEXT ("colon in \"%s\"\n"),
-                         address),
-                        -1);
-    }
-
-    // Read the port number
-    ACE_INET_Addr temp_addr;
-    if (temp_addr.string_to_addr(port_loc) != 0)
-      return -1;
-    port_number = temp_addr.get_port_number();
-
-    // Set the length of the hostname
-    hostname_length = port_separator_loc - address;
-
-  } else {
-
-    // Port separator was not found.  We allow port_number to retain
-    // the value of 0, which will cause the port to be chosen for us
-    // in open_i.
-
-    // Set the length of the hostname
-    hostname_length = ACE_OS::strlen(address);
-  }
-
-  ACE_NEW_RETURN(tmp_host, char[hostname_length + 1], -1);
-  tmp_host_auto.reset(tmp_host);
-  ACE_OS::memcpy (tmp_host, address, hostname_length);
-  tmp_host[hostname_length] = '\0';
-
-  // There may be multiple hostnames.  Parse them.
-  ACE_Array<ACE_CString> hostnames;
-  if (parse_multiple_hostnames(tmp_host, hostnames) != 0)
-    return -1;
-
-  // Check that at least one hostname was obtained.
-  if (hostnames.size() < 1) {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO (%P|%t) ")
-                       ACE_TEXT ("SCIOP_Acceptor::open - ")
-                       ACE_TEXT ("no hostnames in string \"%s\"\n"),
-                       tmp_host),
-                      -1);
-  }
-
-  // Obtain the primary ip address.
-  ACE_UINT32 primary_ip_addr = 0;
-  {
-    // Obtain a char* for the primary hostname.
-    ACE_CString & primary_hostname_obj = hostnames[0];
-    ACE_Auto_Basic_Array_Ptr<char> primary_hostname_auto(primary_hostname_obj.rep());
-    const char* primary_hostname = primary_hostname_auto.get();
-
-    // Convert the primary hostname to ACE_UINT32
-    ACE_INET_Addr temp_addr;
-    if (temp_addr.set((u_short) 0, primary_hostname) != 0)
-      return -1;
-
-    primary_ip_addr = temp_addr.get_ip_address();
-  }
-
-  // Allocate an array of secondary ip addresses.
-  ACE_UINT32 *secondary_ip_addrs = 0;
-  ACE_Auto_Basic_Array_Ptr<ACE_UINT32> secondary_ip_addrs_auto;
-  size_t num_secondary_ip_addrs = hostnames.size() - 1;
-  if (num_secondary_ip_addrs > 0) {
-    ACE_NEW_RETURN(secondary_ip_addrs,
-                   ACE_UINT32[num_secondary_ip_addrs],
-                   -1);
-    secondary_ip_addrs_auto.reset(secondary_ip_addrs);
-  }
-
-  // Populate the array of secondary ip addresses
-  size_t i = 0;
-  ACE_INET_Addr temp_addr;
-  while (i < num_secondary_ip_addrs) {
-
-    // Obtain a char* for a single secondary hostname.
-    ACE_CString & hostname_obj = hostnames[i + 1];
-    ACE_Auto_Basic_Array_Ptr<char> hostname_auto(hostname_obj.rep());
-    const char* hostname = hostname_auto.get();
-
-    // Obtain the ip address for this secondary hostname.
-    if (temp_addr.set((u_short) 0, hostname) != 0)
-      return -1;
-
-    // Put secondary ip address into the array
-    secondary_ip_addrs[i++] = temp_addr.get_ip_address();
-  }
-
-  // Populate our ACE_Multihomed_INET_Addr with all the right
-  // stuff.
-  if (addr.set(port_number,
-               primary_ip_addr,
-               1,
-               secondary_ip_addrs,
-               num_secondary_ip_addrs));
-
-  // Number of endpoints equals the size of the hostname array.
-  this->endpoint_count_ = hostnames.size();
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  // Copy the primary address to the first slot of the
-  // addrs_ array.
-  this->addrs_[0].set (addr);
-
-  // Copy secondary addresses to the remaining slots of the
-  // addrs_ array.
-  ACE_INET_Addr *secondary_addrs = this->addrs_;
-  ++secondary_addrs;
-  addr.get_secondary_addresses(secondary_addrs, num_secondary_ip_addrs);
-
-  // Set cached hostnames.
-  i = 0;
-  while (i < hostnames.size()) {
-
-    // The hostname_in_ior_ field may override the FIRST hostname only.
-    if (this->hostname_in_ior_ != 0 && i == 0)
-    {
-      if (TAO_debug_level > 2)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Overriding address in IOR with %s\n"),
-                    this->hostname_in_ior_));
-      }
-      if (this->hostname (orb_core,
-                          this->addrs_[i],
-                          this->hosts_[i],
-                          this->hostname_in_ior_) != 0)
-        return -1;
-    }
-    else
-    {
-      // Obtain a char* for the hostname.
-      ACE_CString & hostname_obj = hostnames[i];
-      ACE_Auto_Basic_Array_Ptr<char> hostname_auto(hostname_obj.rep());
-      const char* hostname = hostname_auto.get();
-
-      if (this->hostname (orb_core,
-                          this->addrs_[i],
-                          this->hosts_[i],
-                          hostname) != 0)
-        return -1;
-    }
-
-    ++i;
-  }
-
-  // Invoke open_i.
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_SCIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                 ACE_Reactor *reactor,
-                                 int major,
-                                 int minor,
-                                 const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("SCIOP_Acceptor::open_default - ")
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-
-  ACE_UNUSED_ARG (major);
-  ACE_UNUSED_ARG (minor);
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  // Check for multiple network interfaces.
-  if (this->probe_interfaces (orb_core) == -1)
-    return -1;
-
-  // Now that each network interface's hostname has been cached, open
-  // an endpoint on each network interface using the INADDR_ANY
-  // address.
-  ACE_Multihomed_INET_Addr addr;
-
-  if (addr.set (static_cast<u_short> (0),
-                static_cast<ACE_UINT32> (INADDR_ANY),
-                1) != 0)
-    return -1;
-
-  return this->open_i (addr,
-                       reactor);
-}
-
-int
-TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
-                           ACE_Reactor *reactor)
-{
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_SCIOP_CREATION_STRATEGY (this->orb_core_,
-                                              this->lite_flag_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_SCIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_SCIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  u_short requested_port = addr.get_port_number ();
-  if (requested_port == 0)
-    {
-      // don't care, i.e., let the OS choose an ephemeral port
-      if (this->base_acceptor_.open (addr,
-                                     reactor,
-                                     this->creation_strategy_,
-                                     this->accept_strategy_,
-                                     this->concurrency_strategy_) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot open acceptor")));
-          return -1;
-        }
-    }
-  else
-    {
-      ACE_Multihomed_INET_Addr a(addr);
-
-      int found_a_port = 0;
-      ACE_UINT32 last_port = requested_port + this->port_span_ - 1;
-      if (last_port > ACE_MAX_DEFAULT_PORT)
-        {
-          last_port = ACE_MAX_DEFAULT_PORT;
-        }
-
-      for (ACE_UINT32 p = requested_port; p <= last_port; p++)
-        {
-          if (TAO_debug_level > 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) SCIOP_Acceptor::open_i() ")
-                        ACE_TEXT ("trying to listen on port %d\n"), p));
-
-          // Now try to actually open on that port
-          a.set_port_number ((u_short)p);
-          if (this->base_acceptor_.open (a,
-                                         reactor,
-                                         this->creation_strategy_,
-                                         this->accept_strategy_,
-                                         this->concurrency_strategy_) != -1)
-            {
-              found_a_port = 1;
-              break;
-            }
-        }
-
-      // Now, if we couldn't locate a port, we punt
-      if (! found_a_port)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ")
-                        ACE_TEXT ("cannot open acceptor in port range (%d,%d)")
-                        ACE_TEXT ("- %p\n\n"),
-                        requested_port, last_port, ACE_TEXT("")));
-          return -1;
-        }
-    }
-
-  ACE_INET_Addr address;
-
-  // We do this make sure the port number the endpoint is listening on
-  // gets set in the addr.
-  if (this->base_acceptor_.acceptor ().get_local_addr (address) != 0)
-    {
-      // @@ Should this be a catastrophic error???
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot get local addr")));
-      return -1;
-    }
-
-  // Set the port for each addr.  If there is more than one network
-  // interface then the endpoint created on each interface will be on
-  // the same port.  This is how a wildcard socket bind() is supposed
-  // to work.
-  u_short port = address.get_port_number ();
-  for (CORBA::ULong j = 0; j < this->endpoint_count_; ++j)
-    this->addrs_[j].set_port_number (port, 1);
-
-  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
-  // This avoids having child processes acquire the listen socket thereby
-  // denying the server the opportunity to restart on a well-known endpoint.
-  // This does not affect the aberrent behavior on Win32 platforms.
-
-  if (TAO_debug_level > 5)
-    {
-      for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
-                      this->addrs_[i].get_port_number ()));
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
-                             ACE_INET_Addr &addr,
-                             char *&host,
-                             const char *specified_hostname)
-{
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // If dotted decimal addresses are enabled,
-      // just return ours.
-      return this->dotted_decimal_address (addr, host);
-    }
-  else if (specified_hostname != 0)
-    {
-      // If the user specified a hostname, pass it back
-      // blindly as it overrides our choice of hostname.
-      host = CORBA::string_dup (specified_hostname);
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN + 1];
-
-      // Get the hostname associated with our address
-      if (addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-        {
-          // On failure, just return the decimal address.
-          return this->dotted_decimal_address (addr, host);
-        }
-      else
-        {
-          host = CORBA::string_dup (tmp_host);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
-                                           char *&host)
-{
-  int result = 0;
-  const char *tmp = 0;
-
-  // If the IP address in the INET_Addr is the INADDR_ANY address,
-  // then force the actual IP address to be used by initializing a new
-  // INET_Addr with the hostname from the original one.  If that fails
-  // then something is seriously wrong with the systems networking
-  // setup.
-  if (addr.get_ip_address () == INADDR_ANY)
-    {
-      ACE_INET_Addr new_addr;
-      result = new_addr.set (addr.get_port_number (),
-                             addr.get_host_name ());
-      tmp = new_addr.get_host_addr ();
-    }
-  else
-    tmp = addr.get_host_addr ();
-
-  if (tmp == 0 || result != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) ")
-                    ACE_TEXT ("SCIOP_Acceptor::dotted_decimal_address ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot determine hostname")));
-      return -1;
-    }
-
-  host = CORBA::string_dup (tmp);
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
-{
-  // Extract the hostname for each network interface, and then cache
-  // it.  The hostnames will then be used when creating a
-  // TAO_SCIOP_Profile for each endpoint setup on the probed
-  // network interfaces.
-  ACE_INET_Addr *if_addrs = 0;
-  size_t if_cnt = 0;
-
-  if (ACE::get_ip_interfaces (if_cnt,
-                              if_addrs) != 0
-      && errno != ENOTSUP)
-    {
-      // In the case where errno == ENOTSUP, if_cnt and if_addrs will
-      // not be modified, and will each remain equal to zero.  This
-      // causes the default interface to be used.
-      return -1;
-    }
-
-  if (if_cnt == 0 || if_addrs == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) Unable to probe network ")
-                      ACE_TEXT ("interfaces.  Using default.\n")));
-        }
-
-      if_cnt = 1; // Force the network interface count to be one.
-      delete [] if_addrs;
-      ACE_NEW_RETURN (if_addrs,
-                      ACE_INET_Addr[if_cnt],
-                      -1);
-    }
-
-  // Scan for the loopback interface since it shouldn't be included in
-  // the list of cached hostnames unless it is the only interface.
-  size_t lo_cnt = 0;  // Loopback interface count
-  for (size_t j = 0; j < if_cnt; ++j)
-    if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
-      lo_cnt++;
-
-  // The instantiation for this template is in
-  // tao/SCIOP_Connector.cpp.
-  ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_if_addrs (if_addrs);
-
-  // If the loopback interface is the only interface then include it
-  // in the list of interfaces to query for a hostname, otherwise
-  // exclude it from the list.
-  if (if_cnt == lo_cnt)
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt);
-  else
-    this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt - lo_cnt);
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  ACE_OS::memset (this->hosts_, 0, sizeof (char*) * this->endpoint_count_);
-
-  // The number of hosts/interfaces we want to cache may not be the
-  // same as the number of detected interfaces so keep a separate
-  // count.
-  size_t host_cnt = 0;
-
-  for (size_t i = 0; i < if_cnt; ++i)
-    {
-      // Ignore any loopback interface if there are other
-      // non-loopback interfaces.
-      if (if_cnt != lo_cnt &&
-          if_addrs[i].get_ip_address() == INADDR_LOOPBACK)
-        continue;
-
-      if (this->hostname_in_ior_ != 0)
-        {
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("Overriding address in IOR with %s\n"),
-                          this->hostname_in_ior_));
-            }
-          if (this->hostname (orb_core,
-                              if_addrs[i],
-                              this->hosts_[host_cnt],
-                              this->hostname_in_ior_) != 0)
-            return -1;
-        }
-      else
-        {
-          if (this->hostname (orb_core,
-                              if_addrs[i],
-                              this->hosts_[host_cnt]) != 0)
-            return -1;
-        }
-
-      // Copy the addr.  The port is (re)set in
-      // TAO_SCIOP_Acceptor::open_i().
-      if (this->addrs_[host_cnt].set (if_addrs[i]) != 0)
-        return -1;
-
-      host_cnt++;
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames,
-                                              ACE_Array<ACE_CString> &hostnames_out)
-{
-
-  // Make a copy of hostnames string
-  int hostnames_string_length = ACE_OS::strlen(hostnames) + 1;
-  char* hostnames_copy = 0;
-  ACE_NEW_RETURN (hostnames_copy,
-                  char[hostnames_string_length],
-                  -1);
-  ACE_Auto_Basic_Array_Ptr<char> hostnames_copy_auto(hostnames_copy);
-  ACE_OS::strncpy(hostnames_copy, hostnames, hostnames_string_length);
-
-  // Count the number of hostnames separated by "+"
-  size_t num_hostnames = 0;
-  char *last = 0;
-  const char* hostname = ACE_OS::strtok_r (hostnames_copy, "+", &last);
-
-  while (hostname != 0) {
-    ++num_hostnames;
-    hostname = ACE_OS::strtok_r (0, "+", &last);
-  }
-
-  // Set the size of the array to the number of hostnames
-  if (hostnames_out.size(num_hostnames) == -1) {
-
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("TAO (%P|%t) Could not allocate storage ")
-                       ACE_TEXT ("for %d hostnames in SCIOP endpoint\n"),
-                       num_hostnames),
-                      -1);
-  }
-
-  // Refresh copy of hostnames string
-  ACE_NEW_RETURN (hostnames_copy,
-                  char[hostnames_string_length],
-                  -1);
-  hostnames_copy_auto.reset(hostnames_copy);
-  ACE_OS::strncpy(hostnames_copy, hostnames, hostnames_string_length);
-
-  // Iterate over the hostnames and stuff them into the array
-  size_t index = 0;
-  last = 0;
-  hostname = ACE_OS::strtok_r (hostnames_copy, "+", &last);
-
-  while (index < num_hostnames) {
-    ACE_CString hostname_object(hostname);
-    hostnames_out.set(hostname_object, index++);
-
-    hostname = ACE_OS::strtok_r (0, "+", &last);
-  }
-
-  return 0;
-}
-
-
-CORBA::ULong
-TAO_SCIOP_Acceptor::endpoint_count (void)
-{
-  return this->endpoint_count_;
-}
-
-int
-TAO_SCIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO::ObjectKey &object_key)
-{
-  // Create the decoding association from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't*do any*
-  // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) SCIOP_Profile::decode - v%d.%d\n"),
-                      major,
-                      minor));
-        }
-      return -1;
-    }
-
-  CORBA::String_var host;
-  CORBA::UShort port = 0;
-
-  // Get host and port. No processing here too..
-  if (cdr.read_string (host.out ()) == 0
-      || cdr.read_ushort (port) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) TAO_SCIOP_Acceptor::object_key - ")
-                      ACE_TEXT ("error while decoding host/port")));
-        }
-      return -1;
-    }
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  // We are NOT bothered about the rest.
-
-  return 1;
-}
-
-
-int
-TAO_SCIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  ACE_CString options (str);
-
-  size_t len = options.length ();
-
-  const char option_delimiter = '&';
-
-  // Count the number of options.
-
-  CORBA::ULong option_count = 1;
-  // Number of endpoints in the string  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      option_count++;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  int begin = 0;
-  int end = -1;
-
-  for (CORBA::ULong j = 0; j < option_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < option_count - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = static_cast<CORBA::ULong> (len)
-          - begin;  // Handle last endpoint differently
-
-      if (end == begin)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) Zero length SCIOP option.\n")),
-                          -1);
-      else if (end != ACE_CString::npos)
-        {
-          ACE_CString opt = options.substring (begin, end);
-
-          int slot = opt.find ("=");
-
-          if (slot == static_cast<int> (len - 1)
-              || slot == ACE_CString::npos)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) SCIOP option <%s> is ")
-                               ACE_TEXT ("missing a value.\n"),
-                               opt.c_str ()),
-                              -1);
-
-          ACE_CString name = opt.substring (0, slot);
-          ACE_CString value = opt.substring (slot + 1);
-
-          if (name.length () == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Zero length SCIOP ")
-                               ACE_TEXT ("option name.\n")),
-                              -1);
-
-          if (name == "priority")
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
-                                -1);
-            }
-          else if (name == "portspan")
-            {
-              int range = static_cast<int> (ACE_OS::atoi (value.c_str ()));
-              // @@ What's the lower bound on the range?  zero, or one?
-              if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint ")
-                                   ACE_TEXT ("portspan: <%s>\n")
-                                   ACE_TEXT ("Valid range 1 -- %d\n"),
-                                   value.c_str (), ACE_MAX_DEFAULT_PORT),
-                                  -1);
-
-              this->port_span_ = static_cast<u_short> (range);
-            }
-          else if (name == "hostname_in_ior")
-            {
-              this->hostname_in_ior_ = value.rep ();
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid SCIOP option: <%s>\n"),
-                               name.c_str ()),
-                              -1);
-        }
-    }
-  return 0;
-}
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
deleted file mode 100644
index a62f9e9d395..00000000000
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ /dev/null
@@ -1,228 +0,0 @@
-// $Id$
-// ===================================================================
-/*
- *  @file   SCIOP_Acceptor.h
- *
- *  SCIOP specific acceptor processing
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Acceptor, Originally by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-// ===================================================================
-
-
-#ifndef TAO_SCIOP_ACCEPTOR_H
-#define TAO_SCIOP_ACCEPTOR_H
-#include /**/ "ace/pre.h"
-#include "ace/Acceptor.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "ace/SOCK_SEQPACK_Acceptor.h"
-
-#include "tao/Transport_Acceptor.h"
-#include "SCIOP_Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-#include "tao/GIOP_Message_Version.h"
-
-// TAO SCIOP_Acceptor concrete call defination
-
-/**
- * @class TAO_SCIOP_Acceptor
- *
- * @brief TAO_SCIOP_Acceptor
- *
- * The SCIOP-specific bridge class for the concrete acceptor.
- */
-class TAO_Strategies_Export TAO_SCIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  /// Constructor.
-  TAO_SCIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_SCIOP_Acceptor (void);
-
-  /// @@ Helper method for the implementation repository, should go
-  ///    away
-  const ACE_INET_Addr& address (void) const;
-
-  /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
-
-  typedef ACE_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> TAO_SCIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> TAO_SCIOP_ACCEPT_STRATEGY;
-
-  /**
-   * The TAO_Acceptor methods, check the documentation in
-   * Transport_Acceptor.h for details.
-   */
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority);
-  virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key);
-
-  /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
-   * is useful if the given address corresponds to more than one
-   * hostname and the desired one cannot be determined in any
-   * other way.
-   */
-  int hostname (TAO_ORB_Core *orb_core,
-                ACE_INET_Addr &addr,
-                char *&host,
-                const char *specified_hostname = 0);
-
-  /**
-   * Set the host name for the given address using the dotted decimal
-   * format.
-   */
-  int dotted_decimal_address (ACE_INET_Addr &addr,
-                              char *&host);
-
-protected:
-
-  /**
-   * Implement the common part of the open*() methods.  This method is
-   * virtual to allow a derived class implementation to be invoked
-   * instead.
-   */
-  virtual int open_i (const ACE_Multihomed_INET_Addr &addr,
-                      ACE_Reactor *reactor);
-
-  /**
-   * Probe the system for available network interfaces, and initialize
-   * the <addrs_> array with an ACE_INET_Addr for each network
-   * interface.  The port for each initialized ACE_INET_Addr will be
-   * set in the open_i() method.  This method only gets invoked when
-   * no explicit hostname is provided in the specified endpoint.
-   */
-  int probe_interfaces (TAO_ORB_Core *orb_core);
-
-  /**
-   * Split the string into hostnames separated by the plus character
-   * ('+').
-   */
-  int parse_multiple_hostnames (const char *hostnames,
-                                ACE_Array<ACE_CString> &hostnames_out);
-
-  /**
-   * Parse protocol specific options.
-   *
-   * Currently supported:
-   *    portspan -- specifies the range of ports over which the acceptor
-   *                should scan looking for a free port (this is convenient
-   *                for situations where you might normally use an ephemeral
-   *                port but can't because you're behind a firewall and don't
-   *                want to permit passage on all ephemeral ports)
-   */
-  virtual int parse_options (const char *options);
-
-  /// Obtain tcp properties that must be used by this acceptor, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
-  /// Helper method to add a new profile to the mprofile for
-  /// each endpoint.
-  int create_new_profile (const TAO::ObjectKey &object_key,
-                          TAO_MProfile &mprofile,
-                          CORBA::Short priority);
-
-  /// Helper method to create a profile that contains all of
-  /// our endpoints.
-  int create_shared_profile (const TAO::ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             CORBA::Short priority);
-
-protected:
-
-  /// Array of ACE_INET_Addr instances, each one corresponding to a
-  /// given network interface.
-  ACE_INET_Addr *addrs_;
-
-  /**
-   * The number of ports over which the acceptor should search (starting
-   * at the port specified in each element of addrs_) for an available
-   * port.  This is specified via the "portspan=" option to the endpoint.
-   */
-  u_short port_span_;
-
-  /**
-   * Cache the information about the endpoints serviced by this
-   * acceptor.
-   * There may in fact be multiple hostnames for this endpoint. For
-   * example, if the IP address is INADDR_ANY (0.0.0.0) then there
-   * will be possibly a different hostname for each interface.
-   */
-  char **hosts_;
-
-  /// The number of host names cached in the hosts_ array (equivalent
-  /// to the number of endpoints opened by this Acceptor).
-  CORBA::ULong endpoint_count_;
-
-  /**
-   * Override the hostname used in the ORBEndPoint.
-   */
-  char *hostname_in_ior_;
-
-  /**
-   * The GIOP version for this endpoint
-   * @@ Theoretically they shouldn't be here!! We need to look at a
-   * way to move this out
-   */
-  TAO_GIOP_Message_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// Should we use GIOP lite??
-  CORBA::Boolean lite_flag_;
-
-private:
-
-  /// the concrete acceptor, as a pointer to it's base class.
-  TAO_SCIOP_BASE_ACCEPTOR base_acceptor_;
-
-  /// Acceptor strategies.
-  TAO_SCIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_;
-
-};
-
-#if defined(__ACE_INLINE__)
-#include "SCIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_SCIOP_ACCEPTOR_H */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.i b/TAO/tao/Strategies/SCIOP_Acceptor.i
deleted file mode 100644
index b6e6b200890..00000000000
--- a/TAO/tao/Strategies/SCIOP_Acceptor.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_SCIOP_Acceptor::address (void) const
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  // @@ This is busted.
-  //    The Implementation Repository will have to start supporting
-  //    IORs with multiple profiles.  For now, we just return the
-  //    first addr.
-  //                    -Ossama
-  return this->addrs_[0];
-}
-
-ACE_INLINE const ACE_INET_Addr *
-TAO_SCIOP_Acceptor::endpoints (void)
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  return this->addrs_;
-}
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
deleted file mode 100644
index c6b6f60ae5a..00000000000
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-#include "SCIOP_Connection_Handler.h"
-
-#if TAO_HAS_SCIOP == 1
-
-// jcohen@atl.lmco.com: The purpose of this is to allow RH9 to build
-// SCIOR Profile support even without a functioning SCTP implementation
-
-#ifndef IPPROTO_SCTP
-#  include "netinet/sctp.h"
-#else // !IPPROTO_SCTP
-#  ifndef SCTP_NODELAY
-#    define SCTP_NODELAY 1
-#  endif // !SCTP_NODELAY
-#endif
-
-#include "tao/Timeprobe.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "SCIOP_Transport.h"
-#include "SCIOP_Endpoint.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Wait_Strategy.h"
-
-ACE_RCSID (tao,
-           SCIOP_Connection_Handler,
-           "$Id$")
-
-TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_SCIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (0);
-}
-
-
-TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                            CORBA::Boolean flag)
-  : TAO_SCIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-  TAO_SCIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-           TAO_SCIOP_Transport (this, orb_core, flag));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-}
-
-TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core)
-  : TAO_SCIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2)
-{
-}
-
-
-TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-}
-
-int
-TAO_SCIOP_Connection_Handler::open_handler (void *v)
-{
-  return this->open (v);
-}
-
-int
-TAO_SCIOP_Connection_Handler::open (void*)
-{
-  TAO_SCIOP_Protocol_Properties protocol_properties;
-
-  // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  protocol_properties.no_delay_ =
-    this->orb_core ()->orb_params ()->nodelay ();
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
-
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (client)
-        {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  if (this->set_socket_option (this->peer (),
-                               protocol_properties.send_buffer_size_,
-                               protocol_properties.recv_buffer_size_) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_TCP_NODELAY)
-  if (this->peer ().set_option (IPPROTO_SCTP,
-                                SCTP_NODELAY,
-                                (void *) &protocol_properties.no_delay_,
-                                sizeof (protocol_properties.no_delay_)) == -1)
-    return -1;
-#endif /* ! ACE_LACKS_TCP_NODELAY */
-
-  if (this->transport ()->wait_strategy ()->non_blocking ())
-    {
-      if (this->peer ().enable (ACE_NONBLOCK) == -1)
-        return -1;
-    }
-
-  // Called by the <Strategy_Acceptor> when the handler is
-  // completely connected.
-
-  ACE_INET_Addr remote_addr;
-  if (this->peer ().get_remote_addr (remote_addr) == -1)
-    return -1;
-
-  ACE_INET_Addr local_addr;
-  if (this->peer ().get_local_addr (local_addr) == -1)
-    return -1;
-
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT("TAO(%P|%t) - SCIOP_Connection_Handler::open, ")
-                ACE_TEXT("The local addr is (%s) \n"),
-                local_addr. get_host_addr ()));
-
-  if (local_addr.get_ip_address () == remote_addr.get_ip_address ()
-      && local_addr.get_port_number () == remote_addr.get_port_number ())
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16];
-          ACE_TCHAR local_as_string[MAXHOSTNAMELEN + 16];
-
-          (void) remote_addr.addr_to_string (remote_as_string,
-                                             sizeof(remote_as_string));
-          (void) local_addr.addr_to_string (local_as_string,
-                                            sizeof(local_as_string));
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO(%P|%t) - TAO_SCIOP_Connection_Handler::open, ")
-                      ACE_TEXT("Holy Cow! The remote addr and ")
-                      ACE_TEXT("local addr are identical (%s == %s)\n"),
-                      remote_as_string, local_as_string));
-        }
-      return -1;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_TCHAR client[MAXHOSTNAMELEN + 16];
-
-      // Verify that we can resolve the peer hostname.
-      if (remote_addr.addr_to_string (client, sizeof (client)) == -1)
-        return -1;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - SCIOP_Connection_Handler::open, SCIOP ")
-                  ACE_TEXT ("connection to peer <%s> on %d\n"),
-                  client, this->peer ().get_handle ()));
-    }
-
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
-
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Connection_Handler::resume_handler (void)
-{
-  return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
-}
-
-int
-TAO_SCIOP_Connection_Handler::close_connection (void)
-{
-  return this->close_connection_eh (this);
-}
-
-int
-TAO_SCIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_eh (h, this);
-}
-
-int
-TAO_SCIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
-{
-  int result =
-    this->handle_output_eh (handle, this);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_SCIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                              const void *)
-{
-  // We don't use this upcall for I/O.  This is only used by the
-  // Connector to indicate that the connection timedout.  Therefore,
-  // we should call close().
-  return this->close ();
-}
-
-int
-TAO_SCIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                            ACE_Reactor_Mask)
-{
-  ACE_ASSERT (0);
-  return 0;
-}
-
-int
-TAO_SCIOP_Connection_Handler::close (u_long)
-{
-  return this->close_handler ();
-}
-
-int
-TAO_SCIOP_Connection_Handler::release_os_resources (void)
-{
-  return this->peer().close ();
-}
-
-int
-TAO_SCIOP_Connection_Handler::add_transport_to_cache (void)
-{
-  ACE_INET_Addr addr;
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Construct an  SCIOP_Endpoint object
-  TAO_SCIOP_Endpoint endpoint (
-      addr,
-      this->orb_core()->orb_params()->use_dotted_decimal_addresses ());
-
-  // Construct a property object
-  TAO_Base_Transport_Property prop (&endpoint);
-
-  TAO::Transport_Cache_Manager &cache =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Idle the transport..
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
-
-}
-
-int
-TAO_SCIOP_Connection_Handler::process_listen_point_list (
-    IIOP::ListenPointList &listen_list)
-{
-  // Get the size of the list
-  CORBA::ULong len = listen_list.length ();
-
-  for (CORBA::ULong i = 0; i < len; ++ i)
-    {
-      IIOP::ListenPoint listen_point = listen_list[i];
-      ACE_INET_Addr addr (listen_point.port,
-                          listen_point.host.in ());
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"),
-                      listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ())));
-        }
-
-      // Construct an  SCIOP_Endpoint object
-      TAO_SCIOP_Endpoint endpoint (addr,
-        this->orb_core()->orb_params()->use_dotted_decimal_addresses ());
-
-      // Construct a property object
-      TAO_Base_Transport_Property prop (&endpoint);
-
-      // Mark the connection as bidirectional
-      prop.set_bidir_flag (1);
-
-      // The property for this handler has changed. Recache the
-      // handler with this property
-      int retval = this->transport ()->recache_transport (&prop);
-      if (retval == -1)
-        return retval;
-
-      // Make the handler idle and ready for use
-      this->transport ()->make_idle ();
-    }
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_priority)
-{
-  int tos = IPDSFIELD_DSCP_DEFAULT << 2;
-
-  if (set_network_priority)
-    {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
-
-      CORBA::Long codepoint =
-        tph->get_dscp_codepoint ();
-
-      tos = (int)(codepoint) << 2;
-    }
-
-  if (tos != this->dscp_codepoint_)
-    {
-      int result = this->peer ().set_option (IPPROTO_IP,
-                                             IP_TOS,
-                                             (int *) &tos ,
-                                             (int) sizeof (tos));
-
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - SCIOP_Connection_Handler::"
-                      "set_dscp_codepoint -> dscp: %x; result: %d; %s\n",
-                      tos,
-                      result,
-                      result == -1 ? "try running as superuser" : ""));
-        }
-
-      // On successful setting of TOS field.
-      if (result == 0)
-        this->dscp_codepoint_ = tos;
-
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_SOCK_SEQPACK_Association, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_SEQPACK_Association, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
deleted file mode 100644
index 741bb4762e4..00000000000
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-// ===================================================================
-/**
- *  @file   SCIOP_Connection_Handler.h
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Connection_Handler.h
- *  @author  Originally by Chris Cleeland
- *  @author  modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_SCIOP_CONNECTION_HANDLER_H
-#define TAO_SCIOP_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-#include "tao/TimeBaseC.h"
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "strategies_export.h"
-#include "tao/Connection_Handler.h"
-#include "tao/IIOPC.h"
-
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_SEQPACK_Association.h"
-
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
-        TAO_SCIOP_SVC_HANDLER;
-
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
-// ****************************************************************
-
-/**
- * @class TAO_SCIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-
-
-class TAO_Strategies_Export TAO_SCIOP_Connection_Handler
-  : public TAO_SCIOP_SVC_HANDLER,
-    public TAO_Connection_Handler
-{
-
-public:
-
-  TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
-
-  /// Constructor.
-  TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                CORBA::Boolean flag);
-
-  /// Destructor.
-  ~TAO_SCIOP_Connection_Handler (void);
-
-  //@{
-  /**
-   * Connection_Handler overloads
-   */
-  virtual int open_handler (void *);
-  //@}
-
-  /// Called by the <Strategy_Acceptor> when the handler is completely
-  /// connected.  Argument is unused.
-  virtual int open (void *);
-
-  /// Close called by the Acceptor or Connector when connection
-  /// establishment fails.
-  int close (u_long = 0);
-
-  //@{
-  /** @name Event Handler overloads
-   */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-  /// Process the <listen_list>
-  int process_listen_point_list (IIOP::ListenPointList &listen_list);
-
-  /// Set Diff-Serv codepoint on outgoing packets.
-  int set_dscp_codepoint (CORBA::Boolean set_network_priority);
-
-protected:
-
-  /// Constructor that could be used by the derived classes.
-  /**
-   * Sometimes new pluggbale protocols which have similarties with
-   * IIOP may be tempted to this class for their use. Classical
-   * example being that of IIOP_SSL_Connection_Handler. This
-   * constructor just initializes its base class and sets all of its
-   * contents to the default value, if any
-   */
-  TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core);
-
-  //@{
-  /**
-   * @name TAO_Connection Handler overloads
-   */
-  //  void handle_close_i (void);
-  virtual int release_os_resources (void);
-  //@}
-
-private:
-
-  /// Stores the type of service value.
-  int dscp_codepoint_;
-};
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SCIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
deleted file mode 100644
index b53469bddfa..00000000000
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-#include "SCIOP_Connector.h"
-#include "SCIOP_Profile.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Connect_Strategy.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Transport.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Profile_Transport_Resolver.h"
-
-#include "ace/OS_NS_strings.h"
-#include "ace/Strategies_T.h"
-
-
-ACE_RCSID (TAO,
-           SCIOP_Connector,
-           "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_SCIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>;
-template class ACE_Connector_Base<TAO_SCIOP_Connection_Handler>;
-template class ACE_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>;
-
-template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SCIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>
-#pragma instantiate ACE_Connector_Base<TAO_SCIOP_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>
-
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_SCIOP_PROFILE),
-    lite_flag_ (flag),
-    connect_strategy_ (),
-    base_connector_ ()
-{
-}
-
-TAO_SCIOP_Connector::~TAO_SCIOP_Connector (void)
-{
-}
-
-int
-TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  // @@todo: The functionality of the following two statements could
-  // be  done in the constructor, but that involves changing the
-  // interface of the pluggable transport factory.
-
-  // Set the ORB Core
-  this->orb_core (orb_core);
-
-  // Create our connect strategy
-  if (this->create_connect_strategy () == -1)
-    return -1;
-
-  /// Our connect creation strategy
-  TAO_SCIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
-
-  ACE_NEW_RETURN (connect_creation_strategy,
-                  TAO_SCIOP_CONNECT_CREATION_STRATEGY
-                      (orb_core->thr_mgr (),
-                       orb_core,
-                       this->lite_flag_),
-                  -1);
-
-  /// Our activation strategy
-  TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
-
-  ACE_NEW_RETURN (concurrency_strategy,
-                  TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-                  -1);
-
-  return this->base_connector_.open (this->orb_core ()->reactor (),
-                                     connect_creation_strategy,
-                                     &this->connect_strategy_,
-                                     concurrency_strategy);
-}
-
-int
-TAO_SCIOP_Connector::close (void)
-{
-  delete this->base_connector_.concurrency_strategy ();
-  delete this->base_connector_.creation_strategy ();
-  return this->base_connector_.close ();
-}
-
-int
-TAO_SCIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
-{
-  TAO_SCIOP_Endpoint *sciop_endpoint =
-    this->remote_endpoint (endpoint);
-
-  if (sciop_endpoint == 0)
-    return -1;
-
-   const ACE_INET_Addr &remote_address =
-     sciop_endpoint->object_addr ();
-
-   // Verify that the remote ACE_INET_Addr was initialized properly.
-   // Failure can occur if hostname lookup failed when initializing the
-   // remote ACE_INET_Addr.
-   if (remote_address.get_type () != AF_INET)
-     {
-       if (TAO_debug_level > 0)
-         {
-           ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("TAO (%P|%t) SCIOP connection failed.\n")
-                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                       ACE_TEXT ("due to a hostname lookup ")
-                       ACE_TEXT ("failure.\n")));
-         }
-
-       return -1;
-     }
-
-   return 0;
-}
-
-TAO_Transport *
-TAO_SCIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
-                                      TAO_Transport_Descriptor_Interface &desc,
-                                      ACE_Time_Value *timeout)
-{
-  TAO_Endpoint *tao_endpoint = desc.endpoint ();
-
-  TAO_Transport *transport = 0;
-
-  // @@ ATL folks, is this while loop needed?
-  // TAO_Default_Endpoint_Selector has this code already, i.e., the
-  // loop.
-  while (tao_endpoint != 0)
-    {
-      TAO_SCIOP_Endpoint *sciop_endpoint =
-        this->remote_endpoint (tao_endpoint);
-
-      if (sciop_endpoint != 0)
-        {
-          transport =
-            this->make_connection_i (r, desc, timeout, sciop_endpoint);
-          if (transport)
-            {
-              break;
-            }
-        }
-      tao_endpoint = tao_endpoint->next();
-    }
-
-  return transport;
-}
-
-
-TAO_Transport *
-TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
-                                        TAO_Transport_Descriptor_Interface &desc,
-                                        ACE_Time_Value *timeout,
-                                        TAO_SCIOP_Endpoint *sciop_endpoint)
-{
-  const ACE_INET_Addr &remote_address =
-    sciop_endpoint->object_addr ();
-
-  if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                  "to <%s:%d> which should %s\n",
-                  ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()),
-                  sciop_endpoint->port(),
-                  r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
-
-  // Get the right synch options
-  ACE_Synch_Options synch_options;
-
-  this->active_connect_strategy_->synch_options (timeout,
-                                                 synch_options);
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked_connect())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      timeout = &tmp_zero;
-    }
-
-  TAO_SCIOP_Connection_Handler *svc_handler = 0;
-
-  // Connect.
-  ACE_Multihomed_INET_Addr multihomed;
-  if (multihomed.set(remote_address.get_port_number(),
-                     remote_address.get_ip_address()))
-    return 0;
-
-  ACE_Multihomed_INET_Addr local_address;
-
-  bool pn =
-    sciop_endpoint->is_preferred_network ();
-
-  if (pn)
-    local_address.set ((u_short) 0,
-                       sciop_endpoint->preferred_network ());
-
-  int result =
-    this->base_connector_.connect (svc_handler,
-                                   multihomed,
-                                   synch_options,
-                                   local_address);
-
-  // This call creates the service handler and bumps the #REFCOUNT# up
-  // one extra.  There are three possibilities: (a) connection
-  // succeeds immediately - in this case, the #REFCOUNT# on the
-  // handler is two; (b) connection completion is pending - in this
-  // case, the #REFCOUNT# on the handler is also two; (c) connection
-  // fails immediately - in this case, the #REFCOUNT# on the handler
-  // is one since close() gets called on the handler.
-  //
-  // The extra reference count in
-  // TAO_Connect_Creation_Strategy::make_svc_handler() is needed in
-  // the case when connection completion is pending and we are going
-  // to wait on a variable in the handler to changes, signifying
-  // success or failure.  Note, that this increment cannot be done
-  // once the connect() returns since this might be too late if
-  // another thread pick up the completion and potentially deletes the
-  // handler before we get a chance to increment the reference count.
-
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
-
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
-        {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     timeout))
-            {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::"
-                                      "make_connection_i, "
-                                      "wait for completion failed\n"));
-            }
-         }
-       else
-         {
-           // Transport is not usable
-           transport = 0;
-         }
-    }
-
-  // In case of errors transport is zero
-  if (transport == 0)
-    {
-      // Give users a clue to the problem.
-      if (TAO_debug_level)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                      "connection to <%s:%d> failed (%p)\n",
-                      sciop_endpoint->host (), sciop_endpoint->port (),
-                      "errno"));
-        }
-
-      return 0;
-    }
-
-  // At this point, the connection has be successfully connected.
-  // #REFCOUNT# is one.
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                "new %s connection to <%s:%d> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
-                sciop_endpoint->host (), sciop_endpoint->port (),
-                svc_handler->peer ().get_handle ()));
-
-  // Add the handler to Cache
-  int retval =
-    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc,
-                                                                             transport);
-
-  // Failure in adding to cache.
-  if (retval != 0)
-    {
-      // Close the handler.
-      svc_handler->close ();
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
-                      "could not add the new connection to cache\n"));
-        }
-
-      return 0;
-    }
-
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
-
-      // Close the handler.
-      (void) transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - SCIOP_Connector [%d]::make_connection_i, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
-
-      return 0;
-    }
-
-  return transport;
-}
-
-TAO_Profile *
-TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_SCIOP_Profile (this->orb_core ()),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-TAO_Profile *
-TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The endpoint should be of the form:
-  //    N.n@host:port/object_key
-  // or:
-  //    host:port/object_key
-
-  TAO_Profile *profile = 0;
-  ACE_NEW_THROW_EX (profile,
-                    TAO_SCIOP_Profile (this->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return profile;
-}
-
-int
-TAO_SCIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char *protocol[] = { "sciop", "scioploc" };
-
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
-  size_t len0 = ACE_OS::strlen (protocol[0]);
-  size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an SCIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_SCIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_SCIOP_Profile::object_key_delimiter_;
-}
-
-TAO_SCIOP_Endpoint *
-TAO_SCIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != TAO_TAG_SCIOP_PROFILE)
-    return 0;
-
-  TAO_SCIOP_Endpoint *sciop_endpoint =
-    dynamic_cast<TAO_SCIOP_Endpoint *> (endpoint );
-  if (sciop_endpoint == 0)
-    return 0;
-
-  return sciop_endpoint;
-}
-
-int
-TAO_SCIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_SCIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_SCIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    // Cancel from the connector
-    return this->base_connector_.cancel (handler);
-
-  return -1;
-}
-
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
deleted file mode 100644
index dd6aa57d8c2..00000000000
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-//=============================================================================
-/**
- *  @file    SCIOP_Connector.h
- *
- *  SCIOP specific connector processing
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Connector by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Ossama Othman <ossama@uci.edu>
- *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SCIOP_CONNECTOR_H
-#define TAO_SCIOP_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-#include "ace/SOCK_SEQPACK_Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-class TAO_SCIOP_Endpoint;
-
-#include "ace/Connector.h"
-#include "tao/Transport_Connector.h"
-#include "tao/Connector_Impl.h"
-#include "SCIOP_Connection_Handler.h"
-
-// ****************************************************************
-
-/**
- * @class TAO_SCIOP_Connector
- *
- * @brief SCIOP-specific Connector bridge for pluggable protocols.
- *
- * Concrete instance of the TAO_Connector class.  Responsible
- * for establishing a connection with a server and is called from the
- * Connector_Registory.
- */
-class TAO_Strategies_Export TAO_SCIOP_Connector : public TAO_Connector
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_SCIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_SCIOP_Connector (void);
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Transport_Connector.h
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-
-public:
-
-  typedef TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>
-          TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY;
-
-  typedef TAO_Connect_Creation_Strategy<TAO_SCIOP_Connection_Handler>
-          TAO_SCIOP_CONNECT_CREATION_STRATEGY;
-
-  typedef ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler,
-                               ACE_SOCK_SEQPACK_CONNECTOR>
-          TAO_SCIOP_CONNECT_STRATEGY ;
-
-  typedef ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler,
-                                 ACE_SOCK_SEQPACK_CONNECTOR>
-          TAO_SCIOP_BASE_CONNECTOR;
-
-protected:
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Transport_Connector.h
-  int set_validate_endpoint (TAO_Endpoint *ep);
-
-  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
-                                  TAO_Transport_Descriptor_Interface &desc,
-                                  ACE_Time_Value *timeout = 0);
-
-  /// More TAO_Connector methods, please check the documentation on
-  /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-
-protected:
-
-  /// Do we need to use a GIOP_Lite for sending messages?
-  CORBA::Boolean lite_flag_;
-
-
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
-  /// Try to make a connection to the next endpoint in the list.
-  TAO_Transport *make_connection_i (TAO::Profile_Transport_Resolver *r,
-                                    TAO_Transport_Descriptor_Interface &desc,
-                                    ACE_Time_Value *timeout,
-                                    TAO_SCIOP_Endpoint *sciop_endpoint);
-
-private:
-
-  /// Our connect strategy
-  TAO_SCIOP_CONNECT_STRATEGY connect_strategy_;
-
-  /// The connector initiating connection requests for SCIOP.
-  TAO_SCIOP_BASE_CONNECTOR base_connector_;
-};
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SCIOP_CONNECTOR_H */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
deleted file mode 100644
index a6389c1f50e..00000000000
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-#include "SCIOP_Endpoint.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "tao/ORB_Constants.h"
-#include "tao/debug.h"
-
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Log_Msg.h"
-#include "ace/Synch.h"
-#include "ace/OS_NS_stdio.h"
-#include "ORB_Core.h"
-
-ACE_RCSID (Strategies,
-           SCIOP_Endpoint,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "SCIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
-  : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-  , host_ ()
-  , port_ (683)  // default port (IANA assigned)
-  , object_addr_ (addr)
-  , object_addr_set_ (0)
-  , preferred_path_ ()
-  , is_encodable_ (true)
-  , next_ (0)
-{
-  this->set (addr, use_dotted_decimal_addresses);
-}
-
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
-                                        CORBA::UShort port,
-                                        const ACE_INET_Addr &addr,
-                                        CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE,
-                  priority)
-  , host_ (host)
-  , port_ (port)
-  , object_addr_ (addr)
-  , object_addr_set_ (0)
-  , preferred_path_ ()
-  , is_encodable_ (true)
-  , next_ (0)
-{
-}
-
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-  , host_ ()
-  , port_ (683)  // default port (IANA assigned)
-  , object_addr_ ()
-  , object_addr_set_ (0)
-  , preferred_path_ ()
-  , is_encodable_ (true)
-  , next_ (0)
-{
-}
-
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const char *host,
-                                        CORBA::UShort port,
-                                        CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
-  , host_ (host)
-  , port_ (port)
-  , object_addr_ ()
-  , object_addr_set_ (0)
-  , preferred_path_ ()
-  , is_encodable_ (true)
-  , next_ (0)
-{
-  this->priority (priority);
-}
-
-TAO_SCIOP_Endpoint::~TAO_SCIOP_Endpoint (void)
-{
-}
-
-TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const TAO_SCIOP_Endpoint &rhs)
-  : TAO_Endpoint (rhs.tag_,
-                  rhs.priority_)
-  , host_ (rhs.host_)
-  , port_ (rhs.port_)
-  , object_addr_ (rhs.object_addr_)
-  , object_addr_set_ (rhs.object_addr_set_)
-  , preferred_path_  (rhs.preferred_path_)
-  , is_encodable_ (rhs.is_encodable_)
-  , next_ (0)
-{
-}
-
-int
-TAO_SCIOP_Endpoint::set (const ACE_INET_Addr &addr,
-                        int use_dotted_decimal_addresses)
-{
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (use_dotted_decimal_addresses
-      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-    {
-      const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("SCIOP_Endpoint::set ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-          return -1;
-        }
-      else
-        this->host_ = tmp;
-    }
-  else
-    this->host_ = CORBA::string_dup (tmp_host);
-
-  this->port_ = addr.get_port_number();
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_SCIOP_Endpoint::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-TAO_Endpoint *
-TAO_SCIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_SCIOP_Endpoint::duplicate (void)
-{
-  TAO_SCIOP_Endpoint *endpoint = 0;
-
-  // @@NOTE: Not at all exception safe
-  ACE_NEW_RETURN (endpoint,
-                  TAO_SCIOP_Endpoint (*this),
-                  0);
-
-  return endpoint;
-}
-
-CORBA::Boolean
-TAO_SCIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  TAO_Endpoint *endpt =
-    const_cast<TAO_Endpoint *> (other_endpoint);
-
-  TAO_SCIOP_Endpoint *endpoint =
-    dynamic_cast<TAO_SCIOP_Endpoint *> (endpt);
-  if (endpoint == 0)
-    return 0;
-
-  return (this->port_ == endpoint->port_
-          && (ACE_OS::strcmp(this->host(), endpoint->host()) == 0));
-}
-
-CORBA::ULong
-TAO_SCIOP_Endpoint::hash (void)
-{
-  if (this->hash_val_ != 0)
-    return this->hash_val_;
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->addr_lookup_lock_,
-                      this->hash_val_);
-    // .. DCL
-    if (this->hash_val_ != 0)
-      return this->hash_val_;
-
-    // A few comments about this optimization. The call below will
-    // deadlock if the object_addr_set is false. If you don't belive
-
-    if (!this->object_addr_set_)
-      {
-        // Set the object_addr first
-        (void) this->object_addr_i ();
-      }
-
-    this->hash_val_ =
-      this->object_addr_.get_ip_address () + this->port ();
-  }
-
-  return this->hash_val_;
-}
-
-const ACE_INET_Addr &
-TAO_SCIOP_Endpoint::object_addr (void) const
-{
-  // The object_addr_ is initialized here, rather than at IOR decode
-  // time for several reasons:
-  //   1. A request on the object may never be invoked.
-  //   2. The DNS setup may have changed dynamically.
-  //   ...etc..
-
-  // Double checked locking optimization.
-  if (!this->object_addr_set_)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        guard,
-                        this->addr_lookup_lock_,
-                        this->object_addr_);
-
-      if (!this->object_addr_set_)
-        {
-          (void) this->object_addr_i ();
-        }
-    }
-
-  return this->object_addr_;
-}
-
-void
-TAO_SCIOP_Endpoint::object_addr_i (void) const
-{
-  if (this->object_addr_.set (this->port_,
-                              this->host_.in ()) == -1)
-    {
-      // If this call fails, it most likely due a hostname
-      // lookup failure caused by a DNS misconfiguration.  If
-      // a request is made to the object at the given host and
-      // port, then a CORBA::TRANSIENT() exception should be
-      // thrown.
-
-      // Invalidate the ACE_INET_Addr.  This is used as a flag
-      // to denote that ACE_INET_Addr initialization failed.
-      this->object_addr_.set_type (-1);
-    }
-  else
-    {
-      this->object_addr_set_ = true;
-    }
-}
-
-CORBA::ULong
-TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc)
-{
-  ACE_CString tmp (
-    oc->orb_params ()->preferred_interfaces ());
-
-  ssize_t pos = 0;
-
-  pos = tmp.find (this->host_.in ());
-
-  TAO_SCIOP_Endpoint *latest = this;
-
-  CORBA::ULong count = 0;
-
-  while (pos != ACE_CString::npos)
-    {
-      // Do we have a "," or an '\0'?
-      ssize_t new_pos = tmp.find (",",
-                                  pos + 1);
-
-      // Length of the preferred path
-      int length = 0;
-
-      if (new_pos == ACE_CString::npos)
-        length = tmp.length () - pos;
-      else
-        length = new_pos - pos;
-
-      ACE_CString rem_tmp = tmp.substr (pos, length);
-
-      // Search for the ":"
-      ssize_t col_pos = rem_tmp.find (":");
-
-      if (col_pos == ACE_CString::npos)
-        {
-          pos = tmp.find (latest->host_.in (),
-                          pos + length);
-          continue;
-        }
-
-      ACE_CString path = rem_tmp.substr (col_pos + 1);
-
-      latest->preferred_path_.host =
-        CORBA::string_dup (path.c_str ());
-
-      if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Adding path [%s] "
-                    " as preferred path for [%s] \n",
-                    path.c_str (), this->host_.in ()));
-
-      pos = tmp.find (latest->host_.in (),
-                      pos + length);
-
-      if (pos != ACE_CString::npos)
-        {
-          TAO_Endpoint *tmp_ep =
-            latest->duplicate ();
-
-          latest->next_ = dynamic_cast<TAO_SCIOP_Endpoint *> (tmp_ep);
-
-          if (latest->next_ == 0) return count;
-
-          latest = latest->next_;
-          ++count;
-        }
-    }
-
-  if (tmp.length () != 0 &&
-      !oc->orb_params ()->enforce_pref_interfaces ())
-    {
-      TAO_Endpoint *tmp_ep = latest->duplicate ();
-
-      latest->next_ =
-        dynamic_cast<TAO_SCIOP_Endpoint *> (tmp_ep);
-
-      if (latest->next_ == 0) return count;
-
-      latest->next_->preferred_path_.host = (const char *) 0;
-      ++count;
-    }
-
-  return count;
-}
-
-bool
-TAO_SCIOP_Endpoint::is_preferred_network (void) const
-{
-  return (this->preferred_path_.host.in () != 0);
-}
-
-const char *
-TAO_SCIOP_Endpoint::preferred_network (void) const
-{
-  return this->preferred_path_.host.in ();
-}
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
deleted file mode 100644
index 0095ccfe186..00000000000
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-
-//===========================================================================
-/**
- *  @file     SCIOP_Endpoint.h
- *
- *  SCIOP implementation of PP Framework Endpoint interface.
- *
- *  $Id$
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Endpoint by
- *  @author  Marina Spivak <marina@cs.wustl.edu>
- */
-//==========================================================================
-
-
-#ifndef TAO_SCIOP_ENDPOINT_H
-#define TAO_SCIOP_ENDPOINT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-#include "tao/Endpoint.h"
-#include "strategies_export.h"
-#include "tao/CORBA_String.h"
-#include "ace/INET_Addr.h"
-#include "tao/IIOP_EndpointsC.h"
-
-class TAO_SCIOP_Connection_Handler;
-
-/**
- * @class TAO_SCIOP_Endpoint
- *
- * @brief TAO_SCIOP_Endpoint
- *
- * SCIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_Strategies_Export TAO_SCIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  // @todo Lose these friends!
-  friend class TAO_SCIOP_Profile;
-  friend class TAO_SSLIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_SCIOP_Endpoint (void);
-
-  /// Constructor.  This is the most efficient constructor since it
-  /// does not require any address resolution processing.
-  TAO_SCIOP_Endpoint (const char *host,
-                      CORBA::UShort port,
-                      const ACE_INET_Addr &addr,
-                      CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Constructor.
-  TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
-                     int use_dotted_decimal_addresses);
-
-  /// Constructor.  This constructor is used when decoding endpoints.
-  TAO_SCIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     CORBA::Short priority);
-
-  /// Destructor.
-  ~TAO_SCIOP_Endpoint (void);
-
-  // = Implementation of abstract TAO_Endpoint methods.  See
-  // Endpoint.h for their documentation.
-
-  virtual TAO_Endpoint *next (void);
-  virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
-  virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
-
-  // = SCIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_INET_Addr &object_addr (void) const;
-
-  /// Return a pointer to the host string.  This object maintains
-  /// ownership of this string.
-  const char *host (void) const;
-
-  /// Copy the string <h> into <host_> and return the resulting pointer.
-  /// This object maintains ownership of this string.
-  const char *host (const char *h);
-
-  /// Return the port number.
-  CORBA::UShort port (void) const;
-
-  /// Set the port number.
-  CORBA::UShort port (CORBA::UShort p);
-
-  /// Do we have a preferred local network for the target?
-  bool is_preferred_network (void) const;
-
-  /// Return the preferred network if any.
-  const char *preferred_network (void) const;
-
-private:
-
-  /// Helper method for setting INET_Addr.
-  int set (const ACE_INET_Addr &addr,
-           int use_dotted_decimal_addresses);
-
-  /// Helper method for object_addr ().
-  void object_addr_i (void) const;
-
-  /// Generate preferred interfaces from the options passed in by the
-  /// user.
-  CORBA::ULong preferred_interfaces (TAO_ORB_Core *oc);
-
-  /// Canonical copy constructor
-  /**
-   * In private section to prevent clients from invoking this
-   * accidentally. Clients should only use duplicate () to make a depp
-   * copy
-   */
-  TAO_SCIOP_Endpoint (const TAO_SCIOP_Endpoint &);
-
-
-  /// String representing the host name.
-  CORBA::String_var host_;
-
-  /// TCP port number.
-  CORBA::UShort port_;
-
-  /// Cached instance of <ACE_INET_Addr> for use in making
-  /// invocations, etc.
-  mutable ACE_INET_Addr object_addr_;
-
-  /// Flag to indicate if the address has been resolved and set.
-  mutable int object_addr_set_;
-
-  /// Preferred path for this endpoint.
-  TAO::IIOP_Endpoint_Info preferred_path_;
-
-  /// Is this endpoint created encodable as part of the IOR?
-  bool is_encodable_;
-
-  /// SCIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_SCIOP_Endpoint *next_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "SCIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_SCIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.i b/TAO/tao/Strategies/SCIOP_Endpoint.i
deleted file mode 100644
index fd182741c6b..00000000000
--- a/TAO/tao/Strategies/SCIOP_Endpoint.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const char *
-TAO_SCIOP_Endpoint::host (void) const
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_SCIOP_Endpoint::port (void) const
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_SCIOP_Endpoint::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
deleted file mode 100644
index 0383f053e2a..00000000000
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "SCIOP_Factory.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Connector.h"
-#include "ace/OS_NS_strings.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "tao/IOPC.h"
-
-ACE_RCSID (tao,
-           SCIOP_Factory,
-           "$Id$")
-
-static const char prefix_[] = "sciop";
-
-TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
-     major_ (TAO_DEF_SCIOP_MAJOR),
-     minor_ (TAO_DEF_SCIOP_MINOR)
-{
-}
-
-TAO_SCIOP_Protocol_Factory::~TAO_SCIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_SCIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_SCIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_SCIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_SCIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_SCIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_SCIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_SCIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_SCIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory,
-                       ACE_TEXT ("SCIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_SCIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_SCIOP_Protocol_Factory)
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
deleted file mode 100644
index 7b4a30aab29..00000000000
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-//=============================================================================
-/**
- *  @file   SCIOP_Factory.h
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Factory by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SCIOP_FACTORY_H
-#define TAO_SCIOP_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "strategies_export.h"
-#include "ace/Service_Config.h"
-#include "tao/Protocol_Factory.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  TAO_SCIOP_Protocol_Factory (void);
-  virtual ~TAO_SCIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
-
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SCIOP_FACTORY_H */
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
deleted file mode 100644
index 849981f5e07..00000000000
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "SCIOP_Lite_Factory.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Connector.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_strings.h"
-
-#if TAO_HAS_SCIOP == 1
-
-ACE_RCSID(tao, SCIOP_Factory, "$Id$")
-
-static const char prefix_[] = "sciop";
-
-TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
-     major_ (TAO_DEF_SCIOP_MAJOR),
-     minor_ (TAO_DEF_SCIOP_MINOR)
-{
-}
-
-TAO_SCIOP_Lite_Protocol_Factory::~TAO_SCIOP_Lite_Protocol_Factory (void)
-{
-
-}
-
-int
-TAO_SCIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_SCIOP_Lite_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_SCIOP_Lite_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_SCIOP_Lite_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
-  ACE_NEW_RETURN (acceptor,
-                  TAO_SCIOP_Acceptor (lite_flag),
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_SCIOP_Lite_Protocol_Factory::init (int /*argc*/,
-                                      ACE_TCHAR* /*argv*/ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_SCIOP_Lite_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  // We are a Lite factory
-  CORBA::Boolean lite_flag = 1;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_SCIOP_Connector (lite_flag),
-                  0);
-  return connector;
-}
-
-int
-TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory,
-                       ACE_TEXT ("SCIOP_Lite_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_SCIOP_Lite_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                       ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO, TAO_SCIOP_Lite_Protocol_Factory)
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
deleted file mode 100644
index cdade7a16e9..00000000000
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-//==========================================================================
-/**
- *  @file   SCIOP_Lite_Factory.h
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Lite_Factory by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//==========================================================================
-
-
-#ifndef TAO_SCIOP_LITE_FACTORY_H
-#define TAO_SCIOP_LITE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "strategies_export.h"
-#include "ace/Service_Config.h"
-#include "tao/Protocol_Factory.h"
-
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Strategies_Export TAO_SCIOP_Lite_Protocol_Factory :
-  public TAO_Protocol_Factory
-{
-public:
-  TAO_SCIOP_Lite_Protocol_Factory (void);
-
-  virtual ~TAO_SCIOP_Lite_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SCIOP_Lite_factory_H */
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
deleted file mode 100644
index 510b6000462..00000000000
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ /dev/null
@@ -1,515 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// SCIOP_Profile.cpp
-
-#include "SCIOP_Profile.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "sciop_endpointsC.h"
-
-ACE_RCSID(Strategies,
-          SCIOP_Profile,
-          "$Id$")
-
-static const char prefix_[] = "sciop";
-
-const char TAO_SCIOP_Profile::object_key_delimiter_ = '/';
-
-char
-TAO_SCIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_SCIOP_Profile::object_key_delimiter_;
-}
-
-
-
-TAO_SCIOP_Profile::TAO_SCIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO::ObjectKey &object_key,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SCIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ()),
-    count_ (1)
-{
-}
-
-TAO_SCIOP_Profile::TAO_SCIOP_Profile (const char* host,
-                                    CORBA::UShort port,
-                                    const TAO::ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SCIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (host, port, addr),
-    count_ (1)
-{
-}
-
-TAO_SCIOP_Profile::TAO_SCIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SCIOP_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_SCIOP_MAJOR, TAO_DEF_SCIOP_MINOR)),
-    endpoint_ (),
-    count_ (1)
-{
-}
-
-TAO_SCIOP_Profile::~TAO_SCIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-int
-TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
-{
-  // Decode multiple endpoints, starting with the primary (endpoint_)
-  CORBA::StringSeq endpointSeq;
-  cdr >> endpointSeq;
-
-  this->endpoint_.host_ = endpointSeq[0];
-
-  if (cdr.read_ushort (this->endpoint_.port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) SCIOP_Profile::decode - ")
-                    ACE_TEXT ("error while decoding host/port")));
-      return -1;
-    }
-
-  // Add multiple endpoints > 1
-
-  for (int i=endpointSeq.length() - 1; i > 0 ; i--)
-    {
-      TAO_SCIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_SCIOP_Endpoint (endpointSeq[i].in(),
-                                          this->endpoint_.port_,
-                                          this->endpoint_.priority()),
-                      -1);
-
-      this->count_ +=
-        endpoint->preferred_interfaces (this->orb_core ());
-
-      this->add_endpoint (endpoint);
-    }
-
-  // SCIOR has a max_streams variable
-  // We are ignoring it for now since ACE SCTP code fixes at 1 anyway.
-
-  CORBA::UShort max_streams;
-  if ((cdr.read_ushort(max_streams)) == 0) {
-    return -1;
-  }
-
-  if (cdr.good_bit ())
-    {
-      // Invalidate the object_addr_ until first access.
-      this->endpoint_.object_addr_.set_type (-1);
-
-      return 1;
-    }
-
-  return -1;
-}
-
-void
-TAO_SCIOP_Profile::parse_string_i (const char *ior
-                                   ACE_ENV_ARG_DECL)
-{
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-
-  const char *okd = ACE_OS::strchr (ior, this->object_key_delimiter_);
-
-  if (okd == 0 || okd == ior)
-    {
-      // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Length of host string.
-  CORBA::ULong length_host = 0;
-
-  const char *cp_pos = ACE_OS::strchr (ior, ':');  // Look for a port
-
-  if (cp_pos == ior)
-    {
-      // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-  else if (cp_pos != 0)
-    {
-      // A port number or port name was specified.
-      CORBA::ULong length_port = okd - cp_pos - 1;
-
-      CORBA::String_var tmp = CORBA::string_alloc (length_port);
-
-      ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port);
-      tmp[length_port] = '\0';
-
-      this->endpoint_.port_ =
-        static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
-
-      length_host = cp_pos - ior;
-    }
-  else
-    length_host = okd - ior;
-
-  CORBA::String_var tmp = CORBA::string_alloc (length_host);
-
-  // Skip the trailing '/'
-  ACE_OS::strncpy (tmp.inout (), ior, length_host);
-  tmp[length_host] = '\0';
-
-  this->endpoint_.host_ = tmp._retn ();
-
-  if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0)
-    {
-      ACE_INET_Addr host_addr;
-
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host, i.e. the
-      // local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-        {
-          // Can't get the IP address since the INET_Addr wasn't
-          // initialized.  Just throw an exception.
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("SCIOP_Profile::parse_string ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-
-          // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
-                       CORBA::SystemException::_tao_minor_code (
-                         TAO::VMCID,
-                         EINVAL),
-                       CORBA::COMPLETED_NO));
-        }
-      else
-        this->endpoint_.host_ = CORBA::string_dup (tmp_host);
-    }
-
-  TAO::ObjectKey ok;
-
-  TAO::ObjectKey::decode_string_to_sequence (ok,
-                                             okd + 1);
-
-  (void) this->orb_core ()->object_key_table ().bind (ok,
-                                                      this->ref_object_key_);
-}
-
-CORBA::Boolean
-TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
-{
-  const TAO_SCIOP_Profile *op =
-    dynamic_cast<const TAO_SCIOP_Profile *> (other_profile);
-
-  if (op == 0)
-    return 0;
-
-  // Check endpoints equivalence.
-  const TAO_SCIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_SCIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_SCIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Get the hash value for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_SCIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  const TAO::ObjectKey &ok =
-    this->ref_object_key_->object_key ();
-
-  if (ok.length () >= 4)
-    {
-      hashval += ok[1];
-      hashval += ok[3];
-    }
-
-  hashval += this->hash_service_i (max);
-
-  return hashval % max;
-}
-
-TAO_Endpoint*
-TAO_SCIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-CORBA::ULong
-TAO_SCIOP_Profile::endpoint_count (void) const
-{
-  return this->count_;
-}
-
-void
-TAO_SCIOP_Profile::add_endpoint (TAO_SCIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  this->count_++;
-}
-
-char *
-TAO_SCIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::String_var key;
-  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
-                                             this->ref_object_key_->object_key());
-
-  size_t buflen = (8 /* "corbaloc" */ +
-                   1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
-                   1 /* colon separator */ +
-                   1 /* major version */ +
-                   1 /* decimal point */ +
-                   1 /* minor version */ +
-                   1 /* `@' character */ +
-                   ACE_OS::strlen (this->endpoint_.host ()) +
-                   1 /* colon separator */ +
-                   5 /* port number */ +
-                   1 /* object key separator */ +
-                   ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
-
-  return buf;
-}
-
-const char *
-TAO_SCIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-void
-TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The SCIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  //  encap.write_string (this->endpoint_.host ());
-
-  CORBA::StringSeq strseq;
-  strseq.length(this->count_);
-
-  const TAO_SCIOP_Endpoint *endpoint = &this->endpoint_;
-  for (CORBA::ULong i = 0;
-       i < this->count_;
-       ++i)
-    {
-      strseq[i] = endpoint->host();
-      endpoint = endpoint->next_;
-    }
-
-  //  strseq[0] = this->endpoint_.host();
-  encap << strseq;
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->endpoint_.port ());
-
-  // UNSIGNED SHORT max_streams
-  encap.write_ushort (1);
-
-  // OCTET SEQUENCE for object key
-  if (this->ref_object_key_)
-    encap << this->ref_object_key_->object_key ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - IIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
-    }
-
-  // Tagged Components
-  this->tagged_components ().encode (encap);
-}
-
-int
-TAO_SCIOP_Profile::encode_endpoints (void)
-{
-  CORBA::ULong actual_count = 0;
-
-  const TAO_SCIOP_Endpoint *endpoint = &this->endpoint_;
-
-  // Count the number of endpoints that needs to be encoded
-  for (CORBA::ULong c = 0;
-       c != this->count_;
-       ++c)
-    {
-      if (endpoint->is_encodable_)
-        ++actual_count;
-
-      endpoint = endpoint->next_;
-    }
-
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-
-  TAO_SCIOPEndpointSequence endpoints;
-  endpoints.length (actual_count);
-
-  endpoint = &this->endpoint_;
-
-  for (CORBA::ULong i = 0;
-       i < this->count_;
-       ++i)
-    {
-      if (endpoint->is_encodable_)
-        {
-          endpoints[i].host = endpoint->host ();
-          endpoints[i].port = endpoint->port ();
-          endpoints[i].priority = endpoint->priority ();
-        }
-
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-
-  this->set_tagged_components (out_cdr);
-
-  return  0;
-}
-
-int
-TAO_SCIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      // Extract endpoints sequence.
-      TAO_SCIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_SCIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_SCIOP_Endpoint (endpoints[i].host,
-                                             endpoints[i].port,
-                                             endpoints[i].priority),
-                          -1);
-
-          this->add_endpoint (endpoint);
-        }
-    }
-
-  return 0;
-}
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
deleted file mode 100644
index 5310af754b0..00000000000
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     SCIOP_Profile.h
- *
- *  $Id$
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Profile by
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SCIOP_PROFILE_H
-#define TAO_SCIOP_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Profile.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "SCIOP_Endpoint.h"
-
-
-// TAO SCIOP_Profile concrete Profile definitions
-/**
- * @class TAO_SCIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating ORBs over a TCP/IP network.
- *
- * This class defines the SCIOP profile as specified in the CORBA
- * specification.
- */
-class TAO_Strategies_Export TAO_SCIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that SCIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.
-  TAO_SCIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO::ObjectKey &object_key,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  ///  Profile constructor, this is the most efficient since it
-  /// doesn't require any address resolution processing.
-  TAO_SCIOP_Profile (const char *host,
-                    CORBA::UShort port,
-                    const TAO::ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, default.
-  TAO_SCIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SCIOP_Profile (void);
-
-  /// Template methods. Please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-  /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
-   */
-  void add_endpoint (TAO_SCIOP_Endpoint *endp);
-
-protected:
-
-  /// Template methods. Please see Profile.h for the documentation.
-  virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-
-protected:
-
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only for two cases
-   * (1) when RTCORBA is enabled and
-   * (2) the ORB is initialized with -ORBPreferredInterfaces option.
-   * However, in the near future, this will be used in for mode as
-   * well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS  feature.
-   *
-   * This is probably as good a place to discuss how the list of
-   * endpoints is used for #2. If the ORB is configured to use
-   * preferred interfaces for invocation, TAO creates an endpoint per
-   * preferred interface. To be clear, every tuple
-   * <destination:target> will have an endpoint. What TAO essentially
-   * does is that creates it multiple endpoints so that the invocation
-   * code path can use existing iterating techniques to try one
-   * preferred interface after another (if the first did not work). If
-   * the ORB is configured with -ORBEnforcePreferredInterface set to
-   * false in addition to the ORBPreferredInterfaces option , TAO
-   * creates another endpoint with the preferred bit set to null, so
-   * that the invocation code can fall back to a SCTP stack returned
-   * local address.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard SCIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_SCIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  CORBA::ULong count_;
-};
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SCIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
deleted file mode 100644
index c6f11765498..00000000000
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// $Id$
-
-#include "SCIOP_Transport.h"
-
-#if TAO_HAS_SCIOP == 1
-
-#include "SCIOP_Connection_Handler.h"
-#include "SCIOP_Acceptor.h"
-#include "SCIOP_Profile.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/operation_details.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Sync_Strategies.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/GIOP_Message_Base.h"
-// #include "tao/GIOP_Message_Lite.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Adapter.h"
-
-ACE_RCSID (tao,
-           SCIOP_Transport,
-           "$Id$")
-
-TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Boolean )
-  : TAO_Transport (TAO_TAG_SCIOP_PROFILE,
-                   orb_core)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
-{
-#if 0
-  // First step in deprecating this.
-  if (flag)
-    {
-      // Use the lite version of the protocol
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Lite (orb_core));
-    }
-  else
-#endif /*if 0*/
-    {
-      // Use the normal GIOP object
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
-    }
-}
-
-TAO_SCIOP_Transport::~TAO_SCIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-ACE_Event_Handler *
-TAO_SCIOP_Transport::event_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Connection_Handler *
-TAO_SCIOP_Transport::connection_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Pluggable_Messaging *
-TAO_SCIOP_Transport::messaging_object (void)
-{
-  return this->messaging_object_;
-}
-
-ssize_t
-TAO_SCIOP_Transport::send (iovec *iov, int iovcnt,
-                           size_t &bytes_transferred,
-                           const ACE_Time_Value *max_wait_time)
-{
-  ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt,
-                                                             max_wait_time);
-  if (retval > 0)
-    bytes_transferred = retval;
-
-  return retval;
-}
-
-ssize_t
-TAO_SCIOP_Transport::recv (char *buf,
-                           size_t len,
-                           const ACE_Time_Value *max_wait_time)
-{
-  ssize_t n = this->connection_handler_->peer ().recv (buf,
-                                                       len,
-                                                       max_wait_time);
-
-  // Do not print the error message if it is a timeout, which could
-  // occur in thread-per-connection.
-  if (n == -1 &&
-      TAO_debug_level > 4 &&
-      errno != ETIME)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::recv, ")
-                  ACE_TEXT ("read failure - %m\n"),
-                  this->id ()));
-    }
-
-  // Error handling
-  if (n == -1)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-
-
-      return -1;
-    }
-
-  // Most of the errors handling is common for
-  // Now the message has been read
-
-  // @@ What are the other error handling here??
-  else if (n == 0)
-    {
-      return -1;
-    }
-
-  return n;
-}
-
-int
-TAO_SCIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
-
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-    return -1;
-
-  this->first_request_sent();
-
-  return 0;
-}
-
-int
-TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_message_shared (stub,
-                                         message_semantics,
-                                         stream.begin (),
-                                         max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::send_message, ")
-                    ACE_TEXT (" write failure - %m\n"),
-                    this->id ()));
-      return -1;
-    }
-
-  return 1;
-}
-
-int
-TAO_SCIOP_Transport::send_message_shared (TAO_Stub *stub,
-                                         int message_semantics,
-                                         const ACE_Message_Block *message_block,
-                                         ACE_Time_Value *max_wait_time)
-{
-  int r;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-    r = this->send_message_shared_i (stub, message_semantics,
-                                     message_block, max_wait_time);
-  }
-
-  if (r == -1)
-    {
-      this->close_connection ();
-    }
-
-  return r;
-}
-
-int
-TAO_SCIOP_Transport::generate_request_header (TAO_Operation_Details &opdetails,
-                                             TAO_Target_Specification &spec,
-                                             TAO_OutputCDR &msg)
-{
-  // Check whether we have a Bi Dir SCIOP policy set, whether the
-  // messaging objects are ready to handle bidirectional connections
-  // and also make sure that we have not recd. or sent any information
-  // regarding this before...
-  if (this->orb_core ()->bidir_giop_policy () &&
-      this->messaging_object_->is_ready_for_bidirectional (msg) &&
-      this->bidirectional_flag () < 0)
-    {
-      this->set_bidir_context_info (opdetails);
-
-      // Set the flag to 1  (i.e., originating side)
-      this->bidirectional_flag (1);
-
-      // At the moment we enable BiDIR giop we have to get a new
-      // request id to make sure that we follow the even/odd rule
-      // for request id's. We only need to do this when enabled
-      // it, after that the Transport Mux Strategy will make sure
-      // that the rule is followed
-      opdetails.request_id (this->tms ()->request_id ());
-    }
-
-  return TAO_Transport::generate_request_header (opdetails,
-                                                 spec,
-                                                 msg);
-}
-
-int
-TAO_SCIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major, minor);
-
-  return 1;
-}
-
-int
-TAO_SCIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
-{
-  CORBA::Boolean byte_order;
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    return -1;
-
-  cdr.reset_byte_order (static_cast<int> (byte_order));
-
-  IIOP::ListenPointList listen_list;
-  if ((cdr >> listen_list) == 0)
-    return -1;
-
-  // As we have received a bidirectional information, set the flag to
-  // 1 (i.e., non-originating side)
-  this->bidirectional_flag (0);
-
-  return this->connection_handler_->process_listen_point_list (listen_list);
-}
-
-void
-TAO_SCIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
-{
-  // Get a handle to the acceptor registry
-  TAO_Acceptor_Registry &ar =
-    this->orb_core ()->lane_resources ().acceptor_registry ();
-
-  // Get the first acceptor in the registry
-  TAO_AcceptorSetIterator acceptor = ar.begin ();
-
-  IIOP::ListenPointList listen_point_list;
-
-  for (;
-       acceptor != ar.end ();
-       acceptor++)
-    {
-      // Check whether it is a SCIOP acceptor
-      if ((*acceptor)->tag () == TAO_TAG_SCIOP_PROFILE)
-        {
-          if (this->get_listen_point (listen_point_list,
-                                      *acceptor) == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "TAO (%P|%t) - SCIOP_Transport::set_bidir_info, "
-                          "error getting listen_point \n"));
-
-              return;
-            }
-        }
-    }
-
-  // We have the ListenPointList at this point. Create a output CDR
-  // stream at this point
-  TAO_OutputCDR cdr;
-
-  // Marshall the information into the stream
-  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
-      || (cdr << listen_point_list) == 0)
-    return;
-
-  // Add this info in to the svc_list
-  opdetails.request_service_context ().set_context (IOP::BI_DIR_IIOP,
-                                                    cdr);
-
-  return;
-}
-
-int
-TAO_SCIOP_Transport::get_listen_point (
-    IIOP::ListenPointList &listen_point_list,
-    TAO_Acceptor *acceptor)
-{
-  TAO_SCIOP_Acceptor *sciop_acceptor =
-    dynamic_cast<TAO_SCIOP_Acceptor *> (acceptor );
-
-  // Get the array of endpoints serviced by TAO_SCIOP_Acceptor
-  const ACE_INET_Addr *endpoint_addr =
-    sciop_acceptor->endpoints ();
-
-  // Get the endpoint count
-  size_t count =
-    sciop_acceptor->endpoint_count ();
-
-  // Get the local address of the connection
-  ACE_INET_Addr local_addr;
-
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local ")
-                         ACE_TEXT ("host address in ")
-                         ACE_TEXT ("get_listen_point()\n")),
-                        -1);
-    }
-
-  // Note: Looks like there is no point in sending the list of
-  // endpoints on interfaces on which this connection has not
-  // been established. If this is wrong, please correct me.
-  CORBA::String_var local_interface;
-
-  // Get the hostname for the local address
-  if (sciop_acceptor->hostname (this->orb_core_,
-                               local_addr,
-                               local_interface.out ()) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local host")
-                         ACE_TEXT (" name \n")),
-                        -1);
-    }
-
-  for (size_t index = 0;
-       index != count;
-       index++)
-    {
-      if (local_addr.get_ip_address()
-          == endpoint_addr[index].get_ip_address())
-        {
-          // Get the count of the number of elements
-          CORBA::ULong len = listen_point_list.length ();
-
-          // Increase the length by 1
-          listen_point_list.length (len + 1);
-
-          // We have the connection and the acceptor endpoint on the
-          // same interface
-          IIOP::ListenPoint &point = listen_point_list[len];
-          point.host = CORBA::string_dup (local_interface.in ());
-          point.port = endpoint_addr[index].get_port_number ();
-        }
-    }
-
-  return 1;
-}
-
-#endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
deleted file mode 100644
index e51f42b5778..00000000000
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-// ===================================================================
-/**
- *  @file   SCIOP_Transport.h
- *
- *  @author  Jason Cohen, Lockheed Martin ATL  <jcohen@atl.lmco.com>
- *  @author  Keith O'Hara, Lockheed Martin ATL
- *  @author  based on IIOP_Transport
- *  @author  Originally by Fred Kuhns <fredk@cs.wustl.edu>
- *  @author  Modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_SCIOP_TRANSPORT_H
-#define TAO_SCIOP_TRANSPORT_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Transport.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_SCIOP == 1
-
-#include "strategies_export.h"
-#include "tao/IIOPC.h"
-#include "ace/SOCK_SEQPACK_Association.h"
-
-// Forward decls.
-class TAO_SCIOP_Connection_Handler;
-class TAO_ORB_Core;
-class TAO_Operation_Details;
-class TAO_Pluggable_Messaging;
-class TAO_Acceptor;
-
-/**
- * @class TAO_SCIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  SCIOP protocol.
- *
- * Specialization of the base TAO_Transport class to handle the SCIOP
- * protocol.
- */
-class TAO_Strategies_Export TAO_SCIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler,
-                      TAO_ORB_Core *orb_core,
-                      CORBA::Boolean flag);
-
-protected:
-
-  /// Destructor
-  /**
-   * Protected destructor to enforce proper memory management through
-   * the reference counting mechanism.
-   */
-  virtual ~TAO_SCIOP_Transport (void);
-
-  /** @name Overridden Template Methods
-   *
-   * Please check the documentation in "tao/Transport.h" for more
-   * details.
-   */
-  //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-
-  /// Access the underlying messaging object
-  virtual TAO_Pluggable_Messaging *messaging_object (void);
-
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *timeout = 0);
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-  virtual int send_message_shared (TAO_Stub *stub,
-                                   int message_semantics,
-                                   const ACE_Message_Block *message_block,
-                                   ACE_Time_Value *max_wait_time);
-
-
-public:
-  /// @todo These methods IMHO should have more meaningful
-  /// names. The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &association,
-                            int message_semantics,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &association,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  /*virtual int send_reply (TAO_OutputCDR &stream,
-                          TAO_Adapter *poa = 0);*/
-
-  virtual int generate_request_header (TAO_Operation_Details &opdetails,
-                                       TAO_Target_Specification &spec,
-                                       TAO_OutputCDR &msg);
-
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-  virtual int tear_listen_point_list (TAO_InputCDR &cdr);
-
-  virtual TAO_Connection_Handler * connection_handler_i (void);
-
-  //@}
-
-private:
-
-  /// Set the Bidirectional context info in the service context list
-  void set_bidir_context_info (TAO_Operation_Details &opdetails);
-
-  /// Add the listen points in <acceptor> to the <listen_point_list>
-  /// if this connection is in the same interface as that of the
-  /// endpoints in the <acceptor>
-  int get_listen_point (IIOP::ListenPointList &listen_point_list,
-                        TAO_Acceptor *acceptor);
-private:
-
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_SCIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-};
-
-#endif /* TAO_HAS_SCIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SCIOP_TRANSPORT_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
deleted file mode 100644
index aa1b119062c..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "SHMIOP_Acceptor.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "SHMIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/debug.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/CDR.h"
-
-#include "ace/os_include/os_netdb.h"
-#include "ace/os_include/os_ctype.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Acceptor,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0),
-    mmap_file_prefix_ (0),
-    mmap_size_ (1024 * 1024),
-    lite_flag_ (flag)
-{
-}
-
-TAO_SHMIOP_Acceptor::~TAO_SHMIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-//    3) Create multiple profiles for wild carded endpoints (may be multiple
-//       interfaces over which we can receive requests.  Thus a profile
-//       must be made for each one.
-int
-TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
-                                     TAO_MProfile &mprofile,
-                                     CORBA::Short priority)
-{
-  // Check if multiple endpoints should be put in one profile or
-  // if they should be spread across multiple profiles.
-  if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
-  else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
-}
-
-int
-TAO_SHMIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                         TAO_MProfile &mprofile,
-                                         CORBA::Short priority)
-{
-  // @@ we only make one for now
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < 1
-      && mprofile.grow (count + 1) == -1)
-    return -1;
-
-  TAO_SHMIOP_Profile *pfile = 0;
-  ACE_NEW_RETURN (pfile,
-                  TAO_SHMIOP_Profile (this->host_.c_str (),
-                                      this->address_.get_port_number (),
-                                      object_key,
-                                      this->address_.get_remote_addr (),
-                                      this->version_,
-                                      this->orb_core_),
-                  -1);
-  pfile->endpoint ()->priority (priority);
-
-  if (mprofile.give_profile (pfile) == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-      return -1;
-    }
-
-  // Do not add any tagged components to the profile if configured
-  // by the user not to do so, or if an SHMIOP 1.0 endpoint is being
-  // created (IIOP 1.0 did not support tagged components, so we follow
-  // the same convention for SHMIOP).
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0
-      || (this->version_.major == 1 && this->version_.minor == 0))
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-  this->orb_core_->codeset_manager()->
-    set_codeset(pfile->tagged_components());
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                            TAO_MProfile &mprofile,
-                                            CORBA::Short priority)
-{
-  TAO_Profile *pfile = 0;
-  TAO_SHMIOP_Profile *shmiop_profile = 0;
-
-  // First see if <mprofile> already contains a SHMIOP profile.
-  for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
-    {
-      pfile = mprofile.get_profile (i);
-      if (pfile->tag () == TAO_TAG_SHMEM_PROFILE)
-      {
-        shmiop_profile = dynamic_cast <TAO_SHMIOP_Profile *>(pfile);
-        break;
-      }
-    }
-
-  if (shmiop_profile == 0)
-    {
-      // If <mprofile> doesn't contain SHMIOP_Profile, we need to create
-      // one.
-      return create_new_profile (object_key,
-                                 mprofile,
-                                 priority);
-    }
-  else
-    {
-      // A SHMIOP_Profile already exists - just add our endpoint to it.
-
-      TAO_SHMIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_SHMIOP_Endpoint (this->host_.c_str (),
-                                           this->address_.get_port_number (),
-                                           this->address_.get_remote_addr ()),
-                      -1);
-      endpoint->priority (priority);
-      shmiop_profile->add_endpoint (endpoint);
-
-      return 0;
-    }
-}
-
-int
-TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_SHMIOP_Endpoint *endp =
-    dynamic_cast <const TAO_SHMIOP_Endpoint *> (endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-      // @@ TODO The following code looks funky, why only the host
-      //    name is compared?  What if there are multiple SHMIOP
-      //    servers in the same address?  Why do SHMIOP_Endpoints keep
-      //    a INET_Addr but not a MEM_Addr?  And why is there no lazy
-      //    evaluation of IP-addresses for SHMIOP endpoints?  Is it
-      //    because it is always 'localhost'?  We need answers to
-      //    these questions to solve:
-      //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
-      //
-  // The following code is suspec
-  // compare the port and sin_addr (numeric host address)
-  return this->address_.same_host (endp->object_addr ());
-}
-
-int
-TAO_SHMIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                           ACE_Reactor *reactor,
-                           int major,
-                           int minor,
-                           const char *port,
-                           const char *options)
-{
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (static_cast <CORBA::Octet>(major),
-                                static_cast <CORBA::Octet>(minor));
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  if (isdigit (*port) == 0)
-    return -1;                  // Port number must consist of digits
-
-  if (port)
-    this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port));
-
-  return this->open_i (orb_core,
-                       reactor);
-}
-
-int
-TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                   ACE_Reactor *reactor,
-                                   int major,
-                                   int minor,
-                                   const char *options)
-{
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (static_cast <CORBA::Octet>(major),
-                                static_cast <CORBA::Octet>(minor));
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  // @@ Until we can support multihomed machines correctly we must
-  //    pick the "default interface" and only listen on that IP
-  //    address.
-  this->host_ = this->address_.get_host_name ();
-
-  return this->open_i (orb_core,
-                       reactor);
-}
-
-int
-TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
-                                       off_t size)
-{
-  this->mmap_file_prefix_ = prefix;
-  this->mmap_size_ = size;
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
-                             ACE_Reactor *reactor)
-{
-  this->orb_core_ = orb_core;
-
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_,
-                                                this->lite_flag_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_SHMIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_SHMIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  // We only accept connection on localhost.
-  if (this->base_acceptor_.open (this->address_,
-                                 reactor,
-                                 this->creation_strategy_,
-                                 this->accept_strategy_,
-                                 this->concurrency_strategy_) == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"),
-                    ACE_TEXT ("cannot open acceptor")));
-      return -1;
-    }
-
-  this->base_acceptor_.acceptor().mmap_prefix (this->mmap_file_prefix_);
-  this->base_acceptor_.acceptor().init_buffer_size (this->mmap_size_);
-
-  if (orb_core->server_factory ()->activate_server_connections () != 0)
-    this->base_acceptor_.acceptor().preferred_strategy (ACE_MEM_IO::MT);
-
-  // @@ Should this be a catastrophic error???
-  if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"),
-                    ACE_TEXT ("cannot get local addr\n")));
-      return -1;
-    }
-
-  // If the ORB is instructed to use dotted decimal addresses, we respect that
-  // also for shmiop
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // Get the ip address, we get the remote addr to put in the IOR, don't
-      // calls get_host_addr() directly on address_, we then get the internal
-      // address back
-      const char *tmp = this->address_.get_remote_addr().get_host_addr ();
-
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) - ")
-                        ACE_TEXT ("SHMIOP_Acceptor::open_i, ")
-                        ACE_TEXT ("- %p, "),
-                        ACE_TEXT ("cannot determine hostname\n")));
-          return -1;
-        }
-
-      this->host_ = tmp;
-    }
-  else
-    {
-      // This will be the actualy host name of the original endpoint.
-      ACE_TCHAR tmp_host[MAXHOSTNAMELEN+1];
-
-      if (this->address_.get_host_name (tmp_host,
-                                        sizeof tmp_host) != 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, - %p\n"),
-                        ACE_TEXT ("cannot cache hostname\n")));
-          return -1;
-        }
-      this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host);
-    }
-
-  // This avoids having child processes acquire the listen socket thereby
-  // denying the server the opportunity to restart on a well-known endpoint.
-  // This does not affect the aberrent behavior on Win32 platforms.
-  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
-
-  if (TAO_debug_level > 5)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ")
-                  ACE_TEXT ("listening on : <%s:%u>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()),
-                  this->address_.get_port_number ()));
-    }
-  return 0;
-}
-
-
-int
-TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                                 TAO::ObjectKey &object_key)
-{
-  // Create the decoding stream from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (reinterpret_cast<char*>(profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't*do any*
-  // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
-  {
-    if (TAO_debug_level > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - SHMIOP_Profile::decode, v%d.%d\n"),
-                    major,
-                    minor));
-      }
-    return -1;
-  }
-
-  CORBA::String_var host;
-  CORBA::UShort port = 0;
-
-  // Get host and port. No processing here too..
-  if (cdr.read_string (host.out ()) == 0
-      || cdr.read_ushort (port) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::object_key, ")
-                      ACE_TEXT ("error while decoding host/port\n")));
-        }
-      return -1;
-    }
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  // We are NOT bothered about the rest.
-
-  return 1;
-}
-
-
-CORBA::ULong
-TAO_SHMIOP_Acceptor::endpoint_count (void)
-{
-  // @@ for now just assume one!
-  // we should take a look at the local address, if it is zero then
-  // get the list of available IP interfaces and return this number.
-  return 1;
-}
-
-int
-TAO_SHMIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  ACE_CString options (str);
-
-  size_t len = options.length ();
-
-  const char option_delimiter = '&';
-
-  // Count the number of options.
-
-  CORBA::ULong option_count = 1;
-  // Number of endpoints in the string  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      option_count++;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  int begin = 0;
-  int end = -1;
-
-  for (CORBA::ULong j = 0; j < option_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < option_count - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = static_cast <int>(len - begin); // Handle last endpoint differently
-
-      if (end == begin)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) Zero length SHMIOP option.\n")),
-                          -1);
-      else if (end != ACE_CString::npos)
-        {
-          ACE_CString opt = options.substring (begin, end);
-
-          int slot = opt.find ("=");
-
-          if (slot == static_cast <int> (len - 1)
-              || slot == ACE_CString::npos)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ")
-                               ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())),
-                              -1);
-
-          ACE_CString name = opt.substring (0, slot);
-          ACE_CString value = opt.substring (slot + 1);
-
-          if (name.length () == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Zero length SHMIOP ")
-                               ACE_TEXT ("option name.\n")),
-                              -1);
-
-          if (name == "priority")
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported.\n")),
-                                -1);
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
-                              -1);
-        }
-    }
-  return 0;
-}
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
deleted file mode 100644
index ef369ad0f9c..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    SHMIOP_Acceptor.h
-//
-// = DESCRIPTION
-//    SHMIOP specific acceptor processing
-//
-// = AUTHOR
-//    Nanbor Wang
-//
-// ============================================================================
-
-#ifndef TAO_SHMIOP_ACCEPTOR_H
-#define TAO_SHMIOP_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "tao/Transport_Acceptor.h"
-#include "SHMIOP_Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-#include "ace/Acceptor.h"
-#include "ace/MEM_Acceptor.h"
-#include "tao/GIOP_Message_Version.h"
-// TAO SHMIOP_Acceptor concrete call definitions
-
-/**
- * @class TAO_SHMIOP_Acceptor
- *
- * @brief The SHMIOP-specific bridge class for the concrete acceptor.
- *
- */
-class TAO_Strategies_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  /// Constructor.
-  TAO_SHMIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_SHMIOP_Acceptor (void);
-
-  typedef ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> TAO_SHMIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> TAO_SHMIOP_ACCEPT_STRATEGY;
-
-  /**
-   * @name The TAO_Acceptor Methods
-   *
-   * Please check the documentation in Transport_Acceptor.h for details.
-   */
-  //@{
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *port,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority);
-
-  virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key);
-  //@}
-
-  /// Set the MMAP options the MEM_Stream this acceptor creates will
-  /// use.
-  int set_mmap_options (const ACE_TCHAR *prefix,
-                        off_t size);
-
-private:
-  /// Implement the common part of the open*() methods.
-  int open_i (TAO_ORB_Core* orb_core,
-              ACE_Reactor *reactor);
-
-  /// Parse protocol specific options.
-  virtual int parse_options (const char *options);
-
-  /// Create a SHMIOP profile representing this acceptor.
-  int create_new_profile (const TAO::ObjectKey &object_key,
-                          TAO_MProfile &mprofile,
-                          CORBA::Short priority);
-
-  /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO::ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             CORBA::Short priority);
-
-protected:
-  /// Cache the information about the endpoint serviced by this
-  /// acceptor.
-  /// @todo There may in fact be multiple hostnames for this endpoint.
-  ///    For example it the IP address is INADDR_ANY
-  ///    (0.0.0.0) then there will be possibly a different hostname for
-  ///    each interface.
-  ACE_CString host_;
-
-  /// A local endpoint.
-  ACE_MEM_Addr address_;
-
-  /// The GIOP version for this endpoint
-  TAO_GIOP_Message_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-private:
-  /// The concrete acceptor, as a pointer to it's base class.
-  TAO_SHMIOP_BASE_ACCEPTOR base_acceptor_;
-
-  /// Acceptor strategies.
-  TAO_SHMIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_SHMIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_SHMIOP_ACCEPT_STRATEGY *accept_strategy_;
-
-  /// Determine the prefix (include path name) of the mmap file.
-  const ACE_TCHAR *mmap_file_prefix_;
-
-  /// Determine the minimum size of mmap file.  This dictate the
-  /// maximum size of a CORBA method invocation.
-  off_t mmap_size_;
-
-  /// Should we use GIOP lite??
-  CORBA::Boolean lite_flag_;
-};
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SHMIOP_ACCEPTOR_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
deleted file mode 100644
index 2874e649437..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// $Id$
-
-#include "SHMIOP_Connection_Handler.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "tao/Timeprobe.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "SHMIOP_Endpoint.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Protocols_Hooks.h"
-
-#include "ace/os_include/netinet/os_tcp.h"
-#include "ace/os_include/os_netdb.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Connection_Handler,
-           "$Id$")
-
-TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (0);
-}
-
-
-TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                              CORBA::Boolean flag)
-  : TAO_SHMIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core)
-{
-  TAO_SHMIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-          TAO_SHMIOP_Transport(this, orb_core, flag));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-}
-
-
-TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-}
-
-int
-TAO_SHMIOP_Connection_Handler::open_handler (void *v)
-{
-  return this->open (v);
-}
-
-int
-TAO_SHMIOP_Connection_Handler::open (void*)
-{
-  TAO_SHMIOP_Protocol_Properties protocol_properties;
-
-  // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  protocol_properties.no_delay_ =
-    this->orb_core ()->orb_params ()->nodelay ();
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
-
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (client)
-        {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  if (this->set_socket_option (this->peer (),
-                               protocol_properties.send_buffer_size_,
-                               protocol_properties.recv_buffer_size_) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_TCP_NODELAY)
-  if (this->peer ().set_option (ACE_IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &protocol_properties.no_delay_,
-                                sizeof (protocol_properties.no_delay_)) == -1)
-    return -1;
-
-#endif /* ! ACE_LACKS_TCP_NODELAY */
-
-  if (this->transport ()->wait_strategy ()->non_blocking ())
-    {
-      if (this->peer ().enable (ACE_NONBLOCK) == -1)
-        return -1;
-    }
-
-  // Called by the <Strategy_Acceptor> when the handler is
-  // completely connected.
-  ACE_INET_Addr addr;
-
-  ACE_TCHAR local_as_string[MAXHOSTNAMELEN + 16];
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Verify that we can resolve the peer hostname.
-  else if (addr.addr_to_string (local_as_string, sizeof (local_as_string)) == -1)
-    return -1;
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) SHMIOP connection from client")
-                  ACE_TEXT ("<%s> on %d\n"),
-                  local_as_string, this->peer ().get_handle ()));
-    }
-
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
-
-  // Not needed, anyway
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Connection_Handler::resume_handler (void)
-{
-  return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
-}
-
-int
-TAO_SHMIOP_Connection_Handler::close_connection (void)
-{
-  return this->close_connection_eh (this);
-}
-
-int
-TAO_SHMIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_eh (h, this);
-}
-
-int
-TAO_SHMIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
-{
-  int result =
-    this->handle_output_eh (handle, this);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_SHMIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                               const void *)
-{
-  // We don't use this upcall for I/O.  This is only used by the
-  // Connector to indicate that the connection timedout.  Therefore,
-  // we should call close().
-  return this->close ();
-}
-
-int
-TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                             ACE_Reactor_Mask)
-{
-  ACE_ASSERT (0);
-  return 0;
-}
-
-int
-TAO_SHMIOP_Connection_Handler::close (u_long)
-{
-  return this->close_handler ();
-}
-
-int
-TAO_SHMIOP_Connection_Handler::release_os_resources (void)
-{
-  return this->peer().close ();
-}
-
-int
-TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
-{
-  ACE_INET_Addr addr;
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Construct an  SHMIOP_Endpoint object
-  TAO_SHMIOP_Endpoint endpoint (
-      addr,
-      this->orb_core()->orb_params()->use_dotted_decimal_addresses ());
-
-  // Construct a property object
-  TAO_Base_Transport_Property prop (&endpoint);
-
-  TAO::Transport_Cache_Manager &cache =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Add the handler to Cache
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
-}
-
-// ****************************************************************
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
deleted file mode 100644
index fbfa34bc1fc..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   SHMIOP_Connection_Handler.h
- *
- *  $Id$
- *
- *  @author Originally by Nanbor Wang <nanbor@cs.wustl.edu> as UIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_SHMIOP_CONNECT_H
-#define TAO_SHMIOP_CONNECT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "ace/Reactor.h"
-#include "ace/Acceptor.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Connection_Handler.h"
-#include "SHMIOP_Transport.h"
-
-// ****************************************************************
-/**
- * @class TAO_SHMIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-
-
-class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler :
-  public TAO_SHMIOP_SVC_HANDLER,
-  public TAO_Connection_Handler
-{
-
-public:
-  /// Constructor.
-  TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
-
-  /// Constructor.
-  TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                 CORBA::Boolean flag);
-
-  /// Destructor.
-  ~TAO_SHMIOP_Connection_Handler (void);
-
-  /// Called by the <Strategy_Acceptor> when the handler is completely
-  /// connected.  Argument is unused.
-  virtual int open (void *);
-
-  //@{
-  /**
-   * Connection_Handler overloads
-   */
-  virtual int open_handler (void *);
-  //@}
-
-  /// Close called by the Acceptor or Connector when connection
-  /// establishment fails.
-  int close (u_long = 0);
-
-  //@{
-  /** @name Event Handler overloads
-   */
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-protected:
-
-  //@{
-  /**
-   * @name TAO_Connection Handler overloads
-   */
-  virtual int release_os_resources (void);
-  //@}
-
-private:
-  /// Flag that we will be passing to the event handler to indicate
-  /// whether the handle will be resumed by the method or not.
-  int resume_flag_;
-
-};
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SHMIOP_CONNECT_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
deleted file mode 100644
index 1341956dd65..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// $Id$
-
-
-#include "SHMIOP_Connector.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "SHMIOP_Profile.h"
-#include "SHMIOP_Endpoint.h"
-#include "tao/debug.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Blocked_Connect_Strategy.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Connector,
-           "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_Connector_Base<TAO_SHMIOP_Connection_Handler>;
-template class ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<TAO_SHMIOP_Connection_Handler>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_Connector_Base<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_SHMIOP_Connection_Handler>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
-    connect_strategy_ (),
-    base_connector_ (),
-    lite_flag_ (flag)
-{
-}
-
-TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void)
-{
-}
-
-
-int
-TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core (orb_core);
-
-  // The SHMIOP always uses a blocked connect strategy
-  // @@todo: There are better ways of doing this. Let it be like this
-  // for the  present.
-  ACE_NEW_RETURN (this->active_connect_strategy_,
-                  TAO_Blocked_Connect_Strategy (orb_core),
-                  -1);
-
-  // Our connect creation strategy
-  TAO_SHMIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
-
-  ACE_NEW_RETURN (connect_creation_strategy,
-                  TAO_SHMIOP_CONNECT_CREATION_STRATEGY
-                      (orb_core->thr_mgr (),
-                       orb_core,
-                       this->lite_flag_),
-                  -1);
-
-  /// Our activation strategy
-  TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
-
-  ACE_NEW_RETURN (concurrency_strategy,
-                  TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-                  -1);
-
-  if (this->base_connector_.open (this->orb_core ()->reactor (),
-                                  connect_creation_strategy,
-                                  &this->connect_strategy_,
-                                  concurrency_strategy) == -1)
-    return -1;
-  // We can take advantage of the multithreaded shared-memory transport
-  // if the client will block on read (i.e., will not allow callback.)
-  else if (orb_core->client_factory ()->allow_callback () == 0)
-
-    {
-      this->base_connector_.connector ().preferred_strategy (ACE_MEM_IO::MT);
-      this->connect_strategy_.connector ().preferred_strategy (ACE_MEM_IO::MT);
-    }
-  return 0;
-}
-
-int
-TAO_SHMIOP_Connector::close (void)
-{
-  delete this->base_connector_.concurrency_strategy ();
-  delete this->base_connector_.creation_strategy ();
-  return this->base_connector_.close ();
-}
-
-int
-TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != TAO_TAG_SHMEM_PROFILE)
-    return -1;
-
-  TAO_SHMIOP_Endpoint *shmiop_endpoint =
-    dynamic_cast <TAO_SHMIOP_Endpoint *>(endpoint);
-  if (shmiop_endpoint == 0)
-    return -1;
-
-   const ACE_INET_Addr &remote_address =
-     shmiop_endpoint->object_addr ();
-
-   // Verify that the remote ACE_INET_Addr was initialized properly.
-   // Failure can occur if hostname lookup failed when initializing the
-   // remote ACE_INET_Addr.
-   if (remote_address.get_type () != AF_INET)
-     {
-       if (TAO_debug_level > 0)
-         {
-           ACE_ERROR ((LM_ERROR,
-                       ACE_TEXT ("TAO (%P|%t) SHMIOP connection failed.\n")
-                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                       ACE_TEXT ("due to a hostname lookup ")
-                       ACE_TEXT ("failure.\n")));
-         }
-
-       return -1;
-     }
-
-   return 0;
-
-}
-
-TAO_Transport *
-TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
-                                       TAO_Transport_Descriptor_Interface &desc,
-                                       ACE_Time_Value *timeout)
-{
-  if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
-                  ACE_TEXT ("looking for SHMIOP connection.\n")));
-
-  TAO_SHMIOP_Endpoint *shmiop_endpoint =
-    this->remote_endpoint (desc.endpoint ());
-
-  if (shmiop_endpoint == 0)
-    return 0;
-
-  const ACE_INET_Addr &remote_address =
-    shmiop_endpoint->object_addr ();
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                "making a new connection to <%s:%d>\n",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
-                shmiop_endpoint->port ()));
-
-  // Get the right synch options
-  ACE_Synch_Options synch_options;
-
-  this->active_connect_strategy_->synch_options (timeout,
-                                                 synch_options);
-
-  TAO_SHMIOP_Connection_Handler *svc_handler = 0;
-
-  // Connect.
-  int result = this->base_connector_.connect (svc_handler,
-                                              remote_address,
-                                              synch_options);
-
-  // This call creates the service handler and bumps the #REFCOUNT# up
-  // one extra.  There are two possibilities: (a) connection succeeds
-  // immediately - in this case, the #REFCOUNT# on the handler is two;
-  // (b) connection fails immediately - in this case, the #REFCOUNT#
-  // on the handler is one since close() gets called on the handler.
-  // We always use a blocking connection so the connection is never
-  // pending.
-
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
-
-  // In case of errors.
-  if (result == -1)
-    {
-      // Give users a clue to the problem.
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
-                      ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
-                      shmiop_endpoint->port (),
-                      ACE_TEXT ("errno")));
-        }
-
-      return 0;
-    }
-
-  // At this point, the connection has be successfully connected.
-  // #REFCOUNT# is one.
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                "new connection to <%s:%d> on Transport[%d]\n",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
-                shmiop_endpoint->port (),
-                svc_handler->peer ().get_handle ()));
-
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
-  // Add the handler to Cache
-  int retval =
-    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc,
-                                                                             transport);
-
-  // Failure in adding to cache.
-  if (retval != 0)
-    {
-      // Close the handler.
-      svc_handler->close ();
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
-                      "could not add the new connection to cache\n"));
-        }
-
-      return 0;
-    }
-
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
-
-      // Close the handler.
-      (void) transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - SHMIOP_Connector [%d]::make_connection, "
-                    "could not register the transport in the reactor.\n",
-                    transport->id ()));
-
-      return 0;
-    }
-
-  return transport;
-}
-
-TAO_Profile *
-TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile = 0;
-  ACE_NEW_RETURN (pfile,
-                  TAO_SHMIOP_Profile (this->orb_core ()),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // The endpoint should be of the form:
-  //    N.n@port/object_key
-  // or:
-  //    port/object_key
-
-  TAO_Profile *profile = 0;
-  ACE_NEW_THROW_EX (profile,
-                    TAO_SHMIOP_Profile (this->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  return profile;
-}
-
-int
-TAO_SHMIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char *protocol[] = { "shmiop", "shmioploc" };
-
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
-  size_t len0 = ACE_OS::strlen (protocol[0]);
-  size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an SHMIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_SHMIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_SHMIOP_Profile::object_key_delimiter_;
-}
-
-TAO_SHMIOP_Endpoint *
-TAO_SHMIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != TAO_TAG_SHMEM_PROFILE)
-    return 0;
-
-  TAO_SHMIOP_Endpoint *shmiop_endpoint =
-    dynamic_cast <TAO_SHMIOP_Endpoint *>(endpoint);
-  if (shmiop_endpoint == 0)
-    return 0;
-
-  return shmiop_endpoint;
-}
-
-int
-TAO_SHMIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_SHMIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_SHMIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    // Cancel from the connector
-    return this->base_connector_.cancel (handler);
-
-  return -1;
-}
-
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
deleted file mode 100644
index d4b41468c55..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SHMIOP_Connector.h
- *
- *  $Id$
- *
- *  SHMIOP specific connector processing
- *
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SHMIOP_CONNECTOR_H
-#define TAO_SHMIOP_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "ace/MEM_Connector.h"
-#include "ace/Connector.h"
-#include "tao/Transport_Connector.h"
-#include "SHMIOP_Connection_Handler.h"
-#include "tao/Resource_Factory.h"
-#include "tao/Connector_Impl.h"
-
-class TAO_SHMIOP_Endpoint;
-
-// ****************************************************************
-
-/**
- * @class TAO_SHMIOP_Connector
- *
- * @brief SHMIOP-specific Connector bridge for pluggable protocols.
- *
- * Concrete instance of the TAO_Connector class.  Responsible
- * for establishing a connection with a server and is called from the
- * Connector_Registory.
- */
-class TAO_Strategies_Export TAO_SHMIOP_Connector : public TAO_Connector
-{
-public:
-  /// Constructor.
-  TAO_SHMIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Default destructor
-  ~TAO_SHMIOP_Connector (void);
-
-  /**
-   * @name The TAO_Connector Methods
-   *
-   * Please check the documentation in Transport_Connector.h for details.
-   */
-  //@{
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-  //@}
-
-public:
-
-  typedef TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
-          TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY;
-
-  typedef TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
-          TAO_SHMIOP_CONNECT_CREATION_STRATEGY;
-
-  typedef ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler,
-                               ACE_MEM_CONNECTOR>
-          TAO_SHMIOP_CONNECT_STRATEGY ;
-
-  typedef ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler,
-                                 ACE_MEM_CONNECTOR>
-          TAO_SHMIOP_BASE_CONNECTOR;
-
-protected:
-  /**
-   * @name More TAO_Connector Methods
-   *
-   * Please check the documentation in Transport_Connector.h for details.
-   */
-  //@{
-  int set_validate_endpoint (TAO_Endpoint *endpoint);
-
-  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
-                                  TAO_Transport_Descriptor_Interface &desc,
-                                  ACE_Time_Value *timeout = 0);
-
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Cancel the passed cvs handler from the connector
-  int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-  //@}
-
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_SHMIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
-private:
-
-  /// Local address.
-  ACE_MEM_Addr address_;
-
-  /// Our connect strategy.
-  TAO_SHMIOP_CONNECT_STRATEGY connect_strategy_;
-
-  /// The connector initiating connection requests for SHMIOP.
-  TAO_SHMIOP_BASE_CONNECTOR base_connector_;
-
-  /// Are we using GIOP lite?
-  CORBA::Boolean lite_flag_;
-};
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SHMIOP_CONNECTOR_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
deleted file mode 100644
index 8d2ca160b58..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-#include "SHMIOP_Endpoint.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "SHMIOP_Connection_Handler.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-
-#include "ace/OS_NS_stdio.h"
-
-
-ACE_RCSID (Strategies,
-           SHMIOP_Endpoint,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "SHMIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/os_include/os_netdb.h"
-
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr,
-                                          int use_dotted_decimal_addresses)
-  : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
-    , host_ ()
-    , port_ (0)
-    , object_addr_ (addr.get_remote_addr ())
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  this->set (addr.get_remote_addr (), use_dotted_decimal_addresses);
-}
-
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_INET_Addr &addr,
-                                          int use_dotted_decimal_addresses)
-  : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
-    , host_ ()
-    , port_ (0)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  this->set (addr, use_dotted_decimal_addresses);
-}
-
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
-                                          CORBA::UShort port,
-                                          const ACE_INET_Addr &addr,
-                                          CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE, priority)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ (addr)
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-}
-
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
-    , host_ ()
-    , port_ (0)
-    , object_addr_ ()
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-}
-
-TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const char *host,
-                                          CORBA::UShort port,
-                                          CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE)
-    , host_ ()
-    , port_ (port)
-    , object_addr_ ()
-    , object_addr_set_ (0)
-    , next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-
-  this->priority (priority);
-}
-
-TAO_SHMIOP_Endpoint::~TAO_SHMIOP_Endpoint (void)
-{
-}
-
-int
-TAO_SHMIOP_Endpoint::set (const ACE_INET_Addr &addr,
-                          int use_dotted_decimal_addresses)
-{
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (use_dotted_decimal_addresses
-      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-    {
-      if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - SHMIOP_Endpoint::set, ")
-                      ACE_TEXT ("- %p cannot determine hostname\n")));
-        }
-
-      const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - ")
-                        ACE_TEXT ("SHMIOP_Endpoint::set ")
-                        ACE_TEXT ("- %p\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-          return -1;
-        }
-      else
-        this->host_ = tmp;
-    }
-  else
-    this->host_ = CORBA::string_dup (tmp_host);
-
-  this->port_ = addr.get_port_number();
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_SHMIOP_Endpoint::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-TAO_Endpoint *
-TAO_SHMIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_SHMIOP_Endpoint::duplicate (void)
-{
-  TAO_SHMIOP_Endpoint *endpoint = 0;
-  ACE_NEW_RETURN (endpoint,
-                  TAO_SHMIOP_Endpoint (this->host_.in (),
-                                       this->port_,
-                                       this->object_addr_,
-                                       this->priority ()),
-                  0);
-
-  return endpoint;
-}
-
-
-CORBA::Boolean
-TAO_SHMIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  const TAO_SHMIOP_Endpoint *endpoint = dynamic_cast <const TAO_SHMIOP_Endpoint *>
-                                                     (other_endpoint);
-
-  if (endpoint == 0)
-    return 0;
-
-  return
-    this->port_ == endpoint->port_
-    && ACE_OS::strcmp (this->host_.in (), endpoint->host_.in ()) == 0;
-}
-
-CORBA::ULong
-TAO_SHMIOP_Endpoint::hash (void)
-{
-  if (this->hash_val_ != 0)
-    return this->hash_val_;
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->addr_lookup_lock_,
-                      this->hash_val_);
-    // .. DCL
-    if (this->hash_val_ != 0)
-      return this->hash_val_;
-
-    this->hash_val_ =
-      ACE::hash_pjw (this->host ()) + this->port ();
-  }
-
-  return this->hash_val_;
-}
-
-const ACE_INET_Addr &
-TAO_SHMIOP_Endpoint::object_addr (void) const
-{
-  // The object_addr_ is initialized here, rather than at IOR decode
-  // time for several reasons:
-  //   1. A request on the object may never be invoked.
-  //   2. The DNS setup may have changed dynamically.
-  //   ...etc..
-
-  // Double checked locking optimization.
-  if (!this->object_addr_set_)
-    {
-      // We need to modify the object_addr_ in this method.  Do so
-      // using a  non-const copy of the <this> pointer.
-      TAO_SHMIOP_Endpoint *endpoint =
-        const_cast <TAO_SHMIOP_Endpoint *>(this);
-
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        guard,
-                        endpoint->addr_lookup_lock_,
-                        this->object_addr_ );
-
-      if (!this->object_addr_set_)
-        {
-          if (endpoint->object_addr_.set (this->port_,
-                                          this->host_.in ()) == -1)
-            {
-              // If this call fails, it most likely due a hostname
-              // lookup failure caused by a DNS misconfiguration.  If
-              // a request is made to the object at the given host and
-              // port, then a CORBA::TRANSIENT() exception should be
-              // thrown.
-
-              // Invalidate the ACE_INET_Addr.  This is used as a flag
-              // to denote that ACE_INET_Addr initialization failed.
-              endpoint->object_addr_.set_type (-1);
-            }
-          else
-            {
-              endpoint->object_addr_set_ = 1;
-            }
-        }
-    }
-
-  return this->object_addr_;
-}
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
deleted file mode 100644
index c44a9f6705f..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- * @file SHMIOP_Endpoint.h
- *
- * $Id$
- *
- * SHMIOP implementation of PP Framework Endpoint interface.
- *
- *
- * @author Marina Spivak <marina@cs.wustl.edu>
- */
-//==========================================================================
-
-#ifndef TAO_SHMIOP_ENDPOINT_H
-#define TAO_SHMIOP_ENDPOINT_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Endpoint.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-#include "tao/CORBA_String.h"
-#include "strategies_export.h"
-
-#include "ace/INET_Addr.h"
-#include "ace/MEM_Addr.h"
-
-
-
-/**
- * @class TAO_SHMIOP_Endpoint
- *
- * @brief TAO_SHMIOP_Endpoint
- *
- * SHMIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_Strategies_Export TAO_SHMIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  friend class TAO_SHMIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_SHMIOP_Endpoint (void);
-
-  /// Constructor.  This is the most efficient constructor since it
-  /// does not require any address resolution processing.
-  TAO_SHMIOP_Endpoint (const char *host,
-                       CORBA::UShort port,
-                       const ACE_INET_Addr &addr,
-                       CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Constructor.
-  TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr,
-                       int use_dotted_decimal_addresses);
-
-  /// Constructor. -- More of a extension of the previous one. One of
-  /// them need to go. We will decide about that as time goes by.
-  TAO_SHMIOP_Endpoint (const ACE_INET_Addr &addr,
-                       int use_dotted_decimal_addresses);
-
-  /// Constructor.  This constructor is used when decoding endpoints.
-  TAO_SHMIOP_Endpoint (const char *host,
-                       CORBA::UShort port,
-                       CORBA::Short priority);
-
-  /// Destructor.
-  ~TAO_SHMIOP_Endpoint (void);
-
-  /**
-   * @name TAO_Endpoint Methods
-   *
-   * Please check the documentation in Endpoint.h for details.
-   */
-  //@{
-  /// Return a copy of @c this
-  virtual TAO_Endpoint *next (void);
-  virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to @a other_endpoint.  Two
-  /// endpoints are equivalent iff their port and host are the same.
-  CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  CORBA::ULong hash (void);
-  //@}
-
-  // = SHMIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_INET_Addr &object_addr (void) const;
-
-  /// Return a pointer to the host string.  This object maintains
-  /// ownership of this string.
-  const char *host (void) const;
-
-  /// Copy the string <h> into <host_> and return the resulting pointer.
-  /// This object maintains ownership of this string.
-  const char *host (const char *h);
-
-  /// Return the port number.
-  CORBA::UShort port (void) const;
-
-  /// Set the port number.
-  CORBA::UShort port (CORBA::UShort p);
-
-private:
-  /// Helper method for setting INET_Addr.
-  int set (const ACE_INET_Addr &addr,
-           int use_dotted_decimal_addresses);
-
-  /// String representing the host name.
-  CORBA::String_var host_;
-
-  /// TCP port number.
-  CORBA::UShort port_;
-
-  /// Cached instance of <ACE_INET_Addr> for use in making
-  /// invocations, etc.
-  ACE_INET_Addr object_addr_;
-
-  /// Flag to indicate if the address has been resolved and set.
-  int object_addr_set_;
-
-  /// SHMIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_SHMIOP_Endpoint *next_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "SHMIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i
deleted file mode 100644
index e5a11fae5ab..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const char *
-TAO_SHMIOP_Endpoint::host (void) const
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_SHMIOP_Endpoint::port (void) const
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_SHMIOP_Endpoint::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
deleted file mode 100644
index 6d49937a410..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "SHMIOP_Factory.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "SHMIOP_Acceptor.h"
-#include "SHMIOP_Connector.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/OS_NS_strings.h"
-
-
-ACE_RCSID (Strategies,
-           SHMIOP_Factory,
-           "$Id$")
-
-
-static const char prefix_[] = "shmiop";
-
-TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
-  : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
-    major_ (TAO_DEF_GIOP_MAJOR),
-    minor_ (TAO_DEF_GIOP_MINOR),
-    mmap_prefix_ (0),
-    min_bytes_ (10*1024)        // @@ Nanbor, remove this magic number!!
-{
-}
-
-TAO_SHMIOP_Protocol_Factory::~TAO_SHMIOP_Protocol_Factory (void)
-{
-  delete [] this->mmap_prefix_;
-}
-
-int
-TAO_SHMIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_SHMIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_SHMIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_SHMIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_SHMIOP_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_SHMIOP_Acceptor,
-                  0);
-
-  acceptor->set_mmap_options (this->mmap_prefix_,
-                              this->min_bytes_);
-
-  return acceptor;
-}
-
-int
-TAO_SHMIOP_Protocol_Factory::init (int argc,
-                                   ACE_TCHAR* argv[])
-{
-  // Copy command line parameter not to use original as well as type conversion.
-  ACE_Argv_Type_Converter command_line(argc, argv);
-
-  ACE_Arg_Shifter arg_shifter (command_line.get_argc(), command_line.get_TCHAR_argv());
-
-  while (arg_shifter.is_anything_left ())
-    {
-      const ACE_TCHAR *current_arg = 0;
-
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize"))))
-        {
-          this->min_bytes_ = ACE_OS::atoi (current_arg);
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix"))))
-        {
-          this->mmap_prefix_ = ACE::strnew (current_arg);
-          arg_shifter.consume_arg ();
-        }
-      else
-        // Any arguments that don't match are ignored so that the
-        // caller can still use them.
-        arg_shifter.ignore_arg ();
-    }
-
-  return 0;
-}
-
-TAO_Connector *
-TAO_SHMIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_SHMIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory,
-                       ACE_TEXT ("SHMIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_SHMIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory)
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
deleted file mode 100644
index 4093b9069e6..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   SHMIOP_Factory.h
-//
-// = AUTHOR
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_SHMIOP_FACTORY_H
-#define TAO_SHMIOP_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "tao/Protocol_Factory.h"
-#include "strategies_export.h"
-
-#include "ace/Service_Config.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  /// Constructor.
-  TAO_SHMIOP_Protocol_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_SHMIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  /**
-   * @name Protocol factory methods
-   *
-   * Check Protocol_Factory.h for a description of these methods.
-   */
-  //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-  //@}
-
-  /// Set mmap file prefix
-  void mmap_file_prefix (const ACE_TCHAR *prefix);
-
-  /// Get mmap file prefix
-  const ACE_TCHAR *mmap_file_prefix (void);
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-
-  /// Specify the prefix (full path) for mmap files
-  ACE_TCHAR *mmap_prefix_;
-
-  /// Minimum bytes of the mmap files.
-  off_t min_bytes_;
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory)
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SHMIOP_FACTORY_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
deleted file mode 100644
index db66c5aa82d..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-#include "SHMIOP_Profile.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/IIOP_EndpointsC.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (Strategies,
-           SHMIOP_Profile,
-           "$Id$")
-
-#include "ace/os_include/os_netdb.h"
-
-static const char prefix_[] = "shmiop";
-
-const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/';
-
-char
-TAO_SHMIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_SHMIOP_Profile::object_key_delimiter_;
-}
-
-TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                                        const TAO::ObjectKey &object_key,
-                                        const TAO_GIOP_Message_Version &version,
-                                        TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SHMEM_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ()),
-    count_ (1)
-{
-}
-
-TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const char* host,
-                                        CORBA::UShort port,
-                                        const TAO::ObjectKey &object_key,
-                                        const ACE_INET_Addr &addr,
-                                        const TAO_GIOP_Message_Version &version,
-                                        TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SHMEM_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (host, port, addr),
-    count_ (1)
-{
-}
-
-TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_SHMEM_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1)
-{
-}
-
-TAO_SHMIOP_Profile::~TAO_SHMIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-TAO_Endpoint*
-TAO_SHMIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-CORBA::ULong
-TAO_SHMIOP_Profile::endpoint_count (void) const
-{
-  return this->count_;
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-int
-TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr)
-{
-  // Decode host and port into the <endpoint_>.
-  if (cdr.read_string (this->endpoint_.host_.out ()) == 0
-      || cdr.read_ushort (this->endpoint_.port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::decode - ")
-                      ACE_TEXT ("error while decoding host/port")));
-        }
-      return -1;
-    }
-
-  if (cdr.good_bit ())
-    {
-      // Invalidate the object_addr_ until first access.
-      this->endpoint_.object_addr_.set_type (-1);
-
-      return 1;
-    }
-
-  return -1;
-}
-
-void
-TAO_SHMIOP_Profile::parse_string_i (const char *string
-                                    ACE_ENV_ARG_DECL)
-{
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
-
-  char *start = copy.inout ();
-  char *cp = ACE_OS::strchr (start, ':');  // Look for a port
-
-  if (cp == 0)
-    {
-      // No host/port delimiter!
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  char *okd = ACE_OS::strchr (start, this->object_key_delimiter_);
-
-  if (okd == 0)
-    {
-      // No object key delimiter!
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Don't increment the pointer 'cp' directly since we still need
-  // to use it immediately after this block.
-
-  CORBA::ULong length = okd - (cp + 1);
-  // Don't allocate space for the colon ':'.
-
-  CORBA::String_var tmp = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (tmp.inout (), cp + 1, length);
-  tmp[length] = '\0';
-
-  if (ACE_OS::strspn (tmp.in (), "1234567890") == length)
-    {
-      this->endpoint_.port_ =
-        static_cast <CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
-    }
-  else
-    {
-      ACE_INET_Addr ia;
-      if (ia.string_to_addr (tmp.in ()) == -1)
-        {
-          ACE_THROW (CORBA::INV_OBJREF (
-              CORBA::SystemException::_tao_minor_code (
-                  TAO::VMCID,
-                  EINVAL),
-              CORBA::COMPLETED_NO));
-        }
-      else
-        {
-          this->endpoint_.port_ = ia.get_port_number ();
-        }
-    }
-
-  length = cp - start;
-
-  tmp = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (tmp.inout (), start, length);
-  tmp[length] = '\0';
-
-  this->endpoint_.host_ = tmp._retn ();
-
-  ACE_INET_Addr host_addr;
-
-  if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0)
-    {
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host : the local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-      {
-        const char *tmp = host_addr.get_host_addr ();
-        if (tmp == 0)
-          {
-            if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("\n\nTAO (%P|%t) ")
-                          ACE_TEXT ("SHMIOP_Profile::parse_string ")
-                          ACE_TEXT ("- %p\n\n"),
-                          ACE_TEXT ("cannot determine hostname")));
-
-            // @@ What's the right exception to throw here?
-            ACE_THROW (CORBA::INV_OBJREF (
-                         CORBA::SystemException::_tao_minor_code (
-                           TAO::VMCID,
-                           EINVAL),
-                         CORBA::COMPLETED_NO));
-          }
-        else
-          this->endpoint_.host_ = tmp;
-      }
-      else
-        {
-          this->endpoint_.host_ = (const char *) tmp_host;
-        }
-    }
-
-  if (this->endpoint_.object_addr_.set (this->endpoint_.port_,
-                                        this->endpoint_.host_.in ()) == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::parse_string () - \n")
-                      ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed")));
-        }
-
-      // @@ What's the right exception to throw here?
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  start = ++okd;  // increment past the object key separator
-
-  TAO::ObjectKey ok;
-  TAO::ObjectKey::decode_string_to_sequence (ok,
-                                             okd + 1);
-
-  (void) this->orb_core ()->object_key_table ().bind (ok,
-                                                      this->ref_object_key_);
-}
-
-CORBA::Boolean
-TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
-{
-  const TAO_SHMIOP_Profile *op =
-    dynamic_cast <const TAO_SHMIOP_Profile *> (other_profile);
-
-  if (op == 0)
-    return 0;
-
-  // Check endpoints equivalence.
-  const TAO_SHMIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_SHMIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_SHMIOP_Profile::hash (CORBA::ULong max
-                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Get the hashvalue for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_SHMIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  const TAO::ObjectKey &ok =
-    this->ref_object_key_->object_key ();
-
-  if (ok.length () >= 4)
-    {
-      hashval += ok[1];
-      hashval += ok[3];
-    }
-
-  hashval += this->hash_service_i (max);
-
-  return hashval % max;
-}
-
-void
-TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  this->count_++;
-}
-
-char *
-TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::String_var key;
-  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
-                                             this->ref_object_key_->object_key ());
-
-  size_t buflen = (8 /* corbaloc */ +
-                   1 /* colon separator */ +
-                   ACE_OS::strlen (::prefix_) +
-                   1 /* colon separator */ +
-                   1 /* major version */ +
-                   1 /* decimal point */ +
-                   1 /* minor version */ +
-                   1 /* `@' character */ +
-                   ACE_OS::strlen (this->endpoint_.host ()) +
-                   1 /* colon separator */ +
-                   5 /* port number */ +
-                   1 /* object key separator */ +
-                   ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (static_cast <CORBA::ULong> (buflen));
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_SHMIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-void
-TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  encap.write_string (this->endpoint_.host ());
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->endpoint_.port ());
-
-  // OCTET SEQUENCE for object key
-  if (this->ref_object_key_)
-    encap << this->ref_object_key_->object_key ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
-    }
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components ().encode (encap);
-}
-
-int
-TAO_SHMIOP_Profile::encode_endpoints (void)
-{
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-  TAO::IIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
-
-  TAO_SHMIOP_Endpoint *endpoint = &this->endpoint_;
-  for (CORBA::ULong i = 0;
-       i < this->count_;
-       ++i)
-    {
-      endpoints[i].host = endpoint->host ();
-      endpoints[i].port = endpoint->port ();
-      endpoints[i].priority = endpoint->priority ();
-
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-  size_t length = out_cdr.total_length ();
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-  tagged_component.component_data.length (static_cast <CORBA::ULong>(length));
-  CORBA::Octet *buf =
-    tagged_component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
-       iterator = iterator->cont ())
-    {
-      size_t i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
-
-      buf += i_length;
-    }
-
-  // Add component with encoded endpoint data to this profile's
-  // TaggedComponents.
-  tagged_components_.set_component (tagged_component);
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (reinterpret_cast <const char*> (buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (static_cast<int> (byte_order));
-
-      // Extract endpoints sequence.
-      TAO::IIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_SHMIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_SHMIOP_Endpoint (endpoints[i].host,
-                                               endpoints[i].port,
-                                               endpoints[i].priority),
-                          -1);
-
-          this->add_endpoint (endpoint);
-        }
-    }
-
-  return 0;
-}
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
deleted file mode 100644
index b7f367aea82..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     SHMIOP_Profile.h
- *
- *  $Id$
- *
- *   SHMIOP profile specific processing
- *
- *
- *  @author  Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SHMIOP_PROFILE_H
-#define TAO_SHMIOP_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "strategies_export.h"
-#include "tao/Profile.h"
-#include "SHMIOP_Endpoint.h"
-
-
-// TAO SHMIOP_Profile concrete Profile definitions
-/**
- * @class TAO_SHMIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating local ORBs over local IPC mechanism to use the
- * shared memory transport.
- *
- * This class defines the SHMIOP profile.
- */
-class TAO_Strategies_Export TAO_SHMIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that SHMIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.
-  TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr,
-                      const TAO::ObjectKey &object_key,
-                      const TAO_GIOP_Message_Version &version,
-                      TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, this is the most efficient since it
-  /// doesn't require any address resolution processing.
-  TAO_SHMIOP_Profile (const char *host,
-                      CORBA::UShort port,
-                      const TAO::ObjectKey &object_key,
-                      const ACE_INET_Addr &addr,
-                      const TAO_GIOP_Message_Version &version,
-                      TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, default.
-  TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_SHMIOP_Profile (void);
-
-
-  /// Template methods, please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-  /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
-   */
-  void add_endpoint (TAO_SHMIOP_Endpoint *endp);
-
-protected:
-
-  /// Template methods. Please see tao/Profile.h for documentation.
-  virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-
-private:
-
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support TAG_ALTERNATE_IIOP_ADDRESS-style
-   * feature.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard SHMIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_SHMIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  CORBA::ULong count_;
-};
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SHMIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
deleted file mode 100644
index 35ac575d819..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "SHMIOP_Transport.h"
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "SHMIOP_Connection_Handler.h"
-#include "SHMIOP_Profile.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Sync_Strategies.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Resume_Handle.h"
-#include "tao/GIOP_Message_Base.h"
-#include "tao/GIOP_Message_Lite.h"
-
-ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$")
-
-TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
-                                            TAO_ORB_Core *orb_core,
-                                            CORBA::Boolean flag)
-  : TAO_Transport (TAO_TAG_SHMEM_PROFILE,
-                   orb_core),
-    connection_handler_ (handler),
-    messaging_object_ (0)
-{
-  if (flag)
-    {
-      // Use the lite version of the protocol
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Lite (orb_core));
-    }
-  else
-    {
-      // Use the normal GIOP object
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
-    }
-}
-
-TAO_SHMIOP_Transport::~TAO_SHMIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-ACE_Event_Handler *
-TAO_SHMIOP_Transport::event_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Connection_Handler *
-TAO_SHMIOP_Transport::connection_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Pluggable_Messaging *
-TAO_SHMIOP_Transport::messaging_object (void)
-{
-  return this->messaging_object_;
-}
-
-
-ssize_t
-TAO_SHMIOP_Transport::send (iovec *iov, int iovcnt,
-                            size_t &bytes_transferred,
-                            const ACE_Time_Value *max_wait_time)
-{
-  bytes_transferred = 0;
-  for (int i = 0; i < iovcnt; ++i)
-    {
-      ssize_t retval =
-        this->connection_handler_->peer ().send (iov[i].iov_base,
-                                                 iov[i].iov_len,
-                                                 max_wait_time);
-      if (retval > 0)
-        bytes_transferred += retval;
-      if (retval <= 0)
-        return retval;
-    }
-  return bytes_transferred;
-}
-
-ssize_t
-TAO_SHMIOP_Transport::recv (char *buf,
-                            size_t len,
-                            const ACE_Time_Value *max_wait_time)
-{
-  ssize_t n = 0;
-
-  int read_break = 0;
-
-  while (!read_break)
-    {
-      n = this->connection_handler_->peer ().recv (buf,
-                                                   len,
-                                                   max_wait_time);
-
-      // If we get a EWOULBLOCK we try to read again.
-      if (n == -1 && (errno == EAGAIN || errno == EWOULDBLOCK))
-        {
-          n = 0;
-          continue;
-        }
-
-      // If there is anything else we just drop out of the loop.
-      read_break = 1;
-    }
-
-  if (n == -1)
-    {
-      if (TAO_debug_level > 3 && errno != ETIME)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - %p \n"),
-                      ACE_TEXT ("TAO - read message failure ")
-                      ACE_TEXT ("recv_i () \n")));
-        }
-    }
-  else if (n == 0)
-    {
-      n = -1;
-    }
-  return n;
-}
-
-
-int
-TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
-                                           ssize_t missing_data,
-                                           TAO_Resume_Handle &rh,
-                                           ACE_Time_Value *max_wait_time)
-{
-  // Calculate the actual length of the load that we are supposed to
-  // read which is equal to the <missing_data> + length of the buffer
-  // that we have..
-  size_t payload = missing_data + incoming.length ();
-
-  // Grow the buffer to the size of the message
-  ACE_CDR::grow (&incoming,
-                 payload);
-
-  // .. do a read on the socket again.
-  ssize_t bytes = 0;
-
-  // As this used for transports where things are available in one
-  // shot this looping should not create any problems.
-  for (size_t n = missing_data;
-       n != 0;
-       n -= bytes)
-    {
-      // We would have liked to use something like a recv_n ()
-      // here. But at the time when the code was written, the MEM_Stream
-      // classes had poor support  for recv_n (). Till a day when we
-      // get proper recv_n (), let us stick with this. The other
-      // argument that can be said against this is that, this is the
-      // bad layer in which this is being done ie. recv_n is
-      // simulated. But...
-      bytes = this->recv (incoming.wr_ptr (),
-                          n,
-                          max_wait_time);
-
-      if (bytes == 0 ||
-          bytes == -1)
-        {
-          return -1;
-        }
-
-      incoming.wr_ptr (bytes);
-    }
-
-  TAO_Queued_Data pqd (&incoming);
-
-  // With SHMIOP we would not have any missing data...
-  pqd.missing_data_ = 0;
-
-  this->messaging_object ()->get_message_data (&pqd);
-
-  // Now we have a full message in our buffer. Just go ahead and
-  // process that
-  return this->process_parsed_messages (&pqd, rh);
-}
-
-int
-TAO_SHMIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-
-    return -1;
-  this->first_request_sent();
-
-  return 0;
-}
-
-int
-TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_message_shared (stub,
-                                         message_semantics,
-                                         stream.begin (),
-                                         max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) closing transport %d after fault %p\n"),
-                    this->id (),
-                    ACE_TEXT ("send_message ()\n")));
-
-      return -1;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major,
-                                 minor);
-  return 1;
-}
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
deleted file mode 100644
index a8655d8c1db..00000000000
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   SHMIOP_Transport.h
- *
- *  $Id$
- *
- *  @author Originally by Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_SHMIOP_TRANSPORT_H
-#define TAO_SHMIOP_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-
-#include "strategies_export.h"
-#include "ace/Svc_Handler.h"
-#include "ace/MEM_Stream.h"
-#include "tao/Transport.h"
-
-class TAO_SHMIOP_Connection_Handler;
-class TAO_Pluggable_Messaging;
-class TAO_Target_Specification;
-class Tao_Operation_Details;
-
-typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
-         TAO_SHMIOP_SVC_HANDLER;
-
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-/**
- * @class TAO_SHMIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  SHMIOP protocol.
- *
- */
-
-class TAO_Strategies_Export TAO_SHMIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
-                        TAO_ORB_Core *orb_core,
-                        CORBA::Boolean flag);
-
-  /// Default destructor.
-  ~TAO_SHMIOP_Transport (void);
-
-protected:
-  /**
-   * @name Overridden Template Methods
-   *
-   * These are implementations of template methods declared by TAO_Transport.
-   */
-  //@{
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
-  virtual TAO_Pluggable_Messaging *messaging_object (void);
-
-  /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *timeout = 0);
-
-  /// Read len bytes from into buf.
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-  virtual int consolidate_message (ACE_Message_Block &incoming,
-                                   ssize_t missing_data,
-                                   TAO_Resume_Handle &rh,
-                                   ACE_Time_Value *max_wait_time);
-
-  //@}
-
-public:
-  /// @todo These methods IMHO should have more meaningful names.
-  /// The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int message_semantics,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-private:
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_SHMIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-};
-
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SHMIOP_TRANSPORT_H */
diff --git a/TAO/tao/Strategies/TAO_Strategies.pc.in b/TAO/tao/Strategies/TAO_Strategies.pc.in
deleted file mode 100644
index 57d22eedb36..00000000000
--- a/TAO/tao/Strategies/TAO_Strategies.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Strategies
-Description: TAO Strategies Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Strategies
-Cflags: -I${includedir}
diff --git a/TAO/tao/Strategies/TAO_Strategies.rc b/TAO/tao/Strategies/TAO_Strategies.rc
deleted file mode 100644
index d0646d177f1..00000000000
--- a/TAO/tao/Strategies/TAO_Strategies.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "Strategies\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_StrategiesDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_Strategies.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
deleted file mode 100644
index afe3cce5866..00000000000
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ /dev/null
@@ -1,507 +0,0 @@
-#include "UIOP_Acceptor.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/debug.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
-
-ACE_RCSID (Strategies,
-           UIOP_Acceptor,
-           "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_UIOP_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_UIOP_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_UIOP_PROFILE),
-    base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    unlink_on_close_ (true),
-    lite_flag_ (flag)
-{
-}
-
-TAO_UIOP_Acceptor::~TAO_UIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-}
-
-int
-TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
-                                   TAO_MProfile &mprofile,
-                                   CORBA::Short priority)
-{
-  // Check if multiple endpoints should be put in one profile or
-  // if they should be spread across multiple profiles.
-  if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
-  else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
-
-}
-
-int
-TAO_UIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Short priority)
-{
-  ACE_UNIX_Addr addr;
-
-  if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
-    return 0;
-
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < 1
-      && mprofile.grow (count + 1) == -1)
-    return -1;
-
-  TAO_UIOP_Profile *pfile = 0;
-  ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (addr,
-                                    object_key,
-                                    this->version_,
-                                    this->orb_core_),
-                  -1);
-  pfile->endpoint ()->priority (priority);
-
-  if (mprofile.give_profile (pfile) == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-      return -1;
-    }
-
-  // Do not add any tagged components to the profile if configured
-  // by the user not to do so, or if an UIOP 1.0 endpoint is being
-  // created (IIOP 1.0 did not support tagged components, so we follow
-  // the same convention for UIOP).
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0
-      || (this->version_.major == 1 && this->version_.minor == 0))
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-  this->orb_core_->codeset_manager()->
-    set_codeset (pfile->tagged_components());
-  return 0;
-}
-
-int
-TAO_UIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
-                                          TAO_MProfile &mprofile,
-                                          CORBA::Short priority)
-{
-  TAO_Profile *pfile = 0;
-  TAO_UIOP_Profile *uiop_profile = 0;
-
-  // First see if <mprofile> already contains a UIOP profile.
-  for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
-    {
-      pfile = mprofile.get_profile (i);
-      if (pfile->tag () == TAO_TAG_UIOP_PROFILE)
-      {
-        uiop_profile = dynamic_cast<TAO_UIOP_Profile *> (pfile);
-        break;
-      }
-    }
-
-  if (uiop_profile == 0)
-    {
-      // If <mprofile> doesn't contain UIOP_Profile, we need to create
-      // one.
-      return create_new_profile (object_key,
-                                 mprofile,
-                                 priority);
-    }
-  else
-    {
-      // A UIOP_Profile already exists - just add our endpoint to it.
-      ACE_UNIX_Addr addr;
-
-      if (this->base_acceptor_.acceptor ().get_local_addr (addr) == -1)
-        return 0;
-
-      TAO_UIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_UIOP_Endpoint (addr),
-                      -1);
-      endpoint->priority (priority);
-      uiop_profile->add_endpoint (endpoint);
-
-      return 0;
-    }
-}
-
-int
-TAO_UIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_UIOP_Endpoint *endp =
-    dynamic_cast<const TAO_UIOP_Endpoint *> (endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-  // For UNIX Files this is relatively cheap.
-  ACE_UNIX_Addr address;
-  if (this->base_acceptor_.acceptor ().get_local_addr (address) == -1)
-    return 0;
-
-  return endp->object_addr () == address;
-}
-
-int
-TAO_UIOP_Acceptor::close (void)
-{
-  if (this->unlink_on_close_)
-    {
-      ACE_UNIX_Addr addr;
-
-      if (this->base_acceptor_.acceptor ().get_local_addr (addr) == 0)
-        (void) ACE_OS::unlink (addr.get_path_name ());
-
-      this->unlink_on_close_ = false;
-    }
-
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         ACE_Reactor *reactor,
-                         int major,
-                         int minor,
-                         const char *address,
-                         const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (address == 0)
-    return -1;
-
-  if (major >= 0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-  else
-    return this->open_i (address,
-                         reactor);
-}
-
-int
-TAO_UIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                 ACE_Reactor *reactor,
-                                 int major,
-                                 int minor,
-                                 const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (major >= 0 && minor >= 0)
-    this->version_.set_version (static_cast<CORBA::Octet> (major),
-                                static_cast<CORBA::Octet> (minor));
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  ACE_Auto_String_Free tempname (ACE_OS::tempnam (0, "TAO"));
-
-  if (tempname.get () == 0)
-    return -1;
-
-  return this->open_i (tempname.get (),
-                       reactor);
-}
-
-int
-TAO_UIOP_Acceptor::open_i (const char *rendezvous,
-                           ACE_Reactor *reactor)
-{
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_UIOP_CREATION_STRATEGY (this->orb_core_,
-                                              this->lite_flag_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_UIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_UIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_UNIX_Addr addr;
-
-  this->rendezvous_point (addr, rendezvous);
-
-  if (this->base_acceptor_.open (addr,
-                                 reactor,
-                                 this->creation_strategy_,
-                                 this->accept_strategy_,
-                                 this->concurrency_strategy_) == -1)
-    {
-      // Don't unlink an existing rendezvous point since it may be in
-      // use by another UIOP server/client.
-      if (errno == EADDRINUSE)
-        this->unlink_on_close_ = false;
-
-      return -1;
-    }
-
-  (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
-  // This avoids having child processes acquire the listen socket thereby
-  // denying the server the opportunity to restart on a well-known endpoint.
-  // This does not affect the aberrent behavior on Win32 platforms.
-
-  // @@ If Profile creation is slow we may need to cache the
-  //    rendezvous point here
-
-  if (TAO_debug_level > 5)
-    ACE_DEBUG ((LM_DEBUG,
-                "\nTAO (%P|%t) UIOP_Acceptor::open_i - "
-                "listening on: <%s>\n",
-                addr.get_path_name ()));
-  return 0;
-}
-
-void
-TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr,
-                                     const char *rendezvous)
-{
-  // To guarantee portability, local IPC rendezvous points (including
-  // the path and filename) should not be longer than 99 characters
-  // long. Some platforms may support longer rendezvous points,
-  // usually 108 characters including the null terminator, but
-  // Posix.1g only requires that local IPC rendezvous point arrays
-  // contain a maximum of at least 100 characters, including the null
-  // terminator.  If an endpoint is longer than what the platform
-  // supports then it will be truncated so that it fits, and a warning
-  // will be issued.
-
-  // Avoid using relative paths in your UIOP endpoints.  If possible,
-  // use absolute paths instead.  Imagine that the server is given an
-  // endpoint to create using -ORBEndpoint uiop://foobar.  A local IPC
-  // rendezvous point called foobar will be created in the current
-  // working directory.  If the client is not started in the directory
-  // where the foobar rendezvous point exists then the client will not
-  // be able to communicate with the server since its point of
-  // communication, the rendezvous point, was not found. On the other
-  // hand, if an absolute path was used, the client would know exactly
-  // where to find the rendezvous point.  It is up to the user to make
-  // sure that a given UIOP endpoint is accessible by both the server
-  // and the client.
-
-  addr.set (rendezvous);
-
-  const size_t length = ACE_OS::strlen (addr.get_path_name ());
-
-  // Check if rendezvous point was truncated by ACE_UNIX_Addr since
-  // most UNIX domain socket rendezvous points can only be less than
-  // 108 characters long.
-  if (length < ACE_OS::strlen (rendezvous))
-    ACE_DEBUG ((LM_WARNING,
-                "TAO (%P|%t) UIOP rendezvous point was truncated to <%s>\n"
-                "since it was longer than %d characters long.\n",
-                addr.get_path_name (),
-                length));
-}
-
-CORBA::ULong
-TAO_UIOP_Acceptor::endpoint_count (void)
-{
-  return 1;
-}
-
-int
-TAO_UIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO::ObjectKey &object_key)
-{
-  // Create the decoding stream from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't *do any*
-  // processing.
-  if (!(cdr.read_octet (major) && cdr.read_octet (minor)))
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
-                      major,
-                      minor));
-        }
-
-      return -1;
-    }
-
-  char * rendezvous = 0;
-
-  // Get rendezvous_point
-  if (cdr.read_string (rendezvous) == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "error decoding UIOP rendezvous_point"));
-
-      return -1;
-    }
-
-  // delete the rendezvous point. We don't do any processing.
-  delete [] rendezvous;
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  return 1;
-}
-
-int
-TAO_UIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  ACE_CString options (str);
-
-  const size_t len = options.length ();
-
-  static const char option_delimiter = '&';
-
-  // Count the number of options.
-
-  CORBA::ULong option_count = 1;
-  // Number of endpoints in the string (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      ++option_count;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  int begin = 0;
-  int end = -1;
-
-  for (CORBA::ULong j = 0; j < option_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < option_count - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = len - begin;  // Handle last endpoint differently
-
-      if (end == begin)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "TAO (%P|%t) Zero length UIOP option.\n"),
-                          -1);
-      else if (end != ACE_CString::npos)
-        {
-          ACE_CString opt =
-            options.substring (begin, end);
-
-          const int slot = opt.find ("=");
-
-          if (slot == static_cast<int> (len - 1)
-              || slot == ACE_CString::npos)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "TAO (%P|%t) UIOP option <%s> is "
-                               "missing a value.\n",
-                               opt.c_str ()),
-                              -1);
-
-          const ACE_CString name (opt.substring (0, slot));
-          ACE_CString value = opt.substring (slot + 1);
-
-          if (name.length () == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "TAO (%P|%t) Zero length UIOP "
-                               "option name.\n"),
-                              -1);
-
-          if (name == "priority")
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
-                                -1);
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "TAO (%P|%t) Invalid UIOP option: <%s>\n",
-                               name.c_str ()),
-                              -1);
-        }
-    }
-  return 0;
-}
-
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
deleted file mode 100644
index 7610ce7f277..00000000000
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UIOP_Acceptor.h
- *
- *  $Id$
- *
- *  Unix Domain Socket (UIOP) specific acceptor processing
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_UIOP_ACCEPTOR_H
-#define TAO_UIOP_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-#include "UIOP_Connection_Handler.h"
-
-#include "tao/Transport_Acceptor.h"
-#include "tao/Acceptor_Impl.h"
-#include "tao/GIOP_Message_Version.h"
-
-#include "ace/Acceptor.h"
-#include "ace/LSOCK_Acceptor.h"
-
-/**
- * @class TAO_UIOP_Acceptor
- *
- * @brief The UIOP-specific bridge class for the concrete acceptor.
- */
-class TAO_Strategies_Export TAO_UIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  // TAO_UIOP_Acceptor (ACE_UNIX_Addr &addr);
-  // Create Acceptor object using addr.
-
-  /// Create Acceptor object using addr.
-  TAO_UIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor
-  virtual ~TAO_UIOP_Acceptor (void);
-
-  typedef ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_ACCEPT_STRATEGY;
-
-  /**
-   * @name The TAO_Acceptor Methods
-   *
-   * Please check the documentation in Transport_Acceptor.h for details.
-   */
-  //@{
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority);
-
-  virtual int is_collocated (const TAO_Endpoint* endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key);
-  //@}
-
-private:
-  /// Implement the common part of the open*() methods
-  int open_i (const char *rendezvous,
-              ACE_Reactor *reactor);
-
-  /// Set the rendezvous point and verify that it is
-  /// valid (e.g. wasn't truncated because it was too long).
-  void rendezvous_point (ACE_UNIX_Addr &, const char *rendezvous);
-
-  /// Parse protocol specific options.
-  int parse_options (const char *options);
-
-  /// Obtains uiop properties that must be used by this acceptor, i.e.,
-  /// initializes <uiop_properties_>.
-  int init_uiop_properties (void);
-
-  /// Create a UIOP profile representing this acceptor.
-  int create_new_profile (const TAO::ObjectKey &object_key,
-                          TAO_MProfile &mprofile,
-                          CORBA::Short priority);
-
-  /// Add the endpoints on this acceptor to a shared profile.
-  int create_shared_profile (const TAO::ObjectKey &object_key,
-                             TAO_MProfile &mprofile,
-                             CORBA::Short priority);
-
-private:
-  /// The concrete acceptor, as a pointer to its base class.
-  TAO_UIOP_BASE_ACCEPTOR base_acceptor_;
-
-  // Acceptor strategies.
-  TAO_UIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_UIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_UIOP_ACCEPT_STRATEGY *accept_strategy_;
-
-  /// The GIOP version for this endpoint
-  TAO_GIOP_Message_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// Flag that determines whether or not the rendezvous point should
-  /// be unlinked on close.  This is really only used when an error
-  /// occurs.
-  bool unlink_on_close_;
-
-  /// Should we use GIOP lite??
-  const bool lite_flag_;
-};
-
-# endif /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_UIOP_ACCEPTOR_H */
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
deleted file mode 100644
index 33e1a07d51a..00000000000
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// $Id$
-
-#include "UIOP_Connection_Handler.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Transport.h"
-#include "UIOP_Endpoint.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Timeprobe.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/GIOP_Message_Lite.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Protocols_Hooks.h"
-
-ACE_RCSID (Strategies,
-           UIOP_Connection_Handler,
-           "$Id$")
-
-
-TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (0);
-}
-
-
-TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (
-  TAO_ORB_Core *orb_core,
-  CORBA::Boolean flag)
-  : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core)
-{
-  TAO_UIOP_Transport* specific_transport = 0;
-  ACE_NEW (specific_transport,
-           TAO_UIOP_Transport (this, orb_core, flag));
-
-  // store this pointer (indirectly increment ref count)
-  this->transport (specific_transport);
-}
-
-
-TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-}
-
-int
-TAO_UIOP_Connection_Handler::open_handler (void *v)
-{
-  return this->open (v);
-}
-
-int
-TAO_UIOP_Connection_Handler::open (void*)
-{
-  TAO_UIOP_Protocol_Properties protocol_properties;
-
-  // Initialize values from ORB params.
-  protocol_properties.send_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  protocol_properties.recv_buffer_size_ =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
-
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (client)
-        {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  if (this->set_socket_option (this->peer (),
-                               protocol_properties.send_buffer_size_,
-                               protocol_properties.recv_buffer_size_) == -1)
-    return -1;
-
-  if (this->transport ()->wait_strategy ()->non_blocking ())
-    {
-      if (this->peer ().enable (ACE_NONBLOCK) == -1)
-        return -1;
-    }
-
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_UNIX_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) UIOP connection to server ")
-                ACE_TEXT ("<%s> on %d\n"),
-                addr.get_path_name (), this->peer ().get_handle ()));
-
-  // Set that the transport is now connected, if fails we return -1
-  // Use C-style cast b/c otherwise we get warnings on lots of
-  // compilers
-  if (!this->transport ()->post_open ((size_t) this->get_handle ()))
-    return -1;
-
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 0;
-}
-
-int
-TAO_UIOP_Connection_Handler::resume_handler (void)
-{
-  return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER;
-}
-
-int
-TAO_UIOP_Connection_Handler::close_connection (void)
-{
-  return this->close_connection_eh (this);
-}
-
-int
-TAO_UIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_eh (h, this);
-}
-
-int
-TAO_UIOP_Connection_Handler::handle_output (ACE_HANDLE handle)
-{
-  const int result =
-    this->handle_output_eh (handle, this);
-
-  if (result == -1)
-    {
-      this->close_connection ();
-      return 0;
-    }
-
-  return result;
-}
-
-int
-TAO_UIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                             const void *)
-{
-  // We don't use this upcall for I/O.  This is only used by the
-  // Connector to indicate that the connection timedout.  Therefore,
-  // we should call close().
-  return this->close ();
-}
-
-int
-TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE,
-                                           ACE_Reactor_Mask)
-{
-  ACE_ASSERT (0);
-  return 0;
-}
-
-int
-TAO_UIOP_Connection_Handler::close (u_long)
-{
-  return this->close_handler ();
-}
-
-int
-TAO_UIOP_Connection_Handler::release_os_resources (void)
-{
-  return this->peer().close ();
-}
-
-int
-TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
-{
-  ACE_UNIX_Addr addr;
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Construct an  UIOP_Endpoint object
-  TAO_UIOP_Endpoint endpoint (addr);
-
-  // Construct a property object
-  TAO_Base_Transport_Property prop (&endpoint);
-
-  TAO::Transport_Cache_Manager &cache =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Add the handler to Cache
-  return cache.cache_idle_transport (&prop,
-                                     this->transport ());
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /*TAO_HAS_UIOP == 1*/
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
deleted file mode 100644
index ca14c8aeb4a..00000000000
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   UIOP_Connection_Handler.h
- *
- *  $Id$
- *
- *  @author Originally by Ossama Othman <ossama@ece.uci.edu> as
- *   UIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-#ifndef TAO_UIOP_CONNECTION_HANDLER_H
-#define TAO_UIOP_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_UIOP == 1
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-#include "ace/Reactor.h"
-#include "tao/Connection_Handler.h"
-#include "tao/Wait_Strategy.h"
-#include "UIOP_Transport.h"
-
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
-// ****************************************************************
-
-/**
- * @class TAO_UIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-class TAO_Strategies_Export TAO_UIOP_Connection_Handler : public TAO_UIOP_SVC_HANDLER,
-                                                          public TAO_Connection_Handler
-{
-
-public:
-
-  TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
-
-  /// Constructor.
-  TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag);
-
-  /// Destructor.
-  ~TAO_UIOP_Connection_Handler (void);
-
-  //@{
-  /**
-   * Connection_Handler overloads
-   */
-  virtual int open_handler (void *);
-  //@}
-
-  /// Close called by the Acceptor or Connector when connection
-  /// establishment fails.
-  int close (u_long = 0);
-
-  //@{
-  /** @name Event Handler overloads
-   */
-  virtual int open (void *);
-  virtual int resume_handler (void);
-  virtual int close_connection (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_output (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-  //@}
-
-
-  /// Add ourselves to Cache.
-  int add_transport_to_cache (void);
-
-protected:
-
-  //@{
-  /**
-   * @name TAO_Connection Handler overloads
-   */
-  virtual int release_os_resources (void);
-  //@}
-};
-
-#endif /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UIOP_CONNECT_H */
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
deleted file mode 100644
index 789f0e3185e..00000000000
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-#include "UIOP_Connector.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Profile.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Environment.h"
-#include "tao/Protocols_Hooks.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Connect_Strategy.h"
-#include "tao/Profile_Transport_Resolver.h"
-
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID(Strategies,
-          UIOP_Connector,
-          "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connector_Base<TAO_UIOP_Connection_Handler>;
-template class ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_NonBlocking_Connect_Handler<TAO_UIOP_Connection_Handler>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<ACE_UNIX_Addr>
-#pragma instantiate ACE_Unbounded_Stack<ACE_UNIX_Addr>
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connector_Base<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_UIOP_Connection_Handler>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_UIOP_PROFILE),
-    connect_strategy_ (),
-    base_connector_ (),
-    lite_flag_ (flag)
-{
-}
-
-TAO_UIOP_Connector::~TAO_UIOP_Connector (void)
-{
-}
-
-int
-TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core (orb_core);
-
-  // Create our connect strategy
-  if (this->create_connect_strategy () == -1)
-    return -1;
-
-  // Our connect creation strategy
-  TAO_UIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
-
-  ACE_NEW_RETURN (connect_creation_strategy,
-                  TAO_UIOP_CONNECT_CREATION_STRATEGY
-                      (orb_core->thr_mgr (),
-                       orb_core,
-                       this->lite_flag_),
-                  -1);
-
-  /// Our activation strategy
-  TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
-
-  ACE_NEW_RETURN (concurrency_strategy,
-                  TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-                  -1);
-
-  return this->base_connector_.open (this->orb_core ()->reactor (),
-                                     connect_creation_strategy,
-                                     &this->connect_strategy_,
-                                     concurrency_strategy);
-}
-
-int
-TAO_UIOP_Connector::close (void)
-{
-  // Zap the creation strategy that we created earlier.
-  delete this->base_connector_.creation_strategy ();
-  delete this->base_connector_.concurrency_strategy ();
-
-  return this->base_connector_.close ();
-}
-
-TAO_Profile *
-TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
-                                   ACE_ENV_ARG_DECL)
-{
-  if (this->check_prefix (str) != 0)
-    return 0;
-
-  const char *separator = ACE_OS::strchr (str,'|');
-  if (separator == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan error: "
-                    "explicit terminating charactor '|' is missing from <%s>",
-                    str));
-      return 0;
-    }
-  if (*(separator+1) != ',' && *(separator+1) != '/')
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan warning: "
-                    "terminating charactor '|' should be followed by a ','"
-                    "or a '/' in <%s>",
-                    str));
-    }
-  len = (separator - str) + 1;
-  return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-
-int
-TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
-{
-  TAO_UIOP_Endpoint *uiop_endpoint = this->remote_endpoint (endpoint);
-
-  if (uiop_endpoint == 0)
-    return -1;
-
-   const ACE_UNIX_Addr &remote_address = uiop_endpoint->object_addr ();
-
-   // @@ Note, POSIX.1g renames AF_UNIX to AF_LOCAL.
-   // Verify that the remote ACE_UNIX_Addr was initialized properly.
-   // Failure can occur if hostname lookup failed when initializing the
-   // remote ACE_INET_Addr.
-   if (remote_address.get_type () != AF_UNIX)
-     {
-       if (TAO_debug_level > 0)
-         {
-           ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("TAO (%P|%t) UIOP failure.\n")
-                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                       ACE_TEXT ("due to a hostname lookup ")
-                       ACE_TEXT ("failure.\n")));
-         }
-
-       return -1;
-     }
-
-   return 0;
-}
-
-TAO_Transport *
-TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
-                                     TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value *max_wait_time)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ")
-                ACE_TEXT ("looking for UIOP connection.\n")));
-
-  TAO_UIOP_Endpoint *uiop_endpoint =
-    this->remote_endpoint (desc.endpoint ());
-
-  if (uiop_endpoint == 0)
-    return 0;
-
-  const ACE_UNIX_Addr &remote_address =
-    uiop_endpoint->object_addr ();
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) UIUP_Connector::make_connection, ")
-                ACE_TEXT ("making a new connection \n")));
-
-  // Get the right synch options
-  ACE_Synch_Options synch_options;
-
-  this->active_connect_strategy_->synch_options (max_wait_time,
-                                                 synch_options);
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked_connect ())
-    {
-      synch_options.timeout (ACE_Time_Value::zero);
-      max_wait_time = &tmp_zero;
-    }
-
-  TAO_UIOP_Connection_Handler *svc_handler = 0;
-
-  // Connect.
-  int result =
-    this->base_connector_.connect (svc_handler,
-                                   remote_address,
-                                   synch_options);
-
-  // This call creates the service handler and bumps the #REFCOUNT# up
-  // one extra.  There are three possibilities: (a) connection
-  // succeeds immediately - in this case, the #REFCOUNT# on the
-  // handler is two; (b) connection completion is pending - in this
-  // case, the #REFCOUNT# on the handler is also two; (c) connection
-  // fails immediately - in this case, the #REFCOUNT# on the handler
-  // is one since close() gets called on the handler.
-  //
-  // The extra reference count in
-  // TAO_Connect_Creation_Strategy::make_svc_handler() is needed in
-  // the case when connection completion is pending and we are going
-  // to wait on a variable in the handler to changes, signifying
-  // success or failure.  Note, that this increment cannot be done
-  // once the connect() returns since this might be too late if
-  // another thread pick up the completion and potentially deletes the
-  // handler before we get a chance to increment the reference count.
-
-  // Make sure that we always do a remove_reference
-  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
-
-  TAO_Transport *transport =
-    svc_handler->transport ();
-
-  if (result == -1)
-    {
-      // No immediate result, wait for completion
-      if (errno == EWOULDBLOCK)
-        {
-          // Try to wait until connection completion. Incase we block, then we
-          // get a connected transport or not. In case of non block we get
-          // a connected or not connected transport
-          if (!this->wait_for_connection_completion (r,
-                                                     transport,
-                                                     max_wait_time))
-            {
-              if (TAO_debug_level > 2)
-                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::"
-                                      "make_connection, "
-                                      "wait for completion failed\n"));
-            }
-        }
-      else
-        {
-          // Transport is not usable
-          transport = 0;
-        }
-    }
-
-  // In case of errors transport is zero
-  if (transport == 0)
-    {
-      // Give users a clue to the problem.
-      if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_ERROR,
-                      "TAO (%P|%t) - UIOP_Connector::make_connection, "
-                      "connection to <%s> failed (%p)\n",
-                      uiop_endpoint->rendezvous_point (),
-                      ACE_TEXT("errno")));
-
-      return 0;
-    }
-
-
-  // At this point, the connection has be successfully created
-  // connected or not connected, but we have a connection.
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - UIOP_Connector::make_connection, "
-                "new %s connection to <%s> on Transport[%d]\n",
-                transport->is_connected() ? "connected" : "not connected",
-                uiop_endpoint->rendezvous_point (),
-                svc_handler->peer ().get_handle ()));
-
-  // Add the handler to Cache
-  int retval =
-    this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&desc,
-                                                                             transport);
-  // Failure in adding to cache.
-  if (retval != 0)
-    {
-      // Close the handler.
-      svc_handler->close ();
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) UIOP_Connector::make_connection, ")
-                      ACE_TEXT ("could not add the new connection to Cache \n")));
-        }
-
-      return 0;
-    }
-
-  if (transport->is_connected () &&
-      transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) transport->purge_entry ();
-
-      // Close the handler.
-      (void) transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - UIOP_Connector [%d]::make_connection, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    transport->id ()));
-
-      return 0;
-    }
-
-  return transport;
-}
-
-
-TAO_Profile *
-TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (this->orb_core ()),
-                  0);
-
-  const int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-TAO_Profile *
-TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_Profile *profile = 0;
-  ACE_NEW_THROW_EX (profile,
-                    TAO_UIOP_Profile (this->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-
-  ACE_CHECK_RETURN (0);
-
-  return profile;
-}
-
-int
-TAO_UIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  static const char *protocol[] = { "uiop", "uioploc" };
-
-  const size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
-  const size_t len0 = ACE_OS::strlen (protocol[0]);
-  const size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint,
-                              protocol[0],
-                              len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint,
-                                   protocol[1],
-                                   len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an UIOP IOR DO NOT throw an exception here.
-}
-
-char
-TAO_UIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_UIOP_Profile::object_key_delimiter_;
-}
-
-TAO_UIOP_Endpoint *
-TAO_UIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint)
-{
-  if (endpoint->tag () != TAO_TAG_UIOP_PROFILE)
-    return 0;
-
-  TAO_UIOP_Endpoint *uiop_endpoint =
-    dynamic_cast<TAO_UIOP_Endpoint *> (endpoint);
-
-  if (uiop_endpoint == 0)
-    return 0;
-
-  return uiop_endpoint;
-}
-
-int
-TAO_UIOP_Connector::cancel_svc_handler (
-  TAO_Connection_Handler * svc_handler)
-{
-  TAO_UIOP_Connection_Handler* handler=
-    dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler);
-
-  if (handler)
-    // Cancel from the connector
-    return this->base_connector_.cancel (handler);
-
-  return -1;
-}
-
-#endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
deleted file mode 100644
index e53b09b3295..00000000000
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UIOP_Connector.h
- *
- *  $Id$
- *
- *  UIOP specific connector processing
- *
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_UIOP_CONNECTOR_H
-#define TAO_UIOP_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-
-#include "ace/LSOCK_Connector.h"
-#include "ace/Connector.h"
-#include "tao/Transport_Connector.h"
-#include "UIOP_Connection_Handler.h"
-#include "tao/Resource_Factory.h"
-#include "tao/Connector_Impl.h"
-
-class TAO_UIOP_Endpoint;
-class TAO_Endpoint;
-
-/**
- * @class TAO_UIOP_Connector
- *
- * @brief UIOP-specific Connector bridge for pluggable protocols.
- *
- */
-class TAO_Strategies_Export TAO_UIOP_Connector : public TAO_Connector
-{
-public:
-
-  /**
-   * Constructor.
-   * @@ Do we want to pass in the tag here or should it be statically
-   * defined?
-   */
-  TAO_UIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Destructor
-  ~TAO_UIOP_Connector (void);
-
-  /**
-   * @name The TAO_Connector Methods
-   *
-   * Please check the documentation in Transport_Connector.h for details.
-   */
-  //@{
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
-                                      ACE_ENV_ARG_DECL);
-  
-  virtual char object_key_delimiter (void) const;
-
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
-  //@}
-
-public:
-
-  typedef TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-          TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY;
-
-  typedef TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>
-          TAO_UIOP_CONNECT_CREATION_STRATEGY;
-
-  typedef ACE_Connect_Strategy<TAO_UIOP_Connection_Handler,
-                               ACE_LSOCK_CONNECTOR>
-          TAO_UIOP_CONNECT_STRATEGY ;
-
-  typedef ACE_Strategy_Connector<TAO_UIOP_Connection_Handler,
-                                 ACE_LSOCK_CONNECTOR>
-          TAO_UIOP_BASE_CONNECTOR;
-
-protected:
-
-  /**
-   * @name More TAO_Connector methods
-   *
-   * Please check the documentation in Transport_Connector.h.
-   */
-  //@{
-  int set_validate_endpoint (TAO_Endpoint *endpoint);
-
-  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
-                                  TAO_Transport_Descriptor_Interface &desc,
-                                  ACE_Time_Value *timeout = 0);
-
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
-
-  //@}
-
-private:
-
-  /// Return the remote endpoint, a helper function
-  TAO_UIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
-
-private:
-
-  /// Our connect strategy
-  TAO_UIOP_CONNECT_STRATEGY connect_strategy_;
-
-  /// The connector initiating connection requests for UIOP.
-  TAO_UIOP_BASE_CONNECTOR base_connector_;
-
-  /// Do we need to use a GIOP_Lite for sending messages?
-  const bool lite_flag_;
-};
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_UIOP_CONNECTOR_H */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
deleted file mode 100644
index d843a8b2d14..00000000000
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "UIOP_Endpoint.h"
-#include "UIOP_Connection_Handler.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/OS_NS_string.h"
-
-
-#if TAO_HAS_UIOP == 1
-
-
-ACE_RCSID (Strategies,
-           UIOP_Endpoint,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "UIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-
-TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_UIOP_PROFILE, priority)
-    , object_addr_ (addr)
-    , next_ (0)
-{
-}
-
-TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_UIOP_PROFILE)
-    , object_addr_ ()
-    , next_ (0)
-{
-}
-
-TAO_UIOP_Endpoint::~TAO_UIOP_Endpoint (void)
-{
-}
-
-int
-TAO_UIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  if (length < (ACE_OS::strlen (this->rendezvous_point ()) + 1))
-    return -1;
-
-  ACE_OS::strcpy (buffer, this->rendezvous_point ());
-
-  return 0;
-}
-
-TAO_Endpoint *
-TAO_UIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_UIOP_Endpoint::duplicate (void)
-{
-  TAO_UIOP_Endpoint *endpoint = 0;
-  ACE_NEW_RETURN (endpoint,
-                  TAO_UIOP_Endpoint (this->object_addr_,
-                                     this->priority ()),
-                  0);
-
-  return endpoint;
-}
-
-CORBA::Boolean
-TAO_UIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  TAO_Endpoint *endpt = const_cast<TAO_Endpoint *> (other_endpoint);
-
-  TAO_UIOP_Endpoint *endpoint = dynamic_cast<TAO_UIOP_Endpoint *> (endpt);
-
-  if (endpoint == 0)
-    return 0;
-
-  return ACE_OS::strcmp (this->rendezvous_point (),
-                         endpoint->rendezvous_point ()) == 0;
-}
-
-CORBA::ULong
-TAO_UIOP_Endpoint::hash (void)
-{
-  if (this->hash_val_ != 0)
-    return this->hash_val_;
-
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      guard,
-                      this->addr_lookup_lock_,
-                      this->hash_val_);
-    // .. DCL
-    if (this->hash_val_ != 0)
-      return this->hash_val_;
-
-    this->hash_val_ =
-      ACE::hash_pjw (this->rendezvous_point ());
-  }
-
-  return this->hash_val_;
-}
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
deleted file mode 100644
index f788dc014d6..00000000000
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- * @file UIOP_Endpoint.h
- *
- * $Id$
- *
- * UIOP implementation of PP Framework Endpoint interface.
- *
- * @author  Marina Spivak <marina@cs.wustl.edu>
- */
-//==========================================================================
-
-#ifndef TAO_UIOP_ENDPOINT_H
-#define TAO_UIOP_ENDPOINT_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Endpoint.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-
-#include "strategies_export.h"
-#include "ace/UNIX_Addr.h"
-
-
-/**
- * @class TAO_UIOP_Endpoint
- *
- * @brief TAO_UIOP_Endpoint
- *
- * UIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_Strategies_Export TAO_UIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  friend class TAO_UIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_UIOP_Endpoint (void);
-
-  /// Constructor.
-  TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr,
-                     CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-  /// Destructor.
-  ~TAO_UIOP_Endpoint (void);
-
-  /**
-   * @name TAO_Endpoint Methods
-   *
-   * Please check the documentation in Endpoint.h for details.
-   */
-  //@{
-  virtual TAO_Endpoint *next (void);
-  virtual int addr_to_string (char *buffer, size_t length);
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their rendezvous points are the same.
-  CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (void);
-  //@}
-
-  // = UIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_UNIX_Addr &object_addr (void) const;
-
-  /// Return a pointer to the rendezvous point string.
-  /// This object maintains ownership of the returned string.
-  const char *rendezvous_point (void) const;
-
-private:
-
-  /// Cached instance of <ACE_UNIX_Addr> for use in making
-  /// invocations, etc.
-  ACE_UNIX_Addr object_addr_;
-
-  /// UIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_UIOP_Endpoint *next_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "UIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_UIOP_ENDPOINT_H */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i
deleted file mode 100644
index 337bbae6a76..00000000000
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-# if TAO_HAS_UIOP == 1
-
-ACE_INLINE const ACE_UNIX_Addr &
-TAO_UIOP_Endpoint::object_addr (void) const
-{
-  return this->object_addr_;
-}
-
-
-ACE_INLINE const char *
-TAO_UIOP_Endpoint::rendezvous_point (void) const
-{
-  return this->object_addr_.get_path_name ();
-}
-
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
deleted file mode 100644
index 080f76eccc8..00000000000
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "UIOP_Factory.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Acceptor.h"
-#include "UIOP_Connector.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/OS_NS_strings.h"
-
-
-ACE_RCSID (Strategies,
-           UIOP_Factory,
-           "$Id$")
-
-
-static const char prefix_[] = "uiop";
-
-TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_UIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_UIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_UIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '|';
-}
-
-TAO_Acceptor *
-TAO_UIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_UIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_UIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_UIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_UIOP_Connector,
-                  0);
-
-  return connector;
-}
-
-int
-TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
-                       ACE_TEXT ("UIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_UIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                          ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_UIOP_Protocol_Factory)
-
-
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
deleted file mode 100644
index 6214e67f0a1..00000000000
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   UIOP_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_FACTORY_H
-#define TAO_UIOP_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-
-#include "tao/Protocol_Factory.h"
-#include "strategies_export.h"
-#include "ace/Service_Config.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_Strategies_Export TAO_UIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  /// Constructor.
-  TAO_UIOP_Protocol_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_UIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  /**
-   * @name Protocol factory methods
-   *
-   * Check Protocol_Factory.h for a description of these methods.
-   */
-  //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-  //@}
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory)
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UIOP_FACTORY_H */
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
deleted file mode 100644
index b86f8fe3856..00000000000
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "UIOP_Lite_Factory.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Acceptor.h"
-#include "UIOP_Connector.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_strings.h"
-
-
-ACE_RCSID (Strategies,
-           UIOP_Lite_Factory,
-           "$Id$")
-
-
-static const char prefix_[] = "uiop";
-
-TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_UIOP_Lite_Protocol_Factory::~TAO_UIOP_Lite_Protocol_Factory (void)
-{
-}
-
-int
-TAO_UIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_UIOP_Lite_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_UIOP_Lite_Protocol_Factory::options_delimiter (void) const
-{
-  return '|';
-}
-
-TAO_Acceptor *
-TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  // We are Lite factory
-  CORBA::Boolean lite_factory = 1;
-  ACE_NEW_RETURN (acceptor,
-                  TAO_UIOP_Acceptor (lite_factory),
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */,
-                                      ACE_TCHAR* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_UIOP_Lite_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  // We are a lite factory
-  CORBA::Boolean lite_factory = 1;
-  ACE_NEW_RETURN (connector,
-                  TAO_UIOP_Connector (lite_factory),
-                  0);
-
-  return connector;
-}
-
-int
-TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 1;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory,
-                       ACE_TEXT ("UIOP_Lite_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_UIOP_Lite_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                          ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory)
-
-
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h
deleted file mode 100644
index 332506d4dbd..00000000000
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   UIOP_Factory.h
-//
-// = AUTHOR
-//   Fred Kuhns <fredk@cs.wustl.edu>
-//   Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_LITE_FACTORY_H
-#define TAO_UIOP_LITE_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-# if TAO_HAS_UIOP == 1
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "strategies_export.h"
-#include "tao/Protocol_Factory.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-
-class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory :
-  public TAO_Protocol_Factory
-{
-public:
-  /// Constructor.
-  TAO_UIOP_Lite_Protocol_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_UIOP_Lite_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  /**
-   * @name Protocol factory methods Methods
-   *
-   * Please check the documentation in Protocol_Factory.h for details.
-   */
-  //@{
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-  //@}
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory)
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UIOP_LITE_FACTORY_H */
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
deleted file mode 100644
index 76ba5ede816..00000000000
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-#include "UIOP_Profile.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "uiop_endpointsC.h"
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
-
-ACE_RCSID (Strategies,
-           UIOP_Profile,
-           "$Id$")
-
-static const char prefix_[] = "uiop";
-
-const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
-
-char
-TAO_UIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_UIOP_Profile::object_key_delimiter_;
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                                    const TAO::ObjectKey &object_key,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr),
-    count_ (1)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char *,
-                                    const TAO::ObjectKey &object_key,
-                                    const ACE_UNIX_Addr &addr,
-                                    const TAO_GIOP_Message_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UIOP_PROFILE,
-                 orb_core,
-                 object_key,
-                 version),
-    endpoint_ (addr),
-    count_ (1)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UIOP_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
-                                           TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1)
-{
-}
-
-TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-TAO_Endpoint*
-TAO_UIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-CORBA::ULong
-TAO_UIOP_Profile::endpoint_count (void) const
-{
-  return this->count_;
-}
-
-void
-TAO_UIOP_Profile::parse_string_i (const char *string
-                                  ACE_ENV_ARG_DECL)
-{
-  if (!string || !*string)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  // Remove the "N.n@" version prefix, if it exists, and verify the
-  // version is one that we accept.
-
-  // Check for version
-  if (isdigit (string [0]) &&
-      string[1] == '.' &&
-      isdigit (string [2]) &&
-      string[3] == '@')
-    {
-      // @@ This may fail for non-ascii character sets [but take that
-      // with a grain of salt]
-      this->version_.set_version ((char) (string [0] - '0'),
-                                  (char) (string [2] - '0'));
-      string += 4;
-      // Skip over the "N.n@"
-    }
-
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor  > TAO_DEF_GIOP_MINOR)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     0,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-
-  // Pull off the "rendezvous point" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
-
-  char *start = copy.inout ();
-  char *cp = ACE_OS::strchr (start, this->object_key_delimiter_);
-
-  if (cp == 0)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-      // No rendezvous point specified
-    }
-
-  CORBA::ULong length = cp - start;
-
-  CORBA::String_var rendezvous = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (rendezvous.inout (), start, length);
-  rendezvous[length] = '\0';
-
-  if (this->endpoint_.object_addr_.set (rendezvous.in ()) != 0)
-    {
-      ACE_THROW (CORBA::INV_OBJREF (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO::VMCID,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
-    }
-
-  start = ++cp;  // increment past the object key separator
-
-  TAO::ObjectKey ok;
-  TAO::ObjectKey::decode_string_to_sequence (ok,
-                                             start);
-
-  (void) this->orb_core ()->object_key_table ().bind (ok,
-                                                      this->ref_object_key_);
-}
-
-CORBA::Boolean
-TAO_UIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
-{
-  const TAO_UIOP_Profile *op =
-    dynamic_cast <const TAO_UIOP_Profile *> (other_profile);
-
-  if (op == 0)
-    return 0;
-
-  // Check endpoints equivalence.
-  const TAO_UIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_UIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_UIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // Get the hashvalue for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_UIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  const TAO::ObjectKey &ok =
-    this->ref_object_key_->object_key ();
-
-  if (ok.length () >= 4)
-    {
-      hashval += ok[1];
-      hashval += ok[3];
-    }
-
-  hashval += this->hash_service_i (max);
-
-  return hashval % max;
-}
-
-void
-TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  this->count_++;
-}
-
-
-char *
-TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  CORBA::String_var key;
-  TAO::ObjectKey::encode_sequence_to_string (key.inout(),
-                                            this->ref_object_key_->object_key ());
-
-  u_int buflen = (8 /* "corbaloc" */ +
-                  1 /* colon separator */ +
-                  ACE_OS::strlen (::prefix_) +
-                  1 /* colon separator */ +
-                  1 /* major version */ +
-                  1 /* decimal point */ +
-                  1 /* minor version */ +
-                  1 /* `@' character */ +
-                  ACE_OS::strlen (this->endpoint_.rendezvous_point ()) +
-                  1 /* object key separator */ +
-                  ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (buflen);
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%s%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.rendezvous_point (),
-                   this->object_key_delimiter_,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_UIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-int
-TAO_UIOP_Profile::decode_profile (TAO_InputCDR& cdr)
-{
-  char *rendezvous = 0;
-
-  // Get rendezvous_point
-  if (cdr.read_string (rendezvous) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point"));
-      return -1;
-    }
-
-  if (this->endpoint_.object_addr_.set (rendezvous) == -1)
-    {
-      // In the case of an ACE_UNIX_Addr, this should call should
-      // never fail!
-      //
-      // If the call fails, allow the profile to be created, and rely
-      // on TAO's connection handling to throw the appropriate
-      // exception.
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) UIOP_Profile::decode - ")
-                      ACE_TEXT ("ACE_UNIX_Addr::set() failed\n")));
-        }
-    }
-
-  // Clean up
-  delete [] rendezvous;
-
-  return 1;
-}
-
-void
-TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  // CHAR describing byte order, starting the encapsulation
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING rendezvous_pointname from profile
-  encap.write_string (this->endpoint_.rendezvous_point ());
-
-  // OCTET SEQUENCE for object key
-  if (this->ref_object_key_)
-    encap << this->ref_object_key_->object_key ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
-    }
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components ().encode (encap);
-}
-
-int
-TAO_UIOP_Profile::encode_endpoints (void)
-{
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-  TAO_UIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
-
-  TAO_UIOP_Endpoint *endpoint = &this->endpoint_;
-  for (size_t i = 0;
-       i < this->count_;
-       ++i)
-    {
-      endpoints[i].rendezvous_point = endpoint->rendezvous_point ();
-      endpoints[i].priority = endpoint->priority ();
-
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-
-  this->set_tagged_components (out_cdr);
-
-  return  0;
-}
-
-int
-TAO_UIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (reinterpret_cast <const char*>(buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (static_cast<int>(byte_order));
-
-      // Extract endpoints sequence.
-      TAO_UIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_UIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_UIOP_Endpoint,
-                          -1);
-          this->add_endpoint (endpoint);
-          if (endpoint->object_addr_.set
-              (endpoints[i].rendezvous_point)
-              == -1)
-            {
-              // In the case of an ACE_UNIX_Addr, this should call should
-              // never fail!
-              // If the call fails, allow the profile to be created, and rely
-              // on TAO's connection handling to throw the appropriate
-              // exception.
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("TAO (%P|%t) UIOP_Profile::decode_endpoints - ")
-                              ACE_TEXT ("ACE_UNIX_Addr::set() failed\n")));
-                }
-
-            }
-          endpoint->priority (endpoints[i].priority);
-        }
-    }
-
-  return 0;
-}
-
-#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
deleted file mode 100644
index 069c5105965..00000000000
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     UIOP_Profile.h
- *
- *  $Id$
- *
- *   Unix Domain Socket (UIOP) profile specific processing
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_UIOP_PROFILE_H
-#define TAO_UIOP_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-
-#include "strategies_export.h"
-#include "tao/Profile.h"
-#include "UIOP_Connection_Handler.h"
-#include "UIOP_Endpoint.h"
-
-#include "ace/UNIX_Addr.h"
-
-
-/**
- * @class TAO_UIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating ORBs over local IPC.
- *
- * This class defines the UIOP profile.
- */
-class TAO_Strategies_Export TAO_UIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that UIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.  (actually, no marshalling for this protocol)
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO::ObjectKey &object_key,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor
-  TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO::ObjectKey &object_key,
-                    const ACE_UNIX_Addr &addr,
-                    const TAO_GIOP_Message_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Profile constructor, default.
-  TAO_UIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_UIOP_Profile (void);
-
-  /// Template methods. Please see Profile.h for documentation.
-  virtual char *to_string (ACE_ENV_SINGLE_ARG_DECL);
-  virtual int encode_endpoints (void);
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
-  /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
-   */
-  void add_endpoint (TAO_UIOP_Endpoint *endp);
-
-protected:
-
-  /// Protected template methods. Please see documentation in
-  /// Profile.h for details.
-  virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
-  virtual void create_profile_body (TAO_OutputCDR &cdr) const;
-  virtual int decode_endpoints (void);
-  virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
-
-private:
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support a la TAG_ALTERNATE_IIOP_ADDRESS
-   * feature.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard UIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_UIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  CORBA::ULong count_;
-};
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_UIOP_PROFILE_H */
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
deleted file mode 100644
index 936d3bfbc22..00000000000
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// $Id$
-
-#include "UIOP_Transport.h"
-
-#if TAO_HAS_UIOP == 1
-
-#include "UIOP_Connection_Handler.h"
-#include "UIOP_Profile.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Sync_Strategies.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/GIOP_Message_Base.h"
-#include "tao/GIOP_Message_Lite.h"
-
-ACE_RCSID (Strategies,
-           UIOP_Transport,
-           "$Id$")
-
-TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Boolean flag)
-  : TAO_Transport (TAO_TAG_UIOP_PROFILE,
-                   orb_core)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
-{
-  if (flag)
-    {
-      // Use the lite version of the protocol
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Lite (orb_core));
-    }
-  else
-    {
-      // Use the normal GIOP object
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
-    }
-}
-
-TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-ACE_Event_Handler *
-TAO_UIOP_Transport::event_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Connection_Handler *
-TAO_UIOP_Transport::connection_handler_i (void)
-{
-  return this->connection_handler_;
-}
-
-TAO_Pluggable_Messaging *
-TAO_UIOP_Transport::messaging_object (void)
-{
-  return this->messaging_object_;
-}
-
-ssize_t
-TAO_UIOP_Transport::send (iovec *iov, int iovcnt,
-                          size_t &bytes_transferred,
-                          const ACE_Time_Value *max_wait_time)
-{
-  const ssize_t retval =
-    this->connection_handler_->peer ().sendv (iov,
-                                              iovcnt,
-                                              max_wait_time);
-
-  if (retval > 0)
-    bytes_transferred = retval;
-
-  return retval;
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (char *buf,
-                          size_t len,
-                          const ACE_Time_Value *max_wait_time)
-{
-  const ssize_t n = this->connection_handler_->peer ().recv (buf,
-                                                             len,
-                                                             max_wait_time);
-
-  // Most of the errors handling is common for
-  // Now the message has been read
-  if (n == -1 &&
-      TAO_debug_level > 4 &&
-      errno != ETIME)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - %p \n"),
-                  ACE_TEXT ("TAO - read message failure ")
-                  ACE_TEXT ("recv () \n")));
-    }
-
-  // Error handling
-  if (n == -1)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-
-      return -1;
-    }
-  // @@ What are the other error handling here??
-  else if (n == 0)
-    {
-      return -1;
-    }
-
-  return n;
-}
-
-int
-TAO_UIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-
-    return -1;
-
-  this->first_request_sent();
-
-  return 0;
-}
-
-int
-TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int message_semantics,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  // This guarantees to send all data (bytes) or return an error.
-  const ssize_t n = this->send_message_shared (stub,
-                                               message_semantics,
-                                               stream.begin (),
-                                               max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) closing transport %d after fault %p\n"),
-                    this->id (),
-                    ACE_TEXT ("send_message ()\n")));
-
-      return -1;
-    }
-
-  return 1;
-}
-
-
-int
-TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major,
-                                 minor);
-  return 1;
-}
-
-#endif  /* TAO_HAS_UIOP */
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
deleted file mode 100644
index aefcb26ecbc..00000000000
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   UIOP_Transport.h
- *
- *  $Id$
- *
- *  @author Originally by Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@ece.uci.edu>
- *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_UIOP_TRANSPORT_H
-#define TAO_UIOP_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if TAO_HAS_UIOP == 1
-
-#include "strategies_export.h"
-#include "ace/LSOCK_Acceptor.h"
-#include "ace/Svc_Handler.h"
-#include "tao/Transport.h"
-
-// Forward decls.
-
-class TAO_ORB_Core;
-class TAO_UIOP_Connection_Handler;
-class TAO_Pluggable_Messaging;
-
-typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_UIOP_SVC_HANDLER;
-
-/**
- * @class TAO_UIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  UIOP protocol.
- *
- */
-
-class TAO_Strategies_Export TAO_UIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler,
-                      TAO_ORB_Core *orb_core,
-                      CORBA::Boolean flag);
-
-  /// Default destructor.
-  ~TAO_UIOP_Transport (void);
-
-protected:
-  /** @name Overridden Template Methods
-   *
-   * These are implementations of template methods declared by TAO_Transport.
-   */
-  //@{
-
-  virtual ACE_Event_Handler * event_handler_i (void);
-  virtual TAO_Connection_Handler *connection_handler_i (void);
-  virtual TAO_Pluggable_Messaging *messaging_object (void);
-
-  /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *timeout = 0);
-
-  /// Read len bytes from into buf.
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-public:
-  /// @todo These methods IMHO should have more meaningful names.
-  /// The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int message_semantics,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-  //@}
-
-private:
-
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_UIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-};
-
-# endif  /* TAO_HAS_UIOP == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_UIOP_TRANSPORT_H */
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
deleted file mode 100644
index 872b702aa31..00000000000
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ /dev/null
@@ -1,901 +0,0 @@
-// $Id$
-#include "ace/Service_Config.h"
-#include "advanced_resource.h"
-
-#include "UIOP_Factory.h"
-#include "SHMIOP_Factory.h"
-#include "DIOP_Factory.h"
-#include "SCIOP_Factory.h"
-
-#include "LFU_Connection_Purging_Strategy.h"
-#include "FIFO_Connection_Purging_Strategy.h"
-#include "NULL_Connection_Purging_Strategy.h"
-
-#include "LF_Strategy_Null.h"
-
-#include "tao/debug.h"
-#include "tao/LRU_Connection_Purging_Strategy.h"
-#include "tao/LF_Strategy_Complete.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/StringSeqC.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Arg_Shifter.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Config.h"
-#include "ace/Select_Reactor.h"
-#include "ace/WFMO_Reactor.h"
-#include "ace/Msg_WFMO_Reactor.h"
-#include "ace/TP_Reactor.h"
-#include "ace/Memory_Pool.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Malloc.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID(Strategies, advanced_resource, "$Id$")
-
-TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
-{
-
-  TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory");
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
-
-#if TAO_HAS_UIOP == 1
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_UIOP_Protocol_Factory);
-#endif /* TAO_HAS_UIOP == 1 */
-
-#if TAO_HAS_SHMIOP == 1
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_SHMIOP_Protocol_Factory);
-#endif /* TAO_HAS_SHMIOP == 1 */
-
-#if TAO_HAS_DIOP == 1
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_DIOP_Protocol_Factory);
-#endif /* TAO_HAS_DIOP == 1 */
-
-#if TAO_HAS_SCIOP == 1
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_SCIOP_Protocol_Factory);
-#endif /* TAO_HAS_SCIOP == 1 */
-
-}
-
-TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
-  : reactor_type_ (TAO_REACTOR_TP),
-    threadqueue_type_ (TAO_THREAD_QUEUE_NOT_SET),
-    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    amh_response_handler_allocator_lock_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    ami_response_handler_allocator_lock_type_ (TAO_ALLOCATOR_THREAD_LOCK)
-{
-  // Constructor
-}
-
-TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
-{
-  // Destructor
-  TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
-
-  for (TAO_ProtocolFactorySetItor iterator =
-         this->protocol_factories_.begin ();
-       iterator != end;
-       ++iterator)
-    delete *iterator;
-
-  this->protocol_factories_.reset ();
-}
-
-int
-TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
-{
-  ACE_TRACE ("TAO_Advanced_Resource_Factory::init");
-
-  // If this factory has already been disabled then
-  // print a warning and exit because any options
-  // are useless
-  if (this->factory_disabled_) {
-    ACE_DEBUG ((LM_WARNING,
-                ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n")
-                ACE_TEXT ("Advanced Resource Factory is disabled\n")));
-    return 0;
-  }
-  this->options_processed_ = 1;
-
-
-  // If the default resource factory exists, then disable it.
-  // This causes any directives for the "Resource_Factory" to
-  // report warnings.
-  // Note: this is also being done in init_protocol_factories()
-  // to cover the case where init() is not called.
-  TAO_Resource_Factory *default_resource_factory =
-    ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory");
-  if (default_resource_factory != 0)
-    {
-      default_resource_factory->disable_factory ();
-    }
-
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  //for (int curarg = 0; curarg < argc; ++curarg)
-  const ACE_TCHAR *current_arg = 0;
-  while (arg_shifter.is_anything_left ())
-    {
-      if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ORBReactorRegistry")) == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT("TAO_Advanced_Resource_Factory::init - ")
-                             ACE_TEXT("-ORBReactorRegistry no longer supported\n")),
-                            -1);
-
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBReactorLock"))))
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO_Advanced_Resource_Factory - obsolete -ORBReactorLock ")
-                      ACE_TEXT("option, please use -ORBReactorType\n")));
-
-          if (ACE_OS::strcasecmp (current_arg, ACE_TEXT("null")) == 0)
-            this->reactor_type_ = TAO_REACTOR_SELECT_ST;
-          else if (ACE_OS::strcasecmp (current_arg, ACE_TEXT("token")) == 0)
-            this->reactor_type_= TAO_REACTOR_SELECT_MT;
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBReactorType"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("select_mt")) == 0)
-            this->reactor_type_ = TAO_REACTOR_SELECT_MT;
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("select_st")) == 0)
-            this->reactor_type_ = TAO_REACTOR_SELECT_ST;
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("wfmo")) == 0)
-#if defined(ACE_WIN32)
-            this->reactor_type_ = TAO_REACTOR_WFMO;
-#else
-            this->report_unsupported_error (ACE_TEXT("WFMO Reactor"));
-#endif /* ACE_WIN32 */
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("msg_wfmo")) == 0)
-#if defined(ACE_WIN32)
-            this->reactor_type_ = TAO_REACTOR_MSGWFMO;
-#else
-            this->report_unsupported_error (ACE_TEXT("MsgWFMO Reactor"));
-#endif /* ACE_WIN32 */
-
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("tp")) == 0)
-            this->reactor_type_ = TAO_REACTOR_TP;
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("fl")) == 0)
-            this->report_option_value_error (
-                ACE_TEXT("FlReactor not supported by Advanced_Resources_Factory. Please use TAO_FlResource_Loader instead."),
-                         current_arg);
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("tk")) == 0)
-            this->report_option_value_error (
-                ACE_TEXT("TkReactor not supported by Advanced_Resources_Factory. Please use TAO_TkResource_Loader instead."),
-                         current_arg);
-          else
-            this->report_option_value_error (ACE_TEXT("-ORBReactorType"), current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBInputCDRAllocator"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("null")) == 0)
-            {
-              this->cdr_allocator_type_ = TAO_ALLOCATOR_NULL_LOCK;
-              this->use_locked_data_blocks_ = 0;
-            }
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("thread")) == 0)
-            {
-              this->cdr_allocator_type_ = TAO_ALLOCATOR_THREAD_LOCK;
-              this->use_locked_data_blocks_ = 1;
-            }
-          else
-            {
-              this->report_option_value_error (ACE_TEXT("-ORBInputCDRAllocator"), current_arg);
-            }
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBAMHResponseHandlerAllocator"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("null")) == 0)
-            {
-              this->amh_response_handler_allocator_lock_type_ = TAO_ALLOCATOR_NULL_LOCK;
-            }
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("thread")) == 0)
-            {
-              this->amh_response_handler_allocator_lock_type_ = TAO_ALLOCATOR_THREAD_LOCK;
-            }
-          else
-            {
-              this->report_option_value_error (ACE_TEXT("-ORBAMHResponseHandlerAllocator"), current_arg);
-            }
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBAMIResponseHandlerAllocator"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT("null")) == 0)
-            {
-              this->ami_response_handler_allocator_lock_type_ = TAO_ALLOCATOR_NULL_LOCK;
-            }
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("thread")) == 0)
-            {
-              this->ami_response_handler_allocator_lock_type_ = TAO_ALLOCATOR_THREAD_LOCK;
-            }
-          else
-            {
-              this->report_option_value_error (ACE_TEXT("-ORBAMIResponseHandlerAllocator"), current_arg);
-            }
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBReactorThreadQueue"))))
-        {
-          if (ACE_OS::strcasecmp (current_arg,
-                                  ACE_TEXT ("LIFO")) == 0)
-            this->threadqueue_type_ = TAO_THREAD_QUEUE_LIFO;
-          else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT ("FIFO")) == 0)
-            this->threadqueue_type_ = TAO_THREAD_QUEUE_FIFO;
-          else
-            this->report_option_value_error (ACE_TEXT ("-ORBReactorThreadQueue"),
-                                             current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else
-        // Any arguments that don't match are ignored so that they can
-        // be passed to the TAO_Default_Resource_Factory.
-        arg_shifter.ignore_arg ();
-    }
-
-  // If -ORBReactorThreadQueue was passed, make sure it matches the
-  // correct reactor type.  Currently, only the tp reactor can take
-  // advantage of the LIFO strategy, select_mt hangs.
-  if (this->threadqueue_type_ != TAO_THREAD_QUEUE_NOT_SET &&
-      this->reactor_type_ != TAO_REACTOR_TP)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Advanced_Resource_Factory: -ORBReactorThreadQueue ")
-                ACE_TEXT ("option can only be used with -ORBReactorType ")
-                ACE_TEXT ("tp.\n")));
-  // Explicitely set the default only if not set.
-  else if (this->threadqueue_type_ == TAO_THREAD_QUEUE_NOT_SET)
-    this->threadqueue_type_ = TAO_THREAD_QUEUE_LIFO;
-
-  return this->TAO_Default_Resource_Factory::init (argc, argv);
-}
-
-int
-TAO_Advanced_Resource_Factory::load_default_protocols (void)
-{
-  const int r =
-    this->TAO_Default_Resource_Factory::load_default_protocols ();
-
-  this->protocol_factories_ =
-    this->TAO_Default_Resource_Factory::protocol_factories_;
-
-  this->TAO_Default_Resource_Factory::protocol_factories_.reset ();
-
-  if (r == -1)
-    return -1;
-  // Load the UIOP and SHMIOP protocols...
-
-  return 0;
-}
-
-int
-TAO_Advanced_Resource_Factory::init_protocol_factories (void)
-{
-
-  // If the default resource factory exists, then disable it.
-  // This causes any directives for the "Resource_Factory" to
-  // report warnings.
-  // This is needed to ensure warnings when no static directive
-  // for this factory is used (and init() is not called).
-  TAO_Resource_Factory *default_resource_factory =
-    ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory");
-  if (default_resource_factory != 0)
-    {
-      default_resource_factory->disable_factory();
-    }
-
-  TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
-  TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
-
-  if (factory == end)
-    {
-      TAO_Protocol_Factory *protocol_factory = 0;
-      auto_ptr<TAO_Protocol_Factory> safe_protocol_factory;
-
-      TAO_Protocol_Item *item = 0;
-
-      // If a protocol factory is obtained from the Service
-      // Configurator then do not transfer ownership to the
-      // TAO_Protocol_Item.
-      int transfer_ownership = 0;
-
-      int r = this->load_default_protocols ();
-
-      if (r == -1)
-        return -1;
-
-#if TAO_HAS_UIOP == 1
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("UIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_WARNING,
-                        ACE_TEXT("(%P|%t) WARNING - No %s found in Service Repository.")
-                        ACE_TEXT("  Using default instance.\n"),
-                        ACE_TEXT("UIOP Protocol Factory")));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_UIOP_Protocol_Factory,
-                          -1);
-
-          ACE_AUTO_PTR_RESET (safe_protocol_factory,
-                              protocol_factory,
-                              TAO_Protocol_Factory);
-
-          transfer_ownership = 1;
-        }
-      else
-        {
-          transfer_ownership = 0;
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("UIOP_Factory"), -1);
-      // If the TAO_Protocol_Item retains ownership of the
-      // TAO_Protocol_Factory then we used an auto_ptr<> above, so
-      // release the TAO_Protocol_Factory from it.  Otherwise, we
-      // obtained the TAO_Protocol_Factory from the Service
-      // Configurator so an auto_ptr<> wasn't used since the Service
-      // Configurator retains ownership, hence there was no need to
-      // use an auto_ptr<> in this method.
-      item->factory ((transfer_ownership ?
-                      safe_protocol_factory.release () :
-                      protocol_factory),
-                     transfer_ownership);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO (%P|%t) Unable to add ")
-                      ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
-
-          delete item;
-
-          if (transfer_ownership == 0)
-            delete protocol_factory;
-
-          return -1;
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded default ")
-                      ACE_TEXT("protocol <UIOP_Factory>\n")));
-        }
-#endif /* TAO_HAS_UIOP == 1 */
-
-#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("SHMIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_WARNING,
-                        ACE_TEXT("(%P|%t) WARNING - No %s found in Service Repository.")
-                        ACE_TEXT("  Using default instance.\n"),
-                        ACE_TEXT("SHMIOP Protocol Factory")));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_SHMIOP_Protocol_Factory,
-                          -1);
-
-          ACE_AUTO_PTR_RESET (safe_protocol_factory,
-                              protocol_factory,
-                              TAO_Protocol_Factory);
-
-          transfer_ownership = 1;
-        }
-      else
-        {
-          transfer_ownership = 0;
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("SHMIOP_Factory"), -1);
-      // If the TAO_Protocol_Item retains ownership of the
-      // TAO_Protocol_Factory then we used an auto_ptr<> above, so
-      // release the TAO_Protocol_Factory from it.  Otherwise, we
-      // obtained the TAO_Protocol_Factory from the Service
-      // Configurator so an auto_ptr<> wasn't used since the Service
-      // Configurator retains ownership, hence there was no need to
-      // use an auto_ptr<> in this method.
-      item->factory ((transfer_ownership ?
-                      safe_protocol_factory.release () :
-                      protocol_factory),
-                     transfer_ownership);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO (%P|%t) Unable to add ")
-                      ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
-
-          delete item;
-
-          if (transfer_ownership == 0)
-            delete protocol_factory;
-
-          return -1;
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded default ")
-                      ACE_TEXT("protocol <SHMIOP_Factory>\n")));
-        }
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("DIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_WARNING,
-                        ACE_TEXT("(%P|%t) WARNING - No %s found in Service Repository.")
-                        ACE_TEXT("  Using default instance.\n"),
-                        ACE_TEXT("DIOP Protocol Factory")));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_DIOP_Protocol_Factory,
-                          -1);
-
-          ACE_AUTO_PTR_RESET (safe_protocol_factory,
-                              protocol_factory,
-                              TAO_Protocol_Factory);
-
-          transfer_ownership = 1;
-        }
-      else
-        {
-          transfer_ownership = 0;
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("DIOP_Factory"), -1);
-      // If the TAO_Protocol_Item retains ownership of the
-      // TAO_Protocol_Factory then we used an auto_ptr<> above, so
-      // release the TAO_Protocol_Factory from it.  Otherwise, we
-      // obtained the TAO_Protocol_Factory from the Service
-      // Configurator so an auto_ptr<> wasn't used since the Service
-      // Configurator retains ownership, hence there was no need to
-      // use an auto_ptr<> in this method.
-      item->factory ((transfer_ownership ?
-                      safe_protocol_factory.release () :
-                      protocol_factory),
-                     transfer_ownership);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO (%P|%t) Unable to add ")
-                      ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
-
-          delete item;
-
-          if (transfer_ownership == 0)
-            delete protocol_factory;
-
-          return -1;
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded default ")
-                      ACE_TEXT("protocol <DIOP_Factory>\n")));
-        }
-#endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */
-
-#if defined (TAO_HAS_SCIOP) && (TAO_HAS_SCIOP != 0)
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("SCIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_WARNING,
-                        ACE_TEXT("(%P|%t) WARNING - No %s found in Service Repository.")
-                        ACE_TEXT("  Using default instance.\n"),
-                        ACE_TEXT("SCIOP Protocol Factory")));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_SCIOP_Protocol_Factory,
-                          -1);
-
-          ACE_AUTO_PTR_RESET (safe_protocol_factory,
-                              protocol_factory,
-                              TAO_Protocol_Factory);
-
-          transfer_ownership = 1;
-        }
-      else
-        {
-          transfer_ownership = 0;
-        }
-
-      ACE_NEW_RETURN (item, TAO_Protocol_Item ("SCIOP_Factory"), -1);
-      // If the TAO_Protocol_Item retains ownership of the
-      // TAO_Protocol_Factory then we used an auto_ptr<> above, so
-      // release the TAO_Protocol_Factory from it.  Otherwise, we
-      // obtained the TAO_Protocol_Factory from the Service
-      // Configurator so an auto_ptr<> wasn't used since the Service
-      // Configurator retains ownership, hence there was no need to
-      // use an auto_ptr<> in this method.
-      item->factory ((transfer_ownership ?
-                      safe_protocol_factory.release () :
-                      protocol_factory),
-                     transfer_ownership);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT("TAO (%P|%t) Unable to add ")
-                      ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
-
-          delete item;
-
-          if (transfer_ownership == 0)
-            delete protocol_factory;
-
-          return -1;
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded default ")
-                      ACE_TEXT("protocol <SCIOP_Factory>\n")));
-        }
-#endif /* TAO_HAS_SCIOP && TAO_HAS_SCIOP != 0 */
-
-      return 0;
-
-    }
-
-  for (; factory != end; factory++)
-    {
-      const ACE_CString &name = (*factory)->protocol_name ();
-
-      (*factory)->factory (
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ()));
-      if ((*factory)->factory () == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT("TAO (%P|%t) Unable to load ")
-                             ACE_TEXT("protocol <%s>, %m\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
-                            -1);
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
-        }
-    }
- return 0;
-}
-
-
-
-TAO_ProtocolFactorySet *
-TAO_Advanced_Resource_Factory::get_protocol_factories (void)
-{
-  return &protocol_factories_;
-}
-
-ACE_Reactor_Impl *
-TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
-{
-  ACE_Reactor_Impl *impl = 0;
-  switch (this->reactor_type_)
-    {
-    case TAO_REACTOR_SELECT_MT:
-      ACE_NEW_RETURN (impl,
-                      TAO_REACTOR ((ACE_Sig_Handler*)0,
-                                   (ACE_Timer_Queue*)0,
-                                   0,
-                                   (ACE_Reactor_Notify*)0,
-                                   this->reactor_mask_signals_),
-                      0);
-      break;
-
-    case TAO_REACTOR_SELECT_ST:
-      ACE_NEW_RETURN (impl,
-                      TAO_NULL_LOCK_REACTOR ((ACE_Sig_Handler*)0,
-                                             (ACE_Timer_Queue*)0,
-                                             0,
-                                             (ACE_Reactor_Notify*)0,
-                                             this->reactor_mask_signals_),
-                      0);
-      break;
-
-    case TAO_REACTOR_WFMO:
-#if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
-      ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
-      break;
-
-    case TAO_REACTOR_MSGWFMO:
-#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP)
-      ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-      break;
-
-    default:
-    case TAO_REACTOR_TP:
-      ACE_NEW_RETURN (impl, ACE_TP_Reactor ((ACE_Sig_Handler*)0,
-                                            (ACE_Timer_Queue*)0,
-                                            this->reactor_mask_signals_,
-                                            this->threadqueue_type_ == TAO_THREAD_QUEUE_FIFO ?
-                                              ACE_Select_Reactor_Token::FIFO :
-                                              ACE_Select_Reactor_Token::LIFO),
-                      0);
-      break;
-    }
-
-  return impl;
-}
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC;
-typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR;
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC;
-typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
-
-ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->cdr_allocator_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-    default:
-      return
-        this->TAO_Default_Resource_Factory::input_cdr_dblock_allocator();
-    }
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->cdr_allocator_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-    case TAO_ALLOCATOR_THREAD_LOCK:
-    default:
-      ACE_NEW_RETURN (allocator,
-                      LOCKED_ALLOCATOR,
-                      0);
-      break;
-    }
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Advanced_Resource_Factory::input_cdr_msgblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->cdr_allocator_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-    default:
-      return
-        this->TAO_Default_Resource_Factory::input_cdr_msgblock_allocator();
-    }
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Advanced_Resource_Factory::amh_response_handler_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->amh_response_handler_allocator_lock_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-    default:
-      return
-        this->TAO_Default_Resource_Factory::amh_response_handler_allocator();
-    }
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Advanced_Resource_Factory::ami_response_handler_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  switch (this->ami_response_handler_allocator_lock_type_)
-    {
-    case TAO_ALLOCATOR_NULL_LOCK:
-      ACE_NEW_RETURN (allocator,
-                      NULL_LOCK_ALLOCATOR,
-                      0);
-      break;
-    default:
-      return
-        this->TAO_Default_Resource_Factory::ami_response_handler_allocator();
-    }
-
-  return allocator;
-}
-
-int
-TAO_Advanced_Resource_Factory::input_cdr_allocator_type_locked (void)
-{
-  return this->cdr_allocator_type_ == TAO_ALLOCATOR_NULL_LOCK ? 0 : 1;
-}
-
-TAO_Connection_Purging_Strategy *
-TAO_Advanced_Resource_Factory::create_purging_strategy (void)
-{
-  TAO_Connection_Purging_Strategy *strategy = 0;
-
-  switch(this->connection_purging_type_)
-    {
-    case TAO_Resource_Factory::LFU:
-      ACE_NEW_RETURN (strategy,
-                      TAO_LFU_Connection_Purging_Strategy (
-                                               this->cache_maximum ()),
-                      0);
-      break;
-    case TAO_Resource_Factory::FIFO:
-      ACE_NEW_RETURN (strategy,
-                      TAO_FIFO_Connection_Purging_Strategy (
-                                               this->cache_maximum ()),
-                      0);
-      break;
-    case TAO_Resource_Factory::NOOP:
-      ACE_NEW_RETURN (strategy,
-                      TAO_NULL_Connection_Purging_Strategy (
-                                               this->cache_maximum ()),
-                      0);
-      break;
-    case TAO_Resource_Factory::LRU:
-      ACE_NEW_RETURN (strategy,
-                      TAO_LRU_Connection_Purging_Strategy (
-                                               this->cache_maximum ()),
-                      0);
-      break;
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - ")
-                  ACE_TEXT("Unknown connection purging strategy ")
-                  ACE_TEXT("type was found.\n")));
-    }
-
-  return strategy;
-}
-
-TAO_LF_Strategy *
-TAO_Advanced_Resource_Factory::create_lf_strategy (void)
-{
-  TAO_LF_Strategy *strategy = 0;
-
-  if (this->reactor_type_ == TAO_REACTOR_SELECT_ST)
-    {
-      ACE_NEW_RETURN (strategy,
-                      TAO_LF_Strategy_Null,
-                      0);
-    }
-  else
-    {
-      ACE_NEW_RETURN (strategy,
-                      TAO_LF_Strategy_Complete,
-                      0);
-    }
-  return strategy;
-}
-
-void
-TAO_Advanced_Resource_Factory::report_option_value_error (
-                                 const ACE_TCHAR* option_name,
-                                 const ACE_TCHAR* option_value)
-{
-  ACE_DEBUG((LM_DEBUG,
-             ACE_TEXT("Advanced_Resource_Factory - unknown argument")
-             ACE_TEXT(" <%s> for <%s>\n"),
-             option_value,
-             option_name));
-}
-
-void
-TAO_Advanced_Resource_Factory::report_unsupported_error (
-                                 const ACE_TCHAR* option_name)
-{
-  ACE_DEBUG((LM_DEBUG,
-             ACE_TEXT("Advanced_Resource_Factory - <%s>")
-             ACE_TEXT(" not supported on this platform\n"),
-             option_name));
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory,
-                       ACE_TEXT("Advanced_Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Advanced_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_Advanced_Resource_Factory)
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Advanced_Resource_Factory>;
-
-template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
-template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Advanced_Resource_Factory>
-
-#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token>
-#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
deleted file mode 100644
index 17c1279003c..00000000000
--- a/TAO/tao/Strategies/advanced_resource.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// $Id$
-
-#ifndef TAO_ADVANCED_RESOURCE_H
-#define TAO_ADVANCED_RESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "strategies_export.h"
-#include "tao/default_resource.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB_Core.h"
-
-class TAO_Connection_Purging_Strategy;
-
-class TAO_Strategies_Export TAO_Resource_Factory_Changer
-{
-public:
-  TAO_Resource_Factory_Changer (void);
-};
-
-/**
- * @class TAO_Advanced_Resource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- *
- */
-class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_Advanced_Resource_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_Advanced_Resource_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Type of lock used for the allocators
-  enum Allocator_Lock_Type
-  {
-    TAO_ALLOCATOR_NULL_LOCK,
-    TAO_ALLOCATOR_THREAD_LOCK
-  };
-
-  /// Type of Reactor
-  enum
-  {
-    /// Use ACE_Token
-    TAO_REACTOR_SELECT_MT = 1,
-
-    /// Use ACE_Noop_Token
-    TAO_REACTOR_SELECT_ST = 2,
-    TAO_REACTOR_WFMO      = 3,
-    TAO_REACTOR_MSGWFMO   = 4,
-    TAO_REACTOR_TP        = 5
-  };
-
-  /// Thread queueing Strategy
-  enum
-  {
-    /// Not set, use LIFO.
-    TAO_THREAD_QUEUE_NOT_SET,
-
-    /// FIFO, first-in-first-out.
-    TAO_THREAD_QUEUE_FIFO,
-
-    /// LIFO, last-in-first-out (default).
-    TAO_THREAD_QUEUE_LIFO
-  };
-
-  /**
-   * @name Resource Retrieval
-   */
-  //@{
-  virtual int init_protocol_factories (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
-  virtual int input_cdr_allocator_type_locked (void);
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
-  //@}
-
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
-  virtual TAO_LF_Strategy *create_lf_strategy (void);
-
-protected:
-
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-  void report_option_value_error (const ACE_TCHAR* option_name,
-                                  const ACE_TCHAR* option_value);
-
-  void report_unsupported_error (const ACE_TCHAR* option_name);
-
-  /// List of loaded protocol factories.
-  TAO_ProtocolFactorySet protocol_factories_;
-
-  /// The type of reactor registry.
-  int reactor_registry_type_;
-
-  /// Flag indicating which kind of reactor we should use.
-  int reactor_type_;
-
-  /// The type of queueing strategy to use for multi-threaded
-  /// select reactors, TAO_REACTOR_SELECT_MT and TAO_REACTOR_TP.
-  int threadqueue_type_;
-
-  /// The type of CDR allocators.
-  Allocator_Lock_Type cdr_allocator_type_;
-
-  /// Type of lock used by AMH response handler allocator.
-  Allocator_Lock_Type amh_response_handler_allocator_lock_type_;
-
-  /// Type of lock used by AMI response handler allocator.
-  Allocator_Lock_Type ami_response_handler_allocator_lock_type_;
-
-  virtual int load_default_protocols (void);
-
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory)
-
-static TAO_Resource_Factory_Changer TAO_changer;
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ADVANCED_RESOURCE_H */
diff --git a/TAO/tao/Strategies/sciop_endpoints.pidl b/TAO/tao/Strategies/sciop_endpoints.pidl
deleted file mode 100644
index 42050da0264..00000000000
--- a/TAO/tao/Strategies/sciop_endpoints.pidl
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   sciop_endpoints.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for data structures used to
-//   encapsulate data in TAO_TAG_ENDPOINTS tagged component.  This
-//   TAO-specific component is used for transmission of multiple
-//   endpoints per single profile.  Data structures defined here are
-//   used for transmission of SCIOP Endpoints.  See SCIOP_Profile.*
-//   for more details.
-//
-//
-//   This file was used to generate the code in
-//   sciop_endpoints.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci
-//          -Wb,export_macro=TAO_Strategies_Export \
-//          -Wb,export_include="strategies_export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          sciop_endpoints.pidl
-//
-// ================================================================
-
-#ifndef _SCIOP_ENDPOINTS_IDL_
-#define _SCIOP_ENDPOINTS_IDL_
-
-/// Stores information for a single SCIOP endpoint.
-struct TAO_SCIOP_Endpoint_Info
-{
-  string host;
-  short port;
-  short priority;
-};
-
-/// Stores information for a collection of SCIOP endpoints.
-typedef sequence <TAO_SCIOP_Endpoint_Info> TAO_SCIOPEndpointSequence;
-
-#pragma prefix ""
-
-#endif /* _SCIOP_ENDPOINTS_IDL_ */
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
deleted file mode 100644
index b88f306beae..00000000000
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:291
-
-
-#include "sciop_endpointsC.h"
-#include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_SCIOP_Endpoint_Info[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_short },
-    { "priority", &CORBA::_tc_short }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_SCIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    "IDL:TAO_SCIOP_Endpoint_Info:1.0",
-    "TAO_SCIOP_Endpoint_Info",
-    _tao_fields_TAO_SCIOP_Endpoint_Info,
-    3);
-  
-::CORBA::TypeCode_ptr const _tc_TAO_SCIOP_Endpoint_Info =
-  &_tao_tc_TAO_SCIOP_Endpoint_Info;
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_TAO_SCIOPENDPOINTSEQUENCE_CS_)
-#define _TAO_SCIOPENDPOINTSEQUENCE_CS_
-
-TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (void)
-{}
-
-TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_SCIOP_Endpoint_Info
-      >
-    (max)
-{}
-
-TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    TAO_SCIOP_Endpoint_Info * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_SCIOP_Endpoint_Info
-      >
-    (max, length, buffer, release)
-{}
-
-TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (
-    const TAO_SCIOPEndpointSequence &seq
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_SCIOP_Endpoint_Info
-      >
-    (seq)
-{}
-
-TAO_SCIOPEndpointSequence::~TAO_SCIOPEndpointSequence (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD
-#define _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_SCIOPEndpointSequence_0 (
-        CORBA::tk_sequence,
-        &_tc_TAO_SCIOP_Endpoint_Info,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_SCIOPEndpointSequence_0 =
-      &TAO_SCIOPEndpointSequence_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_SCIOPEndpointSequence_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_SCIOPEndpointSequence (
-    CORBA::tk_alias,
-    "IDL:TAO_SCIOPEndpointSequence:1.0",
-    "TAO_SCIOPEndpointSequence",
-    &TAO::TypeCode::tc_TAO_SCIOPEndpointSequence_0);
-  
-::CORBA::TypeCode_ptr const _tc_TAO_SCIOPEndpointSequence =
-  &_tao_tc_TAO_SCIOPEndpointSequence;
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_SCIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port) &&
-    (strm << _tao_aggregate.priority);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_SCIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port) &&
-    (strm >> _tao_aggregate.priority);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_
-#define _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_SCIOPEndpointSequence &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_SCIOPEndpointSequence &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */
diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h
deleted file mode 100644
index 4e89a5b4e47..00000000000
--- a/TAO/tao/Strategies/sciop_endpointsC.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_SCIOP_ENDPOINTSC_H_
-#define _TAO_IDL_ORIG_SCIOP_ENDPOINTSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "strategies_export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Strategies_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_type.cpp:258
-
-struct TAO_SCIOP_Endpoint_Info;
-
-typedef
-  TAO_Var_Var_T<
-      TAO_SCIOP_Endpoint_Info
-    >
-  TAO_SCIOP_Endpoint_Info_var;
-
-typedef
-  TAO_Out_T<
-      TAO_SCIOP_Endpoint_Info,
-      TAO_SCIOP_Endpoint_Info_var
-    >
-  TAO_SCIOP_Endpoint_Info_out;
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_ch.cpp:52
-
-struct TAO_Strategies_Export TAO_SCIOP_Endpoint_Info
-{
-  typedef TAO_SCIOP_Endpoint_Info_var _var_type;
-  
-  
-  TAO_String_Manager host;
-  CORBA::Short port;
-  CORBA::Short priority;
-};
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:44
-
-extern TAO_Strategies_Export ::CORBA::TypeCode_ptr const _tc_TAO_SCIOP_Endpoint_Info;
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_TAO_SCIOPENDPOINTSEQUENCE_CH_)
-#define _TAO_SCIOPENDPOINTSEQUENCE_CH_
-
-class TAO_SCIOPEndpointSequence;
-
-typedef
-  TAO_VarSeq_Var_T<
-      TAO_SCIOPEndpointSequence,
-      TAO_SCIOP_Endpoint_Info
-    >
-  TAO_SCIOPEndpointSequence_var;
-
-typedef
-  TAO_Seq_Out_T<
-      TAO_SCIOPEndpointSequence,
-      TAO_SCIOPEndpointSequence_var,
-      TAO_SCIOP_Endpoint_Info
-    >
-  TAO_SCIOPEndpointSequence_out;
-
-class TAO_Strategies_Export TAO_SCIOPEndpointSequence
-  : public
-      TAO_Unbounded_Sequence<
-          TAO_SCIOP_Endpoint_Info
-        >
-{
-public:
-  TAO_SCIOPEndpointSequence (void);
-  TAO_SCIOPEndpointSequence (CORBA::ULong max);
-  TAO_SCIOPEndpointSequence (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      TAO_SCIOP_Endpoint_Info* buffer, 
-      CORBA::Boolean release = 0
-    );
-  TAO_SCIOPEndpointSequence (const TAO_SCIOPEndpointSequence &);
-  ~TAO_SCIOPEndpointSequence (void);
-  
-  typedef TAO_SCIOPEndpointSequence_var _var_type;
-};
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:44
-
-extern TAO_Strategies_Export ::CORBA::TypeCode_ptr const _tc_TAO_SCIOPEndpointSequence;
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Strategies_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_SCIOP_Endpoint_Info &);
-TAO_Strategies_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_SCIOP_Endpoint_Info &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_
-#define _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_
-
-TAO_Strategies_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const TAO_SCIOPEndpointSequence &
-  );
-TAO_Strategies_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_SCIOPEndpointSequence &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Strategies/strategies_export.h b/TAO/tao/Strategies/strategies_export.h
deleted file mode 100644
index 9ca0498827d..00000000000
--- a/TAO/tao/Strategies/strategies_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_STRATEGIES_EXPORT_H
-#define TAO_STRATEGIES_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_STRATEGIES_HAS_DLL)
-#    define TAO_STRATEGIES_HAS_DLL 0
-#  endif /* ! TAO_STRATEGIES_HAS_DLL */
-#else
-#  if !defined (TAO_STRATEGIES_HAS_DLL)
-#    define TAO_STRATEGIES_HAS_DLL 1
-#  endif /* ! TAO_STRATEGIES_HAS_DLL */
-#endif
-
-#if defined (TAO_STRATEGIES_HAS_DLL) && (TAO_STRATEGIES_HAS_DLL == 1)
-#  if defined (TAO_STRATEGIES_BUILD_DLL)
-#    define TAO_Strategies_Export ACE_Proper_Export_Flag
-#    define TAO_STRATEGIES_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_STRATEGIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_STRATEGIES_BUILD_DLL */
-#    define TAO_Strategies_Export ACE_Proper_Import_Flag
-#    define TAO_STRATEGIES_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_STRATEGIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_STRATEGIES_BUILD_DLL */
-#else /* TAO_STRATEGIES_HAS_DLL == 1 */
-#  define TAO_Strategies_Export
-#  define TAO_STRATEGIES_SINGLETON_DECLARATION(T)
-#  define TAO_STRATEGIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_STRATEGIES_HAS_DLL == 1 */
-
-#endif /* TAO_STRATEGIES_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Strategies/uiop_endpoints.pidl b/TAO/tao/Strategies/uiop_endpoints.pidl
deleted file mode 100644
index 47856ae4ea4..00000000000
--- a/TAO/tao/Strategies/uiop_endpoints.pidl
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   uiop_endpoints.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for data structures used to
-//   encapsulate data in TAO_TAG_ENDPOINTS tagged component.  This
-//   TAO-specific component is used for transmission of multiple
-//   endpoints per single profile.  Data structures defined here are
-//   used for transmission of UIOP Endpoints.  See UIOP_Profile.* for
-//   more details.
-//
-//
-//   This file was used to generate the code in
-//   uiop_endpoints.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//         -o orig -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci
-//          -Wb,export_macro=TAO_Strategies_Export \
-//          -Wb,export_include="strategies_export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          uiop_endpoints.pidl
-//
-// ================================================================
-
-#ifndef _UIOP_ENDPOINTS_IDL_
-#define _UIOP_ENDPOINTS_IDL_
-
-/// Stores information for a single UIOP endpoint.
-struct TAO_UIOP_Endpoint_Info
-{
-  string rendezvous_point;
-  short priority;
-};
-
-/// Stores information for a collection of UIOP endpoints.
-typedef sequence <TAO_UIOP_Endpoint_Info> TAO_UIOPEndpointSequence;
-
-#pragma prefix ""
-
-#endif /* _UIOP_ENDPOINTS_IDL_ */
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
deleted file mode 100644
index 47b181cab77..00000000000
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:291
-
-
-#include "uiop_endpointsC.h"
-#include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_UIOP_Endpoint_Info[] =
-  {
-    { "rendezvous_point", &CORBA::_tc_string },
-    { "priority", &CORBA::_tc_short }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_UIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    "IDL:TAO_UIOP_Endpoint_Info:1.0",
-    "TAO_UIOP_Endpoint_Info",
-    _tao_fields_TAO_UIOP_Endpoint_Info,
-    2);
-  
-::CORBA::TypeCode_ptr const _tc_TAO_UIOP_Endpoint_Info =
-  &_tao_tc_TAO_UIOP_Endpoint_Info;
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_TAO_UIOPENDPOINTSEQUENCE_CS_)
-#define _TAO_UIOPENDPOINTSEQUENCE_CS_
-
-TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (void)
-{}
-
-TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_UIOP_Endpoint_Info
-      >
-    (max)
-{}
-
-TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    TAO_UIOP_Endpoint_Info * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_UIOP_Endpoint_Info
-      >
-    (max, length, buffer, release)
-{}
-
-TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (
-    const TAO_UIOPEndpointSequence &seq
-  )
-  : TAO_Unbounded_Sequence<
-        TAO_UIOP_Endpoint_Info
-      >
-    (seq)
-{}
-
-TAO_UIOPEndpointSequence::~TAO_UIOPEndpointSequence (void)
-{}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD
-#define _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_UIOPEndpointSequence_0 (
-        CORBA::tk_sequence,
-        &_tc_TAO_UIOP_Endpoint_Info,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_UIOPEndpointSequence_0 =
-      &TAO_UIOPEndpointSequence_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_UIOPEndpointSequence_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_UIOPEndpointSequence (
-    CORBA::tk_alias,
-    "IDL:TAO_UIOPEndpointSequence:1.0",
-    "TAO_UIOPEndpointSequence",
-    &TAO::TypeCode::tc_TAO_UIOPEndpointSequence_0);
-  
-::CORBA::TypeCode_ptr const _tc_TAO_UIOPEndpointSequence =
-  &_tao_tc_TAO_UIOPEndpointSequence;
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_UIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.rendezvous_point.in ()) &&
-    (strm << _tao_aggregate.priority);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_UIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.rendezvous_point.out ()) &&
-    (strm >> _tao_aggregate.priority);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_
-#define _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO_UIOPEndpointSequence &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO_UIOPEndpointSequence &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */
diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h
deleted file mode 100644
index f85b1a69906..00000000000
--- a/TAO/tao/Strategies/uiop_endpointsC.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_UIOP_ENDPOINTSC_H_
-#define _TAO_IDL_ORIG_UIOP_ENDPOINTSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "strategies_export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Strategies_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_type.cpp:258
-
-struct TAO_UIOP_Endpoint_Info;
-
-typedef
-  TAO_Var_Var_T<
-      TAO_UIOP_Endpoint_Info
-    >
-  TAO_UIOP_Endpoint_Info_var;
-
-typedef
-  TAO_Out_T<
-      TAO_UIOP_Endpoint_Info,
-      TAO_UIOP_Endpoint_Info_var
-    >
-  TAO_UIOP_Endpoint_Info_out;
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/structure_ch.cpp:52
-
-struct TAO_Strategies_Export TAO_UIOP_Endpoint_Info
-{
-  typedef TAO_UIOP_Endpoint_Info_var _var_type;
-  
-  
-  TAO_String_Manager rendezvous_point;
-  CORBA::Short priority;
-};
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:44
-
-extern TAO_Strategies_Export ::CORBA::TypeCode_ptr const _tc_TAO_UIOP_Endpoint_Info;
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_TAO_UIOPENDPOINTSEQUENCE_CH_)
-#define _TAO_UIOPENDPOINTSEQUENCE_CH_
-
-class TAO_UIOPEndpointSequence;
-
-typedef
-  TAO_VarSeq_Var_T<
-      TAO_UIOPEndpointSequence,
-      TAO_UIOP_Endpoint_Info
-    >
-  TAO_UIOPEndpointSequence_var;
-
-typedef
-  TAO_Seq_Out_T<
-      TAO_UIOPEndpointSequence,
-      TAO_UIOPEndpointSequence_var,
-      TAO_UIOP_Endpoint_Info
-    >
-  TAO_UIOPEndpointSequence_out;
-
-class TAO_Strategies_Export TAO_UIOPEndpointSequence
-  : public
-      TAO_Unbounded_Sequence<
-          TAO_UIOP_Endpoint_Info
-        >
-{
-public:
-  TAO_UIOPEndpointSequence (void);
-  TAO_UIOPEndpointSequence (CORBA::ULong max);
-  TAO_UIOPEndpointSequence (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      TAO_UIOP_Endpoint_Info* buffer, 
-      CORBA::Boolean release = 0
-    );
-  TAO_UIOPEndpointSequence (const TAO_UIOPEndpointSequence &);
-  ~TAO_UIOPEndpointSequence (void);
-  
-  typedef TAO_UIOPEndpointSequence_var _var_type;
-};
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:44
-
-extern TAO_Strategies_Export ::CORBA::TypeCode_ptr const _tc_TAO_UIOPEndpointSequence;
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:59
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Strategies_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_UIOP_Endpoint_Info &);
-TAO_Strategies_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_UIOP_Endpoint_Info &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_TAO_UIOPEndpointSequence_H_
-#define _TAO_CDR_OP_TAO_UIOPEndpointSequence_H_
-
-TAO_Strategies_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const TAO_UIOPEndpointSequence &
-  );
-TAO_Strategies_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    TAO_UIOPEndpointSequence &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
deleted file mode 100644
index 570abbec04c..00000000000
--- a/TAO/tao/StringSeq.pidl
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-//
-//   This file was used to generate the code in StringSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//       -o orig -Ge 1 -GA -Sc -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          StringSeq.pidl
-//
-// ================================================================
-
-
-#ifndef TAO_CORBA_STRING_SEQ_IDL
-#define TAO_CORBA_STRING_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<string> StringSeq;
-};
-
-#endif  /* TAO_CORBA_STRING_SEQ_IDL */
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
deleted file mode 100644
index dc875624d23..00000000000
--- a/TAO/tao/StringSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "StringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_StringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_string,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StringSeq_0 =
-      &CORBA_StringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StringSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StringSeq:1.0",
-    "StringSeq",
-    &TAO::TypeCode::tc_CORBA_StringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringSeq =
-    &_tao_tc_CORBA_StringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
-        _tao_any,
-        CORBA::StringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
deleted file mode 100644
index c6e6dc6f6b7..00000000000
--- a/TAO/tao/StringSeqC.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "StringSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_STRINGSEQ_CS_)
-#define _CORBA_STRINGSEQ_CS_
-
-CORBA::StringSeq::StringSeq (void)
-{}
-
-CORBA::StringSeq::StringSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_String_Sequence
-    (max)
-{}
-
-CORBA::StringSeq::StringSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_String_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::StringSeq::StringSeq (
-    const StringSeq &seq
-  )
-  : TAO_Unbounded_String_Sequence
-    (seq)
-{}
-
-CORBA::StringSeq::~StringSeq (void)
-{}
-
-void CORBA::StringSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  StringSeq * _tao_tmp_pointer =
-    static_cast<StringSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_
-#define _TAO_CDR_OP_CORBA_StringSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StringSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StringSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
deleted file mode 100644
index e039c5b516c..00000000000
--- a/TAO/tao/StringSeqC.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
-#define _TAO_IDL_ORIG_STRINGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_STRINGSEQ_CH_)
-#define _CORBA_STRINGSEQ_CH_
-  
-  class StringSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        StringSeq,
-        TAO_SeqElem_String_Manager
-      >
-    StringSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        StringSeq,
-        StringSeq_var,
-        TAO_SeqElem_String_Manager
-      >
-    StringSeq_out;
-  
-  class TAO_Export StringSeq
-    : public
-        TAO_Unbounded_String_Sequence
-  {
-  public:
-    StringSeq (void);
-    StringSeq (CORBA::ULong max);
-    StringSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        char ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    StringSeq (const StringSeq &);
-    ~StringSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef StringSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_StringSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
-#define _TAO_CDR_OP_CORBA_StringSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::StringSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::StringSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/StringSeqS.h b/TAO/tao/StringSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/StringSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/String_TypeCode.cpp b/TAO/tao/String_TypeCode.cpp
deleted file mode 100644
index ecf53573cfd..00000000000
--- a/TAO/tao/String_TypeCode.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRING_TYPECODE_CPP
-#define TAO_STRING_TYPECODE_CPP
-
-#include "tao/String_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::String<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::String<RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-
-#endif  /* TAO_STRING_TYPECODE_CPP */
diff --git a/TAO/tao/String_TypeCode.h b/TAO/tao/String_TypeCode.h
deleted file mode 100644
index 5a3161c9a64..00000000000
--- a/TAO/tao/String_TypeCode.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_H
-#define TAO_STRING_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template <class RefCountPolicy>
-    class String
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/String_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("String_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_H */
diff --git a/TAO/tao/String_TypeCode.inl b/TAO/tao/String_TypeCode.inl
deleted file mode 100644
index 90e8e887c3b..00000000000
--- a/TAO/tao/String_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
-                                               CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Static.cpp b/TAO/tao/String_TypeCode_Static.cpp
deleted file mode 100644
index 2a5064570a7..00000000000
--- a/TAO/tao/String_TypeCode_Static.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           String_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
diff --git a/TAO/tao/String_TypeCode_Static.h b/TAO/tao/String_TypeCode_Static.h
deleted file mode 100644
index 4ceedbdf135..00000000000
--- a/TAO/tao/String_TypeCode_Static.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_STATIC_H
-#define TAO_STRING_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <class RefCountPolicy> class String;
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template<>
-    class TAO_Export String<TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_STATIC_H */
diff --git a/TAO/tao/String_TypeCode_Static.inl b/TAO/tao/String_TypeCode_Static.inl
deleted file mode 100644
index 4d42413daa1..00000000000
--- a/TAO/tao/String_TypeCode_Static.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
-  CORBA::TCKind kind,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Traits.h b/TAO/tao/String_TypeCode_Traits.h
deleted file mode 100644
index fe287367100..00000000000
--- a/TAO/tao/String_TypeCode_Traits.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Traits.h
- *
- *  $Id$
- *
- *  Header file for bound
- *    @c tk_string,
- *    @c tk_wstring,
- *  @c CORBA::TypeCode factories.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_TRAITS_H
-#define TAO_STRING_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/String_TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    template <typename T> struct String_Traits;
-
-    template<>
-    struct String_Traits<CORBA::Any::from_string>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-    template <>
-    struct String_Traits<CORBA::Any::from_wstring>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/Struct_TypeCode.cpp b/TAO/tao/Struct_TypeCode.cpp
deleted file mode 100644
index ccbdf3940a5..00000000000
--- a/TAO/tao/Struct_TypeCode.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRUCT_TYPECODE_CPP
-#define TAO_STRUCT_TYPECODE_CPP
-
-#include "tao/Struct_TypeCode.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Struct_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<StringType>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<StringType>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-#endif  /* TAO_STRUCT_TYPECODE_CPP */
diff --git a/TAO/tao/Struct_TypeCode.h b/TAO/tao/Struct_TypeCode.h
deleted file mode 100644
index 30420bca0a1..00000000000
--- a/TAO/tao/Struct_TypeCode.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_H
-#define TAO_STRUCT_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Struct
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              FieldArrayType const & fields,
-              CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Struct (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Struct_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Struct_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode.inl b/TAO/tao/Struct_TypeCode.inl
deleted file mode 100644
index eb3da52ae7e..00000000000
--- a/TAO/tao/Struct_TypeCode.inl
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , nfields_ (0)
-  , fields_ ()
-{
-  // CORBA::tk_except is not allowed in the recursive TypeCode case.
-  // ACE_ASSERT (kind == CORBA::tk_struct);
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.cpp b/TAO/tao/Struct_TypeCode_Static.cpp
deleted file mode 100644
index 0cbe55aa344..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// $Id$
-
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Struct_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const & field =
-        *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<char const *>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const &
-        lhs_field = this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<char const *>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.h b/TAO/tao/Struct_TypeCode_Static.h
deleted file mode 100644
index 8c87e1390ea..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_STATIC_H
-#define TAO_STRUCT_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Struct;
-
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template<>
-    class TAO_Export Struct<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            Struct_Field<char const *,
-                                         CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              Struct_Field<char const *,
-                           CORBA::TypeCode_ptr const *> const * fields,
-              CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      Struct_Field<char const *,
-                   CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode_Static.inl b/TAO/tao/Struct_TypeCode_Static.inl
deleted file mode 100644
index f32a858b845..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
deleted file mode 100644
index f12431211a8..00000000000
--- a/TAO/tao/Stub.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-// $Id$
-
-// Portions Copyright 1995 by Sun Microsystems Inc.
-// Portions Copyright 1997-2002 by Washington University
-// All Rights Reserved
-//
-// Some CORBA::Object and other operations are specific to this STUB
-// based implementation, and can neither be used by other kinds of
-// objref nor have a default implementation.
-
-#include "Stub.h"
-#include "Profile.h"
-#include "ORB_Core.h"
-#include "Client_Strategy_Factory.h"
-#include "Sync_Strategies.h"
-#include "debug.h"
-#include "Policy_Manager.h"
-#include "SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Stub.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-
-
-ACE_RCSID (tao,
-           TAO_Stub,
-           "$Id$")
-
-
-TAO_Stub::TAO_Stub (const char *repository_id,
-                    const TAO_MProfile &profiles,
-                    TAO_ORB_Core *orb_core)
-  : type_id (repository_id)
-  , orb_core_ (orb_core)
-  , orb_ ()
-  , servant_orb_ ()
-  , base_profiles_ ((CORBA::ULong) 0)
-  , forward_profiles_ (0)
-  , profile_in_use_ (0)
-  , profile_lock_ptr_ (0)
-  , profile_success_ (0)
-  , refcount_lock_ ()
-  , refcount_ (1)
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-  , policies_ (0)
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-  , ior_info_ (0)
-  , forwarded_ior_info_ (0)
-  , collocation_opt_ (orb_core->optimize_collocation_objects ())
-{
-  if (this->orb_core_.get() == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO: (%P|%t) TAO_Stub created with default ")
-                      ACE_TEXT ("ORB core\n")));
-        }
-
-      this->orb_core_.reset (TAO_ORB_Core_instance ());
-    }
-
-  // Duplicate the ORB_Core, otherwise the allocators and other
-  // resources that this class references (directly or indirectly)
-  // could be destroyed before it is time.
-  (void) this->orb_core_->_incr_refcnt ();
-
-  // Cache the ORB pointer to respond faster to certain queries.
-  this->orb_ = CORBA::ORB::_duplicate (this->orb_core_->orb ());
-
-  this->profile_lock_ptr_ =
-    this->orb_core_->client_factory ()->create_profile_lock ();
-
-  this->base_profiles (profiles);
-}
-
-TAO_Stub::~TAO_Stub (void)
-{
-  ACE_ASSERT (this->refcount_ == 0);
-
-  if (this->forward_profiles_)
-    reset_profiles ();
-
-  if (this->profile_in_use_ != 0)
-    {
-      // decrease reference count on profile
-      this->profile_in_use_->_decr_refcnt ();
-      this->profile_in_use_ = 0;
-    }
-
-  delete this->profile_lock_ptr_;
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  delete this->policies_;
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  if (this->ior_info_)
-    delete this->ior_info_;
-
-  if (this->forwarded_ior_info_)
-    delete this->forwarded_ior_info_;
-}
-
-void
-TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
-{
-  // we assume that the profile_in_use_ is being
-  // forwarded!  Grab the lock so things don't change.
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-
-  TAO_MProfile *now_pfiles = this->forward_profiles_;
-  if (now_pfiles == 0)
-    now_pfiles = &this->base_profiles_;
-
-  ACE_NEW (this->forward_profiles_,
-           TAO_MProfile (mprofiles));
-
-  // forwarded profile points to the new IOR (profiles)
-  this->profile_in_use_->forward_to (this->forward_profiles_);
-
-  // new profile list points back to the list which was forwarded.
-  this->forward_profiles_->forward_from (now_pfiles);
-
-  // make sure we start at the beginning of mprofiles
-  this->forward_profiles_->rewind ();
-
-  // Since we have been forwarded, we must set profile_success_ to 0
-  // since we are starting a new with a new set of profiles!
-  this->profile_success_ = 0;
-
-  // Reset any flags that may be appropriate in the services that
-  // selects profiles for invocation
-  this->orb_core_->reset_service_profile_flags ();
-}
-
-CORBA::Boolean
-TAO_Stub::service_profile_selection (void)
-{
-  // @@todo: This method is deprecated. Needs to be removed after
-  //         1.2.1 goes out.
-  TAO_Profile *profile = 0;
-
-  this->orb_core_->service_profile_selection (this->base_profiles_,
-                                              profile);
-  if (profile)
-    {
-      this->set_profile_in_use_i (profile);
-      return 1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
-                           CORBA::ULong &index
-                           ACE_ENV_ARG_DECL)
-{
-  // We are creating the IOR info. Let us not be disturbed. So grab a
-  // lock.
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            -1));
-
-  IOP::IOR *tmp_info = 0;
-
-  if (this->forward_profiles_ != 0)
-    {
-      if (this->forwarded_ior_info_ == 0)
-        {
-          this->get_profile_ior_info (*this->forward_profiles_,
-                                      tmp_info
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          this->forwarded_ior_info_ = tmp_info;
-        }
-
-      // First we look at the forward profiles to see whether the
-      // profile_in_use is any of it.
-      for (CORBA::ULong i = 0;
-           i < this->forward_profiles_->profile_count ();
-           ++i)
-        {
-          if (this->forward_profiles_->get_profile (i)
-              == this->profile_in_use_)
-            {
-              ior_info = this->forwarded_ior_info_;
-              index = i;
-              return 0;
-            }
-        }
-    }
-
-  // Else we look at the base profiles
-  if (this->ior_info_ == 0)
-    {
-      this->get_profile_ior_info (this->base_profiles_,
-                                  tmp_info
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      this->ior_info_ = tmp_info;
-    }
-
-
-  for (CORBA::ULong ind = 0;
-       ind < this->base_profiles_.profile_count ();
-       ++ind)
-    {
-      if (this->base_profiles_.get_profile (ind) ==
-          this->profile_in_use_)
-        {
-          index = ind;
-          ior_info = this->ior_info_;
-          return 0;
-        }
-    }
-
-  // Error, there was no match
-  return -1;
-}
-
-const TAO::ObjectKey &
-TAO_Stub::object_key (void) const
-{
-  // Return the profile in use's object key if you see one.
-  if (this->profile_in_use_)
-    return this->profile_in_use_->object_key ();
-
-  if (this->forward_profiles_)
-    {
-      // Double-checked
-      ACE_Guard<ACE_Lock> obj (*this->profile_lock_ptr_);
-
-      if (obj.locked () != 0 &&  this->forward_profiles_ != 0)
-        return this->forward_profiles_->get_profile (0)->object_key ();
-    }
-
-  // If no forwarded profiles, just use the base profile
-  return this->base_profiles_.get_profile (0)->object_key ();
-}
-
-int
-TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
-                                IOP::IOR *&ior_info
-                                ACE_ENV_ARG_DECL)
-{
-
-
-  ACE_NEW_THROW_EX (ior_info,
-                    IOP::IOR (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
-
-
-  // Get the number of elements
-  CORBA::ULong count = profiles.profile_count ();
-
-  // Set the number of elements in the sequence of tagged_profile
-  ior_info->profiles.length (count);
-
-  // Call the create_tagged_profile one every member of the
-  // profile and make the sequence
-  for (CORBA::ULong index = 0; index < count; ++index)
-    {
-      TAO_Profile *prof = profiles.get_profile (index);
-
-      IOP::TaggedProfile *tp =
-        prof->create_tagged_profile ();
-
-      if (tp == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (),
-                          -1);
-      ior_info->profiles[index] = *tp;
-    }
-
-  return 0;
-}
-
-
-
-// Quick'n'dirty hash of objref data, for partitioning objrefs into
-// sets.
-//
-// NOTE that this must NOT go across the network!
-
-CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max
-                ACE_ENV_ARG_DECL)
-{
-  // we rely on the profile objects that its address info
-  return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER);
-}
-
-// Expensive comparison of objref data, to see if two objrefs
-// certainly point at the same object. (It's quite OK for this to
-// return FALSE, and yet have the two objrefs really point to the same
-// object.)
-//
-// NOTE that this must NOT go across the network!
-// @@ Two object references are the same if any two profiles are the
-//    same! This function is only test the profile in use!!!
-CORBA::Boolean
-TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
-{
-  if (CORBA::is_nil (other_obj) == 1)
-    return 0;
-
-  TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_;
-  TAO_Profile *this_profile = this->profile_in_use_;
-
-  if (other_profile == 0 || this_profile == 0)
-    return 0;
-
-  // Compare the profiles
-  return this_profile->is_equivalent (other_profile);
-}
-
-// Memory managment
-
-CORBA::ULong
-TAO_Stub::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->refcount_lock_,
-                    0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_Stub::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                      mon,
-                      this->refcount_lock_,
-                      0);
-
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-TAO_Profile *
-TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
-{
-  TAO_Profile *old = this->profile_in_use_;
-
-  // Since we are actively using this profile we dont want
-  // it to disappear, so increase the reference count by one!!
-  if (pfile && (pfile->_incr_refcnt () == 0))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) unable to increment profile ref!\n")),
-                        0);
-    }
-
-  this->profile_in_use_ = pfile;
-
-  if (old)
-    old->_decr_refcnt ();
-
-  return this->profile_in_use_;
-}
-
-void
-TAO_Stub::forward_back_one (void)
-{
-  TAO_MProfile *from = forward_profiles_->forward_from ();
-
-  delete this->forward_profiles_;
-
-  // the current profile in this profile list is no
-  // longer being forwarded, so set the reference to zero.
-  if (from == &this->base_profiles_)
-    {
-      this->base_profiles_.get_current_profile ()->forward_to (0);
-      this->forward_profiles_ = 0;
-    }
-  else
-    {
-      from->get_current_profile ()->forward_to (0);
-      this->forward_profiles_ = from;
-    }
-
-}
-
-
-// Note that if the repository ID (typeID) is NULL, it will make
-// narrowing rather expensive, though it does ensure that type-safe
-// narrowing code gets thoroughly exercised/debugged!  Without a
-// typeID, the _narrow will be required to make an expensive remote
-// "is_a" call.
-
-// THREADING NOTE: Code below this point is of course thread-safe (at
-// least on supported threaded platforms), so the caller of these
-// routines need only ensure that the data being passed in is not
-// being modified by any other thread.
-//
-// As an _experiment_ (to estimate the performance cost) remote calls
-// are currently deemed "cancel-safe".  That means that they can be
-// called by threads when they're in asynchronous cancellation mode.
-// The only effective way to do this is to disable async cancellation
-// for the duration of the call.  There are numerous rude interactions
-// with code generators for C++ ... cancellation handlers just do
-// normal stack unwinding like exceptions, but exceptions are purely
-// synchronous and sophisticated code generators rely on that to
-// generate better code, which in some cases may be very hard to
-// unwind.
-
-class TAO_Synchronous_Cancellation_Required
-// = TITLE
-//     Stick one of these at the beginning of a block that can't
-//     support asynchronous cancellation, and which must be
-//     cancel-safe.
-//
-// = EXAMPLE
-//     somefunc()
-//     {
-//       TAO_Synchronous_Cancellation_Required NOT_USED;
-//       ...
-//     }
-{
-public:
-  // These should probably be in a separate inline file, but they're
-  // only used within this one file right now, and we always want them
-  // inlined, so here they sit.
-  TAO_Synchronous_Cancellation_Required (void)
-    : old_type_ (0)
-  {
-#if !defined (VXWORKS)
-    ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_);
-#endif /* ! VXWORKS */
-  }
-
-  ~TAO_Synchronous_Cancellation_Required (void)
-  {
-#if !defined (VXWORKS)
-    int dont_care;
-    ACE_OS::thr_setcanceltype(old_type_, &dont_care);
-#endif /* ! VXWORKS */
-  }
-private:
-  int old_type_;
-};
-
-// ****************************************************************
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-// Some policies can only be set locally on the client, while others
-// can only be exported in the IOR by the server, and yet others can
-// be set by both by client and server.  Furthermore, reconciliation
-// between client-set values and the ones exported in the IOR is
-// policy-specific.  Therefore, with the current state of things, it
-// isn't possible to write generic code for <get_policy> that will
-// work for any policy type.  Currently, we take specific action for
-// each of the known client-exposed policies (above), and simply look
-// up effective override for any other policy type (below).  Later, if
-// there is a need/desire for generic code, it can be done by pushing
-// the smarts into the policies implementations, and will involve
-// modifying PolicyC* and friends, e.g., to add methods for policy
-// specific reconciliation, etc.
-
-CORBA::Policy_ptr
-TAO_Stub::get_policy (CORBA::PolicyType type
-                      ACE_ENV_ARG_DECL)
-{
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-
-  CORBA::Policy_var result;
-  if (this->policies_ != 0)
-    {
-      result =
-        this->policies_->get_policy (type
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result =
-        this->orb_core_->get_policy_including_current (type
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
-                             ACE_ENV_ARG_DECL)
-{
-  // No need to lock, the stub only changes its policies at
-  // construction time...
-
-  CORBA::Policy_var result;
-  if (this->policies_ != 0)
-    {
-      result =
-        this->policies_->get_cached_policy (type
-                                            ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result =
-        this->orb_core_->get_cached_policy_including_current (type
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-TAO_Stub *
-TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                CORBA::SetOverrideType set_add
-                                ACE_ENV_ARG_DECL)
-{
-  // Notice the use of an explicit constructor....
-  auto_ptr<TAO_Policy_Set> policy_manager (
-    new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE));
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  else if (this->policies_ == 0)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      policy_manager->copy_from (this->policies_
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
-                                                 this->base_profiles_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  stub->policies_ = policy_manager.release ();
-
-  // Copy the servant ORB if it is present.
-  stub->servant_orb (this->servant_orb_var ().in ());
-
-  return stub;
-}
-
-CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                ACE_ENV_ARG_DECL)
-{
-  if (this->policies_ == 0)
-    return 0;
-
-  return this->policies_->get_policy_overrides (types
-                                                ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-TAO_Sync_Strategy &
-TAO_Stub::sync_strategy (void)
-{
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-  bool has_synchronization;
-  Messaging::SyncScope scope;
-
-  this->orb_core_->call_sync_scope_hook (this,
-                                         has_synchronization,
-                                         scope);
-
-  if (has_synchronization == true)
-    return this->orb_core_->get_sync_strategy (this,
-                                               scope);
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-  return this->orb_core_->transport_sync_strategy ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-template class auto_ptr<TAO_Policy_Set>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-#pragma instantiate auto_ptr<TAO_Policy_Set>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
deleted file mode 100644
index e75e1024816..00000000000
--- a/TAO/tao/Stub.h
+++ /dev/null
@@ -1,422 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Stub.h
- *
- *  $Id$
- *
- *  @author  Portions Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Portions Copyright 1997-2002 by Washington University
- */
-//=============================================================================
-
-#ifndef TAO_STUB_H
-#define TAO_STUB_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/MProfile.h"
-#include "tao/ORB_Core_Auto_Ptr.h"
-
-#if defined (HPUX) && defined (IOR)
-   /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
-      and we don't want that definition.  See IOP_IORC.h. */
-# undef IOR
-#endif /* HPUX && IOR */
-
-// Forward declarations.
-class TAO_RelativeRoundtripTimeoutPolicy;
-class TAO_Client_Priority_Policy;
-class TAO_Sync_Scope_Policy;
-class TAO_Buffering_Constraint_Policy;
-class TAO_Sync_Strategy;
-class TAO_GIOP_Invocation;
-class TAO_Policy_Set;
-class TAO_Profile;
-
-/// Forward declaration for ObjectKey
-namespace TAO
-{
-  class ObjectKey;
-}
-
-namespace IOP
-{
-  struct IOR;
-}
-
-/**
- * @class TAO_Stub
- *
- * @brief TAO_Stub
- *
- * Per-objref data includes the (protocol-specific) Profile, which
- * is handled by placing it into a subclass of this type along
- * with data that may be used in protocol-specific caching
- * schemes.
- * The type ID (the data specified by CORBA 2.0 that gets exposed
- * "on the wire", and in stringified objrefs) is held by this
- * module.
- * The stub APIs are member functions of this type.
- */
-class TAO_Export TAO_Stub
-{
-public:
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /**
-   * Returns the effective policy if @a type is a known client-exposed
-   * policy type.  Returns the effective override for all other policy
-   * types.
-   */
-  virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                        ACE_ENV_ARG_DECL);
-
-  virtual CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                               ACE_ENV_ARG_DECL);
-
-  virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL);
-
-  virtual CORBA::PolicyList *get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types
-    ACE_ENV_ARG_DECL);
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-  /// Return the sync strategy to be used in by the transport.
-  /// Selection will be based on the SyncScope policies.
-  TAO_Sync_Strategy &sync_strategy (void);
-
-  /// All objref representations carry around a type ID.
-  CORBA::String_var type_id;
-
-  /**
-   * All objref representations know how to hash themselves and
-   * compare themselves for equivalence to others.  It's easily
-   * possible to have two objrefs that are distinct copies of data
-   * that refers/points to the same remote object (i.e. are
-   * equivalent).
-   */
-  CORBA::ULong hash (CORBA::ULong maximum
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /// Implement the is_equivalent() method for the CORBA::Object
-  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
-
-  // Our Constructors ...
-
-  /// Construct from a repository ID and a list of profiles.
-  TAO_Stub (const char *repository_id,
-            const TAO_MProfile &profiles,
-            TAO_ORB_Core *orb_core);
-
-  // = Memory management.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-  /// Return the Profile lock. This lock can be used at places where
-  /// profiles need to be edited.
-  ACE_Lock *profile_lock (void) const;
-
-  // Manage the base (non-forwarded) profiles.
-  /// returns a pointer to the profile_in_use object.  This object
-  /// retains ownership of this profile.
-  TAO_Profile *profile_in_use (void);
-
-  /// Return the ObjectKey
-  const TAO::ObjectKey &object_key (void) const;
-
-  /**
-   * Copy of the profile list, user must free memory when done.
-   * although the user can call make_profiles() then reorder
-   * the list and give it back to TAO_Stub.
-   */
-  TAO_MProfile *make_profiles (void);
-
-  /// Obtain a reference to the basic profile set.
-  const TAO_MProfile& base_profiles (void) const;
-
-  /// Obtain a reference to the basic profile set.
-  TAO_MProfile& base_profiles (void);
-
-  /// Obtain a pointer to the forwarded profile set
-  const TAO_MProfile *forward_profiles (void) const;
-
-  // Manage forward and base profiles.
-  /**
-   * THREAD SAFE.  If forward_profiles is null then this will
-   * get the next profile in the base_profiles list.  If forward is not null
-   * then this will get the next profile for the list of forwarding
-   * profiles.  If all profiles have been tried then 0 is returned and
-   * profile_in_use_ is set to the first profile in the base_profiles
-   * list.
-   */
-  TAO_Profile *next_profile (void);
-
-  /// NON-THREAD SAFE version of next_profile (void)
-  TAO_Profile *next_profile_i (void);
-
-  /**
-   * THREAD SAFE
-   * this method will reset the base profile list to reference the first
-   * profile and if there are anmy existing forward profiles they are
-   * reset.
-   */
-  void reset_profiles (void);
-
-  /// NON-THREAD SAFE version of reset_profiles (void);
-  void reset_profiles_i (void);
-
-  /// Returns 1 if a forward profile has successfully been used.
-  /// profile_success_ && forward_profiles_
-  CORBA::Boolean valid_forward_profile (void);
-
-  /// NON-THREAD-SAFE.  Will set profile_success_ to 0.
-  void set_valid_profile (void);
-
-  /// Returns TRUE if a connection was successful with at least
-  /// one profile.
-  CORBA::Boolean valid_profile (void);
-
-  /// Initialize the base_profiles_ and set profile_in_use_ to
-  /// reference the first profile.
-  TAO_Profile *base_profiles (const TAO_MProfile& mprofiles);
-
-  /**
-   * THREAD SAFE.
-   * Set the forward_profiles.  This object will assume ownership of
-   * this TAO_MProfile object!!
-   */
-  void add_forward_profiles (const TAO_MProfile &mprofiles);
-
-  /**
-   * THREAD SAFE
-   * Used to get the next profile after the one being used has
-   * failed during the initial connect or send of the message!
-   */
-  CORBA::Boolean next_profile_retry (void);
-
-  /// Accessor.
-  TAO_ORB_Core* orb_core (void) const;
-
-  /// This returns a duplicated ORB pointer.
-  CORBA::ORB_ptr servant_orb_ptr (void);
-
-  /// This returns the ORB var itself (generally for temporary use).
-  CORBA::ORB_var &servant_orb_var (void);
-
-  /**
-   * Accesor and mutator for the servant ORB.  Notice that the muatator
-   * assumes the ownership of the passed in ORB and the accesor does not
-   * return a copy of the orb since the accessing of the ORB is considered
-   * temporary.
-   */
-  void servant_orb (CORBA::ORB_ptr orb);
-
-  /// Make a call on to services to see whether they have some
-  /// preferences on selecting the right profiles.
-  /**
-   * @deprecated  Remove after TAO 1.2.1 is released.
-   */
-  CORBA::Boolean service_profile_selection (void);
-
-  /**
-   * Create the IOP::IOR info. We will create the info at most once.
-   * Get the index of the profile we are using to make the invocation.
-   */
-  int create_ior_info (IOP::IOR *&ior_info,
-                       CORBA::ULong &index
-                       ACE_ENV_ARG_DECL);
-
-  /// Return a reference to the reference count lock.
-  /**
-   * This method is meant to be used by the CORBA::Object
-   * implementation to allow it to directly manipulate the reference
-   * count.
-   */
-  TAO_SYNCH_MUTEX & refcount_lock (void);
-
-  /// Return number of outstanding references to this object.
-  /**
-   * This method is meant to be used by the CORBA::Object
-   * implementation to allow it to directly manipulate the reference
-   * count.
-   */
-  CORBA::ULong & refcount (void);
-
-  /// Deallocate the TAO_Stub object.
-  /**
-   * This method is intended to be used only by the CORBA::Object
-   * class.
-   */
-  void destroy (void);
-
-  /// Return the cached value from the ORB_Core.
-  /**
-   * This flag indicates whether the stub code should make use of the
-   * collocation opportunities that are available to the ORB.
-   */
-  CORBA::Boolean optimize_collocation_objects (void) const;
-protected:
-
-  /// Destructor is to be called only through _decr_refcnt() to
-  /// enforce proper reference counting.
-  virtual ~TAO_Stub (void);
-
-private:
-  /// Makes a copy of the profile and frees the existing profile_in_use.
-  /// NOT THREAD SAFE
-  TAO_Profile *set_profile_in_use_i (TAO_Profile *pfile);
-
-  /// NON-THREAD-SAFE.  Utility method which resets or initializes
-  /// the base_profile list and forward flags.
-  void reset_base ();
-
-  /// NON-THREAD-SAFE.  Utility method which unrolls (removes or pops)
-  /// the top most forwarding profile list.
-  void forward_back_one (void);
-
-   /// NOT THREAD-SAFE.  Utility method which pops all forward profile
-   /// lists and resets the forward_profiles_ pointer.
-  void reset_forward ();
-
-  /// NON-THREAD-SAFE.  utility method for next_profile.
-  TAO_Profile *next_forward_profile (void);
-
-  /// THREAD-SAFE Create the IOR info
-  int get_profile_ior_info (TAO_MProfile &profile,
-                            IOP::IOR *&ior_info
-                            ACE_ENV_ARG_DECL);
-
-private:
-
-  // = Disallow copy construction and assignment.
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
-
-protected:
-  /// Automatically manage the ORB_Core reference count
-  /**
-   * The ORB_Core cannot go away until the object references it
-   * creates are destroyed.  There are multiple reasons for this, but
-   * in particular, the allocators used for some of the TAO_Profile
-   * objects contained on each TAO_Stub are owned by the TAO_ORB_Core.
-   *
-   * This <B>must</B> be the first field of the class, otherwise the
-   * TAO_ORB_Core is destroyed too early!
-   *
-   */
-  TAO_ORB_Core_Auto_Ptr orb_core_;
-
-  /// ORB required for reference counting.  This will help us keep the
-  /// ORB around until the CORBA::Object we represent dies.
-  /**
-   * @todo Why do we need both a reference to the ORB_Core and its
-   *       ORB? It think the memory management rules for the ORB_Core
-   *       changed, in the good old days it was the CORBA::ORB class
-   *       who owned the ORB_Core, now it is the other way around....
-   */
-  CORBA::ORB_var orb_;
-
-  /**
-   * If this stub refers to a collocated object then we need to hold on to
-   * the servant's ORB (which may be different from the client ORB) so that,
-   *   1. we know that the ORB will stay alive long enough, and,
-   *   2. we can search for the servant/POA's status starting from
-   *      the ORB's RootPOA.
-   */
-  CORBA::ORB_var servant_orb_;
-
-  /// Ordered list of profiles for this object.
-  TAO_MProfile base_profiles_;
-
-  /// The list of forwarding profiles.  This is actually implemented as a
-  /// linked list of TAO_MProfile objects.
-  TAO_MProfile *forward_profiles_;
-
-  /// This is the profile that we are currently sending/receiving with.
-  TAO_Profile *profile_in_use_;
-
-  /// Mutex to protect access to the forwarding profile.
-  ACE_Lock* profile_lock_ptr_;
-
-  /// Have we successfully talked to the forward profile yet?
-  size_t profile_success_;
-
-  /// Mutex to protect reference count.
-  TAO_SYNCH_MUTEX refcount_lock_;
-
-  /// Number of outstanding references to this object.
-  CORBA::ULong refcount_;
-
-  /// The policy overrides in this object, if nil then use the default
-  /// policies.
-  TAO_Policy_Set *policies_;
-
-  /**
-   * The ior info. This is needed for GIOP 1.2, as the clients could
-   * receive an exception from the server asking for this info.  The
-   * exception that the client receives is LOC_NEEDS_ADDRESSING_MODE.
-   * The data is set up here to be passed on to Invocation classes
-   * when they receive an exception. This info is for the base
-   * profiles that this class stores
-   */
-  IOP::IOR *ior_info_;
-
-  /// Forwarded IOR info
-  IOP::IOR *forwarded_ior_info_;
-
-  /// TRUE if we want to take advantage of collocation optimization in
-  /// this ORB.
-  /**
-   * This should be the same value as cached in the ORB_Core. The
-   * reason for caching this helps our generated code, notably the
-   * stubs to be decoubled from ORB_Core. Please do not move it away.
-   */
-  const CORBA::Boolean collocation_opt_;
-};
-
-// Define a TAO_Stub auto_ptr class.
-/**
- * @class TAO_Stub_Auto_Ptr
- *
- * @brief Implements the draft C++ standard auto_ptr abstraction.
- * This class allows one to work Stub Objects *Only*!
- */
-class TAO_Export TAO_Stub_Auto_Ptr
-{
-public:
-  // = Initialization and termination methods.
-  /* explicit */ TAO_Stub_Auto_Ptr (TAO_Stub *p = 0);
-  TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap);
-  TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs);
-  ~TAO_Stub_Auto_Ptr (void);
-
-  // = Accessor methods.
-  TAO_Stub &operator *() const;
-  TAO_Stub *get (void) const;
-  TAO_Stub *release (void);
-  void reset (TAO_Stub *p = 0);
-  TAO_Stub *operator-> () const;
-
-protected:
-  TAO_Stub *p_;
-
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Stub.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STUB_H */
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
deleted file mode 100644
index b18c71d5428..00000000000
--- a/TAO/tao/Stub.i
+++ /dev/null
@@ -1,327 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE void
-TAO_Stub::reset_base (void)
-{
-  this->base_profiles_.rewind ();
-  this->profile_success_ = 0;
-
-  this->set_profile_in_use_i (base_profiles_.get_next ());
-}
-
-
-ACE_INLINE ACE_Lock*
-TAO_Stub::profile_lock (void) const
-{
-  return this->profile_lock_ptr_;
-}
-
-ACE_INLINE void
-TAO_Stub::reset_forward (void)
-{
-  while (this->forward_profiles_ != 0)
-    this->forward_back_one ();
-}
-
-ACE_INLINE void
-TAO_Stub::reset_profiles_i (void)
-{
-  this->reset_forward ();
-  this->reset_base ();
-}
-
-ACE_INLINE void
-TAO_Stub::reset_profiles (void)
-{
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-  this->reset_profiles_i ();
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::profile_in_use (void)
-{
-  return this->profile_in_use_;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Stub::make_profiles (void)
-{
-  TAO_MProfile *mp = 0;
-
-  ACE_NEW_RETURN (mp,
-                  TAO_MProfile (base_profiles_),
-                  0);
-
-  return mp;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_forward_profile (void)
-{
-  TAO_Profile *pfile_next = 0;
-
-  while (this->forward_profiles_
-         && (pfile_next = this->forward_profiles_->get_next ()) == 0)
-    // that was the last profile.  Now we clean up our forward profiles.
-    // since we own the forward MProfiles, we must delete them when done.
-    this->forward_back_one ();
-
-  return pfile_next;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile_i (void)
-{
-
-  TAO_Profile *pfile_next = 0;
-  if (this->forward_profiles_)
-    {
-      pfile_next = this->next_forward_profile ();
-      if (pfile_next == 0)
-        pfile_next = this->base_profiles_.get_next ();
-    }
-  else
-    pfile_next = this->base_profiles_.get_next ();
-
-  if (pfile_next == 0)
-    this->reset_base ();
-  else
-    this->set_profile_in_use_i (pfile_next);
-
-  return pfile_next;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::next_profile (void)
-{
-
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-  return this->next_profile_i ();
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::valid_forward_profile (void)
-{
-  return (this->profile_success_ && this->forward_profiles_);
-}
-
-ACE_INLINE void
-TAO_Stub::set_valid_profile (void)
-{
-  this->profile_success_ = 1;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::valid_profile (void)
-{
-  return (CORBA::Boolean) this->profile_success_;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_Stub::base_profiles (const TAO_MProfile &mprofiles)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-
-  // first reset things so we start from scratch!
-  this->reset_forward ();
-  this->base_profiles_.set (mprofiles);
-  this->reset_base ();
-  return this->profile_in_use_;
-
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::next_profile_retry (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
-
-  if (this->profile_success_ && this->forward_profiles_)
-    {
-      this->reset_profiles_i ();
-      return 1;
-    }
-  else if (this->next_profile_i ())
-    {
-      return 1;
-    }
-
-  return 0;
-#if 0
-  else
-    {
-      // Check whether the loaded services have something to say about
-      // this condition
-      TAO_Profile *prof = 0;
-      this->orb_core_->service_profile_reselection (this,
-                                                    prof);
-
-      // If the service is loaded and has a profile then try it.
-      if (prof)
-        {
-          return 1;
-        }
-      this->reset_profiles_i ();
-      return 0;
-    }
-#endif /*If 0 */
-}
-
-ACE_INLINE const TAO_MProfile&
-TAO_Stub::base_profiles (void) const
-{
-  return this->base_profiles_;
-}
-
-ACE_INLINE TAO_MProfile&
-TAO_Stub::base_profiles (void)
-{
-  return this->base_profiles_;
-}
-
-ACE_INLINE const TAO_MProfile *
-TAO_Stub::forward_profiles (void) const
-{
-  return this->forward_profiles_;
-}
-
-ACE_INLINE TAO_ORB_Core*
-TAO_Stub::orb_core (void) const
-{
-  return this->orb_core_.get ();
-}
-
-ACE_INLINE CORBA::ORB_var &
-TAO_Stub::servant_orb_var (void)
-{
-  // Simply pass back the ORB pointer for temporary use.
-  return this->servant_orb_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-TAO_Stub::servant_orb_ptr (void)
-{
-  // Simply pass back the ORB pointer for temporary use.
-  return CORBA::ORB::_duplicate (this->servant_orb_.in ());
-}
-
-ACE_INLINE void
-TAO_Stub::servant_orb (CORBA::ORB_ptr orb)
-{
-  this->servant_orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-ACE_INLINE TAO_SYNCH_MUTEX &
-TAO_Stub::refcount_lock (void)
-{
-  return this->refcount_lock_;
-}
-
-ACE_INLINE CORBA::ULong &
-TAO_Stub::refcount (void)
-{
-  return this->refcount_;
-}
-
-ACE_INLINE void
-TAO_Stub::destroy (void)
-{
-  // The reference count better be zero at this point!
-  delete this;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Stub::optimize_collocation_objects (void) const
-{
-  return this->collocation_opt_;
-}
-
-// ---------------------------------------------------------------
-
-// Creator methods for TAO_Stub_Auto_Ptr (TAO_Stub Auto Pointer)
-ACE_INLINE
-TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub *p)
-  : p_ (p)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr");
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::get (void) const
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::get");
-  return this->p_;
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::release (void)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::release");
-  TAO_Stub *old = this->p_;
-  this->p_ = 0;
-  return old;
-}
-
-ACE_INLINE void
-TAO_Stub_Auto_Ptr::reset (TAO_Stub *p)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::reset");
-  if (this->get () != p && this->get () != 0)
-    this->get ()->_decr_refcnt ();
-  this->p_ = p;
-}
-
-ACE_INLINE TAO_Stub *
-TAO_Stub_Auto_Ptr::operator-> () const
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator->");
-  return this->get ();
-}
-
-ACE_INLINE
-TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &rhs)
-  : p_ (rhs.release ())
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr");
-}
-
-ACE_INLINE TAO_Stub_Auto_Ptr &
-TAO_Stub_Auto_Ptr::operator= (TAO_Stub_Auto_Ptr &rhs)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator=");
-  if (this != &rhs)
-    {
-      this->reset (rhs.release ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void)
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr");
-  if (this->get() != 0)
-    this->get ()->_decr_refcnt ();
-}
-
-// Accessor methods to the underlying Stub Object
-
-ACE_INLINE TAO_Stub &
-TAO_Stub_Auto_Ptr::operator *() const
-{
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator *()");
-  // @@ Potential problem if this->p_ is zero!
-  return *this->get ();
-}
diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp
deleted file mode 100644
index 564138e1fab..00000000000
--- a/TAO/tao/Stub_Factory.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-#include "Stub_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           TAO_Stub_Factory, 
-           "$Id$")
-
-TAO_Stub_Factory::~TAO_Stub_Factory (void)
-{
-  // No-Op.
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Stub_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Stub_Factory>
-
-#endif
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
deleted file mode 100644
index 4effc5450ac..00000000000
--- a/TAO/tao/Stub_Factory.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Stub_Factory.h
- *
- *  $Id$
- *
- *   Defines the a factory interface for creating Stubs.
- *   This class creates the default stub, that is used in
- *   plain CORBA.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STUB_FACTORY_H_
-#define TAO_STUB_FACTORY_H_
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#include "tao/TAO_Export.h"
-
-// Forward references
-class TAO_MProfile;
-class TAO_ORB_Core;
-class TAO_Stub;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-/**
- * @class TAO_Stub_Factory
- *
- * This class is a factory whose product is the plain TAO_Stub used by
- * TAO. Its subclasses build Stub object that are specialization of
- * the TAO_Stub. As an example TAO_RT_Stub_Factory creates
- * RT_TAO_Stub. This factory, or one of its subclasses is dynamically
- * plugged into the ORB_Core, and is used by the ORB_Core to create
- * Stub Objects.
- */
-class TAO_Export TAO_Stub_Factory : public ACE_Service_Object
-{
-public:
-  // -- Ctor/Dtor --
-  virtual ~TAO_Stub_Factory (void);
-
-  /// Creates a Stub Object.
-  virtual TAO_Stub *create_stub (const char *repository_id,
-                                 const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_STUB_FACTORY_H_ */
diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp
deleted file mode 100644
index 4ef50337355..00000000000
--- a/TAO/tao/Sync_Strategies.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// $Id$
-
-#include "Sync_Strategies.h"
-#include "Buffering_Constraint_Policy.h"
-#include "Stub.h"
-#include "debug.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_sys_time.h"
-
-ACE_RCSID (tao,
-           Sync_Strategies,
-           "$Id$")
-
-TAO_Sync_Strategy::~TAO_Sync_Strategy (void)
-{
-}
-
-// ****************************************************************
-
-int
-TAO_Transport_Sync_Strategy::must_queue (int)
-{
-  return 0;
-}
-
-int
-TAO_Transport_Sync_Strategy::buffering_constraints_reached (
-  TAO_Stub *,
-  size_t ,
-  size_t ,
-  int &must_flush,
-  const ACE_Time_Value &,
-  int &set_timer,
-  ACE_Time_Value &)
-{
-  set_timer = 0;
-  must_flush = 1;
-  return 1;
-}
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-// ****************************************************************
-
-int
-TAO_Eager_Buffering_Sync_Strategy::must_queue (int)
-{
-  return 1;
-}
-
-int
-TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (
-  TAO_Stub *stub,
-  size_t msg_count,
-  size_t total_bytes,
-  int &must_flush,
-  const ACE_Time_Value &current_deadline,
-  int &set_timer,
-  ACE_Time_Value &new_deadline)
-{
-  must_flush = 0;
-  set_timer = 0;
-
-  TAO_Buffering_Constraint_Policy *buffering_constraint_policy = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Policy_var bcp_policy =
-        stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TAO::BufferingConstraintPolicy_var bcp =
-        TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      buffering_constraint_policy =
-        dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcp.in ());
-
-      if (buffering_constraint_policy == 0)
-        {
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  TAO::BufferingConstraint buffering_constraint;
-  buffering_constraint_policy->get_buffering_constraint (buffering_constraint);
-
-  if (buffering_constraint.mode == TAO::BUFFER_FLUSH)
-    {
-      must_flush = 1;
-      return 1;
-    }
-
-  int constraints_reached = 0;
-
-  if (ACE_BIT_ENABLED (buffering_constraint.mode,
-                       TAO::BUFFER_MESSAGE_COUNT)
-      && msg_count >= buffering_constraint.message_count)
-    {
-      constraints_reached = 1;
-    }
-
-  if (ACE_BIT_ENABLED (buffering_constraint.mode,
-                       TAO::BUFFER_MESSAGE_BYTES)
-      && total_bytes >= buffering_constraint.message_bytes)
-    {
-      constraints_reached = 1;
-    }
-
-  if (this->timer_check (buffering_constraint,
-                         current_deadline,
-                         set_timer,
-                         new_deadline) != 0)
-    {
-      constraints_reached = 1;
-    }
-
-  return constraints_reached;
-}
-
-int
-TAO_Eager_Buffering_Sync_Strategy::timer_check (
-  const TAO::BufferingConstraint &buffering_constraint,
-  const ACE_Time_Value &current_deadline,
-  int &set_timer,
-  ACE_Time_Value &new_deadline)
-{
-  set_timer = 0;
-
-  if (!ACE_BIT_ENABLED (buffering_constraint.mode,
-                        TAO::BUFFER_TIMEOUT))
-    {
-      return 0;
-    }
-
-  // Compute the next deadline...
-  ACE_Time_Value now = ACE_OS::gettimeofday ();
-  ACE_Time_Value timeout =
-    this->time_conversion (buffering_constraint.timeout);
-  new_deadline = now + timeout;
-
-  // Check if the new deadline is more stringent, or if the deadline
-  // has expired and thus must be reset anyway.
-  if (current_deadline > new_deadline
-      || current_deadline < now)
-    {
-      set_timer = 1;
-    }
-
-  // ... if there is no deadline we don't want to schedule output (the
-  // deadline will be set because set_timer is set to 1 in that case).
-  // If there is a deadline but but it has not been reached, we
-  // don't want to schedule any output either...
-  if (current_deadline == ACE_Time_Value::zero
-      || current_deadline >= now)
-    {
-      return 0;
-    }
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - TAO_Eager_Buffering_Sync_Strategy::timer_check, "
-                  "Now = %u, Current = %u, New = %u\n",
-                  now.msec (), current_deadline.msec (),
-                  new_deadline.msec ()));
-    }
-
-  return 1;
-}
-
-ACE_Time_Value
-TAO_Eager_Buffering_Sync_Strategy::time_conversion (
-  const TimeBase::TimeT &time)
-{
-  TimeBase::TimeT seconds = time / 10000000u;
-  TimeBase::TimeT microseconds = (time % 10000000u) / 10;
-  return ACE_Time_Value (ACE_U64_TO_U32 (seconds),
-                         ACE_U64_TO_U32 (microseconds));
-}
-
-// ****************************************************************
-
-int
-TAO_Delayed_Buffering_Sync_Strategy::must_queue (int queue_empty)
-{
-  // If the queue is empty we want to send immediately
-  return !queue_empty;
-}
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h
deleted file mode 100644
index da20530bb0a..00000000000
--- a/TAO/tao/Sync_Strategies.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sync_Strategies.h
- *
- *  $Id$
- *
- *   Sync Strategies for the ORB Messaging layer.
- *
- *
- *  @author  Irfan Pyarali
- */
-//=============================================================================
-
-
-#ifndef TAO_SYNC_STRATEGIES_H
-#define TAO_SYNC_STRATEGIES_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-#include "tao/Basic_Types.h"
-
-class TAO_Stub;
-class ACE_Time_Value;
-
-namespace TAO
-{
-  struct BufferingConstraint;
-}
-
-namespace TimeBase
-{
-  typedef CORBA::ULongLong TimeT;
-}
-
-/// Define the interface for the Queueing Strategy
-/**
- * The low-level I/O components in the ORB use this strategy to
- * determine when messages must be queued, immediately sent or
- * flushed.
- *
- * The strategy isolates this low-level components from the higher
- * level strategies used by the application developer.
- *
- * @todo The class name (Sync_Strategy) is inherited from the policies
- * (SyncScopePolicy), but Queueing_Strategy probably captures its
- * intent better.  It should be changed in a future revision of the
- * ORB.
- */
-class TAO_Export TAO_Sync_Strategy
-{
-public:
-  /// Destructor
-  virtual ~TAO_Sync_Strategy (void);
-
-  /// Return 1 if a message must be queued
-  virtual int must_queue (int queue_empty) = 0;
-
-  /// Return 1 if it is time to start
-  /**
-   * @param stub The object used to make the request, this is used to
-   *        obtain the policies currently in effect for the request
-   * @param msg_count The number of messages currently queued
-   * @param total_bytes Number of bytes currently queued
-   * @param set_timer Returns 1 if a timer should be set to drain the
-   *        queue
-   * @param interval If set_timer returns 1, this parameter contains
-   *        the timer interval
-   */
-  virtual int buffering_constraints_reached (
-    TAO_Stub *stub,
-    size_t msg_count,
-    size_t total_bytes,
-    int &must_flush,
-    const ACE_Time_Value &current_deadline,
-    int &set_timer,
-    ACE_Time_Value &interval) = 0;
-};
-
-class TAO_Export TAO_Transport_Sync_Strategy : public TAO_Sync_Strategy
-{
-public:
-  virtual int must_queue (int queue_empty);
-
-  virtual int buffering_constraints_reached (
-    TAO_Stub *stub,
-    size_t msg_count,
-    size_t total_bytes,
-    int &must_flush,
-    const ACE_Time_Value &current_deadline,
-    int &set_timer,
-   ACE_Time_Value &interval);
-};
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-class TAO_Export TAO_Eager_Buffering_Sync_Strategy : public TAO_Sync_Strategy
-{
-public:
-  virtual int must_queue (int queue_empty);
-
-  virtual int buffering_constraints_reached (
-    TAO_Stub *stub,
-    size_t msg_count,
-    size_t total_bytes,
-    int &must_flush,
-    const ACE_Time_Value &current_deadline,
-    int &set_timer,
-    ACE_Time_Value &new_deadline);
-
-private:
-  /// Check if the buffering constraint includes any timeouts and
-  /// compute the right timeout interval if needed.
-  /**
-   * @param buffering_constraint The constraints defined by the
-   *        application
-   * @param current_deadline The current deadline
-   * @param set_timer Return 1 if the timer should be set
-   * @param new_deadline Return the timer interval value
-   *
-   * @return Returns 1 if the deadline has already expired and
-   *         flushing must commence immediately.  If the function
-   *         returns 0 then flushing may need to be delayed, use @c
-   *         set_timer and
-   *
-   */
-  int timer_check (const TAO::BufferingConstraint &buffering_constraint,
-                   const ACE_Time_Value &current_deadline,
-                   int &set_timer,
-                   ACE_Time_Value &new_deadline);
-
-  /// Convert from standard CORBA time units to seconds/microseconds.
-  ACE_Time_Value time_conversion (const TimeBase::TimeT &time);
-};
-
-/// Delay the buffering decision until the transport blocks
-/**
- * If the queue is empty the transport will try to send immediately.
- */
-class TAO_Export TAO_Delayed_Buffering_Sync_Strategy
-  : public TAO_Eager_Buffering_Sync_Strategy
-{
-public:
-  virtual int must_queue (int queue_empty);
-};
-
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SYNC_STRATEGIES_H */
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
deleted file mode 100644
index 6e3675e16ff..00000000000
--- a/TAO/tao/Synch_Invocation.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-// $Id$
-
-#include "Synch_Invocation.h"
-#include "Profile_Transport_Resolver.h"
-#include "Profile.h"
-#include "Synch_Reply_Dispatcher.h"
-#include "Transport.h"
-#include "Stub.h"
-#include "Bind_Dispatcher_Guard.h"
-#include "operation_details.h"
-#include "Wait_Strategy.h"
-#include "debug.h"
-#include "ORB_Constants.h"
-#include "Messaging_SyncScopeC.h"
-#include "ORB_Core.h"
-#include "Service_Context.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Countdown_Time.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Synch_Invocation.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Synch_Invocation,
-           "$Id$")
-
-
-namespace TAO
-{
-  Synch_Twoway_Invocation::Synch_Twoway_Invocation (
-    CORBA::Object_ptr otarget,
-    Profile_Transport_Resolver &resolver,
-    TAO_Operation_Details &detail,
-    bool response_expected)
-    : Remote_Invocation (otarget,
-                         resolver,
-                         detail,
-                         response_expected)
-  {
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time
-                                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    ACE_Countdown_Time countdown (max_wait_time);
-
-    TAO_Synch_Reply_Dispatcher rd (this->resolver_.stub ()->orb_core (),
-                                   this->details_.reply_service_info ());
-
-    TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-#if TAO_HAS_INTERCEPTORS == 1
-    // Start the interception point here..
-    s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-    // We have started the interception flow. We need to call the
-    // ending interception flow if things go wrong. The purpose of the
-    // try block is to do just this.
-    ACE_TRY
-      {
-        TAO_OutputCDR &cdr =
-          this->resolver_.transport ()->out_stream ();
-
-        this->write_header (tspec,
-                            cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (s);
-
-        this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (s);
-
-
-        // Register a reply dispatcher for this invocation. Use the
-        // preallocated reply dispatcher.
-        TAO_Bind_Dispatcher_Guard dispatch_guard (
-          this->details_.request_id (),
-          &rd,
-          this->resolver_.transport ()->tms ());
-
-        if (dispatch_guard.status () != 0)
-          {
-            // @@ What is the right way to handle this error? Why should
-            // we close the connection?
-            this->resolver_.transport ()->close_connection ();
-
-            ACE_THROW_RETURN (
-              CORBA::INTERNAL (
-                               0,
-                               CORBA::COMPLETED_NO),
-              s);
-          }
-
-        countdown.update ();
-
-        s = this->send_message (cdr,
-                                TAO_Transport::TAO_TWOWAY_REQUEST,
-                                max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-#if TAO_HAS_INTERCEPTORS == 1
-        // @@NOTE: Too much code repetition.
-        // If the above call returns a restart due to connection
-        // failure then call the receive_other interception point
-        // before we leave.
-        if (s == TAO_INVOKE_RESTART)
-          {
-            const Invocation_Status tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            if (tmp != TAO_INVOKE_SUCCESS)
-              s = tmp;
-          }
-#endif /*TAO_HAS_INTERCEPTORS */
-
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
-
-        countdown.update ();
-
-        // For some strategies one may want to release the transport
-        // back to  cache. If the idling is successfull let the
-        // resolver about that.
-        if (this->resolver_.transport ()->idle_after_send ())
-          this->resolver_.transport_released ();
-
-        // @@ In all MT environments, there's a cancellation point lurking
-        // here; need to investigate.  Client threads would frequently be
-        // canceled sometime during recv_request ... the correct action to
-        // take on being canceled is to issue a CancelRequest message to the
-        // server and then imediately let other client-side cancellation
-        // handlers do their jobs.
-        //
-        // In C++, that basically means to unwind the stack using almost
-        // normal procedures: all destructors should fire, and some "catch"
-        // blocks should probably be able to handle things like releasing
-        // pointers. (Without unwinding the C++ stack, resources that must
-        // be freed by thread cancellation won't be freed, and the process
-        // won't continue to function correctly.)  The tricky part is that
-        // according to POSIX, all C stack frames must also have their
-        // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
-        // environment.
-
-        s =
-          this->wait_for_reply (max_wait_time,
-                                rd,
-                                dispatch_guard
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-#if TAO_HAS_INTERCEPTORS == 1
-        if (s == TAO_INVOKE_RESTART)
-          {
-            Invocation_Status tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            // Push the latest values for the return..
-            if (tmp != TAO_INVOKE_SUCCESS)
-              s = tmp;
-          }
-#endif /*TAO_HAS_INTERCEPTORS */
-
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
-
-        // What happens when the above call returns an error through
-        // the return value? That would be bogus as per the contract
-        // in the interface. The call violated the contract
-
-        s = this->check_reply_status (rd
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // For some strategies one may want to release the transport
-        // back to  cache after receiving the reply.
-        if (this->resolver_.transport ()->idle_after_reply ())
-          this->resolver_.transport_released ();
-
-#if TAO_HAS_INTERCEPTORS == 1
-        Invocation_Status tmp = TAO_INVOKE_FAILURE;
-        if (s == TAO_INVOKE_RESTART)
-          {
-            tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        else if (s == TAO_INVOKE_SUCCESS)
-          {
-            tmp  =
-              this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        if (tmp != TAO_INVOKE_SUCCESS)
-          s = tmp;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-        if (s != TAO_INVOKE_SUCCESS)
-          return s;
-      }
-    ACE_CATCHANY
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        const PortableInterceptor::ReplyStatus status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (status == PortableInterceptor::LOCATION_FORWARD ||
-            status == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else if (status == PortableInterceptor::SYSTEM_EXCEPTION
-                 || status == PortableInterceptor::USER_EXCEPTION)
-#endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        const PortableInterceptor::ReplyStatus st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    return s;
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::wait_for_reply (ACE_Time_Value *max_wait_time,
-                                           TAO_Synch_Reply_Dispatcher &rd,
-                                           TAO_Bind_Dispatcher_Guard &bd
-                                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    /*
-     * Precondition: The call went to the remote
-     * peer. <ACE_Thread::self> is waiting for the reply.
-     *
-     * Postcondition: Any error during a wait is marked by raising an
-     * exception. Success alone is returned through the return value.
-     */
-
-    const int reply_error =
-      this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time,
-                                                            rd);
-    if (TAO_debug_level > 0 && max_wait_time != 0)
-      {
-        const CORBA::ULong msecs = max_wait_time->msec ();
-
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, "
-                    "timeout after recv is <%u> status <%d>\n",
-                    msecs,
-                    reply_error));
-      }
-
-    // Check the reply error.
-    if (reply_error == -1)
-      {
-        // Unbind the dispatcher, since its of no use at this point of
-        // time
-        if (TAO_debug_level > 3)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, "
-                        "recovering after an error \n"));
-          }
-
-        // You the smarty, don't try to moving the unbind_dispatcher
-        // () call since it looks like it is repeated twice. That
-        // could land you in trouble. If you don't believe this
-        // warning go ahead and try. Try running tests to see what is
-        // going on ;)
-        if (errno == ETIME)
-          {
-            // If the unbind succeeds then thrown an exception to the
-            // application, else just collect the reply and dispatch
-            // that to the application.
-            //
-            // NOTE: A fragile synchronization is provided when using
-            // the Muxed Transport strategy. We could infact be a
-            // follower thread getting timedout in the LF whereas the
-            // dispatching thread could be on the reply_dispatcher
-            // that we created. This would lead bad crashes. To get
-            // around that, the call to unbind_dispatcher () will wait
-            // on the lock on the Muxed_Transport_Strategy if
-            // dispatching has started. This is fragile.
-            if (bd.unbind_dispatcher () == 0)
-              {
-                // Just a timeout with completed_maybe, don't close
-                // the connection or  anything
-                ACE_THROW_RETURN (CORBA::TIMEOUT (
-                                    CORBA::SystemException::_tao_minor_code (
-                                      TAO_TIMEOUT_RECV_MINOR_CODE,
-                                      errno),
-                                    CORBA::COMPLETED_MAYBE),
-                                  TAO_INVOKE_FAILURE);
-              }
-          }
-        else
-          {
-            (void) bd.unbind_dispatcher ();
-            this->resolver_.transport ()->close_connection ();
-            this->resolver_.stub ()->reset_profiles ();
-
-            return
-              this->orb_core ()->service_raise_comm_failure (
-                this->details_.request_service_context ().service_info (),
-                this->resolver_.profile ()
-                ACE_ENV_ARG_PARAMETER);
-
-          }
-      }
-
-    return TAO_INVOKE_SUCCESS;
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd
-                                               ACE_ENV_ARG_DECL)
-  {
-    /*
-     * Precondition: We probably got a reply. <ACE_Thread::self> is
-     * checking the status of the reply
-     *
-     * Postcondition: Any error while reading the reply is marked by
-     * raising an exception. LOCATION_FORWARDED replies are marked by
-     * returning a restart since that is what needed to be done by the
-     * callee.
-     */
-    TAO_InputCDR &cdr =
-      rd.reply_cdr ();
-
-    // Set the translators
-    this->resolver_.transport ()->assign_translators (&cdr, 0);
-
-    // At this point it can be assumed that the GIOP/whatever protocol
-    // header and the reply header are already handled.  Further it
-    // can be assumed that the reply body contains the details
-    // required for further processing. All the other details should
-    // have been handled in the reply dispatcher/protocol framework.
-    switch (rd.reply_status ())
-      {
-      case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
-        {
-          Reply_Guard mon (this,
-                           TAO_INVOKE_FAILURE);
-          if (this->details_.demarshal_args (cdr) == false)
-            {
-              ACE_THROW_RETURN (CORBA::MARSHAL (),
-                                TAO_INVOKE_FAILURE);
-            }
-
-          mon.set_status (TAO_INVOKE_SUCCESS);
-        }
-        break;
-      case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
-        return this->location_forward (cdr
-                                       ACE_ENV_ARG_PARAMETER);
-      case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
-        return this->handle_user_exception (cdr
-                                            ACE_ENV_ARG_PARAMETER);
-      case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
-        return this->handle_system_exception (cdr
-                                              ACE_ENV_ARG_PARAMETER);
-
-      case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE:
-        {
-          Reply_Guard mon (this,
-                           TAO_INVOKE_FAILURE);
-          // We have received a message with a request to change the
-          // addressing mode. First let us read the mode that the
-          // server/agent asks for.
-          CORBA::Short addr_mode = 0;
-
-          if (cdr.read_short (addr_mode) == 0)
-            {
-              // Could not demarshal the addressing disposition, raise an local
-              // CORBA::MARSHAL
-            ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                              CORBA::COMPLETED_MAYBE),
-                              TAO_INVOKE_FAILURE);
-            }
-
-          // Now set this addressing mode in the profile, so that
-          // the next invocation need not go through this.
-          this->resolver_.profile ()->addressing_mode (addr_mode
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-          mon.set_status (TAO_INVOKE_RESTART);
-
-          // Now restart the invocation
-          return TAO_INVOKE_RESTART;
-        }
-    }
-    return TAO_INVOKE_SUCCESS;
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    Reply_Guard mon (this,
-                     TAO_INVOKE_FAILURE);
-
-    if (TAO_debug_level > 3)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::location_forward ")
-                    ACE_TEXT ("being handled \n")));
-      }
-
-    CORBA::Object_var fwd;
-
-    if ((inp_stream >> fwd) == 0)
-      {
-        ACE_THROW_RETURN (CORBA::MARSHAL (
-            CORBA::SystemException::_tao_minor_code (
-              TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-              errno),
-            CORBA::COMPLETED_NO),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    this->forwarded_reference (fwd.in ());
-
-    mon.set_status (TAO_INVOKE_RESTART);
-
-    return TAO_INVOKE_RESTART;
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr
-                                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    Reply_Guard mon (this,
-                     TAO_INVOKE_FAILURE);
-
-    if (TAO_debug_level > 3)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Synch_Twoway_Invocation::"
-                  "handle_user_exception \n"));
-
-    // Pull the exception from the stream.
-    CORBA::String_var buf;
-
-    if ((cdr >> buf.inout ()) == 0)
-      {
-        // Could not demarshal the exception id, raise an local
-        // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    CORBA::Exception *exception =
-      this->details_.corba_exception (buf.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    exception->_tao_decode (cdr
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (TAO_debug_level > 5)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::")
-                    ACE_TEXT ("handle_user_exception - ")
-                    ACE_TEXT ("raising exception %s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (buf.in ())));
-      }
-
-    mon.set_status (TAO_INVOKE_USER_EXCEPTION);
-
-#if defined (TAO_HAS_EXCEPTIONS)
-    // If we have native exceptions, we must manage the memory allocated
-    // by the call above to alloc(). Otherwise the Environment class
-    // manages the memory.
-    auto_ptr<CORBA::Exception> safety (exception);
-
-    // Direct throw because we don't have the ACE_TRY_ENV.
-    exception->_raise ();
-#else
-    // We can not use ACE_THROW here.
-    ACE_TRY_ENV.exception (exception);
-#endif
-
-    return TAO_INVOKE_USER_EXCEPTION;
-  }
-
-  Invocation_Status
-  Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr
-                                                    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    Reply_Guard mon (this, TAO_INVOKE_FAILURE);
-
-    if (TAO_debug_level > 3)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Synch_Twoway_Invocation::"
-                  "handle_system_exception \n"));
-
-    CORBA::String_var type_id;
-
-    if ((cdr >> type_id.inout ()) == 0)
-      {
-        // Could not demarshal the exception id, raise an local
-        // CORBA::MARSHAL
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    CORBA::ULong minor = 0;
-    CORBA::ULong completion = 0;
-
-    if ((cdr >> minor) == 0
-        || (cdr >> completion) == 0)
-      {
-        ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                          CORBA::COMPLETED_MAYBE),
-                          TAO_INVOKE_FAILURE);
-      }
-
-    // Special handling for non-fatal system exceptions.
-    //
-    // Note that we are careful to retain "at most once" semantics.
-    if ((ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/TRANSIENT:1.0")   == 0 ||
-         ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0 ||
-         ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/NO_RESPONSE:1.0") == 0 ||
-         ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0) &&
-        (CORBA::CompletionStatus) completion != CORBA::COMPLETED_YES)
-      {
-        {
-          // Start the special case for FTCORBA.
-          /**
-           * There has been a unanimous view that this is not the
-           * right way to do things. But a need to be compliant is
-           * forcing us into this.
-           */
-          const Invocation_Status s =
-            this->orb_core ()->service_raise_transient_failure (
-              this->details_.request_service_context ().service_info (),
-              this->resolver_.profile ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-          if (s == TAO_INVOKE_RESTART)
-            return s;
-        }
-
-        // Attempt profile retry.
-        /**
-         * @note A location forwarding loop may occur where a client
-         *       is bounced from the original target to the forwarded
-         *       target and back if the application is not equipped to
-         *       handle retries of previously called targets.  TAO may
-         *       be able to help in this case but it ultimately ends
-         *       up being an application issue.
-         */
-        if (this->resolver_.stub ()->next_profile_retry ())
-          {
-            return TAO_INVOKE_RESTART;
-          }
-
-        // Fall through and raise an exception.
-      }
-
-    CORBA::SystemException *ex =
-      TAO_Exceptions::create_system_exception (type_id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (ex == 0)
-      {
-        // @@ We should raise a CORBA::NO_MEMORY, but we ran out
-        //    of memory already. We need a pre-allocated, TSS,
-        //    CORBA::NO_MEMORY instance
-        ACE_NEW_RETURN (ex,
-                        CORBA::UNKNOWN,
-                        TAO_INVOKE_FAILURE);
-      }
-
-#if defined (TAO_HAS_EXCEPTIONS)
-    // Without this, the call to create_system_exception() above
-    // causes a memory leak. On platforms without native exceptions,
-    // the CORBA::Environment class manages the memory.
-    auto_ptr<CORBA::SystemException> safety (ex);
-#endif
-
-    ex->minor (minor);
-    ex->completed (CORBA::CompletionStatus (completion));
-
-    if (TAO_debug_level > 4)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Synch_Twoway_Invocation::"
-                  "handle_system_exception, about to raise\n"));
-
-    mon.set_status (TAO_INVOKE_SYSTEM_EXCEPTION);
-
-    // Raise the exception.
-    ACE_ENV_RAISE (ex);
-
-    return TAO_INVOKE_SYSTEM_EXCEPTION;
-  }
-
-  // =========================================================================
-
-  Synch_Oneway_Invocation::Synch_Oneway_Invocation (
-    CORBA::Object_ptr otarget,
-    Profile_Transport_Resolver &r,
-    TAO_Operation_Details &d)
-    : Synch_Twoway_Invocation (otarget, r, d, false)
-  {
-  }
-
-  Invocation_Status
-  Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time
-                                          ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::Exception))
-  {
-    ACE_Countdown_Time countdown (max_wait_time);
-
-    const CORBA::Octet response_flags =
-       this->details_.response_flags ();
-
-    Invocation_Status s = TAO_INVOKE_FAILURE;
-
-    if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER) ||
-        response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
-      {
-        s = Synch_Twoway_Invocation::remote_twoway (max_wait_time
-                                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-        return s;
-      }
-
-    TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-#if TAO_HAS_INTERCEPTORS == 1
-    s = this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    if (s != TAO_INVOKE_SUCCESS)
-      return s;
-#endif /*TAO_HAS_INTERCEPTORS */
-
-    TAO_Transport* transport =
-      this->resolver_.transport ();
-
-    TAO_OutputCDR &cdr =
-      transport->out_stream ();
-
-    ACE_TRY
-      {
-        this->write_header (tspec,
-                            cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        countdown.update ();
-
-        if (transport->is_connected())
-          {
-            // We have a connected transport so we can send the message
-            s = this->send_message (cdr,
-                                    TAO_Transport::TAO_ONEWAY_REQUEST,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        else
-          {
-            if (TAO_debug_level > 4)
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Synch_Oneway_Invocation::"
-                          "remote_oneway, queueing message\n"));
-
-            if (transport->format_queue_message (cdr) != 0)
-              s = TAO_INVOKE_FAILURE;
-          }
-
-#if TAO_HAS_INTERCEPTORS == 1
-        s =
-          this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-#endif /*TAO_HAS_INTERCEPTORS */
-      }
-    ACE_CATCHANY
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (status == PortableInterceptor::LOCATION_FORWARD ||
-            status == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else if (status == PortableInterceptor::SYSTEM_EXCEPTION
-            || status == PortableInterceptor::USER_EXCEPTION)
-#endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
-
-    return s;
-  }
-}
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
deleted file mode 100644
index 4f47a01e192..00000000000
--- a/TAO/tao/Synch_Invocation.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// -*- C++ -*-
-//
-//=============================================================================
-/**
- *  @file    Synch_Invocation.h
- *
- *  $Id$
- *
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_SYNCH_INVOCATION_H
-#define TAO_SYNCH_INVOCATION_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Remote_Invocation.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-
-class TAO_Operation_Details;
-class TAO_Synch_Reply_Dispatcher;
-class TAO_InputCDR;
-class ACE_Time_Value;
-class TAO_Bind_Dispatcher_Guard;
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-
-  /**
-   * @class Synch_Twoway_Invocation
-   *
-   * @brief All the action for a synchronous twoway invocation happen
-   * here.
-   *
-   * An object of this is type is created by TAO::Invocation_Adapter
-   * and invokes a method on this class. The method takes care of
-   * creating and sending a request, waiting for a reply and
-   * demarshalling the reply for the client.
-   *
-   */
-  class TAO_Export Synch_Twoway_Invocation : public Remote_Invocation
-  {
-  public:
-    /// Constructor used by TAO::Invocation_Adapter
-    /**
-     * @param otarget The original target on which this invocation
-     * was started. This is there to be passed up to its parent
-     * class.
-     *
-     * @param resolver The profile and transport holder.
-     *
-     * @param detail Operation details of the invocation on the target
-     *
-     * @param response_expected Flag to indicate whether the
-     * operation encapsulated by @a op returns a response or not.
-     */
-    Synch_Twoway_Invocation (CORBA::Object_ptr otarget,
-                             Profile_Transport_Resolver &resolver,
-                             TAO_Operation_Details &detail,
-                             bool response_expected = true);
-
-    /// Method used by the adapter to kickstart an invocation to the
-    /// remote object.
-    /**
-     * There is a exception declaration in this method which ensures
-     * that the exceptions propogated by the remote objects are
-     * converted a CORBA exceptions for the clients. This method does
-     * a bunch of things necessary to create and send the
-     * invocation. This method is also nerve centre for the
-     * interceptor invocation points.
-     */
-    Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-  protected:
-
-    /**
-     * This method is selectively made virtual, so that inherited
-     * classes can overload the  user exception handling type. For
-     * example the DII needs a totally different method of
-     * user exception exception handling
-     */
-    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr
-                                                     ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::Exception));
-
-    /// Helper method used to handle location forwarded replies.
-    Invocation_Status location_forward (TAO_InputCDR &cdr
-                                        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Helper method used to handle system exceptions from the remote
-    /// objects.
-    Invocation_Status handle_system_exception (TAO_InputCDR &cdr
-                                               ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// As the name suggests waits for a reply from the remote ORB.
-    /**
-     * This method returns an exception when there is an error.
-     */
-    Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time,
-                                      TAO_Synch_Reply_Dispatcher &rd,
-                                      TAO_Bind_Dispatcher_Guard &bd
-                                      ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-
-    /// Helper method that checks the reply status of the
-    /// replies and takes appropriate action.
-    /**
-     * This method returns an exception when there is an error.
-     */
-    Invocation_Status check_reply_status (
-        TAO_Synch_Reply_Dispatcher &rd
-        ACE_ENV_ARG_DECL);
-
-  };
-
-  /**
-   * @class Synch_Oneway_Invocation
-   *
-   * @brief All the action for a synchronous oneway invocation happen
-   * here.
-   *
-   * This class inherits from twoway invocation for the following
-   * reasons
-   *
-   * - We deal with oneway invocation in more or less the same way as
-   *   two but for waiting for the reply
-   *
-   * - For some SYNC_SCOPE policies namely SYNC_WITH_TARGET and
-   *   SYNC_WITH_SERVER the invocation classes have to treat the
-   *   invocation as a twoway invocation (more or less)
-   *
-   */
-  class TAO_Export Synch_Oneway_Invocation
-    : public Synch_Twoway_Invocation
-  {
-  public:
-    /// Constructor used by TAO::Invocation_Adapter
-    /**
-     * @param otarget The original target on which this invocation
-     * was started. This is there to be passed up to its parent
-     * class.
-     *
-     * @param resolver The profile and transport holder.
-     *
-     * @param detail Operation details of the invocation on the target
-     */
-    Synch_Oneway_Invocation (CORBA::Object_ptr otarget,
-                             Profile_Transport_Resolver &resolver,
-                             TAO_Operation_Details &detail);
-
-    /// Method used by the adapter to kickstart an oneway invocation
-    /// to the remote object.
-    Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::Exception));
-  };
-
-  /**
-   * @class Reply_Guard
-   *
-   * @brief A guard class used for storing and forwarding the reply
-   *  status to the portable interceptors.
-   */
-  class TAO_Export Reply_Guard
-  {
-  public:
-    Reply_Guard (Invocation_Base *s,
-                 Invocation_Status is);
-
-    /// The destructor calls Invocation_Base::reply_received with the
-    /// right reply status, which is useful for PI's.
-    ~Reply_Guard (void);
-
-    /// Mutator to set the invocation status.
-    void set_status (Invocation_Status s);
-
-  private:
-    Invocation_Base *invocation_;
-    Invocation_Status status_;
-  };
-
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/Synch_Invocation.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_SYNCH_INVOCATION_H*/
diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl
deleted file mode 100644
index ccf61f981f2..00000000000
--- a/TAO/tao/Synch_Invocation.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-// $Id$
-namespace TAO
-{
-  ACE_INLINE
-  Reply_Guard::Reply_Guard (Invocation_Base *b,
-                            Invocation_Status s)
-    : invocation_ (b)
-    , status_ (s)
-  {
-  }
-
-  ACE_INLINE
-  Reply_Guard::~Reply_Guard (void)
-  {
-    this->invocation_->reply_received (this->status_);
-  }
-
-  ACE_INLINE void
-  Reply_Guard::set_status (Invocation_Status s)
-  {
-    this->status_ = s;
-  }
-}
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
deleted file mode 100644
index b024fffc314..00000000000
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// "$Id$"
-
-#include "Synch_Queued_Message.h"
-#include "debug.h"
-
-#include "ace/Malloc_T.h"
-#include "ace/Message_Block.h"
-
-ACE_RCSID (tao,
-           Synch_Queued_Message,
-           "$Id$")
-
-TAO_Synch_Queued_Message::
-    TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
-                              ACE_Allocator *alloc,
-                              int is_heap_allocated)
-  : TAO_Queued_Message (alloc, is_heap_allocated)
-  , contents_ (const_cast<ACE_Message_Block*> (contents))
-  , current_block_ (contents_)
-{
-}
-
-TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void)
-{
-
-}
-
-const ACE_Message_Block *
-TAO_Synch_Queued_Message::current_block (void) const
-{
-  return this->current_block_;
-}
-
-size_t
-TAO_Synch_Queued_Message::message_length (void) const
-{
-  if (this->current_block_ == 0)
-    {
-      return 0;
-    }
-
-  return this->current_block_->total_length ();
-}
-
-int
-TAO_Synch_Queued_Message::all_data_sent (void) const
-{
-  return this->current_block_ == 0;
-}
-
-void
-TAO_Synch_Queued_Message::fill_iov (int iovcnt_max,
-                                    int &iovcnt,
-                                    iovec iov[]) const
-{
-  ACE_ASSERT (iovcnt_max > iovcnt);
-
-  for (const ACE_Message_Block *message_block = this->current_block_;
-       message_block != 0 && iovcnt < iovcnt_max;
-       message_block = message_block->cont ())
-    {
-      size_t message_block_length = message_block->length ();
-
-      // Check if this block has any data to be sent.
-      if (message_block_length > 0)
-        {
-              // Collect the data in the iovec.
-          iov[iovcnt].iov_base = message_block->rd_ptr ();
-          iov[iovcnt].iov_len  = static_cast<u_long> (message_block_length);
-
-          // Increment iovec counter.
-          ++iovcnt;
-        }
-    }
-}
-
-void
-TAO_Synch_Queued_Message::bytes_transferred (size_t &byte_count)
-{
-  this->state_changed_i (TAO_LF_Event::LFS_ACTIVE);
-
-  while (this->current_block_ != 0 && byte_count > 0)
-    {
-      size_t l = this->current_block_->length ();
-
-      if (byte_count < l)
-        {
-          this->current_block_->rd_ptr (byte_count);
-          byte_count = 0;
-          return;
-        }
-
-      byte_count -= l;
-      this->current_block_->rd_ptr (l);
-      this->current_block_ = this->current_block_->cont ();
-
-      while (this->current_block_ != 0
-             && this->current_block_->length () == 0)
-        {
-          this->current_block_ = this->current_block_->cont ();
-        }
-    }
-
-  if (this->current_block_ == 0)
-    {
-      this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-    }
-}
-
-TAO_Queued_Message *
-TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
-{
-  TAO_Synch_Queued_Message *qm = 0;
-
-  // Clone the message block.
-  // NOTE: We wantedly do the cloning from <current_block_> instead of
-  // starting from <contents_> since we dont want to clone blocks that
-  // have already been sent on the wire. Waste of memory and
-  // associated copying.
-  ACE_Message_Block *mb = this->current_block_->clone ();
-
-  if (alloc)
-    {
-      ACE_NEW_MALLOC_RETURN (qm,
-                             static_cast<TAO_Synch_Queued_Message *> (
-                               alloc->malloc (sizeof (TAO_Synch_Queued_Message))),
-                             TAO_Synch_Queued_Message (mb,
-                                                       alloc),
-                             0);
-    }
-  else
-    {
-      // No allocator, so use the common heap!
-      if (TAO_debug_level == 4)
-        {
-          // This debug is for testing purposes!
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Synch_Queued_Message::clone\n"
-                      "Using global pool for allocation \n"));
-        }
-
-      ACE_NEW_RETURN (qm,
-                      TAO_Synch_Queued_Message (mb),
-                      0);
-    }
-
-  // Set the flag to indicate that <qm> is created on the heap.
-  if (qm)
-    {
-      qm->is_heap_created_ = 1;
-    }
-
-  return qm;
-}
-
-void
-TAO_Synch_Queued_Message::destroy (void)
-{
-  if (this->is_heap_created_)
-    {
-      ACE_Message_Block::release (this->contents_);
-      this->current_block_ = 0;
-
-      // If we have an allocator release the memory to the allocator
-      // pool.
-      if (this->allocator_)
-        {
-          ACE_DES_FREE (this,
-                        this->allocator_->free,
-                        TAO_Synch_Queued_Message);
-
-        }
-      else // global release..
-        {
-          delete this;
-        }
-    }
-}
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
deleted file mode 100644
index 928883487be..00000000000
--- a/TAO/tao/Synch_Queued_Message.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Synch_Queued_Message.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYNCH_QUEUED_MESSAGE_H
-#define TAO_SYNCH_QUEUED_MESSAGE_H
-
-#include /**/ "ace/pre.h"
-
-#include "Queued_Message.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Synch_Queued_Message
- *
- * @brief Specialize TAO_Queued_Message for synchronous requests,
- *        i.e. twoways and oneways sent with reliability better than
- *        SYNC_NONE.
- *
- * Reliable requests block the sending thread until the message is
- * sent, likewise, the sending thread must be informed if the
- * connection is closed or the message times out.
- *
- * In contrast oneway (and AMI) requests sent with the SYNC_NONE
- * policy are simple discarded if the connection fails or they
- * timeout.
- *
- * Another important difference is the management of the data buffer:
- * one SYNC_NONE messages the buffer is immediately copied into a
- * newly allocated buffer, and must be deallocated.  Other types of
- * requests use the memory allocated by the sending thread.
- *
- */
-class TAO_Export TAO_Synch_Queued_Message : public TAO_Queued_Message
-{
-public:
-  /// Constructor
-  /**
-   * @param contents The message block chain that must be sent.
-   *
-   * @param alloc The allocator that is used to allocate objects of
-   *        this type.
-   */
-  TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
-                            ACE_Allocator *alloc = 0,
-                            int is_heap_allocated = 0);
-
-  /// Destructor
-  virtual ~TAO_Synch_Queued_Message (void);
-
-  const ACE_Message_Block *current_block (void) const;
-
-  /** Implement the Template Methods from TAO_Queued_Message
-   */
-  //@{
-  virtual size_t message_length (void) const;
-  virtual int all_data_sent (void) const;
-  virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const;
-  virtual void bytes_transferred (size_t &byte_count);
-  virtual TAO_Queued_Message *clone (ACE_Allocator *alloc);
-  virtual void destroy (void);
-  //@}
-
-private:
-  /// The contents of the message.
-  /**
-   * The message is normally generated by a TAO_OutputCDR stream.  The
-   * application marshals the payload, possibly generating a chain of
-   * message block connected via the 'cont()' field.
-   */
-  ACE_Message_Block *contents_;
-
-  /// The current message block
-  /**
-   * The message may be set in multiple writev() operations.  This
-   * point keeps track of the next message to send out.
-   */
-  ACE_Message_Block *current_block_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Synch_Refcountable.cpp b/TAO/tao/Synch_Refcountable.cpp
deleted file mode 100644
index 206106d7930..00000000000
--- a/TAO/tao/Synch_Refcountable.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "Synch_Refcountable.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           Synch_Refcountable,
-           "$Id$")
-
-TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock,
-                                                int refcount)
-  : ACE_Refcountable (refcount)
-  , refcount_lock_ (lock)
-{
-}
-
-TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void)
-{
-  ACE_ASSERT (this->refcount_ == 0);
-  delete this->refcount_lock_;
-}
diff --git a/TAO/tao/Synch_Refcountable.h b/TAO/tao/Synch_Refcountable.h
deleted file mode 100644
index d66b5bb20fb..00000000000
--- a/TAO/tao/Synch_Refcountable.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// This may look like C, but it's really
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Synch_Refcountable.h
- *
- *  $Id$
- *
- *  Definition for a synchronised refcountable interface.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYNCH_REFCOUNTABLE_H
-#define TAO_SYNCH_REFCOUNTABLE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Refcountable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "TAO_Export.h"
-
-class ACE_Lock;
-
-/**
- * @class TAO_Synch_Refcountable
- *
- * @brief Definition for a synchronised refcountable interface.
- */
-class TAO_Export TAO_Synch_Refcountable : private ACE_Refcountable
-{
-public:
-  virtual ~TAO_Synch_Refcountable (void);
-
-  int increment (void);
-  int decrement (void);
-
-  int refcount (void) const;
-
-protected:
-  TAO_Synch_Refcountable (ACE_Lock *lock, int refcount);
-
-  ACE_Lock *refcount_lock_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "Synch_Refcountable.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_SYNCH_REFCOUNTABLE*/
diff --git a/TAO/tao/Synch_Refcountable.inl b/TAO/tao/Synch_Refcountable.inl
deleted file mode 100644
index 2f4cc32778d..00000000000
--- a/TAO/tao/Synch_Refcountable.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-//$Id$
-
-#include "ace/Guard_T.h"
-
-ACE_INLINE int
-TAO_Synch_Refcountable::increment (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
-  return ACE_Refcountable::increment ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::decrement (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->refcount_lock_, 0);
-  return ACE_Refcountable::decrement ();
-}
-
-ACE_INLINE int
-TAO_Synch_Refcountable::refcount (void) const
-{
-  return ACE_Refcountable::refcount ();
-}
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
deleted file mode 100644
index 170e2a61ecd..00000000000
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#include "Synch_Reply_Dispatcher.h"
-#include "ORB_Core.h"
-#include "Pluggable_Messaging_Utils.h"
-#include "debug.h"
-
-
-ACE_RCSID (tao,
-           Synch_Reply_Dispatcher,
-           "$Id$")
-
-// Constructor.
-TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (
-    TAO_ORB_Core *orb_core,
-    IOP::ServiceContextList &sc
-  )
-  : reply_service_info_ (sc),
-    orb_core_ (orb_core),
-    db_ (sizeof buf_,
-         ACE_Message_Block::MB_DATA,
-         this->buf_,
-         this->orb_core_->input_cdr_buffer_allocator (),
-         this->orb_core_->locking_strategy (),
-         ACE_Message_Block::DONT_DELETE,
-         this->orb_core_->input_cdr_dblock_allocator ()),
-    reply_cdr_ (&db_,
-                ACE_Message_Block::DONT_DELETE,
-                TAO_ENCAP_BYTE_ORDER,
-                TAO_DEF_GIOP_MAJOR,
-                TAO_DEF_GIOP_MINOR,
-                orb_core)
-{
-  // As a TAO_LF_Event we start in the active state....
-  this->state_changed_i (TAO_LF_Event::LFS_ACTIVE);
-}
-
-// Destructor.
-TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void)
-{
-}
-
-TAO_InputCDR &
-TAO_Synch_Reply_Dispatcher::reply_cdr (void)
-{
-  return this->reply_cdr_;
-}
-
-int
-TAO_Synch_Reply_Dispatcher::dispatch_reply (
-    TAO_Pluggable_Reply_Params &params)
-{
-  if (params.input_cdr_ == 0)
-    return -1;
-
-  this->reply_status_ = params.reply_status_;
-
-  // Steal the buffer, that way we don't do any unnecesary copies of
-  // this data.
-  CORBA::ULong max = params.svc_ctx_.maximum ();
-  CORBA::ULong len = params.svc_ctx_.length ();
-  IOP::ServiceContext* context_list = params.svc_ctx_.get_buffer (1);
-  this->reply_service_info_.replace (max, len, context_list, 1);
-
-  // Must reset the message state, it is possible that the same reply
-  // dispatcher is used because the request must be re-sent.
-  //this->message_state_.reset (0);
-
-  // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  ACE_Data_Block *db =
-    this->reply_cdr_.clone_from (*params.input_cdr_);
-
-  if (db == 0)
-    {
-      if (TAO_debug_level > 2)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply "
-                      "clone_from failed \n"));
-        }
-      return -1;
-    }
-
-  // See whether we need to delete the data block by checking the
-  // flags. We cannot be happy that we initally allocated the
-  // datablocks of the stack. If this method is called twice, as is in
-  // some cases where the same invocation object is used to make two
-  // invocations like forwarding, the release becomes essential.
-  if (ACE_BIT_DISABLED (db->flags (),
-                        ACE_Message_Block::DONT_DELETE))
-    {
-      db->release ();
-    }
-
-  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
-
-  return 1;
-}
-
-void
-TAO_Synch_Reply_Dispatcher::connection_closed (void)
-{
-  this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-}
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
deleted file mode 100644
index f103dd2779a..00000000000
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Synch_Reply_Dispatcher.h
- *
- *  $Id$
- *
- *   Dispatch the reply appropriately.
- *
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYNCH_REPLY_DISPATCHER_H
-#define TAO_SYNCH_REPLY_DISPATCHER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Reply_Dispatcher.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LF_Invocation_Event.h"
-#include "tao/CDR.h"
-
-class TAO_Pluggable_Reply_Params;
-
-namespace IOP
-{
-  class ServiceContextList;
-}
-
-/**
- * @class TAO_Synch_Reply_Dispatcher
- *
- * @brief Reply dispatcher for Synchoronous Method Invocation (SMI)s.
- *
- */
-class TAO_Export TAO_Synch_Reply_Dispatcher
-  : public TAO_Reply_Dispatcher
-  , public TAO_LF_Invocation_Event
-{
-
-public:
-  /// Constructor.
-  TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core,
-                              IOP::ServiceContextList &sc);
-
-  /// Destructor.
-  virtual ~TAO_Synch_Reply_Dispatcher (void);
-
-  /// Return the reply CDR.
-  TAO_InputCDR &reply_cdr (void);
-
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
-
-  virtual void connection_closed (void);
-
-protected:
-  /// The service context list
-  IOP::ServiceContextList &reply_service_info_;
-
-private:
-  /// Cache the ORB Core pointer.
-  TAO_ORB_Core *orb_core_;
-
-  /* @todo At some point of time we are going to get to a situation
-     where TAO has huge stack sizes. Need to think on how we would
-     deal with that. One idea would be to push these things on TSS as
-     this is created by the thread on a per invocation basis. Post 1.2
-     would be a nice time for that I guess
-  */
-
-  /// The buffer that is used to initialise the data block
-  char buf_[ACE_CDR::DEFAULT_BUFSIZE];
-
-  /// datablock that is created on teh stack to initialise the CDR
-  /// stream underneath.
-  ACE_Data_Block db_;
-
-  /// CDR stream which has the reply information that needs to be
-  /// demarshalled by the stubs
-  TAO_InputCDR reply_cdr_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REPLY_DISPATCHER_H */
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
deleted file mode 100644
index 1b037fc1882..00000000000
--- a/TAO/tao/SystemException.cpp
+++ /dev/null
@@ -1,917 +0,0 @@
-// $Id$
-
-#include "SystemException.h"
-#include "Any_SystemException.h"
-#include "Environment.h"
-#include "ORB_Constants.h"
-#include "CORBA_String.h"
-#include "CDR.h"
-#include "debug.h"
-
-#include "ace/Malloc.h"
-#include "ace/SString.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdio.h"
-
-
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-// Needed for ostream& operator<< (ostream &os, const CORBA::Exception &e)
-// FUZZ: disable check_for_streams_include
-#include "ace/streams.h"
-#endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/SystemException.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           SystemException,
-           "$Id$")
-
-
-/**
- * @name @c errno Encoding
- *
- * The @c errno encoding is located in the bottom 7 bits.
- */
-//@{
-const CORBA::ULong TAO_UNSPECIFIED_MINOR_CODE        = 0x0U;
-const CORBA::ULong TAO_ETIMEDOUT_MINOR_CODE          = 0x1U;
-const CORBA::ULong TAO_ENFILE_MINOR_CODE             = 0x2U;
-const CORBA::ULong TAO_EMFILE_MINOR_CODE             = 0x3U;
-const CORBA::ULong TAO_EPIPE_MINOR_CODE              = 0x4U;
-const CORBA::ULong TAO_ECONNREFUSED_MINOR_CODE       = 0x5U;
-const CORBA::ULong TAO_ENOENT_MINOR_CODE             = 0x6U;
-const CORBA::ULong TAO_EBADF_MINOR_CODE              = 0x7U;
-const CORBA::ULong TAO_ENOSYS_MINOR_CODE             = 0x8U;
-const CORBA::ULong TAO_EPERM_MINOR_CODE              = 0x9U;
-const CORBA::ULong TAO_EAFNOSUPPORT_MINOR_CODE       = 0xAU;
-const CORBA::ULong TAO_EAGAIN_MINOR_CODE             = 0xBU;
-const CORBA::ULong TAO_ENOMEM_MINOR_CODE             = 0xCU;
-const CORBA::ULong TAO_EACCES_MINOR_CODE             = 0xDU;
-const CORBA::ULong TAO_EFAULT_MINOR_CODE             = 0xEU;
-const CORBA::ULong TAO_EBUSY_MINOR_CODE              = 0xFU;
-const CORBA::ULong TAO_EEXIST_MINOR_CODE             = 0x10U;
-const CORBA::ULong TAO_EINVAL_MINOR_CODE             = 0x11U;
-const CORBA::ULong TAO_ECOMM_MINOR_CODE              = 0x12U;
-const CORBA::ULong TAO_ECONNRESET_MINOR_CODE         = 0x13U;
-const CORBA::ULong TAO_ENOTSUP_MINOR_CODE            = 0x14U;
-// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU!
-//@}
-
-// ****************************************************************
-
-CORBA::SystemException::SystemException (void)
-  : minor_ (0),
-    completed_ (CORBA::COMPLETED_NO)
-{
-}
-
-CORBA::SystemException::SystemException (const char *repository_id,
-                                         const char *local_name,
-                                         CORBA::ULong code,
-                                         CORBA::CompletionStatus completed)
-  : CORBA::Exception (repository_id,
-                      local_name),
-    minor_ (code),
-    completed_ (completed)
-{
-}
-
-CORBA::SystemException::SystemException (CORBA::ULong code,
-                                         CORBA::CompletionStatus completed)
-  : minor_ (code),
-    completed_ (completed)
-{
-}
-
-
-CORBA::SystemException::SystemException (const CORBA::SystemException &src)
-  : CORBA::Exception (src),
-    minor_ (src.minor_),
-    completed_ (src.completed_)
-{
-}
-
-CORBA::SystemException::~SystemException (void)
-{
-}
-
-CORBA::SystemException &
-CORBA::SystemException::operator= (const CORBA::SystemException &src)
-{
-  this->Exception::operator= (src);
-
-  this->minor_ = src.minor_;
-  this->completed_ = src.completed_;
-
-  return *this;
-}
-
-
-int
-CORBA::SystemException::_is_a (const char* interface_id) const
-{
-  return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) ||
-          (ACE_OS::strcmp (interface_id,
-                           "IDL:omg.org/CORBA/SystemException:1.0") == 0)
-          || this->Exception::_is_a (interface_id));
-}
-
-void
-CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
-                                     ACE_ENV_ARG_DECL) const
-{
-  if (cdr.write_string (this->_rep_id ())
-      && cdr.write_ulong (this->minor ())
-      && cdr.write_ulong (this->completed ()))
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
-                                     ACE_ENV_ARG_DECL)
-{
-  // The string is read by the caller, to determine the exact type of
-  // the exception.  We just decode the fields...
-  // cdr.read_string (this->id ());
-  CORBA::ULong tmp;
-
-  if (cdr.read_ulong (this->minor_)
-      && cdr.read_ulong (tmp))
-    {
-      this->completed_ = CORBA::CompletionStatus (tmp);
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::ULong
-CORBA::SystemException::_tao_errno (int errno_value)
-{
-  switch (errno_value)
-    {
-    case 0:
-      return TAO_UNSPECIFIED_MINOR_CODE;
-    case ETIMEDOUT:
-      return TAO_ETIMEDOUT_MINOR_CODE;
-    case ENFILE:
-      return TAO_ENFILE_MINOR_CODE;
-    case EPIPE:
-      return TAO_EPIPE_MINOR_CODE;
-    case ECONNREFUSED:
-      return TAO_ECONNREFUSED_MINOR_CODE;
-    case ENOENT:
-      return TAO_ENOENT_MINOR_CODE;
-
-#if !defined (ACE_HAS_WINCE)
-    case EMFILE:
-      return TAO_EMFILE_MINOR_CODE;
-    case EBADF:
-      return TAO_EBADF_MINOR_CODE;
-    case EPERM:
-      return TAO_EPERM_MINOR_CODE;
-    case EINVAL:
-      return TAO_EINVAL_MINOR_CODE;
-#endif  // ACE_HAS_WINCE
-
-#if (ENOSYS != EFAULT)
-    case ENOSYS:
-      return TAO_ENOSYS_MINOR_CODE;
-#endif /* ENOSYS != EFAULT */
-    case EAFNOSUPPORT:
-      return TAO_EAFNOSUPPORT_MINOR_CODE;
-    case EAGAIN:
-      return TAO_EAGAIN_MINOR_CODE;
-    case ENOMEM:
-      return TAO_ENOMEM_MINOR_CODE;
-    case EACCES:
-      return TAO_EACCES_MINOR_CODE;
-    case EFAULT:
-      return TAO_EFAULT_MINOR_CODE;
-    case EBUSY:
-      return TAO_EBUSY_MINOR_CODE;
-    case EEXIST:
-      return TAO_EEXIST_MINOR_CODE;
-    case ECOMM:
-      return TAO_ECOMM_MINOR_CODE;
-    case ECONNRESET:
-      return TAO_ECONNRESET_MINOR_CODE;
-#if (ENOTSUP != ENOSYS)
-    case ENOTSUP:
-      return TAO_ENOTSUP_MINOR_CODE;
-#endif /* ENOSYS != EFAULT */
-    default:
-      // Mask off bottom 7 bits and return them.
-      return errno_value & 0x7FU;
-    }
-}
-
-CORBA::ULong
-CORBA::SystemException::_tao_minor_code (u_int location,
-                                         int errno_value)
-{
-  return
-    TAO::VMCID
-    | location
-    | _tao_errno (errno_value);
-}
-
-void
-CORBA::SystemException::_tao_print_system_exception (FILE *) const
-{
-  ACE_DEBUG ((LM_ERROR,
-              ACE_TEXT("(%P|%t) system exception, ID '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
-}
-
-ACE_CString
-CORBA::SystemException::_info (void) const
-{
-  // @@ there are a few other "user exceptions" in the CORBA scope,
-  // they're not all standard/system exceptions ... really need to
-  // either compare exhaustively against all those IDs (yeech) or
-  // (preferably) to represent the exception type directly in the
-  // exception value so it can be queried.
-
-  ACE_CString info = "system exception, ID '";
-  info += this->_rep_id ();
-  info += "'\n";
-
-  const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u;
-
-  if (VMCID == TAO::VMCID)
-    {
-      // @@ Move the following code to a subroutine, it is too long already!
-      const char *location;
-      switch (this->minor () & 0x00000F80u)
-        {
-        case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
-          location = "location forward failed";
-          break;
-        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
-          location = "send request failed";
-          break;
-        case TAO_POA_DISCARDING:
-          location = "poa in discarding state";
-          break;
-        case TAO_POA_HOLDING:
-          location = "poa in holding state";
-          break;
-        case TAO_POA_INACTIVE:
-          location = "poa in inactive state";
-          break;
-        case TAO_UNHANDLED_SERVER_CXX_EXCEPTION:
-          location = "unhandled c++ exception in server side";
-          break;
-        case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE:
-          location = "failed to recv request response";
-          break;
-        case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL:
-          location = "all protocols failed to parse the IOR";
-          break;
-        case TAO_MPROFILE_CREATION_ERROR:
-          location = "error during MProfile creation";
-          break;
-        case TAO_TIMEOUT_CONNECT_MINOR_CODE:
-          location = "timeout during connect";
-          break;
-        case TAO_TIMEOUT_SEND_MINOR_CODE:
-          location = "timeout during send";
-          break;
-        case TAO_TIMEOUT_RECV_MINOR_CODE:
-          location = "timeout during recv";
-          break;
-        case TAO_IMPLREPO_MINOR_CODE:
-          location = "implrepo server exception";
-          break;
-        case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE:
-          location = "endpoint initialization failure in Acceptor Registry";
-          break;
-        case TAO_ORB_CORE_INIT_LOCATION_CODE:
-          location = "ORB Core initialization failed";
-          break;
-        case TAO_POLICY_NARROW_CODE:
-          location = "Failure when narrowing a Policy";
-          break;
-        case TAO_GUARD_FAILURE:
-          location = "Failure when trying to acquire a guard/monitor";
-          break;
-        case TAO_POA_BEING_DESTROYED:
-          location = "POA has been destroyed or is currently being destroyed";
-          break;
-        case TAO_AMH_REPLY_LOCATION_CODE:
-          location = "Failure when trying to send AMH reply";
-          break;
-        case TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE:
-          location = "Failure in thread creation for RTCORBA thread pool";
-          break;
-        default:
-          location = "unknown location";
-        }
-
-      const char *errno_indication;
-      char unknown_errno [255];
-      CORBA::ULong minor_code = this->minor () & 0x7FU;
-      switch (minor_code)
-        {
-        case TAO_UNSPECIFIED_MINOR_CODE:
-          errno_indication = "unspecified errno";
-          break;
-        case TAO_ETIMEDOUT_MINOR_CODE:
-          errno_indication = "ETIMEOUT";
-          break;
-        case TAO_ENFILE_MINOR_CODE:
-          errno_indication = "ENFILE";
-          break;
-        case TAO_EMFILE_MINOR_CODE:
-          errno_indication = "EMFILE";
-          break;
-        case TAO_EPIPE_MINOR_CODE:
-          errno_indication = "EPIPE";
-          break;
-        case TAO_ECONNREFUSED_MINOR_CODE:
-          errno_indication = "ECONNREFUSED";
-          break;
-        case TAO_ENOENT_MINOR_CODE:
-          errno_indication = "ENOENT";
-          break;
-        case TAO_EBADF_MINOR_CODE:
-          errno_indication = "EBADF";
-          break;
-        case TAO_ENOSYS_MINOR_CODE:
-          errno_indication = "ENOSYS";
-          break;
-        case TAO_EPERM_MINOR_CODE:
-          errno_indication = "EPERM";
-          break;
-        case TAO_EAFNOSUPPORT_MINOR_CODE:
-          errno_indication = "EAFNOSUPPORT";
-          break;
-        case TAO_EAGAIN_MINOR_CODE:
-          errno_indication = "EAGAIN";
-          break;
-        case TAO_ENOMEM_MINOR_CODE:
-          errno_indication = "ENOMEM";
-          break;
-        case TAO_EACCES_MINOR_CODE:
-          errno_indication = "EACCES";
-          break;
-        case TAO_EFAULT_MINOR_CODE:
-          errno_indication = "EFAULT";
-          break;
-        case TAO_EBUSY_MINOR_CODE:
-          errno_indication = "EBUSY";
-          break;
-        case TAO_EEXIST_MINOR_CODE:
-          errno_indication = "EEXIST";
-          break;
-        case TAO_EINVAL_MINOR_CODE:
-          errno_indication = "EINVAL";
-          break;
-        case TAO_ECOMM_MINOR_CODE:
-          errno_indication = "ECOMM";
-          break;
-        case TAO_ECONNRESET_MINOR_CODE:
-          errno_indication = "ECONNRESET";
-          break;
-        case TAO_ENOTSUP_MINOR_CODE:
-          errno_indication = "ENOTSUP";
-          break;
-        default:
-          {
-            // 7 bits of some other errno.
-            ACE_OS::sprintf (unknown_errno,
-                             "low 7 bits of errno: %3u %s",
-                             minor_code, ACE_OS::strerror (minor_code));
-
-            errno_indication = unknown_errno;
-          }
-        }
-
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "TAO exception, "
-                       "minor code = %x (%s; %s), "
-                       "completed = %s\n",
-                       minor_code,
-                       location,
-                       errno_indication,
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
-    }
-  else if (VMCID == CORBA::OMGVMCID)
-    {
-      const CORBA::ULong minor_code = this->minor () & 0xFFFU;
-
-      const char *minor_description = 0;
-
-      if (minor_code > 0)
-          minor_description =
-            CORBA::SystemException::_tao_get_omg_exception_description (
-              *this,
-              minor_code);
-      else
-        minor_description = "*unknown description*";
-
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "OMG minor code (%d), "
-                       "described as '%s', "
-                       "completed = %s\n",
-                       minor_code,
-                       minor_description,
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
-    }
-  else
-    {
-      char buffer[BUFSIZ];
-      ACE_OS::sprintf (buffer,
-                       "Unknown vendor minor code id (%x), "
-                       "minor code = %x, completed = %s\n",
-                       VMCID,
-                       this->minor (),  // Use the raw minor code
-                       (completed () == CORBA::COMPLETED_YES) ? "YES" :
-                       (completed () == CORBA::COMPLETED_NO) ? "NO" :
-                       (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                       "garbage");
-
-      info += buffer;
-    }
-
-  return info;
-}
-
-const char *
-CORBA::SystemException::_tao_get_omg_exception_description (
-  const CORBA::SystemException &exc,
-  CORBA::ULong minor_code)
-{
-#ifndef ACE_NDEBUG
-
-  static const char *UNKNOWN_TABLE[] =
-    {
-      "Unlisted user exception received by client.",    // 1
-      "Non-standard SystemException not supported.",    // 2
-      "An unknown user exception received by a portable interceptor." // 3
-    };
-
-  static const char *BAD_PARAM_TABLE[] =
-    {
-      "Failure to register, unregister, or lookup value factory.", // 1
-      "RID already defined in IFR.",                               // 2
-      "Name already used in the context in IFR.",                  // 3
-      "Target is not a valid container.",                          // 4
-      "Name clash in inherited context.",                          // 5
-      "Incorrect type for abstract interface.",                    // 6
-      "string_to_object conversion failed due to a bad scheme name.", // 7
-      "string_to_object conversion failed due to a bad address.",  // 8
-      "string_to_object conversion failed due to a bad schema specific part.",// 9
-      "string_to_object conversion failed due to non specific reason.", // 10
-      "Attempt to derive abstract interface from non-abstract base interface in the Interface Repository.", // 11
-      "Attempt to let a ValueDef support more than one non-abstract interface in the Interface Repository.", // 12
-      "Attempt to use an incomplete TypeCode as a parameter.",     // 13
-      "Invalid object id passed to POA::create_reference_by_id.",  // 14
-      "Bad name argument in TypeCode operation.",                  // 15
-      "Bad RepositoryId argument in TypeCode operation.",          // 16
-      "Invalid member name in TypeCode operation.",                 // 17
-      "Duplicate label value in create_union_tc.",                 // 18
-      "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19
-      "Supplied discriminator type illegitimate in create_union_tc.", // 20
-      "Any passed to ServerRequest::set_exception does not contain an exception.", // 21
-      "Unlisted user exception passed to ServerRequest::set_exception", // 22
-      "wchar transmission code set not in service context.",       // 23
-      "Service context is not in OMG-defined range.",              // 24
-      "Enum value out of range.",                                  // 25
-      "Invalid service context Id in portable interceptor.",       // 26
-      "Attempt to call register_initial_reference with a null Object.", // 27
-      "Invalid component Id in portable interceptor.",             // 28
-      "Invalid profile Id in portable interceptor.",               // 29
-      "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30
-      "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31
-      "DII asked to create request for an implicit operation.",     // 32,
-      "An OTS/XA integration xa_ call returned XAER_INVAL.",        // 33
-      "Union branch modifier called with bad case label discriminator.", // 34
-      "Illegal IDL context property name.",   // 35
-      "Illegal IDL property search string.",  // 36
-      "Illegal IDL context name.",            // 37
-      "Non-empty IDL context.",               // 38
-      "Unsupported RMI/IDL customer value type stream format.",  // 39
-      "ORB output stream does not support ValueOutputStream interface.", // 40
-      "ORB input stream does not support ValueInputStream interface.",    // 41
-      "Character support limited to ISO 8859-1 for this object reference", // 42
-      "Attempt to add a Pollable to a second PollableSet."
-    };
-
-  static const char *IMP_LIMIT_TABLE[] =
-    {
-      "Unable to use any profile in IOR." // 1
-    };
-
-  static const char *INITIALIZE_TABLE[] =
-    {
-      "Priority range too restricted for ORB." // 1
-    };
-
-
-  static const char *INV_OBJREF_TABLE[] =
-    {
-      "wchar Code Set support not specified.", // 1
-      "Codeset component required for type using wchar or wstring data." // 2
-    };
-
-  static const char *MARSHAL_TABLE[] =
-    {
-      "Unable to locate value factory.",  // 1
-      "ServerRequest::set_result called before ServerRequest::ctx when the operation IDL contains a context clause.", // 2
-      "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3
-      "Attempt to marshal Local object.", // 4
-      "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5
-      "wchar or wstring data erroneously returned by server over GIOP 1.0 connection.", //6
-      "Unsupported RMI/IDL custom value type stream format.", // 7
-      "Custom data not compatible with ValueHandler read operation.", // 8
-      "Codeset service contexts with different values recieved on the same connection." // 9
-
-    };
-
-  static const char *BAD_TYPECODE_TABLE[] =
-    {
-      "Attempt to marshal incomplete TypeCode.",              // 1
-      "Member type code illegitimate in TypeCode operation.", // 2
-      "Illegal parameter type."                               // 3
-    };
-
-  static const char *NO_IMPLEMENT_TABLE[] =
-    {
-      "Missing local value implementation.",        // 1
-      "Incompatible value implementation version.", // 2
-      "Unable to use any profile in IOR.",          // 3
-      "Attempt to use DII on Local object.",        // 4
-      "Biomolecular Sequence Analysis iterator cannot be reset.",         // 5
-      "Biomolecular Sequence Analysis metadata is not available as XML.", // 6
-      "Genomic Maps iterator cannot be rest.",       // 7
-      "Operation not implemented in local object"   // 8
-    };
-
-  static const char *NO_RESOURCE_TABLE[] =
-    {
-      "Portable Interceptor operation not support in this binding.", // 1
-      "No connection for request's priority."                        // 2
-    };
-
-  static const char *BAD_INV_ORDER_TABLE[] =
-    {
-      "Dependency exists in IFR preventing destruction of this object", // 1
-      "Attempt to destroy indestructible objects in IFR.", // 2
-      "Operation would deadlock.",                         // 3
-      "ORB has shutdown.",                                 // 4
-      "Attempt to invoke \"send\" or \"invoke\" operation of the same \"Request\" object more than once.", // 5
-      "Attempt to set a servant manager after one has already been set.", // 6
-      "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7
-      "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8
-      "ServerRequest::set_result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9
-      "Attempt to send a DII request after it was sent previously.", // 10
-      "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11
-      "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12
-      "Attempt to poll a synchronous DII request or to retrieve results from a synchronous DII request.", // 13
-      "Invalid portable interceptor call",                 // 14
-      "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15
-      "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16
-      "POA cannot create POAs while undergoing destruction.", // 17
-      "Attempt to reassign priority.", // 18
-      "An OTS/XA integration xa_start call returned XAER_OUTSIDE.", // 19
-      "An OTS/XA integration xa_call returned XAER_PROTO.", // 20
-      "Transaction context of request & client threads do not match in interceptor.", // 21
-      "Poller has not returned any response yet.", // 22
-      "Registration of TaggedProfileFactory failed because a factory already exists for the given id.", // 23
-      "Registration of TaggedComponentFactory failed because a factory already exists for the given id.", // 24
-       "Iteration has no more elements.", // 25
-       "Invocation of this operation not allowed in post_init." // 26
-
-    };
-
-  static const char *TRANSIENT_TABLE[] =
-    {
-      "Request discarded because of resource exhaustion in POA, or because POA is in discarding state.", // 1
-      "No usable profile in IOR.",                            // 2
-      "Request cancelled.",                                   // 3
-      "POA destroyed."                                        // 4
-    };
-
-  static const char *OBJ_ADAPTER_TABLE[] =
-    {
-      "System exception in AdapterActivator::unknown_adapter.",              // 1
-      "Incorrect servant type returned by servant manager",     // 2
-      "No default servant available [POA policy].",             // 3
-      "No servant manager available [POA policy].",             // 4
-      "Violation of POA policy by ServantActivator::incarnate.",// 5
-      "Exception in PortableInterceptor::IORInterceptor.components_established.", // 6
-      "Null servant returned by servant manager."               // 7
-    };
-
-  static const char *DATA_CONVERSION_TABLE[] =
-    {
-      "Character does not map to negotiated transmission code set.", // 1
-      "Failure of PriorityMapping object."                           // 2
-    };
-
-  static const char *OBJECT_NOT_EXIST_TABLE[] =
-    {
-      "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1
-      "Failed to create or locate Object Adapter.", // 2
-      "Biomolecular Sequence Analysis Service is no longer available.", // 3
-      "Object Adapter inactive.", // 4
-      "This Poller has already delivered a reply to some client." // 5
-    };
-
-  static const char *INV_POLICY_TABLE[] =
-    {
-      "Unable to reconcile IOR specified policy with the effective policy override.", // 1
-      "Invalid PolicyType.", // 2
-      "No PolicyFactory has been registered for the given PolicyType." // 3
-    };
-
-  static const char *ACTIVITY_COMPLETED_TABLE[] =
-    {
-      "Activity context completed through timeout, or in some way other then requested." // 1
-    };
-
-  static const char *ACTIVITY_REQUIRED_TABLE[] =
-    {
-      "Calling thread lacks required activity context." // 1
-    };
-
-  static const char *BAD_OPERATION_TABLE[] =
-    {
-      "ServantManager returned wrong servant type.", // 1
-      "Operation or attribute not known to target object." // 2
-    };
-
-  static const char *BAD_CONTEXT_TABLE[] =
-    {
-      "IDL context not found.", // 1
-      "No matching IDL context property." // 2
-    };
-
-  static const char *CODESET_INCOMPATIBLE_TABLE[] =
-    {
-      "Codeset negotiation failed.", // 1
-      "Codeset delivered in CodeSetContext is not supported by server as transmission codeset." // 2
-    };
-
-  static const char *INTF_REPOS_TABLE[] =
-    {
-      "Interface Repository not available.", // 1
-      "No entry for requested interface in Interface Repository." // 2
-    };
-
-  if (minor_code == 0)
-    return "*unknown description*";
-
-  minor_code--;  // Adjust to match table offset.
-
-  if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0")
-      && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *))
-    return UNKNOWN_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0")
-      && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *))
-    return BAD_PARAM_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0")
-      && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *))
-    return IMP_LIMIT_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0")
-      && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *))
-    return INITIALIZE_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0")
-      && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *))
-    return INV_OBJREF_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0")
-      && minor_code < sizeof MARSHAL_TABLE / sizeof (char *))
-    return MARSHAL_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0")
-      && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *))
-    return BAD_TYPECODE_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0")
-      && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *))
-    return NO_IMPLEMENT_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0")
-      && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *))
-    return NO_RESOURCE_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0")
-      && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *))
-    return BAD_INV_ORDER_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0")
-      && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *))
-    return TRANSIENT_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0")
-      && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *))
-    return OBJ_ADAPTER_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0")
-      && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *))
-    return DATA_CONVERSION_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0")
-      && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *))
-    return OBJECT_NOT_EXIST_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0")
-      && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
-    return INV_POLICY_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_COMPLETED:1.0")
-      && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *))
-    return ACTIVITY_COMPLETED_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_REQUIRED:1.0")
-      && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *))
-    return ACTIVITY_REQUIRED_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_OPERATION:1.0")
-      && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
-    return BAD_OPERATION_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_CONTEXT:1.0")
-      && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *))
-    return BAD_CONTEXT_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/CODESET_INCOMPATIBLE:1.0")
-      && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *))
-    return CODESET_INCOMPATIBLE_TABLE[minor_code];
-
-  if (exc._is_a ("IDL:omg.org/CORBA/INTF_REPOS:1.0")
-      && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *))
-    return INTF_REPOS_TABLE[minor_code];
-
-#else
-  ACE_UNUSED_ARG (exc);
-  ACE_UNUSED_ARG (minor_code);
-#endif  /* !ACE_NDEBUG */
-
-  return "*unknown description*";
-}
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes, then later to initialize that storage
-// using the routine above. (It's just too painful to init these
-// typecodes statically in all cases!)
-
-#define STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
-    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
-    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
-    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
-
-static const char *repo_id_array[] = {
-#define TAO_SYSTEM_EXCEPTION(name) \
-                  (char *) "IDL:omg.org/CORBA/" #name ":1.0",
-      STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-      0
-  };
-
-// Since we add an extra element subtract 1
-static const CORBA::ULong array_sz =
-  (sizeof (repo_id_array) / sizeof (char const *)) - 1;
-
-TAO::excp_factory excp_array [] = {
-#define TAO_SYSTEM_EXCEPTION(name) \
-      &CORBA::name::_tao_create,
-      STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-      0
-};
-
-CORBA::SystemException *
-TAO_Exceptions::create_system_exception (const char *id
-                                         ACE_ENV_ARG_DECL_NOT_USED)
-{
-  for (CORBA::ULong i = 0; i < array_sz; ++i)
-    {
-      if (ACE_OS::strcmp (id, repo_id_array[i]) == 0)
-        return (*(excp_array[i])) ();
-    }
-
-  return 0;
-}
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::name ::_raise (void) const \
-{ \
-  TAO_RAISE (*this); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-// SystemException constructors
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::name ::name (void) \
-  :  CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
-                             #name, \
-                             0, \
-                             CORBA::COMPLETED_NO) \
-{ \
-} \
-\
-CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \
-  : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
-                            #name, \
-                            code, \
-                            completed) \
-{ \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Exception * \
-CORBA::name ::_tao_duplicate (void) const \
-{ \
-  CORBA::Exception * result; \
-  ACE_NEW_RETURN (result, CORBA::name (*this), 0); \
-  return result; \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::SystemException * \
-CORBA::name ::_tao_create (void) \
-{ \
-  CORBA::name *result; \
-  ACE_NEW_RETURN (result, CORBA::name (), 0); \
-  return result; \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
deleted file mode 100644
index 241bb3d8c89..00000000000
--- a/TAO/tao/SystemException.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    SystemException.h
- *
- *  $Id$
- *
- *  CORBA::SystemException class header.
- *
- *  @author DOC Group at Vanderbilt U, Wash U, and UCI
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SYSTEM_EXCEPTION_H
-#define TAO_SYSTEM_EXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-// Do not try removing this. If you remove this for subsetting lots of
-// things go wrong in TAO.
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Exception.h"
-
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// This is already done in orbconf.h. But this file is totally
-// decoupled from its contents that we have to do this here. Including
-// orbconf.h is probably going to be a overhead.
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Environment;
-
-  class Any;
-  typedef Any *Any_ptr;
-
-  /**
-   * @enum CompletionStatus
-   *
-   * @brief Completion status for CORBA system exceptions
-   *
-   * Enumerations that denote how an operation was (not) completed
-   * when a @c CORBA::SystemException is thrown.
-   */
-  enum CompletionStatus
-  {
-    COMPLETED_YES,     ///< Successful or exceptional completion.
-    COMPLETED_NO,      ///< Didn't change any state; retry is OK.
-    COMPLETED_MAYBE    ///< Can't say what happened; retry unsafe.
-  };
-
-  /**
-   * @class SystemException
-   *
-   * @brief SystemException
-   *
-   * System exceptions are those defined in the CORBA specification;
-   * OMG-IDL defines these.
-   */
-  class TAO_Export SystemException : public Exception
-  {
-  public:
-
-    /// Copy constructor.
-    SystemException (const SystemException & src);
-
-    /// Destructor.
-    ~SystemException (void);
-
-    /// Get the minor status.
-    ULong minor (void) const;
-
-    /// Set the minor status.
-    void minor (ULong m);
-
-    /// Get the completion status.
-    CORBA::CompletionStatus completed (void) const;
-
-    /// Set the operation completion status.
-    void completed (CORBA::CompletionStatus c);
-
-    /// Narrow to a SystemException.
-    static SystemException *_downcast (CORBA::Exception *exception);
-
-        /// The const version of narrow operation to a SystemException
-    static const SystemException *_downcast(const CORBA::Exception *exception);
-
-    virtual void _raise (void) const = 0;
-
-    // = TAO-specific extension.
-
-    /// Helper for the _downcast operation.
-    virtual int _is_a (const char *type_id) const;
-
-    /// Print the system exception @c ex to output determined by @c f.
-    /// This function is not CORBA compliant.
-    void _tao_print_system_exception (FILE *f = stdout) const;
-
-    /// Create an exception from the available exception
-    /// virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    /// Returns a string containing information about the exception. This
-    /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const;
-
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED);
-
-    /// Helper to create a minor status value.
-    static CORBA::ULong _tao_minor_code (u_int location,
-                                         int errno_value);
-
-    /// Helper to translate a platform-specific errno to a TAO errno
-    /// value.
-    static CORBA::ULong _tao_errno (int errno_value);
-
-    /// Overridden base class method to help compilers that use
-    /// explicit template instantiations going
-    virtual CORBA::Exception *_tao_duplicate (void) const {return 0;}
-
-  protected:
-
-    /// Default constructor.
-    SystemException (void);
-
-    /// Assignment operator.
-    SystemException & operator= (const SystemException &src);
-
-    /// Constructor using a repository id.
-    SystemException (CORBA::ULong code,
-                     CORBA::CompletionStatus completed);
-
-    /// Constructor using a repository id.
-    SystemException (const char *repository_id,
-                     const char *local_name,
-                     CORBA::ULong code,
-                     CORBA::CompletionStatus completed);
-
-    /// Return the exception description associated with the given OMG
-    /// minor code.
-    static const char *_tao_get_omg_exception_description (
-      const CORBA::SystemException &exc,
-      CORBA::ULong minor_code);
-
-  private:
-    /// Minor code.
-    CORBA::ULong minor_;
-
-    /// Completion status.
-    CORBA::CompletionStatus completed_;
-
-  };
-
-  // Declarations for all of the CORBA standard exceptions.
-  //
-  // @@ - shouldn't have a default minor code, at least for code that's
-  // inside the ORB.  All minor codes should be symbolically catalogued.
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-    class TAO_Export name : public SystemException \
-    { \
-    public: \
-      name (void); \
-      name (CORBA::ULong code, \
-            CORBA::CompletionStatus completed); \
-      static name * _downcast (CORBA::Exception* exception); \
-      static name const * _downcast (CORBA::Exception const * exception); \
-      virtual void _raise (void) const; \
-      virtual CORBA::TypeCode_ptr _tao_type (void) const; \
-      static void _tao_any_destructor (void*); \
-      virtual CORBA::Exception *_tao_duplicate (void) const; \
-      static CORBA::SystemException *_tao_create (void); \
-    }; \
-  TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
-  TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
-  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
-                                         const CORBA::name *&); \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
-
-  TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
-  TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
-  TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
-  TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
-  TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
-  TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
-  TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
-  TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
-  TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policies present
-  TAO_SYSTEM_EXCEPTION(REBIND);           // rebind needed
-  TAO_SYSTEM_EXCEPTION(TIMEOUT);          // operation timed out
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);        // invalid transaction mode
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);    // operation needs transaction
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);  // operation was a no-op
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);     // invalid TP context passed
-  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE);    // incompatible code set
-  TAO_SYSTEM_EXCEPTION(BAD_QOS);          // bad quality of service
-  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY);
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED);
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
-  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-#undef TAO_SYSTEM_EXCEPTION
-
-} // End CORBA namespace
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/SystemException.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/"ace/post.h"
-
-#endif /* TAO_SYSTEM_EXCEPTION_H */
diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl
deleted file mode 100644
index 2657bc1b135..00000000000
--- a/TAO/tao/SystemException.inl
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::ULong
-CORBA::SystemException::minor (void) const
-{
-  return this->minor_;
-}
-
-ACE_INLINE void
-CORBA::SystemException::minor (CORBA::ULong m)
-{
-  this->minor_ = m;
-}
-
-ACE_INLINE CORBA::CompletionStatus
-CORBA::SystemException::completed (void) const
-{
-  return this->completed_;
-}
-
-ACE_INLINE void
-CORBA::SystemException::completed (CORBA::CompletionStatus c)
-{
-  this->completed_ = c;
-}
-
-ACE_INLINE CORBA::SystemException*
-CORBA::SystemException::_downcast (CORBA::Exception* exception)
-{
-  return dynamic_cast<CORBA::SystemException *> (exception);
-}
-
-ACE_INLINE const CORBA::SystemException*
-CORBA::SystemException::_downcast (const CORBA::Exception *exception)
-{
-  return dynamic_cast<const CORBA::SystemException *> (exception);
-}
-
-
-#define TAO_STANDARD_SYSTEM_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
-    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
-    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
-    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-ACE_INLINE CORBA::name * \
-CORBA::name ::_downcast (CORBA::Exception* exception) \
-{ \
-  return dynamic_cast<CORBA::name *> (exception); \
-}
-
-TAO_STANDARD_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-ACE_INLINE CORBA::name const * \
-CORBA::name ::_downcast (CORBA::Exception const * exception) \
-{ \
-  return dynamic_cast<CORBA::name const *> (exception); \
-}
-
-TAO_STANDARD_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/SystemExceptionA.cpp b/TAO/tao/SystemExceptionA.cpp
deleted file mode 100644
index 1ec437e599a..00000000000
--- a/TAO/tao/SystemExceptionA.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#include "SystemException.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
-#include "TypeCode_Constants.h"
-#include "Enum_TypeCode_Static.h"
-#include "TypeCode_Struct_Field.h"
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-#include "CORBA_String.h"
-
-
-ACE_RCSID (tao,
-           SystemExceptionA,
-           "$Id$")
-
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes.
-
-#define STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
-    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
-    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
-    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::TypeCode_ptr \
-CORBA::name ::_tao_type (void) const \
-{ \
-  return CORBA::_tc_ ## name; \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::name ::_tao_any_destructor (void * x) \
-{ \
-  delete static_cast<CORBA::name *> (x); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    char const * const enumerators_CORBA_CompletionStatus[] =
-      {
-        "COMPLETED_YES",
-        "COMPLETED_NO",
-        "COMPLETED_MAYBE"
-      };
-
-    Enum<char const *,
-         char const * const *,
-         TAO::Null_RefCount_Policy>
-      tc_CompletionStatus ("IDL:omg.org/CORBA/CompletionStatus:1.0",
-                           "CompletionStatus",
-                           enumerators_CORBA_CompletionStatus,
-                           3 /* # of enumerators */);
-  }
-}
-
-namespace CORBA
-{
-  // An internal TypeCode.
-  TypeCode_ptr const _tc_CompletionStatus =
-    &TAO::TypeCode::tc_CompletionStatus;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    Struct_Field<char const *,
-                 CORBA::TypeCode_ptr const *> const
-    fields_CORBA_SystemException[] =
-      {
-        { "minor",     &CORBA::_tc_ulong },
-        { "completed", &CORBA::_tc_CompletionStatus }
-      };
-
-    typedef TAO::TypeCode::Struct<char const *,
-                                  CORBA::TypeCode_ptr const *,
-                                  TAO::TypeCode::Struct_Field<char const *,
-                                                              CORBA::TypeCode_ptr const *> const *,
-                                  TAO::Null_RefCount_Policy> tc_SystemException;
-  }
-}
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-namespace TAO \
-{ \
-  namespace TypeCode \
-  { \
-    tc_SystemException tc_CORBA_ ## name ( \
-      CORBA::tk_except, \
-      "IDL:omg.org/CORBA/" #name ":1.0", \
-      #name, \
-      TAO::TypeCode::fields_CORBA_SystemException, \
-      2 /* # of fields */); \
-  } \
-} \
-CORBA::TypeCode_ptr const CORBA::_tc_ ## name = \
-    &TAO::TypeCode::tc_CORBA_ ## name;
-
-STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \
-{ \
-  TAO::Any_SystemException::insert_copy ( \
-      any, \
-      CORBA::name ::_tao_any_destructor, \
-      CORBA::_tc_ ## name, \
-      ex \
-    ); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \
-{ \
-  TAO::Any_SystemException::insert ( \
-      any, \
-      CORBA::name ::_tao_any_destructor, \
-      CORBA::_tc_ ## name, \
-      ex \
-    ); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Boolean operator>>= (const CORBA::Any &any, \
-                            const CORBA::name *&ex) \
-{ \
-  return \
-    TAO::Any_SystemException::extract ( \
-        any, \
-        CORBA::name ::_tao_any_destructor, \
-        CORBA::_tc_ ## name, \
-        (const CORBA::SystemException *&) ex, \
-        &CORBA::name ::_tao_create); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/TAO.pc.in b/TAO/tao/TAO.pc.in
deleted file mode 100644
index ce8d342789c..00000000000
--- a/TAO/tao/TAO.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO
-Description: The ACE ORB
-Requires: ACE
-Version: @VERSION@
-Libs: -L${libdir} -lTAO
-Cflags: -I${includedir}
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
deleted file mode 100644
index 74fd3f7979c..00000000000
--- a/TAO/tao/TAO.pidl
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file TAO.pidl
- *
- *  $Id$
- *
- *  This file contains TAO-specific idl interfaces (not part of CORBA
- *  2.6).
- *
- *  The steps to regenerate the code are as follows:
- *
- * 1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -GA -SS -Sci
- *       -Wb,export_macro=TAO_Export
- *       -Wb,pre_include="ace/pre.h"
- *       -Wb,post_include="ace/post.h"
- *       TAO.pidl
- *
- * 2. The files are ready to use
- */
-// ================================================================
-
-#ifndef TAO_TAO_IDL
-#define TAO_TAO_IDL
-
-#include "Policy.pidl"
-#include "TimeBase.pidl"
-#include "Messaging_SyncScope.pidl"
-
-#pragma prefix "tao"
-
-module TAO
-{
-
-  //
-  // Buffering constraint.
-  //
-  typedef unsigned short BufferingConstraintMode;
-  const BufferingConstraintMode BUFFER_FLUSH         = 0x00;
-
-  // Note that timeout, message_count, and message_bytes can be or'd.
-  const BufferingConstraintMode BUFFER_TIMEOUT       = 0x01;
-  const BufferingConstraintMode BUFFER_MESSAGE_COUNT = 0x02;
-  const BufferingConstraintMode BUFFER_MESSAGE_BYTES = 0x04;
-
-  struct BufferingConstraint
-  {
-    BufferingConstraintMode mode;
-    TimeBase::TimeT timeout;
-    unsigned long message_count;
-    unsigned long message_bytes;
-  };
-
-  const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 0x54410001;
-
-  local interface BufferingConstraintPolicy : CORBA::Policy
-    {
-      readonly attribute BufferingConstraint buffering_constraint;
-    };
-
-  // = TAO specific.
-  const Messaging::SyncScope SYNC_EAGER_BUFFERING   = Messaging::SYNC_NONE;
-  const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
-
-};
-
-#pragma prefix ""
-
-#endif /* TAO_TAO_IDL */
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
deleted file mode 100644
index 9af3c53c6db..00000000000
--- a/TAO/tao/TAOA.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TAOC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintMode (
-    CORBA::tk_alias,
-    "IDL:tao/TAO/BufferingConstraintMode:1.0",
-    "BufferingConstraintMode",
-    &CORBA::_tc_ushort);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode =
-    &_tao_tc_TAO_BufferingConstraintMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_BufferingConstraint[] =
-  {
-    { "mode", &TAO::_tc_BufferingConstraintMode },
-    { "timeout", &TimeBase::_tc_TimeT },
-    { "message_count", &CORBA::_tc_ulong },
-    { "message_bytes", &CORBA::_tc_ulong }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraint (
-    CORBA::tk_struct,
-    "IDL:tao/TAO/BufferingConstraint:1.0",
-    "BufferingConstraint",
-    _tao_fields_TAO_BufferingConstraint,
-    4);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraint =
-    &_tao_tc_TAO_BufferingConstraint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintPolicy (
-    CORBA::tk_local_interface,
-    "IDL:tao/TAO/BufferingConstraintPolicy:1.0",
-    "BufferingConstraintPolicy");
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy =
-    &_tao_tc_TAO_BufferingConstraintPolicy;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert_copy (
-      _tao_any,
-      TAO::BufferingConstraint::_tao_any_destructor,
-      TAO::_tc_BufferingConstraint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert (
-      _tao_any,
-      TAO::BufferingConstraint::_tao_any_destructor,
-      TAO::_tc_BufferingConstraint,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::BufferingConstraint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::extract (
-        _tao_any,
-        TAO::BufferingConstraint::_tao_any_destructor,
-        TAO::_tc_BufferingConstraint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr _tao_elem
-  )
-{
-  TAO::BufferingConstraintPolicy_ptr _tao_objptr =
-    TAO::BufferingConstraintPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::insert (
-      _tao_any,
-      TAO::BufferingConstraintPolicy::_tao_any_destructor,
-      TAO::_tc_BufferingConstraintPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::extract (
-        _tao_any,
-        TAO::BufferingConstraintPolicy::_tao_any_destructor,
-        TAO::_tc_BufferingConstraintPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
deleted file mode 100644
index e8eccd0db16..00000000000
--- a/TAO/tao/TAOC.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "TAOC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-TAO::BufferingConstraint::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  BufferingConstraint *_tao_tmp_pointer =
-    static_cast<BufferingConstraint *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for TAO::BufferingConstraintPolicy.
-
-TAO::BufferingConstraintPolicy_ptr
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate (
-    TAO::BufferingConstraintPolicy_ptr p
-  )
-{
-  return TAO::BufferingConstraintPolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release (
-    TAO::BufferingConstraintPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-TAO::BufferingConstraintPolicy_ptr
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void)
-{
-  return TAO::BufferingConstraintPolicy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal (
-    TAO::BufferingConstraintPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
-{}
-
-TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
-{}
-
-void 
-TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  BufferingConstraintPolicy *_tao_tmp_pointer =
-    static_cast<BufferingConstraintPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BufferingConstraintPolicy::_nil ();
-    }
-  
-  BufferingConstraintPolicy_ptr proxy =
-    dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-  
-  return BufferingConstraintPolicy::_duplicate (proxy);
-}
-
-TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return BufferingConstraintPolicy::_nil ();
-    }
-  
-  BufferingConstraintPolicy_ptr proxy =
-    dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref);
-  
-  return BufferingConstraintPolicy::_duplicate (proxy);
-}
-
-TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-TAO::BufferingConstraintPolicy::_tao_release (BufferingConstraintPolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-TAO::BufferingConstraintPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:tao/TAO/BufferingConstraintPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const
-{
-  return "IDL:tao/TAO/BufferingConstraintPolicy:1.0";
-}
-
-CORBA::Boolean
-TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::BufferingConstraint &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.mode) &&
-    (strm << _tao_aggregate.timeout) &&
-    (strm << _tao_aggregate.message_count) &&
-    (strm << _tao_aggregate.message_bytes);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::BufferingConstraint &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.mode) &&
-    (strm >> _tao_aggregate.timeout) &&
-    (strm >> _tao_aggregate.message_count) &&
-    (strm >> _tao_aggregate.message_bytes);
-}
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
deleted file mode 100644
index 188db5dc4cb..00000000000
--- a/TAO/tao/TAOC.h
+++ /dev/null
@@ -1,344 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_TAOC_H_
-#define _TAO_IDL_ORIG_TAOC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/PolicyC.h"
-#include "tao/TimeBaseC.h"
-#include "tao/Messaging_SyncScopeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TAO
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::UShort BufferingConstraintMode;
-  typedef CORBA::UShort_out BufferingConstraintMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct BufferingConstraint;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        BufferingConstraint
-      >
-    BufferingConstraint_var;
-  
-  typedef
-    BufferingConstraint &
-    BufferingConstraint_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export BufferingConstraint
-  {
-    typedef BufferingConstraint_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TAO::BufferingConstraintMode mode;
-    TimeBase::TimeT timeout;
-    CORBA::ULong message_count;
-    CORBA::ULong message_bytes;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraint;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
-  
-  class BufferingConstraintPolicy;
-  typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        BufferingConstraintPolicy
-      >
-    BufferingConstraintPolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        BufferingConstraintPolicy
-      >
-    BufferingConstraintPolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
-  
-  class TAO_Export BufferingConstraintPolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef BufferingConstraintPolicy_ptr _ptr_type;
-    typedef BufferingConstraintPolicy_var _var_type;
-    
-    // The static operations.
-    static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-    
-    static void _tao_release (BufferingConstraintPolicy_ptr obj);
-    
-    static BufferingConstraintPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static BufferingConstraintPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static BufferingConstraintPolicy_ptr _nil (void)
-    {
-      return static_cast<BufferingConstraintPolicy_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::TAO::BufferingConstraint buffering_constraint (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // 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
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    BufferingConstraintPolicy (void);
-    
-    virtual ~BufferingConstraintPolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    BufferingConstraintPolicy (const BufferingConstraintPolicy &);
-    
-    void operator= (const BufferingConstraintPolicy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TAO
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
-  {
-    static ::TAO::BufferingConstraintPolicy_ptr duplicate (
-        ::TAO::BufferingConstraintPolicy_ptr
-      );
-    static void release (
-        ::TAO::BufferingConstraintPolicy_ptr
-      );
-    static ::TAO::BufferingConstraintPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::TAO::BufferingConstraintPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/TAOS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/TAO_Export.h b/TAO/tao/TAO_Export.h
deleted file mode 100644
index fc49ecbc163..00000000000
--- a/TAO/tao/TAO_Export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_EXPORT_H
-#define TAO_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_HAS_DLL)
-#    define TAO_HAS_DLL 0
-#  endif /* ! TAO_HAS_DLL */
-#else
-#  if !defined (TAO_HAS_DLL)
-#    define TAO_HAS_DLL 1
-#  endif /* ! TAO_HAS_DLL */
-#endif
-
-#if defined (TAO_HAS_DLL) && (TAO_HAS_DLL == 1)
-#  if defined (TAO_BUILD_DLL)
-#    define TAO_Export ACE_Proper_Export_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_BUILD_DLL */
-#    define TAO_Export ACE_Proper_Import_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_BUILD_DLL */
-#else /* TAO_HAS_DLL == 1 */
-#  define TAO_Export
-#  define TAO_SINGLETON_DECLARATION(T)
-#  define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_HAS_DLL == 1 */
-
-#endif /* TAO_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_FlResource_Export.h b/TAO/tao/TAO_FlResource_Export.h
deleted file mode 100644
index e63890b54a6..00000000000
--- a/TAO/tao/TAO_FlResource_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_FlResource
-// ------------------------------
-#ifndef TAO_FLRESOURCE_EXPORT_H
-#define TAO_FLRESOURCE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FLRESOURCE_HAS_DLL)
-#  define TAO_FLRESOURCE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_FLRESOURCE_HAS_DLL */
-
-#if !defined (TAO_FLRESOURCE_HAS_DLL)
-#  define TAO_FLRESOURCE_HAS_DLL 1
-#endif /* ! TAO_FLRESOURCE_HAS_DLL */
-
-#if defined (TAO_FLRESOURCE_HAS_DLL) && (TAO_FLRESOURCE_HAS_DLL == 1)
-#  if defined (TAO_FLRESOURCE_BUILD_DLL)
-#    define TAO_FlResource_Export ACE_Proper_Export_Flag
-#    define TAO_FLRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_FLRESOURCE_BUILD_DLL */
-#    define TAO_FlResource_Export ACE_Proper_Import_Flag
-#    define TAO_FLRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_FLRESOURCE_BUILD_DLL */
-#else /* TAO_FLRESOURCE_HAS_DLL == 1 */
-#  define TAO_FlResource_Export
-#  define TAO_FLRESOURCE_SINGLETON_DECLARATION(T)
-#  define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_FLRESOURCE_HAS_DLL == 1 */
-
-// Set TAO_FLRESOURCE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_FLRESOURCE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_FLRESOURCE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_FLRESOURCE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_FLRESOURCE_NTRACE */
-
-#if (TAO_FLRESOURCE_NTRACE == 1)
-#  define TAO_FLRESOURCE_TRACE(X)
-#else /* (TAO_FLRESOURCE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_FLRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_FLRESOURCE_NTRACE == 1) */
-
-#endif /* TAO_FLRESOURCE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
deleted file mode 100644
index 6f8e213cc44..00000000000
--- a/TAO/tao/TAO_Internal.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-// $Id$
-
-#include "TAO_Internal.h"
-#include "default_server.h"
-#include "default_client.h"
-#include "default_resource.h"
-#include "IIOP_Factory.h"
-#include "MCAST_Parser.h"
-#include "CORBANAME_Parser.h"
-#include "CORBALOC_Parser.h"
-#include "FILE_Parser.h"
-#include "DLL_Parser.h"
-#include "ORB_Core.h"
-#include "Adapter_Factory.h"
-#include "Default_Stub_Factory.h"
-#include "Default_Endpoint_Selector_Factory.h"
-#include "Default_Protocols_Hooks.h"
-#include "Default_Thread_Lane_Resources_Manager.h"
-#include "Default_Collocation_Resolver.h"
-#include "debug.h"
-#include "StringSeqC.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/Env_Value_T.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Static_Object_Lock.h"
-
-ACE_RCSID (tao,
-           TAO_Internal,
-           "$Id$")
-
-
-#ifndef TAO_DEFAULT_RESOURCE_FACTORY_ARGS
-#  define TAO_DEFAULT_RESOURCE_FACTORY_ARGS 0
-#endif  /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-
-#ifndef TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS
-#  define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS 0
-#endif  /* !TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
-
-#ifndef TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS
-#  define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS 0
-#endif  /* !TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-
-
-namespace
-{
-  /**
-   * Initialize the ACE Service Configurator.  This is a one-shot
-   * method, i.e., it can be called multiple times but it will only do
-   * its work once.  It does, however, track the number of times it's
-   * called (see @c open_services()).  It is fully thread-safe.
-   *
-   * @return @c 0 if successful, @c -1 with @c errno set if failure.
-   *
-   * @note You can provide your program a set of default `svc.conf'
-   *       entries by setting @a ignore_default_svc_conf_file to
-   *       non-zero and use @c default_svc_conf_entries() before
-   *       calling @c open_services().  In addition, you can @a
-   *       skip_service_config_open altogether, which used to be
-   *       important when the ORB is linked in via the
-   *       ACE_Service_Configurator, since the
-   *       ACE_Service_Configurator was non-reentrant.  However, the
-   *       ACE_Service_Configurator is now reentrant meaning that it
-   *       is really no longer necessary to do so.
-   */
-  int open_services_i (int & argc,
-                       char ** argv,
-                       bool ignore_default_svc_conf_file = false,
-                       bool skip_service_config_open = false);
-
-  /// Number of times open_services() has been called.  Incremented by
-  /// open_services(), and decremented by close_services().
-  /**
-   * @note In/decrement operations are atomic.
-   */
-  long service_open_count = 0;
-
-  char const * resource_factory_args =
-    TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
-  char const * server_strategy_factory_args =
-    TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
-  char const * client_strategy_factory_args =
-    TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
-}
-
-int
-TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
-{
-  // Construct an argument vector specific to the Service
-  // Configurator.
-  CORBA::StringSeq svc_config_argv;
-
-  // Be certain to copy the program name so that service configurator
-  // has something to skip!
-  ACE_CString argv0 ("");
-
-  if (argc > 0 && argv != 0)
-    {
-      argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]);
-    }
-
-  CORBA::ULong len = 0;
-  svc_config_argv.length (1);
-  svc_config_argv[0] = argv0.c_str ();
-
-  // Should we skip the ACE_Service_Config::open() method, e.g., if we
-  // already being configured by the ACE Service Configurator.
-  //
-  //   @@ This is no longer needed since the Service Configurator is
-  //      now reentrant.
-  //         -Ossama
-  bool skip_service_config_open = false;
-
-#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
-  // Make it a little easier to debug programs using this code.
-  {
-    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
-
-    char * const value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-    if (value != 0)
-      {
-        TAO_debug_level = ACE_OS::atoi (value);
-
-        if (TAO_debug_level <= 0)
-          {
-            TAO_debug_level = 1;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_debug_level == %d\n"),
-                    TAO_debug_level));
-      }
-  }
-#endif  /* TAO_DEBUG && !ACE_HAS_WINCE */
-
-  // Extract the Service Configurator ORB options from the argument
-  // vector.
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      const ACE_TCHAR *current_arg = 0;
-
-      // Start with the parameterless flags.
-      if (arg_shifter.cur_arg_strncasecmp
-          (ACE_TEXT ("-ORBSkipServiceConfigOpen")) == 0)
-        {
-          skip_service_config_open = true;
-
-          arg_shifter.consume_arg ();
-        }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDebug")) == 0)
-        {
-          // later, replace all of these
-          // warning this turns on a daemon
-          ACE::debug (1);
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT ("-ORBDebugLevel"))))
-        {
-          TAO_debug_level =
-            ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBDaemon")) == 0)
-        {
-          // Be a daemon
-
-          len = svc_config_argv.length ();
-          svc_config_argv.length (len + 1);
-
-          svc_config_argv[len] = CORBA::string_dup ("-b");
-
-          arg_shifter.consume_arg ();
-        }
-      // Continue with flags that accept parameters.
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"))))
-        {
-          len = svc_config_argv.length ();
-          svc_config_argv.length (len + 2);  // 2 arguments to add
-
-          // This is used to pass arguments to the Service
-          // Configurator using the "command line" to provide
-          // configuration information rather than using a svc.conf
-          // file.  Pass the "-S" to the service configurator.
-          svc_config_argv[len] = CORBA::string_dup ("-S");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
-        {
-          // Specify the name of the svc.conf file to be used.
-
-          // Proceeds only if the configuration file exists.
-          FILE * const conf_file = ACE_OS::fopen (current_arg, ACE_TEXT ("r"));
-
-          if (conf_file == 0)
-            {
-              // Assigning EINVAL to errno to make an exception
-              // thrown.  calling code does not throw an exception if
-              // the errno is set to ENOENT for some reason.
-              errno = EINVAL;
-
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("TAO (%P|%t) Service Configurator ")
-                                 ACE_TEXT ("unable to open file %s\n"),
-                                           current_arg),
-                                -1);
-
-            }
-          else
-            {
-              ACE_OS::fclose (conf_file);
-            }
-
-          len = svc_config_argv.length ();
-          svc_config_argv.length (len + 2);  // 2 arguments to add
-
-          svc_config_argv[len] = CORBA::string_dup ("-f");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg();
-        }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
-        {
-          len = svc_config_argv.length ();
-          svc_config_argv.length (len + 2);  // 2 arguments to add
-
-          svc_config_argv[len] = CORBA::string_dup ("-k");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
-
-          arg_shifter.consume_arg ();
-        }
-      // Can't interpret this argument.  Move on to the next argument.
-      else
-        {
-          // Any arguments that don't match are ignored so that the
-          // caller can still use them.
-          arg_shifter.ignore_arg ();
-        }
-    }
-
-  int svc_config_argc = svc_config_argv.length ();
-  return open_services_i (svc_config_argc,
-                          svc_config_argv.get_buffer (),
-                          0,  // @@ What about this argument?
-                          skip_service_config_open);
-}
-
-int
-TAO::ORB::close_services (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                            guard,
-                            *ACE_Static_Object_Lock::instance (),
-                            -1));
-
-  --service_open_count;
-
-  return 0;
-}
-
-void
-TAO::ORB::default_svc_conf_entries (char const * rf_args,
-                                    char const * ssf_args,
-                                    char const * csf_args)
-{
-  resource_factory_args        = rf_args;
-  server_strategy_factory_args = ssf_args;
-  client_strategy_factory_args = csf_args;
-}
-
-// -----------------------------------------------------
-namespace
-{
-  int
-  open_services_i (int & argc,
-                   char ** argv,
-                   bool ignore_default_svc_conf_file,
-                   bool skip_service_config_open)
-  {
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-    ignore_default_svc_conf_file = true;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-
-    {
-      ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                                guard,
-                                *ACE_Static_Object_Lock::instance (),
-                                -1));
-
-      if (service_open_count++ != 0)  // Atomic increment
-        return 0;
-    }
-
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Resource_Factory);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Client_Strategy_Factory);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Server_Strategy_Factory);
-
-    // Configure the IIOP factory. You do *NOT* need modify this
-    // code to add your own protocol, instead simply add the
-    // following to your svc.conf file:
-    //
-    // dynamic PN_Factory Service_Object * LIB:_make_PN_Protocol_Factory() ""
-    // static Resource_Factory "-ORBProtocolFactory PN_Factory"
-    //
-    // where PN is the name of your protocol and LIB is the base
-    // name of the shared library that implements the protocol.
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_IIOP_Protocol_Factory);
-
-    // add descriptor to list of static objects.
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_MCAST_Parser);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_CORBANAME_Parser);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_CORBALOC_Parser);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_FILE_Parser);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_DLL_Parser);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Stub_Factory);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Endpoint_Selector_Factory);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Protocols_Hooks);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Thread_Lane_Resources_Manager_Factory);
-    ACE_Service_Config::process_directive (
-      ace_svc_desc_TAO_Default_Collocation_Resolver);
-
-    int result = 0;
-
-    if (!skip_service_config_open)
-      {
-        // Copy command line parameter not to use original.
-        ACE_Argv_Type_Converter command_line (argc, argv);
-
-        result =
-          ACE_Service_Config::open (command_line.get_argc(),
-                                    command_line.get_TCHAR_argv(),
-                                    ACE_DEFAULT_LOGGER_KEY,
-                                    0, // Don't ignore static services.
-                                    ignore_default_svc_conf_file);
-      }
-
-    // If available, allow the Adapter Factory to setup.
-    ACE_Service_Object *adapter_factory =
-      ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
-        TAO_ORB_Core::poa_factory_name ().c_str());
-
-    if (adapter_factory != 0)
-      {
-        adapter_factory->init (0, 0);
-      }
-
-    // Handle RTCORBA library special case.  Since RTCORBA needs
-    // its init method call to register several hooks, call it
-    // here if it hasn't already been called.
-    ACE_Service_Object * const rt_loader =
-      ACE_Dynamic_Service<ACE_Service_Object>::instance ("RT_ORB_Loader");
-
-    if (rt_loader != 0)
-      {
-        rt_loader->init (0, 0);
-      }
-
-    ACE_Service_Object * const rtscheduler_loader =
-      ACE_Dynamic_Service<ACE_Service_Object>::instance ("RTScheduler_Loader");
-
-    if (rtscheduler_loader != 0)
-      {
-        rtscheduler_loader->init (0, 0);
-      }
-
-    // @@ What the heck do these things do and do we need to avoid
-    //    calling them if we're not invoking the svc.conf file?
-    // @@ They are needed for platforms that have no file system,
-    //    like VxWorks.
-    if (resource_factory_args != 0)
-      {
-        ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args));
-      }
-
-    if (client_strategy_factory_args != 0)
-      {
-        ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args));
-      }
-
-    if (server_strategy_factory_args != 0)
-      {
-        ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args));
-      }
-
-    return result;
-  }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Service<ACE_Service_Object>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate ACE_Dynamic_Service<ACE_Service_Object>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE)
-#  if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Env_Value<u_int>;
-#  elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#    pragma instantiate ACE_Env_Value<u_int>
-#  endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* TAO_DEBUG && !ACE_HAS_WINCE */
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
deleted file mode 100644
index f814c3a8c2d..00000000000
--- a/TAO/tao/TAO_Internal.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TAO_Internal.h
- *
- *  $Id$
- *
- *  Structures and methods completely internal to TAO.
- *
- *  @author Chris Cleeland
- */
-//=============================================================================
-
-#ifndef TAO_INTERNAL_H
-#define TAO_INTERNAL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace TAO
-{
-  /**
-   * @namespace ORB
-   *
-   * @brief This @c namespace encapsulates some private behaviors and
-   *        global data structures used internal to TAO.  No
-   *        application should EVER see them which is why they are not
-   *        exported.
-   */
-  namespace ORB
-  {
-    /// Extract ACE Service Configurator arguments from the given
-    /// argument vector, and initialize the ACE Service Configurator.
-    /**
-     * @note This method should be called before the ORB Core is
-     *       initialized, and before any ORBInitializers are invoked.
-     */
-    int open_services (int& argc, ACE_TCHAR** argv);
-
-    /**
-     * The complement to @c open_services(), this will perform
-     * appropriate ACE Service Configurator closure operations.  It
-     * should be called as many times as @c open_services(), and will
-     * only actually close things down on the last call.  It is fully
-     * thread-safe.
-     * @return @c 0 if successful, @c -1 with @c errno set if
-     *         failure.
-     */
-    int close_services (void);
-
-    /// Set default @c `svc.conf' content.  This call has no effect if
-    /// This function must be called before first ORB initialization.
-    void default_svc_conf_entries (char const * rf_args,
-                                   char const * ssf_args,
-                                   char const * csf_args);
-
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_INTERNAL_H */
diff --git a/TAO/tao/TAO_QtResource_Export.h b/TAO/tao/TAO_QtResource_Export.h
deleted file mode 100644
index 1e61d00a1c0..00000000000
--- a/TAO/tao/TAO_QtResource_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_QtResource
-// ------------------------------
-#ifndef TAO_QTRESOURCE_EXPORT_H
-#define TAO_QTRESOURCE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_QTRESOURCE_HAS_DLL)
-#  define TAO_QTRESOURCE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_QTRESOURCE_HAS_DLL */
-
-#if !defined (TAO_QTRESOURCE_HAS_DLL)
-#  define TAO_QTRESOURCE_HAS_DLL 1
-#endif /* ! TAO_QTRESOURCE_HAS_DLL */
-
-#if defined (TAO_QTRESOURCE_HAS_DLL) && (TAO_QTRESOURCE_HAS_DLL == 1)
-#  if defined (TAO_QTRESOURCE_BUILD_DLL)
-#    define TAO_QtResource_Export ACE_Proper_Export_Flag
-#    define TAO_QTRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_QTRESOURCE_BUILD_DLL */
-#    define TAO_QtResource_Export ACE_Proper_Import_Flag
-#    define TAO_QTRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_QTRESOURCE_BUILD_DLL */
-#else /* TAO_QTRESOURCE_HAS_DLL == 1 */
-#  define TAO_QtResource_Export
-#  define TAO_QTRESOURCE_SINGLETON_DECLARATION(T)
-#  define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_QTRESOURCE_HAS_DLL == 1 */
-
-// Set TAO_QTRESOURCE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_QTRESOURCE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_QTRESOURCE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_QTRESOURCE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_QTRESOURCE_NTRACE */
-
-#if (TAO_QTRESOURCE_NTRACE == 1)
-#  define TAO_QTRESOURCE_TRACE(X)
-#else /* (TAO_QTRESOURCE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_QTRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_QTRESOURCE_NTRACE == 1) */
-
-#endif /* TAO_QTRESOURCE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
deleted file mode 100644
index f525588e9a7..00000000000
--- a/TAO/tao/TAO_Server_Request.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-// $Id$
-
-#include "TAO_Server_Request.h"
-#include "ORB_Core.h"
-#include "Timeprobe.h"
-#include "debug.h"
-#include "Pluggable_Messaging.h"
-#include "GIOP_Utils.h"
-#include "Stub.h"
-#include "operation_details.h"
-#include "Transport.h"
-#include "CDR.h"
-#include "SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "TAO_Server_Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           TAO_Server_Request,
-           "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char * TAO_Server_Request_Timeprobe_Description[] =
-{
-  "TAO_ServerRequest::TAO_ServerRequest - start",
-  "TAO_ServerRequest::TAO_ServerRequest - end",
-};
-
-enum
-  {
-    // Timeprobe description table start key.
-    TAO_SERVER_REQUEST_START = 400,
-    TAO_SERVER_REQUEST_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
-                                  TAO_SERVER_REQUEST_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
-                                      TAO_InputCDR &input,
-                                      TAO_OutputCDR &output,
-                                      TAO_Transport *transport,
-                                      TAO_ORB_Core *orb_core)
-  : mesg_base_ (mesg_base),
-    operation_ (),
-    incoming_ (&input),
-    outgoing_ (&output),
-    // transport already duplicated in
-    // TAO_Transport::process_parsed_messages ()
-    transport_(transport),
-    response_expected_ (false),
-    deferred_reply_ (false),
-    sync_with_server_ (false),
-    is_dsi_ (false),
-    // @@ We shouldn't be using GIOP specific types here. Need to be revisited.
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    request_id_ (0),
-    profile_ (orb_core),
-    requesting_principal_ (0),
-    dsi_nvlist_align_ (0),
-    operation_details_ (0),
-    argument_flag_ (1)
-#if TAO_HAS_INTERCEPTORS == 1
-    , interceptor_count_ (0)
-    , rs_pi_current_ ()
-    , pi_current_copy_callback_ ()
-    , result_seq_ (0)
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
-  // No-op.
-}
-
-// This constructor is used, by the locate request code.
-TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
-                                      CORBA::ULong request_id,
-                                      CORBA::Boolean response_expected,
-                                      CORBA::Boolean deferred_reply,
-                                      TAO::ObjectKey &object_key,
-                                      const char *operation,
-                                      TAO_OutputCDR &output,
-                                      TAO_Transport *transport,
-                                      TAO_ORB_Core *orb_core,
-                                      int &parse_error)
-  : mesg_base_ (mesg_base),
-    operation_ (operation),
-    incoming_ (0),
-    outgoing_ (&output),
-    // transport already duplicated in
-    // TAO_Transport::process_parsed_messages ()
-    transport_ (transport),
-    response_expected_ (response_expected),
-    deferred_reply_ (deferred_reply),
-    sync_with_server_ (false),
-    is_dsi_ (false),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    request_id_ (request_id),
-    profile_ (orb_core),
-    requesting_principal_ (0),
-    dsi_nvlist_align_ (0),
-    operation_details_ (0),
-    argument_flag_ (true)
-#if TAO_HAS_INTERCEPTORS == 1
-  , interceptor_count_ (0)
-  , rs_pi_current_ ()
-  , result_seq_ (0)
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-{
-  this->profile_.object_key (object_key);
-  parse_error = 0;
-}
-
-// Constructor used in Thru-POA collocation code.
-TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
-                                      TAO_Operation_Details const & details,
-                                      CORBA::Object_ptr target)
-  : mesg_base_ (0),
-    operation_ (details.opname ()),
-    incoming_ (0),
-    outgoing_ (0),
-    transport_ (0),
-    response_expected_ (details.response_flags () == TAO_TWOWAY_RESPONSE_FLAG
-                        || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_SERVER)
-                        || details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_TARGET)),
-    deferred_reply_ (false),
-    sync_with_server_ (details.response_flags () == static_cast<CORBA::Octet> (Messaging::SYNC_WITH_SERVER)),
-    is_dsi_ (false),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    request_id_ (0),
-    profile_ (orb_core),
-    requesting_principal_ (0),
-    dsi_nvlist_align_ (0),
-    operation_details_ (&details),
-    argument_flag_ (false)
-#if TAO_HAS_INTERCEPTORS == 1
-  , interceptor_count_ (0)
-  , rs_pi_current_ ()
-  , result_seq_ (0)
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-{
-  // Have to use a const_cast<>.  *sigh*
-  this->profile_.object_key (const_cast<TAO::ObjectKey &> (target->_stubobj ()->object_key ()));
-
-  // Shallow copy the request service context list. This way the operation
-  // details and server request share the request context.
-  IOP::ServiceContextList & dest_request_contexts =
-    this->request_service_context_.service_info ();
-
-  IOP::ServiceContextList & src_request_contexts =
-    (const_cast <TAO_Operation_Details&> (details)).request_service_info ();
-
-  dest_request_contexts.replace (src_request_contexts.maximum (),
-                                 src_request_contexts.length (),
-                                 src_request_contexts.get_buffer (),
-                                 false /* Do not release. */);
-
-  // Don't shallow copy the reply service context. It is probably empty,
-  // when then during the request it is used, the buffer gets allocated and
-  // then the operation details don't get the reply service context
-}
-
-TAO_ServerRequest::~TAO_ServerRequest (void)
-{
-}
-
-CORBA::ORB_ptr
-TAO_ServerRequest::orb (void)
-{
-  return this->orb_core_->orb ();
-}
-
-TAO_Service_Context &
-TAO_ServerRequest::reply_service_context (void)
-{
-  if (!operation_details_)
-  {
-    return this->reply_service_context_;
-  }
-  else
-  {
-    return const_cast <TAO_Operation_Details*> (this->operation_details_)->reply_service_context ();
-  }
-}
-
-
-void
-TAO_ServerRequest::init_reply (void)
-{
-  if (!this->outgoing_)
-    return;  // Collocated
-
-  // Construct our reply generator.
-  TAO_Pluggable_Reply_Params_Base reply_params;
-
-  // We put all the info that we have in to this <reply_params> and
-  // call the <write_reply_header> in the
-  // pluggable_messaging_interface. One point to be noted however is
-  // that, it was the pluggable_messaging classes who created us and
-  // delegated us to do work on its behalf. But we would be calling
-  // back. As we don't have a LOCK or any such things we can call
-  // pluggable_messaging guys again. We would be on the same thread of
-  // invocation. So *theoretically* there should not be a problem.
-  reply_params.request_id_ = this->request_id_;
-  reply_params.is_dsi_ = this->is_dsi_;
-  reply_params.dsi_nvlist_align_ = this->dsi_nvlist_align_;
-
-  // Send back the reply service context.
-  reply_params.service_context_notowned (&this->reply_service_info ());
-
-  // Are we going to marshall any data with the reply?
-  reply_params.argument_flag_ = this->argument_flag_;
-
-  // Forward exception only.
-  if (!CORBA::is_nil (this->forward_location_.in ()))
-    {
-      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
-    }
-  // Any exception at all.
-  else if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
-    {
-      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
-    }
-  else
-    {
-      reply_params.reply_status_ = this->exception_type_;
-    }
-
-  // Construct a REPLY header.
-  this->mesg_base_->generate_reply_header (*this->outgoing_,
-                                           reply_params);
-
-  // Finish the GIOP Reply header, then marshal the exception.
-  if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD)
-    {
-      // Marshal the forward location pointer.
-      CORBA::Object_ptr object_ptr = this->forward_location_.in ();
-
-      if ((*this->outgoing_ << object_ptr) == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::init_reply, ")
-                      ACE_TEXT ("TAO_GIOP_ServerRequest::marshal - ")
-                      ACE_TEXT ("marshal encoding forwarded objref failed\n")));
-        }
-    }
-  this->transport_->assign_translators (0, this->outgoing_);
-}
-
-void
-TAO_ServerRequest::send_no_exception_reply (void)
-{
-  // Construct our reply generator.
-  TAO_Pluggable_Reply_Params_Base reply_params;
-  reply_params.request_id_ = this->request_id_;
-  reply_params.is_dsi_ = this->is_dsi_;
-  reply_params.dsi_nvlist_align_ = this->dsi_nvlist_align_;
-
-  // Change this to pass back the same thing we received, as well as
-  // leave a comment why this is important!
-  reply_params.svc_ctx_.length (0);
-
-  // Send back the reply service context.
-  reply_params.service_context_notowned (&this->reply_service_info ());
-
-  reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION;
-
-  // No data anyway.
-  reply_params.argument_flag_ = 0;
-
-  // Construct a REPLY header.
-  this->mesg_base_->generate_reply_header (*this->outgoing_,
-                                           reply_params);
-
-  // Send the message.
-  int result = this->transport_->send_message (*this->outgoing_,
-                                               0,
-                                               TAO_Transport::TAO_REPLY);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          // No exception but some kind of error, yet a response
-          // is required.
-          ACE_ERROR ((
-                      LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_no_exception_reply, ")
-                      ACE_TEXT ("cannot send NO_EXCEPTION reply\n")
-                      ));
-        }
-    }
-}
-
-void
-TAO_ServerRequest::tao_send_reply (void)
-{
-  if (this->collocated ())
-    return;  // No transport in the collocated case.
-
-  int result = this->transport_->send_message (*this->outgoing_,
-                                               0,
-                                               TAO_Transport::TAO_REPLY);
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          // No exception but some kind of error, yet a response
-          // is required.
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply, ")
-                      ACE_TEXT ("cannot send reply\n")));
-        }
-    }
-}
-
-void
-TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
-{
-  //  int result = 0;
-  if (this->response_expected_ && !this->collocated ())
-    {
-      // A copy of the reply parameters
-      TAO_Pluggable_Reply_Params_Base reply_params;
-
-      reply_params.request_id_ = this->request_id_;
-      reply_params.svc_ctx_.length (0);
-
-      // Send back the reply service context.
-      reply_params.service_context_notowned (&this->reply_service_info ());
-
-      // We are going to send some data
-      reply_params.argument_flag_ = 1;
-
-      // Make a default reply status
-      reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
-
-      // Check whether we are able to downcast the exception
-      if (CORBA::SystemException::_downcast (&ex) != 0)
-        {
-          reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
-        }
-
-      // Create a new output CDR stream
-#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
-      // Only inititialize the buffer if we're compiling with a profiler.
-      // Otherwise, there is no real need to do so, especially since
-      // we can avoid the initialization overhead at runtime if we
-      // are not compiling with memory profiler support.
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
-#else
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-      TAO_OutputCDR output (repbuf,
-                            sizeof repbuf,
-                            TAO_ENCAP_BYTE_ORDER,
-                            this->orb_core_->output_cdr_buffer_allocator (),
-                            this->orb_core_->output_cdr_dblock_allocator (),
-                            this->orb_core_->output_cdr_msgblock_allocator (),
-                            this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                            TAO_DEF_GIOP_MAJOR,
-                            TAO_DEF_GIOP_MINOR);
-
-      this->transport_->assign_translators (0, &output);
-      // Make the reply message
-      if (this->mesg_base_->generate_exception_reply (*this->outgoing_,
-                                                      reply_params,
-                                                      ex) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
-                      ACE_TEXT ("could not make exception reply\n")));
-
-        }
-
-      // Send the message
-      if (this->transport_->send_message (*this->outgoing_,
-                                          0,
-                                          TAO_Transport::TAO_REPLY) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
-                      ACE_TEXT ("could not send exception reply\n")));
-        }
-    }
-  else if (TAO_debug_level > 0)
-    {
-      // It is unfortunate that an exception (probably a system
-      // exception) was thrown by the upcall code (even by the
-      // user) when the client was not expecting a response.
-      // However, in this case, we cannot close the connection
-      // down, since it really isn't the client's fault.
-
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ")
-                  ACE_TEXT ("exception thrown ")
-                  ACE_TEXT ("but client is not waiting a response\n")));
-    }
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-void
-TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
-{
-  #if defined(ACE_HAS_PURIFY)
-      // Only inititialize the buffer if we're compiling with Purify.
-      // Otherwise, there is no real need to do so, especially since
-      // we can avoid the initialization overhead at runtime if we
-      // are not compiling with Purify support.
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
-#else
-      char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_HAS_PURIFY */
-
-  TAO_OutputCDR output (repbuf,
-                        sizeof repbuf,
-                        TAO_ENCAP_BYTE_ORDER,
-                        this->orb_core_->output_cdr_buffer_allocator (),
-                        this->orb_core_->output_cdr_dblock_allocator (),
-                        this->orb_core_->output_cdr_msgblock_allocator (),
-                        this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-  this->transport_->assign_translators(0,&output);
-
-  // A copy of the reply parameters
-  TAO_Pluggable_Reply_Params_Base reply_params;
-
-  reply_params.request_id_ = this->request_id_;
-
-  reply_params.svc_ctx_.length (0);
-
-  // Send back the empty reply service context.
-  reply_params.service_context_notowned (&this->reply_service_info ());
-
-  // We are going to send some data
-  reply_params.argument_flag_ = 1;
-
-  // Make a default reply status
-  reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION;
-
-  // Make the reply message
-  if (this->mesg_base_->generate_reply_header (*this->outgoing_,
-                                               reply_params) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
-                  ACE_TEXT ("could not make cached reply\n")));
-
-    }
-
-  /// Append reply here....
-  this->outgoing_->write_octet_array (
-    s.get_buffer (),
-    s.length ());
-
-  if (!this->outgoing_->good_bit ())
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
-                ACE_TEXT ("could not marshal reply\n")));
-
-  // Send the message
-  if (this->transport_->send_message (*this->outgoing_,
-                                      0,
-                                      TAO_Transport::TAO_REPLY) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
-                  ACE_TEXT ("could not send cached reply\n")));
-    }
-}
-#endif /*TAO_HAS_INTERCEPTORS*/
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
deleted file mode 100644
index 36ffb35a677..00000000000
--- a/TAO/tao/TAO_Server_Request.h
+++ /dev/null
@@ -1,338 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
-*  @file    TAO_Server_Request.h
-*
-*  $Id$
-*
-*  Header file for CORBA's Server Skeleton Interface's
-*  "Server Request" type.
-*
-*
-* @author Copyright 1994-1995 by Sun Microsystems Inc.
-* @author Chris Cleeland
-* @author Aniruddha Gokhale
-*/
-//=============================================================================
-
-#ifndef TAO_GIOP_SERVER_REQUEST_H
-#define TAO_GIOP_SERVER_REQUEST_H
-
-#include /**/ "ace/pre.h"
-#include "ace/SString.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Tagged_Profile.h"
-#include "Service_Context.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent.h"
-#include "PICurrent_Copy_Callback.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-class TAO_Pluggable_Messaging;
-class TAO_Transport;
-class TAO_AMH_Response_Handler;
-
-namespace CORBA
-{
-  class ORB;
-  typedef ORB *ORB_ptr;
-}
-
-class TAO_Operation_Details;
-
-/**
- * @class TAO_ServerRequest
- *
- * @brief Class representing a ServerRequest object.
- *
- * Encapsulates CDR, transport and pluggable messaging
- * components on the server side.
-*/
-class TAO_Export TAO_ServerRequest
-{
-public:
-  /// Declare TAO_AMH_Response_Handler a friend
-  /**
-   * The TAO_AMH_Response_Handler class needs to copy part of the
-   * state in a TAO_ServerRequest, however, we do not want to expose
-   * that state as public members of this class, neither do we want to
-   * add modifiers to the TAO_AMH_Response_Handler class that would
-   * allow us (the TAO_ServerRequest class) to set the state.
-   *
-   * Lucky for us, C++ is a language for adult developers, and allow
-   * us to use the evil "friend" declaration.
-   *
-   */
-  friend class TAO_AMH_Response_Handler;
-
-  // Constructors.
-
-  TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
-                     TAO_InputCDR &input,
-                     TAO_OutputCDR &output,
-                     TAO_Transport *transport,
-                     TAO_ORB_Core *orb_core);
-
-  TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
-                     CORBA::ULong request_id,
-                     CORBA::Boolean response_expected,
-                     CORBA::Boolean deferred_flag,
-                     TAO::ObjectKey &object_key,
-                     const char *operation,
-                     TAO_OutputCDR &output,
-                     TAO_Transport *transport,
-                     TAO_ORB_Core *orb_core,
-                     int &parse_error);
-
-  /// Constructor used by thru-POA collocated invocation path.
-  TAO_ServerRequest (TAO_ORB_Core * orb_core,
-                     TAO_Operation_Details const & details,
-                     CORBA::Object_ptr target);
-
-  /// Destructor.
-  virtual ~TAO_ServerRequest (void);
-
-  /**
-   * @name Request attributes.
-   */
-  //@{
-  /// Return the operation name.
-  const char *operation (void) const;
-
-  /// Set the operation name.
-  void operation (const char *operation,
-                  size_t length,
-                  int release);
-
-  /// Return the length of the operation.
-  size_t operation_length (void) const;
-  //@}
-
-  /// Return the underlying ORB.
-  CORBA::ORB_ptr orb (void);
-
-  /// Return the ORB core pointer member.
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Start a Reply message.
-  void init_reply (void);
-
-  /// Retrieve the incoming stream.
-  TAO_InputCDR * incoming (void) const;
-
-  /// Retrieve the outgoing stream.
-  TAO_OutputCDR * outgoing (void) const;
-
-  /// Is the response expected?
-  CORBA::Boolean response_expected (void) const;
-
-  /// Should the reply be deferred?
-  CORBA::Boolean deferred_reply (void) const;
-
-  /// Set the response expected flag.
-  void response_expected (CORBA::Boolean response);
-
-  /// Should we return before dispatching the servant?
-  CORBA::Boolean sync_with_server (void) const;
-
-  /// Set the sync_with_server flag.
-  void sync_with_server (CORBA::Boolean sync_flag);
-
-  /// Used with reliable oneway requests.
-  void send_no_exception_reply (void);
-
-  TAO::ObjectKey &object_key (void);
-
-  /// Return the request TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-
-  /// Return the reply TAO_Service_Context
-  TAO_Service_Context &reply_service_context (void);
-
-  IOP::ServiceContextList &reply_service_info (void);
-
-  IOP::ServiceContextList &request_service_info (void);
-
-  /// Return the underlying transport
-  TAO_Transport *transport ();
-
-  /// To handle System Exceptions at the lowest level, a method
-  /// returning the request_id_ is needed.
-  //@{
-  CORBA::ULong request_id (void);
-  void request_id (CORBA::ULong req);
-  //@}
-
-  /**
-   * Set the reference to the object the request should be forwarded
-   * to.  This reference will only be used if set prior to calling
-   * init_reply().
-   */
-  void forward_location (CORBA::Object_ptr forward_reference);
-
-  /// Get the forward_location.
-  CORBA::Object_ptr forward_location (void);
-
-  /// Get the exception type.
-  CORBA::ULong exception_type (void);
-
-  /// Set the exception type.
-  void exception_type (CORBA::ULong except_type);
-
-  /// Set the requesting principal
-  void requesting_principal (const CORBA::OctetSeq & principal);
-
-  /// Return the reference to the tagged profile
-  TAO_Tagged_Profile &profile (void);
-
-  void tao_send_reply (void);
-
-  void tao_send_reply_exception (CORBA::Exception&);
-
-  /// Set the boolean member to 1.
-  void is_dsi (void);
-
-  /// Set the member.
-  void dsi_nvlist_align (ptrdiff_t alignment);
-
-  // Get the operation details for the current request.
-  TAO_Operation_Details const * operation_details (void) const;
-
-  /// Set the argument_flag
-  void argument_flag (CORBA::Boolean flag);
-
-  /// Get the argument_flag
-  CORBA::Boolean argument_flag (void);
-
-  /// Returns @c true if the current request is collocated.
-  bool collocated (void) const;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  /// Send cached reply. Used in scenarios where the FTORB thinks that
-  /// this request is a duplicate
-  void send_cached_reply (CORBA::OctetSeq &ocs);
-
-  /// Return the octet sequence pointer through which the FTORB would
-  /// send the reply back.
-  void result_seq (CORBA::OctetSeq &ocs);
-
-  /// Check whether we got the result.
-  int got_result (void);
-
-  /// Return a reference to the number of interceptors pushed on to
-  /// the current interceptor flow stack.
-  /**
-   * @note It is a reference since the Portable Interceptor flow stack
-   *       code must be able to modify this value and use that value
-   *       at a later time without being forced to use TSS.
-   */
-  size_t & interceptor_count (void);
-
-  /// Return a reference to the "request scope" PICurrent object.
-  TAO::PICurrent_Impl & rs_pi_current (void);
-
-  /// Return a reference to the PICurrent copy callback object.
-  TAO::PICurrent_Copy_Callback & pi_current_copy_callback (void);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-private:
-  TAO_Pluggable_Messaging *mesg_base_;
-
-  /// Operation name.
-  ACE_CString operation_;
-
-  CORBA::Object_var forward_location_;
-
-  /// Incoming stream.
-  TAO_InputCDR *incoming_;
-
-  /// Outgoing stream.
-  TAO_OutputCDR *outgoing_;
-
-  /// Transport class.
-  TAO_Transport *transport_;
-
-  /// 0: oneway (SYNC_NONE or SYNC_WITH_TRANSPORT)
-  /// 1: twoway, or oneway (SYNC_WITH_SERVER or SYNC_WITH_TARGET)
-  CORBA::Boolean response_expected_;
-
-  /**
-   * 0: Reply would be sent by the object of this class which is the
-   *    default.
-   * 1: Reply would not be prepared by this class and it would be
-   *    deferred for somebody.
-   */
-  CORBA::Boolean deferred_reply_;
-
-  /// 1: oneway (SYNC_WITH_SERVER)
-  /// 0: anything else
-  CORBA::Boolean sync_with_server_;
-
-  /// Did we get passed to a CORBA::ServerRequest?
-  CORBA::Boolean is_dsi_;
-
-  //  TAO_GIOP_ReplyStatusType exception_type_;
-  /// Exception type (will be NO_EXCEPTION in the majority of the cases).
-  CORBA::ULong exception_type_;
-
-  /// A pointer to the ORB Core for the context where the request was
-  /// created.
-  TAO_ORB_Core *orb_core_;
-
-  /// Service Context info
-  TAO_Service_Context request_service_context_;
-  TAO_Service_Context reply_service_context_;
-
-  /// Unique identifier for a request.
-  CORBA::ULong request_id_;
-
-  /// The tagged profile that has the addressing information.
-  TAO_Tagged_Profile profile_;
-
-  /// Identifies the requester.
-  CORBA::OctetSeq_var requesting_principal_;
-
-  /// Used to pad CDR stream if we have used DSI.
-  ptrdiff_t dsi_nvlist_align_;
-
-  TAO_Operation_Details const * const operation_details_;
-
-  /**
-   * An argument flag to indicate whether there is any data that is
-   * going to get marshalled along as a reply. The default will be 1
-   * which indicates that we have some data that needs to be sent back
-   * to the client.
-   */
-  CORBA::Boolean argument_flag_;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  /// The number of interceptors pushed on to the current interceptor
-  /// flow stack.
-  size_t interceptor_count_;
-
-  /// The "Request Scope Current" (RSC) object, as required by
-  /// Portable Interceptors.
-  TAO::PICurrent_Impl rs_pi_current_;
-
-  /// PICurrent callback object responsible for copying slot table
-  /// between PICurrents in different scopes (i.e. thread or request).
-  TAO::PICurrent_Copy_Callback pi_current_copy_callback_;
-
-  /// Used by the FTORB
-  CORBA::OctetSeq_var result_seq_;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-};
-
-#if defined (__ACE_INLINE__)
-# include "TAO_Server_Request.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_GIOP_SERVER_REQUEST_H */
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
deleted file mode 100644
index aa1fd412d02..00000000000
--- a/TAO/tao/TAO_Server_Request.i
+++ /dev/null
@@ -1,229 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO_ORB_Core *
-TAO_ServerRequest::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE TAO_InputCDR *
-TAO_ServerRequest::incoming (void) const
-{
-  return this->incoming_;
-}
-
-ACE_INLINE TAO_OutputCDR *
-TAO_ServerRequest::outgoing (void) const
-{
-  return this->outgoing_;
-}
-
-ACE_INLINE const char *
-TAO_ServerRequest::operation (void) const
-{
-  return this->operation_.c_str ();
-}
-
-ACE_INLINE void
-TAO_ServerRequest::operation (const char *operation,
-                              size_t length,
-                              int release)
-{
-  if (length == 0)
-    {
-      this->operation_.set (operation, release);
-    }
-  else
-    {
-      this->operation_.set (operation, length, release);
-    }
-}
-
-ACE_INLINE size_t
-TAO_ServerRequest::operation_length (void) const
-{
-  return this->operation_.length ();
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ServerRequest::response_expected (void) const
-{
-  return this->response_expected_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ServerRequest::deferred_reply (void) const
-{
-  return this->deferred_reply_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::response_expected (CORBA::Boolean response)
-{
-  this->response_expected_ = response;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ServerRequest::sync_with_server (void) const
-{
-  return this->sync_with_server_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::sync_with_server (CORBA::Boolean sync_flag)
-{
-  this->sync_with_server_ = sync_flag;
-}
-
-ACE_INLINE TAO::ObjectKey &
-TAO_ServerRequest::object_key (void)
-{
-  return this->profile_.object_key ();
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_ServerRequest::request_service_context (void)
-{
-  return this->request_service_context_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::reply_service_info (void)
-{
-  return this->reply_service_context ().service_info ();
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::request_service_info (void)
-{
-  return this->request_service_context ().service_info ();
-}
-
-ACE_INLINE TAO_Transport *
-TAO_ServerRequest::transport (void)
-{
-  return this->transport_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ServerRequest::request_id (void)
-{
-  return this->request_id_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::request_id (CORBA::ULong req)
-{
-  this->request_id_ = req;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal)
-{
-  this->requesting_principal_ = principal;
-}
-
-ACE_INLINE TAO_Tagged_Profile &
-TAO_ServerRequest::profile (void)
-{
-  return this->profile_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::forward_location (CORBA::Object_ptr forward_reference)
-{
-  this->forward_location_ =
-    CORBA::Object::_duplicate (forward_reference);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_ServerRequest::forward_location (void)
-{
-  return CORBA::Object::_duplicate (this->forward_location_.in ());
-}
-
-ACE_INLINE CORBA::ULong
-TAO_ServerRequest::exception_type (void)
-{
-  return this->exception_type_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::exception_type (CORBA::ULong except_type)
-{
-  this->exception_type_ = except_type;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::is_dsi (void)
-{
-  this->is_dsi_ = 1;
-}
-
-ACE_INLINE TAO_Operation_Details const *
-TAO_ServerRequest::operation_details (void) const
-{
-  return this->operation_details_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment)
-{
-  this->dsi_nvlist_align_ = alignment;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_ServerRequest::argument_flag (void)
-{
-  return this->argument_flag_;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::argument_flag (CORBA::Boolean flag)
-{
-  this->argument_flag_ = flag;
-}
-
-ACE_INLINE bool
-TAO_ServerRequest::collocated (void) const
-{
-  return this->transport_ == 0;
-}
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-ACE_INLINE size_t &
-TAO_ServerRequest::interceptor_count (void)
-{
-  return this->interceptor_count_;
-}
-
-ACE_INLINE TAO::PICurrent_Impl &
-TAO_ServerRequest::rs_pi_current (void)
-{
-  return this->rs_pi_current_;
-}
-
-ACE_INLINE TAO::PICurrent_Copy_Callback &
-TAO_ServerRequest::pi_current_copy_callback (void)
-{
-  return this->pi_current_copy_callback_;
-}
-
-ACE_INLINE int
-TAO_ServerRequest::got_result (void)
-{
-  if (this->result_seq_.ptr () == 0)
-    return 0;
-
-  return 1;
-}
-
-ACE_INLINE void
-TAO_ServerRequest::result_seq (CORBA::OctetSeq &ocs)
-{
-  this->result_seq_ = ocs;
-}
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp
deleted file mode 100644
index 13ea18bf273..00000000000
--- a/TAO/tao/TAO_Singleton.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_SINGLETON_CPP
-#define TAO_SINGLETON_CPP
-
-#include "tao/TAO_Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Singleton_Manager.h"
-
-#include "ace/Guard_T.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/TAO_Singleton.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           TAO_Singleton,
-           "$Id$")
-
-template <class TYPE, class ACE_LOCK> void
-TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
-              TAO_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TAO_Singleton<TYPE, ACE_LOCK> *&
-TAO_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static TAO_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return TAO_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-TAO_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::instance");
-
-  TAO_Singleton<TYPE, ACE_LOCK> *&singleton =
-    TAO_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-      if (TAO_Singleton_Manager::starting_up () ||
-          TAO_Singleton_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the TAO_Singleton_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // TAO_Singleton_Manager:  we'll have to leak this instance.
-
-          ACE_NEW_RETURN (singleton, (TAO_Singleton<TYPE, ACE_LOCK>), 0);
-        }
-      else
-        {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per TAO_Singleton
-          // instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            {
-#endif /* ACE_MT_SAFE */
-              ACE_NEW_RETURN (singleton, (TAO_Singleton<TYPE, ACE_LOCK>), 0);
-
-              // Register for destruction with TAO_Singleton_Manager.
-              TAO_Singleton_Manager::at_exit (singleton);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-            }
-#endif /* ACE_MT_SAFE */
-        }
-    }
-
-  return &singleton->instance_;
-}
-
-template <class TYPE, class ACE_LOCK> void
-TAO_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
-{
-  delete this;
-  TAO_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
-}
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-// Pointer to the Singleton instance.
-template <class TYPE, class ACE_LOCK> TAO_Singleton<TYPE, ACE_LOCK> *
-TAO_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-
-template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
-#endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
-
-
-template <class TYPE, class ACE_LOCK> void
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
-{
-  ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump");
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("instance_ = %x"),
-              TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TAO_TSS_Singleton<TYPE, ACE_LOCK> *&
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void)
-{
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++ and it's (mis-)handling of templates and statics...
-  static TAO_TSS_Singleton<TYPE, ACE_LOCK> *singleton_ = 0;
-
-  return singleton_;
-#else
-  return TAO_TSS_Singleton<TYPE, ACE_LOCK>::singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-}
-
-template <class TYPE, class ACE_LOCK> TYPE *
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
-{
-  ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance");
-
-  TAO_TSS_Singleton<TYPE, ACE_LOCK> *&singleton =
-    TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-      if (TAO_Singleton_Manager::starting_up () ||
-          TAO_Singleton_Manager::shutting_down ())
-        {
-          // The program is still starting up, and therefore assumed
-          // to be single threaded.  There's no need to double-check.
-          // Or, the TAO_Singleton_Manager instance has been destroyed,
-          // so the preallocated lock is not available.  Either way,
-          // don't register for destruction with the
-          // TAO_Singleton_Manager:  we'll have to leak this instance.
-
-          ACE_NEW_RETURN (singleton, (TAO_TSS_Singleton<TYPE, ACE_LOCK>), 0);
-        }
-      else
-        {
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-          // Obtain a lock from the ACE_Object_Manager.  The pointer
-          // is static, so we only obtain one per TAO_Singleton
-          // instantiation.
-          static ACE_LOCK *lock = 0;
-          if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
-            return 0;
-
-          ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
-
-          if (singleton == 0)
-            {
-#endif /* ACE_MT_SAFE */
-              ACE_NEW_RETURN (singleton, (TAO_TSS_Singleton<TYPE, ACE_LOCK>),
-                              0);
-
-              // Register for destruction with TAO_Singleton_Manager.
-              TAO_Singleton_Manager::at_exit (singleton);
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-            }
-#endif /* ACE_MT_SAFE */
-        }
-    }
-
-  return ACE_TSS_GET (&singleton->instance_, TYPE);
-}
-
-template <class TYPE, class ACE_LOCK> void
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
-{
-  delete this;
-  TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
-}
-
-#endif  /* TAO_SINGLETON_CPP */
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
deleted file mode 100644
index b4c2194f86c..00000000000
--- a/TAO/tao/TAO_Singleton.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TAO_Singleton.h
- *
- *  $Id$
- *
- *   Header file for the TAO-specific Singleton implementation.
- *   Based entirely on ace/Singleton.*.
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_SINGLETON_H
-#define TAO_SINGLETON_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/TSS_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Cleanup.h"
-
-
-/**
- * @class TAO_Singleton
- *
- * @brief TAO-specific Singleton class
- *
- * TAO_Singletons are used by TAO to register TAO-specific
- * singleton instances with the TAO_Object_Manager.  This
- * ensures that TAO singletons are isolated from ACE's
- * Object_Manager, thus allowing TAO to be safely dynamically
- * unloaded.
- */
-template <class TYPE, class ACE_LOCK>
-class TAO_Singleton : public ACE_Cleanup
-{
-
-public:
-  /// Global access point to the Singleton.
-  static TYPE *instance (void);
-
-  /// Cleanup method, used by <ace_cleanup_destroyer> to destroy the
-  /// singleton.
-  virtual void cleanup (void *param = 0);
-
-  /// Dump the state of the object.
-  static void dump (void);
-
-protected:
-  /// Default constructor.
-  TAO_Singleton (void);
-
-  /// Contained instance.
-  TYPE instance_;
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  /// Pointer to the Singleton (ACE_Cleanup) instance.
-  static TAO_Singleton<TYPE, ACE_LOCK> *singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  /// Get pointer to the TAO Singleton instance.
-  static TAO_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-};
-
-/**
- * @class TAO_TSS_Singleton
- *
- * @brief TAO-specific Singleton class
- *
- * TAO_Singletons are used by TAO to register TAO-specific
- * singleton instances with the TAO_Object_Manager.  This
- * ensures that TAO singletons are isolated from ACE's
- * Object_Manager, thus allowing TAO to be safely dynamically
- * unloaded.
- */
-template <class TYPE, class ACE_LOCK>
-class TAO_TSS_Singleton : public ACE_Cleanup
-{
-
-public:
-  /// Global access point to the Singleton.
-  static TYPE *instance (void);
-
-  /// Cleanup method, used by <ace_cleanup_destroyer> to destroy the
-  /// singleton.
-  virtual void cleanup (void *param = 0);
-
-  /// Dump the state of the object.
-  static void dump (void);
-
-protected:
-  /// Default constructor.
-  TAO_TSS_Singleton (void);
-
-  /// Contained instance.
-  ACE_TSS_TYPE (TYPE) instance_;
-
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  /// Pointer to the Singleton (ACE_Cleanup) instance.
-  static TAO_TSS_Singleton<TYPE, ACE_LOCK> *singleton_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
-
-  /// Get pointer to the TAO TSS Singleton instance.
-  static TAO_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
-
-private:
-
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_TSS_Singleton<TYPE,ACE_LOCK> &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Singleton (const TAO_TSS_Singleton<TYPE,ACE_LOCK> &))
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/TAO_Singleton.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/TAO_Singleton.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TAO_Singleton.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SINGLETON_H */
diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl
deleted file mode 100644
index d1d32b6998c..00000000000
--- a/TAO/tao/TAO_Singleton.inl
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// Default constructors.
-//
-// Note: don't explicitly initialize "instance_", because TYPE may not
-// have a default constructor.  Let the compiler figure it out . . .
-
-template <class TYPE, class ACE_LOCK> ACE_INLINE
-TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton (void)
-{
-}
-
-template <class TYPE, class ACE_LOCK> ACE_INLINE
-TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void)
-{
-}
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
deleted file mode 100644
index fcacaa78283..00000000000
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-// $Id$
-
-#include "tao/TAO_Singleton_Manager.h"
-#include "tao/Exception.h"
-
-#include "ace/Guard_T.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Log_Msg.h"
-#include "ace/Object_Manager.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/TAO_Singleton_Manager.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_MVS)
-#   include /**/ <unexpect.h>
-# else
-#  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#   include /**/ <exception>
-#  else
-#   include /**/ <exception.h>
-#  endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-# endif /* ACE_MVS */
-#endif /* ACE_HAS_EXCEPTIONS */
-
-ACE_RCSID (tao,
-           TAO_Singleton_Manager,
-           "$Id$")
-
-extern "C" void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *)
-{
-  if (TAO_Singleton_Manager::instance_)
-    {
-      (void) TAO_Singleton_Manager::instance ()->fini ();
-    }
-}
-
-TAO_Singleton_Manager *TAO_Singleton_Manager::instance_ = 0;
-
-void *TAO_Singleton_Manager::preallocated_object[
-  TAO_Singleton_Manager::TAO_PREALLOCATED_OBJECTS] = { 0 };
-
-TAO_Singleton_Manager::TAO_Singleton_Manager (void)
-  // default_mask_ isn't initialized, because it's defined by <init>.
-  : thread_hook_ (0),
-    exit_info_ (),
-    registered_with_object_manager_ (-1)
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    , internal_lock_ (new TAO_SYNCH_RECURSIVE_MUTEX)
-# endif /* ACE_MT_SAFE */
-#if defined (ACE_HAS_EXCEPTIONS)
-    , old_unexpected_ (0)
-#endif  /* ACE_HAS_EXCEPTIONS */
-{
-  // Be sure that no further instances are created via instance ().
-  if (instance_ == 0)
-    {
-      instance_ = this;
-    }
-
-  // @@ This is a hack.  Allow the TAO_Singleton_Manager to be registered
-  //    with the ACE_Object_Manager (or not) in an explicit call to
-  //    TAO_Singleton_Manager::init().  However, once the explicit call is
-  //    made, it will not be possible to alter the setting.
-  int register_with_object_manager = -1;
-  (void) this->init (register_with_object_manager);
-}
-
-TAO_Singleton_Manager::~TAO_Singleton_Manager (void)
-{
-  this->dynamically_allocated_ = 0;   // Don't delete this again in fini()
-  (void) this->fini ();
-}
-
-sigset_t *
-TAO_Singleton_Manager::default_mask (void)
-{
-  return TAO_Singleton_Manager::instance ()->default_mask_;
-}
-
-ACE_Thread_Hook *
-TAO_Singleton_Manager::thread_hook (void)
-{
-  return TAO_Singleton_Manager::instance ()->thread_hook_;
-}
-
-ACE_Thread_Hook *
-TAO_Singleton_Manager::thread_hook (ACE_Thread_Hook *new_thread_hook)
-{
-  TAO_Singleton_Manager *tao_om = TAO_Singleton_Manager::instance ();
-  ACE_Thread_Hook *old_hook = tao_om->thread_hook_;
-  tao_om->thread_hook_ = new_thread_hook;
-  return old_hook;
-}
-
-TAO_Singleton_Manager *
-TAO_Singleton_Manager::instance (void)
-{
-  // This function should be called during construction of static
-  // instances, or before any other threads have been created in the
-  // process.  So, it's not thread safe.
-
-  if (instance_ == 0)
-    {
-      TAO_Singleton_Manager *instance_pointer;
-
-      ACE_NEW_RETURN (instance_pointer,
-                      TAO_Singleton_Manager,
-                      0);
-      ACE_ASSERT (instance_pointer == instance_);
-
-      instance_pointer->dynamically_allocated_ = 1;
-
-      return instance_pointer;
-    }
-  else
-    {
-      return instance_;
-    }
-}
-
-int
-TAO_Singleton_Manager::init (void)
-{
-  if (this->registered_with_object_manager_ == -1)
-    {
-      // Register the TAO_Singleton_Manager with the
-      // ACE_Object_Manager.
-      int register_with_object_manager = 1;
-
-      return this->init (register_with_object_manager);
-    }
-
-  return 1;  // Already initialized.
-}
-
-int
-TAO_Singleton_Manager::init (int register_with_object_manager)
-{
-  if (this->starting_up_i ())
-    {
-      // First, indicate that this TAO_Singleton_Manager instance is being
-      // initialized.
-      this->object_manager_state_ = OBJ_MAN_INITIALIZING;
-
-      if (this == instance_)
-        {
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-          // @@ No MT-specific pre-allocated objects.
-# endif /* ACE_MT_SAFE */
-        }
-
-      ACE_NEW_RETURN (this->default_mask_, sigset_t, -1);
-      ACE_OS::sigfillset (this->default_mask_);
-
-      // Finally, indicate that the TAO_Singleton_Manager instance has
-      // been initialized.
-      this->object_manager_state_ = OBJ_MAN_INITIALIZED;
-
-      return 0;
-    }
-
-  // @@ This strange looking code is what provides the "register on
-  //    explicit call to init()" semantics.  This was needed since the
-  //    TAO_Singleton_Manager constructor invokes init().
-  //    Unfortunately, I couldn't get rid of that init() call without
-  //    breaking things.  The fact things broke needs to be
-  //    investigated further.
-  if (this->registered_with_object_manager_ != -1
-      && register_with_object_manager != this->registered_with_object_manager_)
-    {
-      // An attempt was made to register the TAO_Singleton_Manager
-      // with a manager of a different type from the one it is
-      // currently registered with.  This indicates a problem with the
-      // caller's logic.
-
-      errno = EINVAL;
-      return -1;
-    }
-
-  if (this->registered_with_object_manager_ == -1)
-    {
-      if (register_with_object_manager == 1
-          && ACE_Object_Manager::at_exit (
-               this,
-               (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer,
-               0) != 0)
-        return -1;
-
-      this->registered_with_object_manager_ =
-        register_with_object_manager;
-    }
-
-  // Had already initialized.
-  return 1;
-}
-
-// Clean up a TAO_Singleton_Manager.  There can be instances of this object
-// other than The Instance.  This can happen if a user creates one for some
-// reason.  All objects clean up their per-object information and managed
-// objects, but only The Instance cleans up the static preallocated objects.
-
-int
-TAO_Singleton_Manager::fini (void)
-{
-  if (instance_ == 0  ||  this->shutting_down_i ())
-    // Too late.  Or, maybe too early.  Either fini () has already
-    // been called, or init () was never called.
-    return this->object_manager_state_ == OBJ_MAN_SHUT_DOWN  ?  1  :  -1;
-
-  // No mutex here.  Only the main thread should destroy the singleton
-  // TAO_Singleton_Manager instance.
-
-  // Indicate that the TAO_Singleton_Manager instance is being shut
-  // down.  This object manager should be the last one to be shut
-  // down.
-  this->object_manager_state_ = OBJ_MAN_SHUTTING_DOWN;
-
-  // If another Object_Manager has registered for termination, do it.
-  if (this->next_)
-    {
-      this->next_->fini ();
-      this->next_ = 0;  // Protect against recursive calls.
-    }
-
-  // Call all registered cleanup hooks, in reverse order of
-  // registration.
-  this->exit_info_.call_hooks ();
-
-  // Only clean up preallocated objects when the singleton Instance is being
-  // destroyed.
-  if (this == instance_)
-    {
-#if ! defined (ACE_HAS_STATIC_PREALLOCATION)
-      // Cleanup the dynamically preallocated objects.
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      // @@ No MT-specific preallocated objects yet.
-# endif  /* ACE_MT_SAFE */
-      // @@ No preallocated objects yet.
-#endif  /* ! ACE_HAS_STATIC_PREALLOCATION */
-    }
-
-  delete this-> default_mask_;
-  this->default_mask_ = 0;
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  delete this->internal_lock_;
-  this->internal_lock_ = 0;
-#endif /* ACE_MT_SAFE */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-  // Restore the old unexpected exception handler since TAO will no
-  // longer be handling exceptions.  Allow the application to once
-  // again handle unexpected exceptions.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  (void) std::set_unexpected (this->old_unexpected_);
-# else
-  (void) set_unexpected (this->old_unexpected_);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-#endif /* ACE_HAS_EXCEPTIONS */
-
-  // Indicate that this TAO_Singleton_Manager instance has been shut down.
-  this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
-
-  if (this == instance_)
-    instance_ = 0;
-
-  if (this->dynamically_allocated_)
-    {
-      delete this;
-    }
-
-  return 0;
-}
-
-int
-TAO_Singleton_Manager::starting_up (void)
-{
-  return TAO_Singleton_Manager::instance_
-    ? instance_->starting_up_i ()
-    : 1;
-}
-
-int
-TAO_Singleton_Manager::shutting_down (void)
-{
-  return TAO_Singleton_Manager::instance_
-    ? instance_->shutting_down_i ()
-    : 1;
-}
-
-#if defined (ACE_HAS_EXCEPTIONS)
-void
-TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u)
-{
-  // This must be done after the system TypeCodes and Exceptions have
-  // been initialized.  An unexpected exception will cause TAO's
-  // unexpected exception handler to be called.  That handler
-  // transforms all unexpected exceptions to CORBA::UNKNOWN, which of
-  // course requires the TypeCode constants and system exceptions to
-  // have been initialized.
-# if (!defined (_MSC_VER) \
-      && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \
-      && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs)
-  this->old_unexpected_ = std::set_unexpected (u);
-# else
-  this->old_unexpected_ = set_unexpected (u);
-# endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-}
-#endif /* ACE_HAS_EXCEPTIONS */
-
-int
-TAO_Singleton_Manager::at_exit_i (void *object,
-                                  ACE_CLEANUP_FUNC cleanup_hook,
-                                  void *param)
-{
-  ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                            ace_mon,
-                            *instance_->internal_lock_,
-                            -1));
-
-  if (this->shutting_down_i ())
-    {
-      errno = EAGAIN;
-      return -1;
-    }
-
-  if (this->exit_info_.find (object))
-    {
-      // The object has already been registered.
-      errno = EEXIST;
-      return -1;
-    }
-
-  return this->exit_info_.at_exit_i (object, cleanup_hook, param);
-}
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
deleted file mode 100644
index 891a31ebf0e..00000000000
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ /dev/null
@@ -1,224 +0,0 @@
-// -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file    TAO_Singleton_Manager.h
- *
- *  $Id$
- *
- *   Header file for the TAO-specific Singleton Manager.  Based
- *   entirely on ace/Object_Manager.{h,i,cpp}.
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SINGLETON_MANAGER_H
-#define TAO_SINGLETON_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-#include "ace/Object_Manager_Base.h"
-
-#if defined (ACE_HAS_EXCEPTIONS)
-typedef void (*TAO_unexpected_handler)(void);
-#endif  /* ACE_HAS_EXCEPTIONS */
-
-
-/// Adapter for cleanup, used to register cleanup function with the
-/// ACE_Object_Manager.
-extern "C"
-void
-TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
-
-
-/**
- * @class TAO_Singleton_Manager
- *
- * @brief Manager for TAO library services and singleton cleanup.
- *
- * The TAO_Singleton_Manager is basically simplified version of the
- * ACE_Object_Manager.  It is designed specifically to manage
- * singletons created by TAO.  For example, singleton instances
- * created by TAO will be automatically registered with the singleton
- * instance of this Singleton Manager.
- * @par
- * This class is necessary to ensure that TAO-specific
- * singletons are isolated to TAO itself, not ACE, for example.  The
- * idea is that destruction of the instance of the
- * TAO_Singleton_Manager triggers destruction of all objects/services
- * registered with it.
- */
-class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base
-{
-
-  friend void TAO_Singleton_Manager_cleanup_destroyer (void *, void *);
-
-public:
-  /// Explicitly initialize.
-  virtual int init (void);
-
-  /**
-   * Explicitly initialize the TAO_Singleton_Manager, in addition to
-   * explicitly registering (or not registering) with the
-   * ACE_Object_Manager.
-   */
-  int init (int register_with_object_manager);
-
-  /// Explicitly destroy.
-  virtual int fini (void);
-
-  /**
-   * Returns 1 before the TAO_Singleton_Manager has been constructed.
-   * See ACE_Object_Manager::starting_up for more information.
-   */
-  static int starting_up (void);
-
-  /// Returns 1 after the TAO_Singleton_Manager has been destroyed.
-  /// See ACE_Object_Manager::shutting_down for more information.
-  static int shutting_down (void);
-
-  /// Unique identifiers for preallocated Objects.
-  enum Preallocated_Object
-    {
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      /// @@ No MT-specific preallocated objects (yet).  Remove the
-      ///    below dummy enum once a preallocated object is added.
-      TAO_EMPTY_PREALLOCATED_OBJECT,
-# else
-      /// Without ACE_MT_SAFE, There are no preallocated objects.
-      /// Make sure that the preallocated_array size is at least one
-      /// by declaring this dummy ...
-      TAO_EMPTY_PREALLOCATED_OBJECT,
-# endif /* ACE_MT_SAFE */
-
-      /// This enum value must be last!
-      TAO_PREALLOCATED_OBJECTS
-    };
-
-  /// Accesses a default signal set used, for example, in
-  /// ACE_Sig_Guard methods.
-  static sigset_t *default_mask (void);
-
-  /// Returns the current thread hook for the process.
-  static ACE_Thread_Hook *thread_hook (void);
-
-  /// Returns the existing thread hook and assign a new_thread_hook.
-  static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *new_thread_hook);
-
-  /// Accessor to singleton instance.
-  static TAO_Singleton_Manager *instance (void);
-
-  /// Register an ACE_Cleanup object for cleanup at process
-  /// termination.
-  /**
-   * The object is deleted via the ace_cleanup_destroyer.  If you need
-   * more flexiblity, see the other at_exit method below.  For OS's
-   * that do not have processes, cleanup takes place  at the end of
-   * main.  Returns 0 on success.  On failure, returns -1 and sets
-   * errno to: EAGAIN if shutting down, ENOMEM if insufficient virtual
-   * memory, or EEXIST if the object (or array) had already been
-   * registered.
-   */
-  static int at_exit (ACE_Cleanup *object, void *param = 0);
-
-  /// Register an object (or array) for cleanup at process
-  /// termination.
-  /**
-   * cleanup_hook points to a (global, or static member) function that
-   * is called for the object or array when it to be destroyed.  It
-   * may perform any necessary cleanup specific for that object or its
-   * class.  param is passed as the second parameter to the
-   * cleanup_hook function; the first parameter is the object (or
-   * array) to be destroyed.  cleanup_hook, for example, may delete
-   * the object (or array).  For OS's that do not have processes, this
-   * function is the same as <at_thread_exit>.  Returns 0 on success.
-   * On failure, returns -1 and sets errno to: EAGAIN if shutting
-   * down, ENOMEM if insufficient virtual memory, or EEXIST if the
-   * object (or array) had already been registered.
-   */
-  static int at_exit (void *object,
-                      ACE_CLEANUP_FUNC cleanup_hook,
-                      void *param);
-
-#if defined (ACE_HAS_EXCEPTIONS)
-  /// Set a new unexpected exception handler.
-  /**
-   * The old one will be stored for restoration later on.
-   *
-   * @note Calling this method multiple times will cause the stored
-   *       old unexpected exception handler pointer to be lost.
-   */
-  void _set_unexpected (TAO_unexpected_handler u);
-#endif /* ACE_HAS_EXCEPTIONS */
-
-private:
-  /// Force allocation on the heap.
-  //@{
-  TAO_Singleton_Manager (void);
-  ~TAO_Singleton_Manager (void);
-  //@}
-
-  /// Disallow copying by not implementing the following ...
-  //@{
-  TAO_Singleton_Manager (const TAO_Singleton_Manager &);
-  TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &);
-  //@}
-
-  /// Register an object or array for deletion at program termination.
-  /// See description of static version above for return values.
-  int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param);
-
-private:
-  /// Singleton instance pointer.
-  static TAO_Singleton_Manager *instance_;
-
-  /// Table of preallocated objects.
-  static void *preallocated_object[TAO_PREALLOCATED_OBJECTS];
-
-  /// Default signal set used, for example, in ACE_Sig_Guard.
-  sigset_t *default_mask_;
-
-  /// Thread hook that's used by this process.
-  ACE_Thread_Hook *thread_hook_;
-
-  /// For at_exit support.
-  ACE_OS_Exit_Info exit_info_;
-
-  /// Indicates if TAO_Singleton_Manager is registered with the
-  /// ACE_Object_Manager.
-  int registered_with_object_manager_;
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  /// Lock that is used to guard internal structures.
-  TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_;
-#endif /* ACE_MT_SAFE */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-  /// The old unexpected exception handler.
-  /**
-   * A pointer to the old unexpected exception handler is stored so
-   * that it can be restored when TAO is unloaded, for example.
-   * Otherwise, any unexpected exceptions will result in a call to
-   * TAO's unexpected exception handler which may no longer exist if
-   * TAO was unloaded.
-   */
-  TAO_unexpected_handler old_unexpected_;
-#endif  /* ACE_HAS_EXCEPTIONS */
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/TAO_Singleton_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_SINGLETON_MANAGER_H */
diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl
deleted file mode 100644
index f9f0dd141ce..00000000000
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-int
-TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
-                             void *param)
-{
-  return TAO_Singleton_Manager::instance ()->at_exit_i (
-    object,
-    (ACE_CLEANUP_FUNC) ace_cleanup_destroyer,
-    param);
-}
-
-ACE_INLINE
-int
-TAO_Singleton_Manager::at_exit (void *object,
-                             ACE_CLEANUP_FUNC cleanup_hook,
-                             void *param)
-{
-  return TAO_Singleton_Manager::instance ()->at_exit_i (
-    object,
-    cleanup_hook,
-    param);
-}
diff --git a/TAO/tao/TAO_TkResource_Export.h b/TAO/tao/TAO_TkResource_Export.h
deleted file mode 100644
index 34904a6d9af..00000000000
--- a/TAO/tao/TAO_TkResource_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_TkResource
-// ------------------------------
-#ifndef TAO_TKRESOURCE_EXPORT_H
-#define TAO_TKRESOURCE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TKRESOURCE_HAS_DLL)
-#  define TAO_TKRESOURCE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_TKRESOURCE_HAS_DLL */
-
-#if !defined (TAO_TKRESOURCE_HAS_DLL)
-#  define TAO_TKRESOURCE_HAS_DLL 1
-#endif /* ! TAO_TKRESOURCE_HAS_DLL */
-
-#if defined (TAO_TKRESOURCE_HAS_DLL) && (TAO_TKRESOURCE_HAS_DLL == 1)
-#  if defined (TAO_TKRESOURCE_BUILD_DLL)
-#    define TAO_TkResource_Export ACE_Proper_Export_Flag
-#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_TKRESOURCE_BUILD_DLL */
-#    define TAO_TkResource_Export ACE_Proper_Import_Flag
-#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_TKRESOURCE_BUILD_DLL */
-#else /* TAO_TKRESOURCE_HAS_DLL == 1 */
-#  define TAO_TkResource_Export
-#  define TAO_TKRESOURCE_SINGLETON_DECLARATION(T)
-#  define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_TKRESOURCE_HAS_DLL == 1 */
-
-// Set TAO_TKRESOURCE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_TKRESOURCE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_TKRESOURCE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_TKRESOURCE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_TKRESOURCE_NTRACE */
-
-#if (TAO_TKRESOURCE_NTRACE == 1)
-#  define TAO_TKRESOURCE_TRACE(X)
-#else /* (TAO_TKRESOURCE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_TKRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_TKRESOURCE_NTRACE == 1) */
-
-#endif /* TAO_TKRESOURCE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_Utils.pc.in b/TAO/tao/TAO_Utils.pc.in
deleted file mode 100644
index 43c6394db2d..00000000000
--- a/TAO/tao/TAO_Utils.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Utils
-Description: TAO Utilities Library
-Requires: TAO_PortableServer, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Utils
-Cflags: -I${includedir}
diff --git a/TAO/tao/TAO_XtResource_Export.h b/TAO/tao/TAO_XtResource_Export.h
deleted file mode 100644
index 5cc41d8da11..00000000000
--- a/TAO/tao/TAO_XtResource_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_XtResource
-// ------------------------------
-#ifndef TAO_XTRESOURCE_EXPORT_H
-#define TAO_XTRESOURCE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_XTRESOURCE_HAS_DLL)
-#  define TAO_XTRESOURCE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_XTRESOURCE_HAS_DLL */
-
-#if !defined (TAO_XTRESOURCE_HAS_DLL)
-#  define TAO_XTRESOURCE_HAS_DLL 1
-#endif /* ! TAO_XTRESOURCE_HAS_DLL */
-
-#if defined (TAO_XTRESOURCE_HAS_DLL) && (TAO_XTRESOURCE_HAS_DLL == 1)
-#  if defined (TAO_XTRESOURCE_BUILD_DLL)
-#    define TAO_XtResource_Export ACE_Proper_Export_Flag
-#    define TAO_XTRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_XTRESOURCE_BUILD_DLL */
-#    define TAO_XtResource_Export ACE_Proper_Import_Flag
-#    define TAO_XTRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_XTRESOURCE_BUILD_DLL */
-#else /* TAO_XTRESOURCE_HAS_DLL == 1 */
-#  define TAO_XtResource_Export
-#  define TAO_XTRESOURCE_SINGLETON_DECLARATION(T)
-#  define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_XTRESOURCE_HAS_DLL == 1 */
-
-// Set TAO_XTRESOURCE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_XTRESOURCE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_XTRESOURCE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_XTRESOURCE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_XTRESOURCE_NTRACE */
-
-#if (TAO_XTRESOURCE_NTRACE == 1)
-#  define TAO_XTRESOURCE_TRACE(X)
-#else /* (TAO_XTRESOURCE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_XTRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_XTRESOURCE_NTRACE == 1) */
-
-#endif /* TAO_XTRESOURCE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h
deleted file mode 100644
index 72c27451a1c..00000000000
--- a/TAO/tao/TC_Constants_Forward.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TC_Constants_Forward.h
- *
- *  $Id$
- *
- *  Forward declare the type code constants used in the ORB.
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_TC_CONSTANTS_FORWARD_H
-#define TAO_TC_CONSTANTS_FORWARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-#define TAO_SYSTEM_EXCEPTION_LIST \
-  TAO_SYSTEM_EXCEPTION(UNKNOWN); \
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
-  TAO_SYSTEM_EXCEPTION(INTERNAL); \
-  TAO_SYSTEM_EXCEPTION(MARSHAL); \
-  TAO_SYSTEM_EXCEPTION(INITIALIZE); \
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
-  TAO_SYSTEM_EXCEPTION(TRANSIENT); \
-  TAO_SYSTEM_EXCEPTION(FREE_MEM); \
-  TAO_SYSTEM_EXCEPTION(INV_IDENT); \
-  TAO_SYSTEM_EXCEPTION(INV_FLAG); \
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
-  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
-  TAO_SYSTEM_EXCEPTION(REBIND); \
-  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
-  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
-  TAO_SYSTEM_EXCEPTION(BAD_QOS); \
-  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-  //@}
-
-  extern TAO_Export TypeCode_ptr const _tc_UnknownUserException;
-
-  extern TAO_Export TypeCode_ptr const _tc_Current;
-
-  extern TAO_Export TypeCode_ptr const _tc_NamedValue;
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TC_CONSTANTS_FORWARD_H */
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
deleted file mode 100644
index 516a081dc82..00000000000
--- a/TAO/tao/TSS_Resources.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-
-#include "TSS_Resources.h"
-#include "GUIResource_Factory.h"
-#include "TAO_Singleton.h"
-
-
-ACE_RCSID (tao,
-           TSS_Resources,
-           "$Id$")
-
-
-TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0)
-  , rtscheduler_current_impl_ (0)
-  , rtscheduler_previous_current_impl_ (0)
-  , default_environment_ (&this->tss_environment_)
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  , policy_current_ (&this->initial_policy_current_)
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-  , gui_resource_factory_ (0)
-
-{
-}
-
-TAO_TSS_Resources::~TAO_TSS_Resources (void)
-{
-  delete gui_resource_factory_;
-}
-
-TAO_TSS_Resources *
-TAO_TSS_Resources::instance (void)
-{
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
-
-  return
-    TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::instance ();
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_TSS_Resources>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_TSS_Resources>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-
-template
-  TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> *
-  TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
deleted file mode 100644
index a85d840eb38..00000000000
--- a/TAO/tao/TSS_Resources.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   TSS_Resources.h
- *
- *  $Id$
- *
- *  @author DOC Group - ISIS at Vanderbilt University
- *  @author DOC Center - Washington University at St. Louis
- *  @author DOC Laboratory - University of California at Irvine
- */
-// ===================================================================
-
-#ifndef TAO_TAO_TSS_RESOURCES_H
-#define TAO_TAO_TSS_RESOURCES_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Policy_Manager.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Environment.h"
-#include "tao/TAO_Export.h"
-
-// Forward declarations
-namespace TAO
-{
-  class GUIResource_Factory;
-}
-/**
- * @class TAO_TSS_Resources
- *
- * @brief The TSS resoures shared by all the ORBs
- *
- * This class is used by TAO to store the resources that are
- * thread-specific but are *not* ORB specific. The members are public
- * because only the ORB Core is expected to access them.
- */
-class TAO_Export TAO_TSS_Resources
-{
-public:
-
-  /// Constructor
-  TAO_TSS_Resources (void);
-
-  /// Destructor
-  ~TAO_TSS_Resources (void);
-
-  /// Return a singleton instance of this class.
-  static TAO_TSS_Resources * instance (void);
-
-private:
-
-  /// Do not copy TSS resources
-  //@{
-  ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Resources(const TAO_TSS_Resources&))
-  ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_TSS_Resources&))
-  //@}
-
-public:
-
-  /**
-   * Points to structure containing state for the current upcall
-   * context in this thread.  Note that it does not come from the
-   * resource factory because it must always be held in
-   * thread-specific storage.  For now, since TAO_ORB_Core instances
-   * are TSS singletons, we simply ride along and don't allocate
-   * occupy another TSS slot since there are some platforms where
-   * those are precious commodities (e.g., NT).
-   */
-  void * poa_current_impl_;
-
-  void * rtscheduler_current_impl_;
-
-  void * rtscheduler_previous_current_impl_;
-
-  /// The default environment for the thread.
-  CORBA::Environment * default_environment_;
-
-  /// If the user (or library) provides no environment the ORB_Core
-  /// still holds one.
-  CORBA::Environment tss_environment_;
-
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-
-  /// The initial PolicyCurrent for this thread. Should be a TSS
-  /// resource.
-  TAO_Policy_Current_Impl initial_policy_current_;
-
-  /// This pointer is reset by the POA on each upcall.
-  TAO_Policy_Current_Impl * policy_current_;
-
-#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
-   /// A factory for creating GUIReactors.
-  /**
-   * @c GUIResource_Factory has to be stored in TSS, as GUIReactors
-   * are operational only in within the context of GUI event loops.
-   */
-  TAO::GUIResource_Factory * gui_resource_factory_;
-};
-
-/**
- * @todo TAO_TSS_RESOURCES typedef should go away.  It is deprecated,
- *       and only exists for backward compatibility.
- */
-typedef TAO_TSS_Resources TAO_TSS_RESOURCES;
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TSS_RESOURCES_H */
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
deleted file mode 100644
index 925a6f4d9d8..00000000000
--- a/TAO/tao/Tagged_Components.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-// $Id$
-
-#include "tao/Tagged_Components.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* ! __ACE_INLINE__ */
-
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Tagged_Components,
-           "$Id$")
-
-void
-TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
-{
-  this->orb_type_ = orb_type;
-  this->orb_type_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->orb_type_;
-
-  this->set_component_i (IOP::TAG_ORB_TYPE, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (
-    const CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->code_sets_ = ci;
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->set_code_sets_i (this->code_sets_.ForCharData,
-                         ci.ForCharData);
-  this->set_code_sets_i (this->code_sets_.ForWcharData,
-                         ci.ForWcharData);
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets_i (
-    CONV_FRAME::CodeSetComponent &lhs,
-    CONV_FRAME::CodeSetComponent &rhs)
-{
-  lhs.native_code_set = rhs.native_code_set;
-  CORBA::ULong max = rhs.conversion_code_sets.maximum ();
-  CORBA::ULong len = rhs.conversion_code_sets.length ();
-  CONV_FRAME::CodeSetId *buffer = rhs.conversion_code_sets.get_buffer (1);
-  lhs.conversion_code_sets.replace (max, len, buffer, 1);
-}
-
-// ****************************************************************
-
-void
-TAO_Tagged_Components::set_component_i (IOP::ComponentId tag,
-                                        TAO_OutputCDR &cdr)
-{
-  IOP::TaggedComponent component;
-  component.tag = tag;
-
-  // Make a *copy* of the CDR stream...
-  size_t length = cdr.total_length ();
-  component.component_data.length (static_cast<CORBA::ULong> (length));
-  CORBA::Octet *buf = component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
-      buf += i->length ();
-    }
-
-  this->set_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component (const IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    {
-      this->set_known_component_i (component);
-    }
-
-  if (this->unique_tag (component.tag))
-    {
-      this->set_component_i (component);
-    }
-  else
-    {
-      this->add_component_i (component);
-    }
-}
-
-void
-TAO_Tagged_Components::set_component (IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    {
-      this->set_known_component_i (component);
-    }
-
-  if (this->unique_tag (component.tag))
-    {
-      this->set_component_i (component);
-    }
-  else
-    {
-      this->add_component_i (component);
-    }
-}
-
-void
-TAO_Tagged_Components::set_known_component_i (
-    const IOP::TaggedComponent& component)
-{
-  TAO_InputCDR cdr (reinterpret_cast<const char*> (
-                      component.component_data.get_buffer ()),
-                    component.component_data.length ());
-
-  CORBA::Boolean byte_order;
-
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    {
-      return;
-    }
-
-  cdr.reset_byte_order (static_cast<int> (byte_order));
-
-  if (component.tag == IOP::TAG_ORB_TYPE)
-    {
-      CORBA::ULong orb_type;
-
-      if ((cdr >> orb_type) == 0)
-        {
-          return;
-        }
-
-      this->orb_type_ = orb_type;
-      this->orb_type_set_ = 1;
-    }
-  else if (component.tag == IOP::TAG_CODE_SETS)
-    {
-      CONV_FRAME::CodeSetComponentInfo ci;
-
-      if ((cdr >> ci) == 0)
-        {
-          return;
-        }
-
-      this->set_code_sets_i (this->code_sets_.ForCharData,
-                             ci.ForCharData);
-      this->set_code_sets_i (this->code_sets_.ForWcharData,
-                             ci.ForWcharData);
-      this->code_sets_set_ = 1;
-    }
-}
-
-void
-TAO_Tagged_Components::set_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          this->components_[i] = component;
-          return;
-        }
-    }
-
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component_i (IOP::TaggedComponent& component)
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          CORBA::ULong max = component.component_data.maximum ();
-          CORBA::ULong len = component.component_data.length ();
-          CORBA::Octet* buf = component.component_data.get_buffer (1);
-          this->components_[i].component_data.replace (max, len, buf, 1);
-          return;
-        }
-    }
-
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::add_component_i (IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l].tag = component.tag;
-  CORBA::ULong max = component.component_data.maximum ();
-  CORBA::ULong len = component.component_data.length ();
-  CORBA::Octet* buf = component.component_data.get_buffer (1);
-  this->components_[l].component_data.replace (max, len, buf, 1);
-}
-
-void
-TAO_Tagged_Components::add_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l] = component;
-}
-
-int
-TAO_Tagged_Components::remove_component (IOP::ComponentId id)
-{
-  if (this->known_tag (id))
-    {
-      return this->remove_known_component_i (id);
-    }
-  else
-    {
-      return this->remove_component_i (id);
-    }
-}
-
-int
-TAO_Tagged_Components::remove_known_component_i (
-    IOP::ComponentId tag)
-{
-  if (tag == IOP::TAG_ORB_TYPE)
-    {
-      this->orb_type_ = 0;
-      this->orb_type_set_ = 0;
-      return 1;
-    }
-  else if (tag == IOP::TAG_CODE_SETS)
-    {
-      this->code_sets_set_ = 0;
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-int
-TAO_Tagged_Components::remove_component_i (IOP::ComponentId tag)
-{
-  CORBA::ULong src = 0, dest = 0;
-  CORBA::ULong len = this->components_.length ();
-
-  for (;src != len;++src)
-    {
-      if ( tag != this->components_[src].tag)
-        {
-          this->components_[dest] = this->components_[src];
-          ++dest;
-        }
-    }
-
-  this->components_.length (dest);
-  return src - dest;
-}
-
-int
-TAO_Tagged_Components::get_component (IOP::TaggedComponent& component) const
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          component = this->components_[i];
-          return 1;
-        }
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-int
-TAO_Tagged_Components::encode (TAO_OutputCDR& cdr) const
-{
-  return (cdr << this->components_);
-}
-
-int
-TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
-{
-  // Mark the well-known components as removed
-  this->orb_type_set_ = 0;
-  this->code_sets_set_ = 0;
-
-  if ((cdr >> this->components_) == 0)
-    {
-      return 0;
-    }
-
-  CORBA::ULong l = this->components_.length ();
-
-  for (CORBA::ULong i = 0; i != l; ++i)
-    {
-      const IOP::TaggedComponent &component =
-        this->components_[i];
-
-      if (this->known_tag (component.tag))
-        {
-          this->set_known_component_i (component);
-        }
-    }
-
-  return 1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
deleted file mode 100644
index aed3109e1df..00000000000
--- a/TAO/tao/Tagged_Components.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Tagged_Components.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
- */
-//=============================================================================
-
-#ifndef TAO_TAGGED_COMPONENTS_H
-#define TAO_TAGGED_COMPONENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOP_IORC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CONV_FRAMEC.h"
-
-class TAO_Profile;
-
-/// Tag for storing multiple endpoints within a single profile.
-/**
- * This is TAO-specific, and is mostly used by TAO's RTCORBA support.
- * The standard TAG_ALTERNATE_IIOP_ADDRESSES tagged component is the
- * portable alternative.
- */
-const CORBA::ULong TAO_TAG_ENDPOINTS =  0x54414f02U;
-
-/**
- * @class TAO_Tagged_Components
- *
- * @brief The policy manager implementation.
- *
- * This class is used to manipulate and access the <components>
- * field of an IIOP profile (and other GIOP profiles).
- * The definition for that field is simply a sequence of the
- * following structures:
- * typedef unsigned long ComponentId;
- * struct TaggedComponent {
- * ComponentId     tag;
- * sequence<octet> component_data;
- * };
- * the real motivation is to minimize the marshaling and
- * demarshaling of the <component_data> field for certain critical
- * components.
- */
-class TAO_Export TAO_Tagged_Components
-{
-public:
-  /// Constructor
-  TAO_Tagged_Components (void);
-
-  // = Standard OMG that require fast access.
-  /// The the IOP::TAG_ORB_TYPE component value
-  void set_orb_type (CORBA::ULong orb_type);
-
-  /// Gets the IOP::TAG_ORB_TYPE component value, return 0 if the
-  /// component is not present.
-  int get_orb_type (CORBA::ULong& orb_type) const;
-
-  /**
-   * The the IOP::TAG_CODE_SETS component value, the first version
-   * copies the data, the second version steal all the sequence
-   * buffers.
-   */
-  void set_code_sets (const CONV_FRAME::CodeSetComponentInfo &);
-  void set_code_sets (CONV_FRAME::CodeSetComponentInfo &);
-
-  /// Gets a reference of the IOP::TAG_CODE_SETS component value,
-  /// return 0 if the component is not present.
-  int get_code_sets (const CONV_FRAME::CodeSetComponentInfo* &) const;
-
-  /// Gets a copy of the IOP::TAG_CODE_SETS component value, return 0
-  /// if the component is not present.
-  int get_code_sets (CONV_FRAME::CodeSetComponentInfo &) const;
-
-  // = Generic components
-
-  /// Insert the component into the list, making a copy of the octet
-  /// sequence.
-  void set_component (const IOP::TaggedComponent& component);
-
-  /// Insert the component into the list, but efficiently stealing the
-  /// contents of the octet sequence.
-  void set_component (IOP::TaggedComponent& component);
-
-  /// Get a copy of the component identified by <component.tag>, return
-  /// 0 if the component is not present.
-  int get_component (IOP::TaggedComponent& component) const;
-
-  /// Remove a component, if present. Return number of components
-  /// removed.
-  int remove_component (IOP::ComponentId id);
-
-  // = Marshaling and demarshaling
-
-  /// Marshal and demarshal the list.
-  int encode (TAO_OutputCDR& cdr) const;
-  int decode (TAO_InputCDR& cdr);
-
-  /**
-   * Read/Write access to the underlying
-   * MutipleComponentProfile. Added by request from Chris Hafey
-   * <chris@stentorsoft.com>
-   */
-  IOP::MultipleComponentProfile &components (void);
-
-private:
-  /// Helper method to implement set_code_sets()
-  void set_code_sets_i (CONV_FRAME::CodeSetComponent &lhs,
-                        CONV_FRAME::CodeSetComponent &rhs);
-
-  /// Helper methods to implement set_component()
-  void set_known_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (IOP::TaggedComponent& component);
-  void add_component_i (const IOP::TaggedComponent& component);
-  void add_component_i (IOP::TaggedComponent& component);
-  void set_component_i (IOP::ComponentId tag, TAO_OutputCDR &cdr);
-
-  /// Helper methods to implement remove_component()
-  int remove_known_component_i (IOP::ComponentId tag);
-  int remove_component_i (IOP::ComponentId tag);
-
-  /// Helper methods to implement set_component()
-  int get_known_component_i (IOP::TaggedComponent& component) const;
-  int get_component_i (IOP::TaggedComponent& component) const;
-
-  /// Is <tag> a well-known component?
-  int known_tag (IOP::ComponentId tag) const;
-
-  /// Does <tag> show up only once?
-  int unique_tag (IOP::ComponentId tag) const;
-
-private:
-  /// The ORB_TYPE component value
-  CORBA::ULong orb_type_;
-
-  /// The ORB_TYPE component value
-  CONV_FRAME::CodeSetComponentInfo code_sets_;
-
-  //  CORBA::Short tao_priority_;
-  // The TAO_PRIORITY priorities
-
-  /// The rest of the components, to be compliant we cannot drop a
-  /// bunch of them.
-  IOP::MultipleComponentProfile components_;
-
-  // A flag for each component...
-  CORBA::Octet orb_type_set_;
-  CORBA::Octet code_sets_set_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TAGGED_COMPONENTS_H */
diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i
deleted file mode 100644
index 62ab4a40f05..00000000000
--- a/TAO/tao/Tagged_Components.i
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO_Tagged_Components::TAO_Tagged_Components (void)
-  :  orb_type_ (0),
-     orb_type_set_ (0),
-     code_sets_set_ (0)
-{
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_orb_type (CORBA::ULong& orb_type) const
-{
-  if (this->orb_type_set_ == 1)
-    {
-      orb_type = this->orb_type_;
-    }
-
-  return this->orb_type_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (
-  const CONV_FRAME::CodeSetComponentInfo* &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    {
-      ci = &this->code_sets_;
-    }
-
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (
-  CONV_FRAME::CodeSetComponentInfo &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    {
-      ci = this->code_sets_;
-    }
-
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::known_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS);
-}
-
-
-ACE_INLINE int
-TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS
-          || tag == IOP::TAG_POLICIES
-          || tag == TAO_TAG_ENDPOINTS
-          // || tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS
-          || tag == IOP::TAG_COMPLETE_OBJECT_KEY
-          || tag == IOP::TAG_ENDPOINT_ID_POSITION
-          || tag == IOP::TAG_LOCATION_POLICY
-          || tag == IOP::TAG_FT_PRIMARY
-          || tag == IOP::TAG_FT_GROUP
-          || tag == IOP::TAG_DCE_STRING_BINDING
-          || tag == IOP::TAG_DCE_BINDING_NAME
-          || tag == IOP::TAG_DCE_NO_PIPES);
-}
-
-ACE_INLINE IOP::MultipleComponentProfile&
-TAO_Tagged_Components::components (void)
-{
-  return this->components_;
-}
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
deleted file mode 100644
index cfe643f6066..00000000000
--- a/TAO/tao/Tagged_Profile.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// $Id$
-
-#include "tao/Tagged_Profile.h"
-#include "tao/ORB_Core.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Transport_Acceptor.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/debug.h"
-#include "tao/target_specification.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Tagged_Profile.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Tagged_Profile,
-           "$Id$")
-
-CORBA::Boolean
-TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
-{
-  // Get our Acceptor registry
-  TAO_Acceptor_Registry &acceptor_registry =
-    this->orb_core_->lane_resources ().acceptor_registry ();
-
-  // Get the right acceptor for the tag in the TaggedProfile
-  TAO_Acceptor *acceptor =
-    acceptor_registry.get_acceptor (profile.tag);
-
-  if (acceptor)
-    {
-      // Get the object key
-      int retval =
-        acceptor->object_key (profile,
-                              this->object_key_);
-      if (retval == -1)
-        {
-          return 0;
-        }
-    }
-  else
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t)TAO_Tagged_Profile \n")));
-        }
-
-      return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_Tagged_Profile::unmarshall_target_address (TAO_InputCDR &cdr)
-{
-  CORBA::Boolean hdr_status = cdr.read_short (this->discriminator_);
-
-  if (hdr_status)
-    {
-      switch (this->discriminator_)
-        {
-        case TAO_Target_Specification::Key_Addr:
-          hdr_status = this->unmarshall_object_key_i (cdr);
-          break;
-
-        case TAO_Target_Specification::Profile_Addr:
-          hdr_status = this->unmarshall_iop_profile_i (cdr);
-          break;
-
-        case TAO_Target_Specification::Reference_Addr:
-          hdr_status = this->unmarshall_ref_addr_i (cdr);
-          break;
-
-        default:
-          hdr_status = 0;
-          break;
-        }
-    }
-
-  return hdr_status;
-}
-
-CORBA::Boolean
-TAO_Tagged_Profile::unmarshall_object_key (
-    TAO_InputCDR &input)
-{
-  this->discriminator_ = TAO_Target_Specification::Key_Addr;
-
-  return this->unmarshall_object_key_i (input);
-}
-
-
-CORBA::Boolean
-TAO_Tagged_Profile::unmarshall_object_key_i (
-    TAO_InputCDR &input)
-{
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
-
-  CORBA::Long key_length = 0;
-  hdr_status = hdr_status && input.read_long (key_length);
-
-  if (hdr_status)
-    {
-      this->object_key_.replace (key_length,
-                                 key_length,
-                                 (CORBA::Octet*)input.rd_ptr (),
-                                 0);
-      input.skip_bytes (key_length);
-
-      this->object_key_extracted_ = 1;
-    }
-
-  return hdr_status;
-}
-
-
-CORBA::Boolean
-TAO_Tagged_Profile::unmarshall_iop_profile_i (
-    TAO_InputCDR &input)
-{
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
-
-  // Extract into the IOP::Tagged profile.
-  hdr_status &= input >> this->profile_;
-
-  return hdr_status;
-}
-
-CORBA::Boolean
-TAO_Tagged_Profile::unmarshall_ref_addr_i (
-    TAO_InputCDR &input)
-{
-  CORBA::Boolean hdr_status =
-    (CORBA::Boolean) input.good_bit ();
-
-  /*
-   * The GIOP::IORAddressingInfo is defined as follows
-   *   struct IORAddressingInfo
-   *     {
-   *       unsigned long selected_profile_index;
-   *       IOP::IOR ior;
-   *     };
-   *
-   * and the IOP::IOR is defined to be
-   *   struct IOR
-   *      {
-   *        string type_id;
-   *        sequence<TaggedProfile>   profiles;
-   *      };
-   */
-
-  // First read the profile index
-  CORBA::ULong prof_index =  0;
-
-  hdr_status =
-    hdr_status && input.read_ulong (prof_index);
-
-  // Set the value in TAO_Tagged_Profile
-  if (hdr_status)
-    {
-      this->profile_index_ = prof_index;
-    }
-
-  // Get the length of the type_id
-  CORBA::Long id_length = 0;
-  hdr_status = hdr_status && input.read_long (id_length);
-
-  if (hdr_status)
-    {
-      // Set the type_id
-      this->type_id_.set (input.rd_ptr (),
-                          0);
-
-      input.skip_bytes (id_length);
-    }
-
-  // Unmarshall the sequnce of TaggedProfiles
-  IOP::TaggedProfileSeq ior_profiles;
-
-  hdr_status &= input >> ior_profiles;
-
-  // Get the right TaggedProfile from the <ior_profiles>
-  if (hdr_status)
-    {
-      this->profile_ = ior_profiles [prof_index];
-    }
-
-  return hdr_status;
-}
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
deleted file mode 100644
index 5e9e10f8348..00000000000
--- a/TAO/tao/Tagged_Profile.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Tagged_Profile.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TAGGED_PROFILE_H
-#define TAO_TAGGED_PROFILE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/IOPC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object_KeyC.h"
-#include "ace/SString.h"
-
-/**
- * @class TAO_Tagged_Profile
- *
- * @brief This class is used to manipulate and access the target
- *        address field of a GIOP 1.2 request.
- *
- */
-class TAO_Export TAO_Tagged_Profile
-{
-public:
-  /// Ctor
-  TAO_Tagged_Profile (TAO_ORB_Core *orb_core);
-
-  /// Unmarshall the GIOP 1.2 target address field.
-  CORBA::Boolean unmarshall_target_address (TAO_InputCDR &cdr);
-
-  /// Unmarshals the received object key for GIOP 1.0/1.1
-  CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr);
-
-  /// Return the object key
-  TAO::ObjectKey &object_key (void);
-
-  /// Save the object key
-  void object_key (TAO::ObjectKey &object_key);
-
-  /// Return a const object key
-  const TAO::ObjectKey &object_key (void) const;
-
-  /// get the tagged_profile
-  const IOP::TaggedProfile &tagged_profile (void) const;
-
-  /// Get the profile index, that needs to be used in the
-  /// sequnce of TaggedProfiles contained  IOP::IOR that is
-  /// receivedfrom the client.
-  CORBA::ULong profile_index (void) const;
-
-  /// Accessor to the type_id contained in the IOP::IOR received from
-  /// the client.
-  const ACE_CString &type_id (void) const;
-
-  CORBA::Short discriminator (void) const;
-
-private:
-  /// Extract the object key from the TaggedProfile and store it in
-  /// <object_key_>
-  CORBA::Boolean extract_object_key (IOP::TaggedProfile &profile);
-
-  /// Unmarshals the received object key
-  CORBA::Boolean unmarshall_object_key_i (TAO_InputCDR &cdr);
-
-  /// Unmarshall the IOP::TaggedProfile
-  CORBA::Boolean unmarshall_iop_profile_i (TAO_InputCDR &cdr);
-
-  /// Unmarshalls the GIOP::IORAddressingInfo
-  CORBA::Boolean unmarshall_ref_addr_i (TAO_InputCDR &cdr);
-
-private:
-  /// Our ORB Core
-  TAO_ORB_Core *orb_core_;
-
-  /// Keep track of which kind of target profile that was extracted.
-  CORBA::Short discriminator_;
-
-  /// Flag to denote whether the object key has been extracted yet.
-  CORBA::Boolean object_key_extracted_;
-
-  /// The object key
-  TAO::ObjectKey object_key_;
-
-  /// The Tagged profile. This class would have the Tagged Profile
-  IOP::TaggedProfile profile_;
-
-  /*
-   * The GIOP::IORAddressingInfo is defined as follows
-   *   struct IORAddressingInfo
-   *     {
-   *       unsigned long selected_profile_index;
-   *       IOP::IOR ior;
-   *     };
-   *
-   * and the IOP::IOR is defined to be
-   *   struct IOR
-   *      {
-   *        string type_id;
-   *        sequence<TaggedProfile>   profiles;
-   *      };
-   * The mapping for the type_id of type string is TAO_String_Manager
-   * which does lot of bad things like allocation on construction and
-   * a deallocation on destruction. This is bad along the critical
-   * path. So we will store this nested structure ripped open with the
-   * profile_index and the type_id with the TaggedProfile that is
-   * pointed to.
-   */
-
-  /// The profile index incase we receive a GIOP::IORAddressingInfo
-  /// information
-  CORBA::ULong profile_index_;
-
-  /// The type_id in the IOP::IOR in case we receive the
-  /// GIOP::IORAddressingInfo information.
-  ACE_CString type_id_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Tagged_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_TAGGED_PROFILE_H*/
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
deleted file mode 100644
index 52e7b34fae1..00000000000
--- a/TAO/tao/Tagged_Profile.i
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core),
-    discriminator_ (0),
-    object_key_ (),
-    profile_ (),
-    profile_index_ (0),
-    type_id_ ()
-{
-
-}
-
-
-ACE_INLINE TAO::ObjectKey &
-TAO_Tagged_Profile::object_key (void)
-{
-  if (this->object_key_extracted_ == 0)
-    this->object_key_extracted_ = this->extract_object_key (this->profile_);
-
-  return this->object_key_;
-}
-
-ACE_INLINE void
-TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key)
-{
-  this->object_key_.replace (object_key.length (),
-                             object_key.length (),
-                             object_key.get_buffer ());
-  this->object_key_extracted_ = 1;
-}
-
-ACE_INLINE const TAO::ObjectKey &
-TAO_Tagged_Profile::object_key (void) const
-{
-  return const_cast<TAO_Tagged_Profile *> (this)->object_key ();
-}
-
-ACE_INLINE const IOP::TaggedProfile &
-TAO_Tagged_Profile::tagged_profile (void) const
-{
-  return this->profile_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Tagged_Profile::profile_index (void) const
-{
-  return this->profile_index_;
-}
-
-ACE_INLINE const ACE_CString &
-TAO_Tagged_Profile::type_id (void) const
-{
-  return this->type_id_;
-}
-
-ACE_INLINE CORBA::Short
-TAO_Tagged_Profile::discriminator (void) const
-{
-  return this->discriminator_;
-}
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
deleted file mode 100644
index f99eb637b8c..00000000000
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-// $Id$
-
-#include "tao/Thread_Lane_Resources.h"
-
-ACE_RCSID (tao,
-           Thread_Lane_Resources,
-           "$Id$")
-
-#include "tao/Acceptor_Registry.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Connection_Handler.h"
-#include "tao/Transport.h"
-#include "tao/Connector_Registry.h"
-#include "tao/SystemException.h"
-
-#include "ace/Reactor.h"
-
-TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (
-    TAO_ORB_Core &orb_core,
-    TAO_New_Leader_Generator *new_leader_generator
-  )
-  : orb_core_ (orb_core),
-    acceptor_registry_ (0),
-    connector_registry_ (0),
-    transport_cache_ (0),
-    leader_follower_ (0),
-    new_leader_generator_ (new_leader_generator),
-    input_cdr_dblock_allocator_ (0),
-    input_cdr_buffer_allocator_ (0),
-    input_cdr_msgblock_allocator_ (0),
-    transport_message_buffer_allocator_ (0),
-    output_cdr_dblock_allocator_ (0),
-    output_cdr_buffer_allocator_ (0),
-    output_cdr_msgblock_allocator_ (0),
-    amh_response_handler_allocator_ (0),
-    ami_response_handler_allocator_ (0)
-{
-  // Create the transport cache.
-  ACE_NEW (this->transport_cache_,
-           TAO::Transport_Cache_Manager (orb_core));
-
-}
-
-TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources (void)
-{
-
-}
-
-TAO::Transport_Cache_Manager &
-TAO_Thread_Lane_Resources::transport_cache (void)
-{
-  return *this->transport_cache_;
-}
-
-int
-TAO_Thread_Lane_Resources::has_acceptor_registry_been_created (void) const
-{
-  return this->acceptor_registry_ != 0;
-}
-
-int
-TAO_Thread_Lane_Resources::is_collocated (const TAO_MProfile& mprofile)
-{
-  if (!this->has_acceptor_registry_been_created ())
-    {
-      return 0;
-    }
-
-  return this->acceptor_registry ().is_collocated (mprofile);
-}
-
-TAO_Acceptor_Registry &
-TAO_Thread_Lane_Resources::acceptor_registry (void)
-{
-  // Double check.
-  if (this->acceptor_registry_ == 0)
-    {
-      // @@todo: Wouldnt this crash big time if you happen to
-      // dereference a null-pointer? Needs fixing.
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        this->lock_,
-                        *this->acceptor_registry_);
-
-      if (this->acceptor_registry_ == 0)
-        {
-          // @@ Not exception safe code
-          // Get the resource factory.
-          TAO_Resource_Factory &resource_factory =
-            *this->orb_core_.resource_factory ();
-
-          // Ask it to create a new acceptor registry.
-          this->acceptor_registry_ =
-            resource_factory.get_acceptor_registry ();
-        }
-    }
-
-  return *this->acceptor_registry_;
-}
-
-TAO_Connector_Registry *
-TAO_Thread_Lane_Resources::connector_registry (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Double check.
-  if (this->connector_registry_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        this->lock_,
-                        0);
-
-      if (this->connector_registry_ == 0)
-        {
-          // Ask it to create a new acceptor registry.
-          TAO_Connector_Registry *connector_registry =
-            this->orb_core_.resource_factory ()->get_connector_registry ();
-
-          if (connector_registry == 0)
-            {
-              ACE_THROW_RETURN (
-                  CORBA::INITIALIZE (
-                      CORBA::SystemException::_tao_minor_code (
-                          TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
-                          0
-                        ),
-                      CORBA::COMPLETED_NO
-                    ),
-                  0
-                );
-            }
-
-          if (connector_registry->open (&this->orb_core_) != 0)
-            {
-              ACE_THROW_RETURN (
-                  CORBA::INITIALIZE (
-                      CORBA::SystemException::_tao_minor_code (
-                          TAO_CONNECTOR_REGISTRY_INIT_LOCATION_CODE,
-                          0
-                        ),
-                      CORBA::COMPLETED_NO
-                    ),
-                  0
-                );
-            }
-
-          // Finally, everything is created and opened successfully:
-          // now we can assign to the member.  Otherwise, the
-          // assignment would be premature.
-          this->connector_registry_ = connector_registry;
-        }
-    }
-
-  return this->connector_registry_;
-}
-
-
-TAO_Leader_Follower &
-TAO_Thread_Lane_Resources::leader_follower (void)
-{
-  // Double check.
-  if (this->leader_follower_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                        ace_mon,
-                        this->lock_,
-                        *this->leader_follower_);
-
-      if (this->leader_follower_ == 0)
-        {
-          // Create a new Leader Follower object.
-          ACE_NEW_RETURN (this->leader_follower_,
-                          TAO_Leader_Follower (&this->orb_core_,
-                                               this->new_leader_generator_),
-                          *this->leader_follower_);
-        }
-    }
-
-  return *this->leader_follower_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_dblock_allocator (void)
-{
-  if (this->input_cdr_dblock_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->input_cdr_dblock_allocator_ == 0)
-        {
-          this->input_cdr_dblock_allocator_ =
-            this->resource_factory ()->input_cdr_dblock_allocator ();
-        }
-    }
-
-  return this->input_cdr_dblock_allocator_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_buffer_allocator (void)
-{
-  if (this->input_cdr_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->input_cdr_buffer_allocator_ == 0)
-        {
-          this->input_cdr_buffer_allocator_ =
-            this->resource_factory ()->input_cdr_buffer_allocator ();
-        }
-    }
-
-  return this->input_cdr_buffer_allocator_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::input_cdr_msgblock_allocator (void)
-{
-  if (this->input_cdr_msgblock_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->input_cdr_msgblock_allocator_ == 0)
-        {
-          this->input_cdr_msgblock_allocator_ =
-            this->resource_factory ()->input_cdr_msgblock_allocator ();
-        }
-    }
-
-  return this->input_cdr_msgblock_allocator_;
-}
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::transport_message_buffer_allocator (void)
-{
-  if (this->transport_message_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->transport_message_buffer_allocator_ == 0)
-        {
-          this->transport_message_buffer_allocator_ =
-            this->resource_factory ()->input_cdr_dblock_allocator ();
-        }
-    }
-
-  return this->transport_message_buffer_allocator_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_dblock_allocator (void)
-{
-  if (this->output_cdr_dblock_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->output_cdr_dblock_allocator_ == 0)
-        {
-          this->output_cdr_dblock_allocator_ =
-            this->resource_factory ()->output_cdr_dblock_allocator ();
-        }
-    }
-
-  return this->output_cdr_dblock_allocator_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_buffer_allocator (void)
-{
-  if (this->output_cdr_buffer_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->output_cdr_buffer_allocator_ == 0)
-        {
-          this->output_cdr_buffer_allocator_ =
-            this->resource_factory ()->output_cdr_buffer_allocator ();
-        }
-    }
-
-  return this->output_cdr_buffer_allocator_;
-}
-
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::output_cdr_msgblock_allocator (void)
-{
-  if (this->output_cdr_msgblock_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->output_cdr_msgblock_allocator_ == 0)
-        {
-          this->output_cdr_msgblock_allocator_ =
-            this->resource_factory ()->output_cdr_msgblock_allocator ();
-        }
-    }
-
-  return this->output_cdr_msgblock_allocator_;
-}
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::amh_response_handler_allocator (void)
-{
-  if (this->amh_response_handler_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->amh_response_handler_allocator_ == 0)
-        {
-          this->amh_response_handler_allocator_ =
-            this->resource_factory ()->amh_response_handler_allocator ();
-        }
-    }
-
-  return this->amh_response_handler_allocator_;
-}
-
-ACE_Allocator*
-TAO_Thread_Lane_Resources::ami_response_handler_allocator (void)
-{
-  if (this->ami_response_handler_allocator_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->ami_response_handler_allocator_ == 0)
-        {
-          this->ami_response_handler_allocator_ =
-            this->resource_factory ()->ami_response_handler_allocator ();
-        }
-    }
-
-  return this->ami_response_handler_allocator_;
-}
-
-int
-TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
-                                                   bool ignore_address
-                                                   ACE_ENV_ARG_DECL)
-{
-  // Access the acceptor registry.
-  TAO_Acceptor_Registry &ar = this->acceptor_registry ();
-
-  // Open it.
-  int result = ar.open (&this->orb_core_,
-                        this->leader_follower ().reactor (),
-                        endpoint_set,
-                        ignore_address
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-TAO_Resource_Factory *
-TAO_Thread_Lane_Resources::resource_factory (void)
-{
-  return this->orb_core_.resource_factory ();
-}
-
-void
-TAO_Thread_Lane_Resources::finalize (void)
-{
-  // Close connectors before acceptors!
-  // Ask the registry to close all registered connectors.
-  if (this->connector_registry_ != 0)
-    {
-      this->connector_registry_->close_all ();
-      delete this->connector_registry_;
-    }
-
-  // Ask the registry to close all registered acceptors.
-  if (this->acceptor_registry_ != 0)
-    {
-      this->acceptor_registry_->close_all ();
-      delete this->acceptor_registry_;
-    }
-
-  // Set of handlers still in the connection cache.
-  TAO::Connection_Handler_Set handlers;
-
-  // Close the transport cache and return the handlers that were still
-  // registered.  The cache will decrease the #REFCOUNT# on the
-  // handler when it removes the handler from cache.  However,
-  // #REFCOUNT# is increased when the handler is placed in the handler
-  // set.
-  this->transport_cache_->close (handlers);
-
-  // Go through the handler set, closing the connections and removing
-  // the references.
-  TAO_Connection_Handler **handler = 0;
-
-  for (TAO::Connection_Handler_Set::iterator iter (handlers);
-       iter.next (handler);
-       iter.advance ())
-    {
-      // Connection is closed.  Potential removal from the Reactor.
-      (*handler)->close_connection ();
-
-      // #REFCOUNT# related to the handler set decreases.
-      (*handler)->transport ()->remove_reference ();
-    }
-
-  delete this->transport_cache_;
-  delete this->leader_follower_;
-
-  // Delete all the allocators here.. They shouldnt be done earlier,
-  // lest some of the contents in the above, say reactor or acceptor
-  // may use memory from the pool..
-  if (this->input_cdr_dblock_allocator_ != 0)
-    {
-      this->input_cdr_dblock_allocator_->remove ();
-      delete this->input_cdr_dblock_allocator_;
-      this->input_cdr_dblock_allocator_ = 0;
-    }
-
-  if (this->input_cdr_buffer_allocator_ != 0)
-    {
-      this->input_cdr_buffer_allocator_->remove ();
-      delete this->input_cdr_buffer_allocator_;
-      this->input_cdr_buffer_allocator_ = 0;
-    }
-
-  if (this->input_cdr_msgblock_allocator_ != 0)
-    {
-      this->input_cdr_msgblock_allocator_->remove ();
-      delete this->input_cdr_msgblock_allocator_;
-      this->input_cdr_msgblock_allocator_ = 0;
-    }
-
-  if (this->transport_message_buffer_allocator_ != 0)
-    {
-      this->transport_message_buffer_allocator_->remove ();
-      delete this->transport_message_buffer_allocator_;
-      this->transport_message_buffer_allocator_ = 0;
-    }
-
-  if (this->output_cdr_dblock_allocator_ != 0)
-    {
-      this->output_cdr_dblock_allocator_->remove ();
-      delete this->output_cdr_dblock_allocator_;
-      this->output_cdr_dblock_allocator_ = 0;
-    }
-
-  if (this->output_cdr_buffer_allocator_ != 0)
-    {
-      this->output_cdr_buffer_allocator_->remove ();
-      delete this->output_cdr_buffer_allocator_;
-      this->output_cdr_buffer_allocator_ = 0;
-    }
-
-  if (this->output_cdr_msgblock_allocator_ != 0)
-    {
-      this->output_cdr_msgblock_allocator_->remove ();
-      delete this->output_cdr_msgblock_allocator_;
-      this->output_cdr_msgblock_allocator_ = 0;
-    }
-
-  if (this->amh_response_handler_allocator_ != 0)
-    {
-      this->amh_response_handler_allocator_->remove ();
-      delete this->amh_response_handler_allocator_;
-      this->amh_response_handler_allocator_ = 0;
-    }
-
-  if (this->ami_response_handler_allocator_ != 0)
-    {
-      this->ami_response_handler_allocator_->remove ();
-      delete this->ami_response_handler_allocator_;
-      this->ami_response_handler_allocator_ = 0;
-    }
-}
-
-void
-TAO_Thread_Lane_Resources::shutdown_reactor (void)
-{
-  TAO_Leader_Follower &leader_follower = this->leader_follower ();
-
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             ace_mon,
-             leader_follower.lock ());
-
-
-  ACE_Reactor *reactor = leader_follower.reactor ();
-
-
-  // Wakeup all the threads waiting blocked in the event loop, this
-  // does not guarantee that they will all go away, but reduces the
-  // load on the POA....
-
-  // If there are some client threads running we have to wait until
-  // they finish, when the last one does it will shutdown the reactor
-  // for us.  Meanwhile no new requests will be accepted because the
-  // POA will not process them.
-  if (!this->orb_core_.resource_factory ()->drop_replies_during_shutdown () &&
-      leader_follower.has_clients ())
-    {
-      reactor->wakeup_all_threads ();
-      return;
-    }
-
-  // End the reactor if we want shutdown dropping replies along the
-  // way.
-  reactor->end_reactor_event_loop ();
-}
-
-void
-TAO_Thread_Lane_Resources::cleanup_rw_transports (void)
-{
-  // If we have no-drop-reply strategy simply return.
-  if (!this->orb_core_.resource_factory ()->drop_replies_during_shutdown ())
-    return;
-
-  // Set of handlers still in the connection cache.
-  TAO::Connection_Handler_Set handlers;
-
-  this->transport_cache_->blockable_client_transports (handlers);
-
-  // Go through the handler set, closing the connections and removing
-  // the references.
-  TAO_Connection_Handler **handler = 0;
-
-  for (TAO::Connection_Handler_Set::iterator iter (handlers);
-       iter.next (handler);
-       iter.advance ())
-    {
-      // Connection is closed. There will be a double closure but that
-      // is okay.
-      (*handler)->release_os_resources ();
-
-      // #REFCOUNT# related to the handler set decreases.
-      (*handler)->transport ()->remove_reference ();
-    }
-}
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
deleted file mode 100644
index f0c1a61a07f..00000000000
--- a/TAO/tao/Thread_Lane_Resources.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Thread_Lane_Resources.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ===================================================================
-
-#ifndef TAO_THREAD_LANE_RESOURCES_H
-#define TAO_THREAD_LANE_RESOURCES_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Thread_Mutex.h"
-
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-#include "params.h"
-
-class ACE_Allocator;
-class TAO_ORB_Core;
-class TAO_Acceptor_Registry;
-class TAO_Leader_Follower;
-class TAO_MProfile;
-class TAO_New_Leader_Generator;
-class TAO_Connector_Registry;
-class TAO_Resource_Factory;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-namespace TAO
-{
-  class Transport_Cache_Manager;
-}
-
-/**
- * @class TAO_Thread_Lane_Resources
- *
- * @brief Class representing a thread lane's resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Thread_Lane_Resources
-{
-public:
-  /// Constructor.
-  TAO_Thread_Lane_Resources (
-      TAO_ORB_Core &orb_core,
-      TAO_New_Leader_Generator *new_leader_generator = 0);
-
-  /// Destructor.
-  ~TAO_Thread_Lane_Resources (void);
-
-  // Does @a mprofile belong to us?
-  int is_collocated (const TAO_MProfile &mprofile);
-
-  /// Open the acceptor registry.
-  int open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
-                              bool ignore_address
-                              ACE_ENV_ARG_DECL);
-
-  /// Finalize resources.
-  void finalize (void);
-
-  /// Shutdown the reactor.
-  void shutdown_reactor (void);
-
-  /// Certain ORB policies such as dropping replies on shutdown with
-  /// RW connection handlers would need cleanup of transports to wake
-  /// threads up.
-  void cleanup_rw_transports (void);
-
-  /// @named Accessors
-  //@{
-
-  TAO_Acceptor_Registry &acceptor_registry (void);
-
-  /*
-   * @note Returning a pointer helps to return 0 in case of
-   * exceptions.
-   */
-  TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
-
-  TAO::Transport_Cache_Manager &transport_cache (void);
-
-  TAO_Leader_Follower &leader_follower (void);
-
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
-   * incoming CDR streams.  This allocator has locks.
-   */
-  ACE_Allocator *input_cdr_dblock_allocator (void);
-
-  /* Allocator is intended for allocating the buffers in the incoming
-   * CDR streams.  This allocator has locks.
-   */
-  ACE_Allocator *input_cdr_buffer_allocator (void);
-
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
-   * in incoming CDR streams.  This allocator is global, and has locks.
-   */
-  ACE_Allocator *input_cdr_msgblock_allocator (void);
-
-  /* Allocator is intended for allocating the buffers used in the
-   * Transport object. This allocator has locks.
-   */
-  ACE_Allocator *transport_message_buffer_allocator (void);
-
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
-   * outgoing CDR streams.  This allocator has locks.
-   */
-  ACE_Allocator *output_cdr_dblock_allocator (void);
-
-  /* Allocator is intended for allocating the buffers in the outgoing
-   * CDR streams.  This allocator has locks.
-   */
-  ACE_Allocator *output_cdr_buffer_allocator (void);
-
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
-   * in the outgoing CDR streams.  This allocator is global, and has
-   * locks.
-   */
-  ACE_Allocator *output_cdr_msgblock_allocator (void);
-
-  /* Allocator is intended for allocating the AMH response handlers
-   * This allocator is global.
-   */
-  ACE_Allocator *amh_response_handler_allocator (void);
-
-  /* Allocator is intended for allocating the AMI response handlers
-   * This allocator is global.
-   */
-  ACE_Allocator *ami_response_handler_allocator (void);
-  //@}
-
-private:
-
-  /// Checks if the acceptor registry has been created.
-  int has_acceptor_registry_been_created (void) const;
-
-  /// Helper to get the resource factory in the ORB_Core
-  TAO_Resource_Factory *resource_factory (void);
-
-private:
-  /// ORB_Core related to this thread lane.
-  TAO_ORB_Core &orb_core_;
-
-  /// The registry which maintains a list of acceptor factories for
-  /// each loaded protocol.
-  TAO_Acceptor_Registry *acceptor_registry_;
-
-  /// The connector registry which all active connectors must register
-  /// themselves with.
-  TAO_Connector_Registry *connector_registry_;
-
-  /// Transport cache.
-  TAO::Transport_Cache_Manager *transport_cache_;
-
-  /// The leader/followers management class for this lane.
-  TAO_Leader_Follower *leader_follower_;
-
-  /// Synchronization.
-  TAO_SYNCH_MUTEX lock_;
-
-  /// Generator of new leader threads.
-  TAO_New_Leader_Generator *new_leader_generator_;
-
-  /// @name The allocators for the input CDR streams.
-  //@{
-  ACE_Allocator *input_cdr_dblock_allocator_;
-  ACE_Allocator *input_cdr_buffer_allocator_;
-  ACE_Allocator *input_cdr_msgblock_allocator_;
-  //@}
-
-  /// @name The allocators for the buffering messages in the transport.
-  //@{
-  ACE_Allocator *transport_message_buffer_allocator_;
-  //@}
-
-  /// @name The allocators for the output CDR streams.
-  //@{
-  ACE_Allocator *output_cdr_dblock_allocator_;
-  ACE_Allocator *output_cdr_buffer_allocator_;
-  ACE_Allocator *output_cdr_msgblock_allocator_;
-  //@}
-
-  /// @name The allocators for AMH.
-  //@{
-  ACE_Allocator *amh_response_handler_allocator_;
-  //@}
-
-  /// @name The allocators for AMI.
-  //@{
-  ACE_Allocator *ami_response_handler_allocator_;
-  //@}
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_THREAD_LANE_RESOURCES_H */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
deleted file mode 100644
index d3864856d85..00000000000
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-#include "tao/Thread_Lane_Resources_Manager.h"
-#include "tao/ORB_Core.h"
-#include "tao/LF_Strategy.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           Thread_Lane_Resources_Manager,
-           "$Id$")
-
-TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
-  : orb_core_ (&orb_core),
-    lf_strategy_ (0)
-{
-  this->lf_strategy_ =
-    this->orb_core_->resource_factory ()->create_lf_strategy ();
-}
-
-TAO_Thread_Lane_Resources_Manager::~TAO_Thread_Lane_Resources_Manager (void)
-{
-  delete this->lf_strategy_;
-}
-
-TAO_LF_Strategy &
-TAO_Thread_Lane_Resources_Manager::lf_strategy (void)
-{
-  return *this->lf_strategy_;
-}
-
-TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Factory (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Thread_Lane_Resources_Manager_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
deleted file mode 100644
index cbd6be69009..00000000000
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Thread_Lane_Resources_Manager.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali
- */
-// ============================================================================
-
-#ifndef TAO_THREAD_LANE_RESOURCES_MANAGER_H
-#define TAO_THREAD_LANE_RESOURCES_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Object.h"
-
-#include "tao/TAO_Export.h"
-
-class TAO_ORB_Core;
-class TAO_Thread_Lane_Resources;
-class TAO_LF_Strategy;
-class TAO_MProfile;
-
-namespace CORBA
-{
-  class Environment;
-}
-
-/**
- * @class TAO_Thread_Lane_Resources_Manager
- *
- * @brief This class is a manager for thread resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Thread_Lane_Resources_Manager
-{
-public:
-
-  /// Constructor.
-  TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
-
-  /// Destructor.
-  virtual ~TAO_Thread_Lane_Resources_Manager (void);
-
-  /// Finalize resources.
-  virtual void finalize (void) = 0;
-
-  /// Open default resources.
-  virtual int open_default_resources (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Shutdown reactor.
-  virtual void shutdown_reactor (void) = 0;
-
-  /// Cleanup transports that use the RW strategy since there are no
-  /// ways to wake threads up waiting on those sockets.
-  virtual void cleanup_rw_transports (void) = 0;
-
-  /// Does @a mprofile belong to us?
-  virtual int is_collocated (const TAO_MProfile& mprofile) = 0;
-
-  /// @name Accessors
-  // @{
-
-  virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0;
-
-  virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0;
-
-  TAO_LF_Strategy &lf_strategy (void);
-
-  // @}
-
-protected:
-  /// The ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// The leader follower strategy
-  TAO_LF_Strategy *lf_strategy_;
-};
-
-/**
- * @class TAO_Thread_Lane_Resources_Manager_Factory
- *
- * @brief This class is a factory for managers of thread resources.
- *
- * \nosubgrouping
- *
- **/
-class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory
-  : public ACE_Service_Object
-{
-public:
-
-  /// Virtual destructor.
-  virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
-
-  /// Factory method.
-  virtual
-  TAO_Thread_Lane_Resources_Manager *
-  create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
deleted file mode 100644
index 6cd522c8298..00000000000
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//$Id$
-#include "Thread_Per_Connection_Handler.h"
-#include "Connection_Handler.h"
-#include "debug.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "ace/Flag_Manip.h"
-
-ACE_RCSID (tao,
-           Thread_Per_Connection_Handler,
-           "$Id$")
-
-TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler (
-    TAO_Connection_Handler *ch,
-    TAO_ORB_Core *oc)
-  : TAO_TPC_BASE (oc->thr_mgr ())
-  , ch_ (ch)
-{
-  this->ch_->transport ()->add_reference ();
-}
-
-TAO_Thread_Per_Connection_Handler::~TAO_Thread_Per_Connection_Handler (void)
-{
-  this->ch_->close_connection ();
-  this->ch_->transport ()->remove_reference ();
-}
-
-int
-TAO_Thread_Per_Connection_Handler::activate (long flags,
-                                             int n_threads,
-                                             int force_active,
-                                             long priority,
-                                             int grp_id,
-                                             ACE_Task_Base *task,
-                                             ACE_hthread_t thread_handles[],
-                                             void *stack[],
-                                             size_t stack_size[],
-                                             ACE_thread_t  thread_names[])
-{
-  if (TAO_debug_level)
-    {
-      ACE_DEBUG  ((LM_DEBUG,
-                   ACE_TEXT ("TAO (%P|%t) - Thread_Per_Connection_Handler::")
-                   ACE_TEXT ("activate %d threads, flags = %d\n"),
-                   n_threads,
-                   flags));
-    }
-
-  return TAO_TPC_BASE::activate (flags,
-                                 n_threads,
-                                 force_active,
-                                 priority,
-                                 grp_id,
-                                 task,
-                                 thread_handles,
-                                 stack,
-                                 stack_size,
-                                 thread_names);
-}
-
-int
-TAO_Thread_Per_Connection_Handler::svc (void)
-{
-  ACE::clr_flags (this->ch_->transport ()->event_handler_i ()->get_handle (),
-                  ACE_NONBLOCK);
-
-  // Call the implementation here
-  return this->ch_->svc_i ();
-}
-
-int
-TAO_Thread_Per_Connection_Handler::open (void*v)
-{
-  return this->ch_->open_handler (v);
-}
-
-int
-TAO_Thread_Per_Connection_Handler::close (u_long)
-{
-  delete this;
-
-  return 0;
-}
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
deleted file mode 100644
index 08ed211ae58..00000000000
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Thread_Per_Connection_Handler.h
- *
- *  $Id$
- *
- *  Definition of a connection handler for the thread-per-connection
- *  strategy.
- *
- *  @author  Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_THREAD_PER_CONNECTION_HANDLER_H
-#define TAO_THREAD_PER_CONNECTION_HANDLER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Task_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-
-class TAO_Connection_Handler;
-class TAO_ORB_Core;
-
-typedef ACE_Task<ACE_NULL_SYNCH> TAO_TPC_BASE;
-
-/**
- * @class TAO_Thread_Per_Connection_Handler
- *
- * @brief Definition for the thread-per-connection strategy.
- *
- * This object acts as an active object, encapsulating the protocol
- * specific handler which the active thread uses to process incoming
- * messages.
- *
- */
-class TAO_Export TAO_Thread_Per_Connection_Handler : public TAO_TPC_BASE
-{
-public:
-  TAO_Thread_Per_Connection_Handler (TAO_Connection_Handler *ch,
-                                     TAO_ORB_Core *oc);
-
-  ~TAO_Thread_Per_Connection_Handler (void);
-
-  /// = Active object activation method.
-  /**
-   * @todo This probably needs to go after x.4.1
-   */
-  virtual int activate (long flags = THR_NEW_LWP,
-                        int n_threads = 1,
-                        int force_active = 0,
-                        long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                        int grp_id = -1,
-                        ACE_Task_Base *task = 0,
-                        ACE_hthread_t thread_handles[] = 0,
-                        void *stack[] = 0,
-                        size_t stack_size[] = 0,
-                        ACE_thread_t  thread_names[] = 0);
-
-  /// Template hook method that the thread uses...
-  /**
-   * Please see the documentation in ace/Task.h for details.
-   */
-  virtual int svc (void);
-  virtual int open (void *);
-  virtual int close (u_long);
-
-private:
-  /// Pointer to protocsol specific code that does the bunch of the
-  /// job.
-  TAO_Connection_Handler *ch_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_THREAD_PER_CONNECTION_HANDLER_H*/
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
deleted file mode 100644
index da4c27139c4..00000000000
--- a/TAO/tao/TimeBase.pidl
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- *  @file TimeBase.pidl
- *
- *  $Id$
- *
- * This file was used to generate the code in TimeBase{C,S,S_T}.{h,i,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl.exe
- *        -o orig -Ge 1 -GA -SS -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        TimeBase.pidl
- *
- * After that the files are ready for use
- */
-//=============================================================================
-
-#ifndef TIME_BASE_PIDL
-#define TIME_BASE_PIDL
-
-#pragma prefix "omg.org"
-
-/**
- * @brief COS Time Service basic types.
- *
- *
- * The standard CORBA Time Service defines a number of data structures
- * to manipulate and express time.
- * Over time these data structures have found their way into core
- * components of CORBA, such as CORBA Messaging, RT CORBA, etc.
- *
- */
-module TimeBase
-{
-  /// Time in TimeT is expressed in units of 100 nano seconds
-  /**
-   * In other words each TimeT is 10^-7 seconds.
-   * When used for absolute time 0 is to October 15, 1582. Please read
-   * the spec for further details.
-   */
-  typedef unsigned long long TimeT;
-
-  /// To express an error estimate for time.
-  typedef TimeT InaccuracyT;
-
-  /// Minutes of displacement from the Greenwich time.
-  typedef short TdfT;
-
-  /**
-   * @brief A timestamp in UTC time
-   *
-   * The inaccuracy is packed into inacclo & inacchi.
-   * tdf holds the time displacement factor.
-   *
-   * There are a total of 16 octets in this struct.
-   *
-   * @todo What is exactly the range of time here?
-   *       Is it [time-inacclo,time+inacchi]?
-   */
-  struct UtcT
-  {
-    /// The actual time
-    TimeT time;
-
-    /// The lowest bound for innacuracy
-    unsigned long inacclo;
-
-    /// The upper bound for the innacuracy
-    unsigned short inacchi;
-
-    /// @todo please document
-    TdfT tdf;
-  };
-
-  /**
-   * @brief An UTC time interval
-   *
-   */
-  struct IntervalT
-  {
-    /// Lower bound of the interval.
-    TimeT lower_bound;
-
-    /// Upper bound of the interval.
-    TimeT upper_bound;
-  };
-};
-
-#endif /* TIME_BASE_PIDL */
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
deleted file mode 100644
index 9586e864fe1..00000000000
--- a/TAO/tao/TimeBaseA.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TimeBaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TimeT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TimeT:1.0",
-    "TimeT",
-    &CORBA::_tc_ulonglong);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TimeT =
-    &_tao_tc_TimeBase_TimeT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_InaccuracyT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/InaccuracyT:1.0",
-    "InaccuracyT",
-    &TimeBase::_tc_TimeT);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_InaccuracyT =
-    &_tao_tc_TimeBase_InaccuracyT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TdfT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TdfT:1.0",
-    "TdfT",
-    &CORBA::_tc_short);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TdfT =
-    &_tao_tc_TimeBase_TdfT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_UtcT[] =
-  {
-    { "time", &TimeBase::_tc_TimeT },
-    { "inacclo", &CORBA::_tc_ulong },
-    { "inacchi", &CORBA::_tc_ushort },
-    { "tdf", &TimeBase::_tc_TdfT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_UtcT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/UtcT:1.0",
-    "UtcT",
-    _tao_fields_TimeBase_UtcT,
-    4);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_UtcT =
-    &_tao_tc_TimeBase_UtcT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_IntervalT[] =
-  {
-    { "lower_bound", &TimeBase::_tc_TimeT },
-    { "upper_bound", &TimeBase::_tc_TimeT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_IntervalT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/IntervalT:1.0",
-    "IntervalT",
-    _tao_fields_TimeBase_IntervalT,
-    2);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_IntervalT =
-    &_tao_tc_TimeBase_IntervalT;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::UtcT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert_copy (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::UtcT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::UtcT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::UtcT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::UtcT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::UtcT>::extract (
-        _tao_any,
-        TimeBase::UtcT::_tao_any_destructor,
-        TimeBase::_tc_UtcT,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::IntervalT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert_copy (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::IntervalT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::IntervalT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::extract (
-        _tao_any,
-        TimeBase::IntervalT::_tao_any_destructor,
-        TimeBase::_tc_IntervalT,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
deleted file mode 100644
index 79fb5ffe580..00000000000
--- a/TAO/tao/TimeBaseC.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "TimeBaseC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-TimeBase::UtcT::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  UtcT *_tao_tmp_pointer =
-    static_cast<UtcT *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-TimeBase::IntervalT::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  IntervalT *_tao_tmp_pointer =
-    static_cast<IntervalT *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TimeBase::UtcT &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.time) &&
-    (strm << _tao_aggregate.inacclo) &&
-    (strm << _tao_aggregate.inacchi) &&
-    (strm << _tao_aggregate.tdf);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TimeBase::UtcT &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.time) &&
-    (strm >> _tao_aggregate.inacclo) &&
-    (strm >> _tao_aggregate.inacchi) &&
-    (strm >> _tao_aggregate.tdf);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TimeBase::IntervalT &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.lower_bound) &&
-    (strm << _tao_aggregate.upper_bound);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TimeBase::IntervalT &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.lower_bound) &&
-    (strm >> _tao_aggregate.upper_bound);
-}
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
deleted file mode 100644
index d14e6e08e52..00000000000
--- a/TAO/tao/TimeBaseC.h
+++ /dev/null
@@ -1,223 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
-#define _TAO_IDL_ORIG_TIMEBASEC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace TimeBase
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULongLong TimeT;
-  typedef CORBA::ULongLong_out TimeT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TimeT;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef TimeT InaccuracyT;
-  typedef TimeT_out InaccuracyT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InaccuracyT;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short TdfT;
-  typedef CORBA::Short_out TdfT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TdfT;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct UtcT;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        UtcT
-      >
-    UtcT_var;
-  
-  typedef
-    UtcT &
-    UtcT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export UtcT
-  {
-    typedef UtcT_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TimeBase::TimeT time;
-    CORBA::ULong inacclo;
-    CORBA::UShort inacchi;
-    TimeBase::TdfT tdf;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UtcT;
-  
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-  
-  struct IntervalT;
-  
-  typedef
-    TAO_Fixed_Var_T<
-        IntervalT
-      >
-    IntervalT_var;
-  
-  typedef
-    IntervalT &
-    IntervalT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
-  struct TAO_Export IntervalT
-  {
-    typedef IntervalT_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    TimeBase::TimeT lower_bound;
-    TimeBase::TimeT upper_bound;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IntervalT;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module TimeBase
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::UtcT &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/TimeBaseS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
deleted file mode 100644
index 4d6efb6ad8b..00000000000
--- a/TAO/tao/Timeprobe.h
+++ /dev/null
@@ -1,100 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    Timeprobe.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_TIMEPROBE_H
-#define TAO_TIMEPROBE_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-// Please see ace/Timeprobe.h for details on these #defines.
-
-// #define TAO_ENABLE_TIMEPROBES
-// #define TAO_MT_TIMEPROBES
-// #define TAO_TSS_TIMEPROBES
-
-#if defined (TAO_ENABLE_TIMEPROBES)
-#define ACE_ENABLE_TIMEPROBES
-#endif /* TAO_ENABLE_TIMEPROBES */
-
-#if defined (TAO_MT_TIMEPROBES)
-#define ACE_MT_TIMEPROBES
-#endif /* TAO_MT_TIMEPROBES */
-
-#if defined (TAO_TSS_TIMEPROBES)
-#define ACE_TSS_TIMEPROBES
-#endif /* TAO_TSS_TIMEPROBES */
-
-#include "ace/Timeprobe.h"
-
-// The macro for turning off all timeprobes except
-// the ones that are pertinent to pluggable protocols.
-//#define TAO_SELECT_PP_TIMEPROBES
-
-// The macro for turning off all timeprobes except
-// four - 2 to measure client send time and 2 to measure
-// server upcall processing and return time.
-// NOTE: If both this and the pluggable protocols macro
-// above are defined, code below will undefine this macro.
-// They should not both be defined at the same time.
-//#define TAO_SELECT_MINIMAL_TIMEPROBES
-
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-# define TAO_PP_TIMEPROBE(id) \
-         ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X) \
-         ACE_Function_Timeprobe<ACE_TIMEPROBE_WITH_LOCKING> \
-         function_timeprobe (*ACE_TIMEPROBE_SINGLETON::instance (), X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-# if defined (TAO_SELECT_PP_TIMEPROBES)
-#   if defined TAO_SELECT_MINIMAL_TIMEPROBES
-#     undef TAO_SELECT_MINIMIAL_TIMEPROBES
-#   endif /* TAO_SELECT_MINIMAL_TIMEPROBES */
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   define TAO_MINIMAL_TIMEPROBE(id)
-# endif /* TAO_SELECT_PP_TIMEPROBES */
-
-# if defined (TAO_SELECT_MINIMAL_TIMEPROBES)
-#   undef TAO_MINIMAL_TIMEPROBE
-#   define TAO_MINIMAL_TIMEPROBE(id) \
-           ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   undef TAO_PP_TIMEPROBE
-#   define TAO_PP_TIMEPROBE(id)
-#   undef TAO_FUNCTION_PP_TIMEPROBE
-#   define TAO_FUNCTION_PP_TIMEPROBE(X)
-# endif /* TAO_SELECT_MINIMAL_TIMEPROBES */
-
-#else /* ACE_ENABLE_TIMEPROBES */
-
-# define TAO_PP_TIMEPROBE(id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_TIMEPROBE_H */
diff --git a/TAO/tao/TkResource.mpc b/TAO/tao/TkResource.mpc
deleted file mode 100644
index 3e077e448cc..00000000000
--- a/TAO/tao/TkResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_TkResource) : acelib, taolib, core, tao_output, taodefaults, ace_tkreactor {
-
-  sharedname   = TAO_TkResource
-  dynamicflags += TAO_TKRESOURCE_BUILD_DLL
-
-  Source_Files {
-    TkResource_Factory.cpp
-    TkResource_Loader.cpp
-  }
-
-  Header_Files {
-    TkResource_Factory.h
-    TkResource_Loader.h
-    TAO_TkResource_Export.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource_Factory.cpp
deleted file mode 100644
index 765e7a40e02..00000000000
--- a/TAO/tao/TkResource_Factory.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//$Id$
-
-#include "tao/TkResource_Factory.h"
-#include "tao/debug.h"
-#include "ace/TkReactor.h"
-
-ACE_RCSID( TAO_TkResource,
-           TkResource_Factory,
-           "$Id$");
-
-
-namespace TAO
-{
-
-  TkResource_Factory::TkResource_Factory ():
-    reactor_impl_( 0 )
-  {
-  }
-
-  ACE_Reactor_Impl *
-  TkResource_Factory::reactor_impl (void)
-  {
-    // synchronized by external locks
-    if (!this->reactor_impl_)
-    {
-      ACE_NEW_RETURN (this->reactor_impl_,
-                      ACE_TkReactor (),
-                      0);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - ACE_TkReactor created \n"));
-    }
-
-    return this->reactor_impl_;
-  }
-}
diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource_Factory.h
deleted file mode 100644
index e08b436d274..00000000000
--- a/TAO/tao/TkResource_Factory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TkResource_Factory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-#ifndef TAO_TKRESOURCE_FACTORY_H
-#define TAO_TKRESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-#include "ace/TkReactor.h"
-#include "tao/TAO_TkResource_Export.h"
-#include "tao/GUIResource_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class TkResource_Factory
-   *
-   * @brief TAO_GUI_Resource_Factory for creating TkReactor.
-   *
-   * This factory is intended for creating TkReactor for ORB. This
-   * factory can be feed into ORB using
-   * TAO_ORB_Core::set_gui_resource_factory method which is usually
-   * done by TAO_TkResource_Loader.
-   */
-
-  class TAO_TkResource_Export TkResource_Factory : public GUIResource_Factory
-  {
-  public:
-
-    TkResource_Factory ();
-
-  protected:
-
-    /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
-
-  private:
-
-    /// Reactor created by this factory.
-    ACE_TkReactor *reactor_impl_;
-
-    /// for internal locking.
-    TAO_SYNCH_MUTEX lock_;
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_TKRESOURCE_FACTORY_H */
diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp
deleted file mode 100644
index 782fbc92bf0..00000000000
--- a/TAO/tao/TkResource_Loader.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//$Id$
-#include "TkResource_Loader.h"
-#include "ORB_Core.h"
-#include "TkResource_Factory.h"
-
-ACE_RCSID( TAO_TkResource,
-           TkResource_Loader,
-           "$Id$");
-
-namespace TAO
-{
-
-  TkResource_Loader::TkResource_Loader ()
-  {
-    TkResource_Factory *tmp = 0;
-
-    ACE_NEW (tmp,
-             TkResource_Factory ());
-
-    TAO_ORB_Core::set_gui_resource_factory( tmp );
-  }
-
-  TkResource_Loader::~TkResource_Loader ()
-  {
-  }
-}
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
deleted file mode 100644
index 9b20a5eac02..00000000000
--- a/TAO/tao/TkResource_Loader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TkResource_Loader.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-
-#ifndef TAO_TKRESOURCE_LOADER_H
-#define TAO_TKRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-#include "tao/TAO_TkResource_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class TkResource_Loader
-   *
-   * @brief Loads TAO resources related with Tk.
-   *
-   * This class changes the default reactor implementation into
-   * ACE_TkReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
-   * User should create an instance of this class before ORB_init
-   * when the TAO server has has to be integrated within Tk event loop.
-   *
-   * Please notice, this class has to be created in the main Tk thread,
-   * because set_gui_resource_factory creates a variable in TSS. This way
-   * TkReactor is instantiated only in Tk event loop thread.
-   */
-  class TAO_TkResource_Export TkResource_Loader
-  {
-
-  public:
-    TkResource_Loader ( );
-
-    virtual ~TkResource_Loader ();
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_TKRESOURCE_LOADER_H */
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
deleted file mode 100644
index 06aa4f74b14..00000000000
--- a/TAO/tao/Transport.cpp
+++ /dev/null
@@ -1,2471 +0,0 @@
-// $Id$
-
-#include "Transport.h"
-
-#include "LF_Follower.h"
-#include "Leader_Follower.h"
-#include "Client_Strategy_Factory.h"
-#include "Wait_Strategy.h"
-#include "Transport_Mux_Strategy.h"
-#include "Stub.h"
-#include "Sync_Strategies.h"
-#include "Connection_Handler.h"
-#include "Pluggable_Messaging.h"
-#include "Synch_Queued_Message.h"
-#include "Asynch_Queued_Message.h"
-#include "Flushing_Strategy.h"
-#include "Thread_Lane_Resources.h"
-#include "Resume_Handle.h"
-#include "Codeset_Manager.h"
-#include "Codeset_Translator_Factory.h"
-#include "debug.h"
-#include "CDR.h"
-
-#include "ace/OS_NS_sys_time.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Reactor.h"
-#include "ace/os_include/sys/os_uio.h"
-
-
-#if !defined (__ACE_INLINE__)
-# include "Transport.inl"
-#endif /* __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Transport,
-           "$Id$")
-
-/*
- * Static function in file scope
- */
-static void
-dump_iov (iovec *iov, int iovcnt, size_t id,
-          size_t current_transfer,
-          const char *location)
-{
-  ACE_Log_Msg::instance ()->acquire ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
-              ACE_TEXT ("sending %d buffers\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt));
-
-  for (int i = 0; i != iovcnt && 0 < current_transfer; ++i)
-    {
-      size_t iov_len = iov[i].iov_len;
-
-      // Possibly a partially sent iovec entry.
-      if (current_transfer < iov_len)
-        {
-          iov_len = current_transfer;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
-                  ACE_TEXT ("buffer %d/%d has %d bytes\n"),
-                  id, ACE_TEXT_CHAR_TO_TCHAR(location),
-                  i, iovcnt,
-                  iov_len));
-
-      size_t len;
-
-      for (size_t offset = 0; offset < iov_len; offset += len)
-        {
-          ACE_TCHAR header[1024];
-          ACE_OS::sprintf (header,
-                           ACE_TEXT("TAO - ")
-                           ACE_TEXT("Transport[")
-                           ACE_SIZE_T_FORMAT_SPECIFIER
-                           ACE_TEXT("]::%s")
-                           ACE_TEXT(" (")
-                           ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT("/")
-                           ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT(")"),
-                           id, location, offset, iov_len);
-
-          len = iov_len - offset;
-
-          if (len > 512)
-            {
-              len = 512;
-            }
-
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         static_cast<char*> (iov[i].iov_base) + offset,
-                         len,
-                         header));
-        }
-      current_transfer -= iov_len;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
-              ACE_TEXT ("end of data\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR(location)));
-
-  ACE_Log_Msg::instance ()->release ();
-}
-
-TAO_Transport::TAO_Transport (CORBA::ULong tag,
-                              TAO_ORB_Core *orb_core)
-  : tag_ (tag)
-  , orb_core_ (orb_core)
-  , cache_map_entry_ (0)
-  , bidirectional_flag_ (-1)
-  , opening_connection_role_ (TAO::TAO_UNSPECIFIED_ROLE)
-  , head_ (0)
-  , tail_ (0)
-  , incoming_message_queue_ (orb_core)
-  , current_deadline_ (ACE_Time_Value::zero)
-  , flush_timer_id_ (-1)
-  , transport_timer_ (this)
-  , handler_lock_ (orb_core->resource_factory ()->create_cached_connection_lock ())
-  , id_ ((size_t) this)
-  , purging_order_ (0)
-  , recv_buffer_size_ (0)
-  , sent_byte_count_ (0)
-  , is_connected_ (false)
-  , char_translator_ (0)
-  , wchar_translator_ (0)
-  , tcs_set_ (0)
-  , first_request_ (1)
-  , partial_message_ (0)
-{
-  TAO_Client_Strategy_Factory *cf =
-    this->orb_core_->client_factory ();
-
-  // Create WS now.
-  this->ws_ = cf->create_wait_strategy (this);
-
-  // Create TMS now.
-  this->tms_ = cf->create_transport_mux_strategy (this);
-}
-
-TAO_Transport::~TAO_Transport (void)
-{
-  delete this->ws_;
-
-  delete this->tms_;
-
-  delete this->handler_lock_;
-
-  if (!this->is_connected_)
-    {
-      // When we have a not connected transport we could have buffered
-      // messages on this transport which we have to cleanup now.
-      this->cleanup_queue_i();
-
-      // Cleanup our cache entry
-      this->purge_entry();
-    }
-
-  // Release the partial message block, however we may
-  // have never allocated one.
-  ACE_Message_Block::release (this->partial_message_);
-
-  // By the time the destructor is reached here all the connection stuff
-  // *must* have been cleaned up.
-  ACE_ASSERT (this->head_ == 0);
-  ACE_ASSERT (this->cache_map_entry_ == 0);
-}
-
-void
-TAO_Transport::provide_handler (TAO::Connection_Handler_Set &handlers)
-{
-  (void) this->add_reference ();
-
-  handlers.insert (this->connection_handler_i ());
-}
-
-bool
-TAO_Transport::provide_blockable_handler (TAO::Connection_Handler_Set &h)
-{
-  if (this->ws_->non_blocking () ||
-      this->opening_connection_role_ == TAO::TAO_SERVER_ROLE)
-    return false;
-
-  (void) this->add_reference ();
-
-  h.insert (this->connection_handler_i ());
-
-  return true;
-}
-
-bool
-TAO_Transport::idle_after_send (void)
-{
-  return this->tms ()->idle_after_send ();
-}
-
-bool
-TAO_Transport::idle_after_reply (void)
-{
-  return this->tms ()->idle_after_reply ();
-}
-
-int
-TAO_Transport::tear_listen_point_list (TAO_InputCDR &)
-{
-  ACE_NOTSUP_RETURN (-1);
-}
-
-bool
-TAO_Transport::post_connect_hook (void)
-{
-  return true;
-}
-
-void
-TAO_Transport::close_connection (void)
-{
-  this->connection_handler_i ()->close_connection ();
-}
-
-int
-TAO_Transport::register_handler (void)
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::register_handler\n",
-                  this->id ()));
-    }
-
-  ACE_Reactor *r = this->orb_core_->reactor ();
-
-  // @@note: This should be okay since the register handler call will
-  // not make a nested call into the transport.
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->handler_lock_,
-                    false);
-
-  if (r == this->event_handler_i ()->reactor ())
-    {
-      return 0;
-    }
-
-  // Set the flag in the Connection Handler and in the Wait Strategy
-  // @@Maybe we should set these flags after registering with the
-  // reactor. What if the  registration fails???
-  this->ws_->is_registered (1);
-
-  // Register the handler with the reactor
-  return r->register_handler (this->event_handler_i (),
-                              ACE_Event_Handler::READ_MASK);
-}
-
-int
-TAO_Transport::generate_locate_request (
-    TAO_Target_Specification &spec,
-    TAO_Operation_Details &opdetails,
-    TAO_OutputCDR &output)
-{
-  if (this->messaging_object ()->generate_locate_request_header (opdetails,
-                                                                 spec,
-                                                                 output)
-       == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::generate_locate_request, "
-                      "error while marshalling the LocateRequest header\n",
-                      this->id ()));
-        }
-
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Transport::generate_request_header (
-    TAO_Operation_Details &opdetails,
-    TAO_Target_Specification &spec,
-    TAO_OutputCDR &output)
-{
-  // codeset service context is only supposed to be sent in the first request
-  // on a particular connection.
-  if (this->first_request_)
-    {
-      this->orb_core ()->codeset_manager ()->generate_service_context (
-                                                 opdetails,
-                                                 *this
-                                               );
-    }
-
-  if (this->messaging_object ()->generate_request_header (opdetails,
-                                                          spec,
-                                                          output) == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-        ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) - Transport[%d]::generate_request_header, "
-                      "error while marshalling the Request header\n",
-                      this->id()));
-        }
-
-      return -1;
-    }
-
-  return 0;
-}
-
-/// @todo Ideally the following should be inline.
-/// @todo purge_entry has a return value, use it
-int
-TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
-{
-  // First purge our entry
-  this->purge_entry ();
-
-  // Then add ourselves to the cache
-  return this->transport_cache_manager ().cache_transport (desc,
-                                                           this);
-}
-
-int
-TAO_Transport::purge_entry (void)
-{
-  return this->transport_cache_manager ().purge_entry (this->cache_map_entry_);
-}
-
-int
-TAO_Transport::make_idle (void)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::make_idle\n",
-                  this->id ()));
-    }
-
-  return this->transport_cache_manager ().make_idle (this->cache_map_entry_);
-}
-
-int
-TAO_Transport::update_transport (void)
-{
-  return this->transport_cache_manager ().update_entry (this->cache_map_entry_);
-}
-
-/*
- *
- *  Methods called and used in the output path of the ORB.
- *
- */
-int
-TAO_Transport::handle_output (void)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_output\n",
-                  this->id ()));
-    }
-
-  // The flushing strategy (potentially via the Reactor) wants to send
-  // more data, first check if there is a current message that needs
-  // more sending...
-  int retval = this->drain_queue ();
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_output, "
-                  "drain_queue returns %d/%d\n",
-                  this->id (),
-                  retval, errno));
-    }
-
-  // Any errors are returned directly to the Reactor
-  return retval;
-}
-
-int
-TAO_Transport::format_queue_message (TAO_OutputCDR &stream)
-{
-  if (this->messaging_object ()->format_message (stream) != 0)
-    return -1;
-
-  return this->queue_message_i (stream.begin());
-}
-
-int
-TAO_Transport::send_message_block_chain (const ACE_Message_Block *mb,
-                                         size_t &bytes_transferred,
-                                         ACE_Time_Value *max_wait_time)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-  return this->send_message_block_chain_i (mb,
-                                           bytes_transferred,
-                                           max_wait_time);
-}
-
-int
-TAO_Transport::send_message_block_chain_i (const ACE_Message_Block *mb,
-                                           size_t &bytes_transferred,
-                                           ACE_Time_Value *)
-{
-  const size_t total_length = mb->total_length ();
-
-  // We are going to block, so there is no need to clone
-  // the message block.
-  TAO_Synch_Queued_Message synch_message (mb);
-
-  synch_message.push_back (this->head_, this->tail_);
-
-  int n = this->drain_queue_i ();
-
-  if (n == -1)
-    {
-      synch_message.remove_from_list (this->head_, this->tail_);
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
-      return -1; // Error while sending...
-    }
-  else if (n == 1)
-    {
-      ACE_ASSERT (synch_message.all_data_sent ());
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
-      bytes_transferred = total_length;
-      return 1;  // Empty queue, message was sent..
-    }
-
-  ACE_ASSERT (n == 0); // Some data sent, but data remains.
-
-  // Remove the temporary message from the queue...
-  synch_message.remove_from_list (this->head_, this->tail_);
-
-  bytes_transferred =
-    total_length - synch_message.message_length ();
-
-  return 0;
-}
-
-int
-TAO_Transport::send_message_shared (TAO_Stub *stub,
-                                    int message_semantics,
-                                    const ACE_Message_Block *message_block,
-                                    ACE_Time_Value *max_wait_time)
-{
-  int result;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-    result =
-      this->send_message_shared_i (stub, message_semantics,
-                                   message_block, max_wait_time);
-  }
-
-  if (result == -1)
-    {
-      this->close_connection ();
-    }
-
-  return result;
-}
-
-int
-TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
-                                           ACE_Time_Value *max_wait_time)
-{
-  // We are going to block, so there is no need to clone
-  // the message block.
-  TAO_Synch_Queued_Message synch_message (mb);
-
-  synch_message.push_back (this->head_, this->tail_);
-
-  int n =
-    this->send_synch_message_helper_i (synch_message,
-                                       max_wait_time);
-
-  if (n == -1 || n == 1)
-    {
-      return n;
-    }
-
-  ACE_ASSERT (n == 0);
-
-  // @todo: Check for timeouts!
-  // if (max_wait_time != 0 && errno == ETIME) return -1;
-  TAO_Flushing_Strategy *flushing_strategy =
-    this->orb_core ()->flushing_strategy ();
-  (void) flushing_strategy->schedule_output (this);
-
-  // Release the mutex, other threads may modify the queue as we
-  // block for a long time writing out data.
-  int result;
-  {
-    typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK;
-    TAO_REVERSE_LOCK reverse (*this->handler_lock_);
-    ACE_GUARD_RETURN (TAO_REVERSE_LOCK,
-                      ace_mon,
-                      reverse,
-                      -1);
-
-    result = flushing_strategy->flush_message (this,
-                                               &synch_message,
-                                               max_wait_time);
-  }
-
-  if (result == -1)
-    {
-      synch_message.remove_from_list (this->head_, this->tail_);
-
-      if (errno == ETIME)
-        {
-          if (this->head_ == &synch_message)
-            {
-              // This is a timeout, there is only one nasty case: the
-              // message has been partially sent!  We simply cannot take
-              // the message out of the queue, because that would corrupt
-              // the connection.
-              //
-              // What we do is replace the queued message with an
-              // asynchronous message, that contains only what remains of
-              // the timed out request.  If you think about sending
-              // CancelRequests in this case: there is no much point in
-              // doing that: the receiving ORB would probably ignore it,
-              // and figuring out the request ID would be a bit of a
-              // nightmare.
-              //
-
-              synch_message.remove_from_list (this->head_, this->tail_);
-              TAO_Queued_Message *queued_message = 0;
-              ACE_NEW_RETURN (queued_message,
-                              TAO_Asynch_Queued_Message (
-                                  synch_message.current_block (),
-                                  0,
-                                  1),
-                              -1);
-              queued_message->push_front (this->head_, this->tail_);
-            }
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, "
-                      "error while flushing message - %m\n",
-                      this->id ()));
-        }
-
-      return -1;
-    }
-
-  else
-    {
-      ACE_ASSERT (synch_message.all_data_sent () != 0);
-    }
-
-  ACE_ASSERT (synch_message.next () == 0);
-  ACE_ASSERT (synch_message.prev () == 0);
-  return 1;
-}
-
-
-int
-TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
-                                     ACE_Time_Value *max_wait_time)
-{
-  // Dont clone now.. We could be sent in one shot!
-  TAO_Synch_Queued_Message synch_message (mb);
-
-  synch_message.push_back (this->head_,
-                           this->tail_);
-
-  int n =
-    this->send_synch_message_helper_i (synch_message,
-                                       max_wait_time);
-
-  if (n == -1 || n == 1)
-    {
-      return n;
-    }
-
-  ACE_ASSERT (n == 0);
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::send_reply_message_i, "
-                  "preparing to add to queue before leaving \n",
-                  this->id ()));
-    }
-
-  // Till this point we shouldnt have any copying and that is the
-  // point anyway. Now, remove the node from the list
-  synch_message.remove_from_list (this->head_,
-                                  this->tail_);
-
-  // Clone the node that we have.
-  TAO_Queued_Message *msg =
-    synch_message.clone (this->orb_core_->transport_message_buffer_allocator ());
-
-  // Stick it in the queue
-  msg->push_back (this->head_,
-                  this->tail_);
-
-  TAO_Flushing_Strategy *flushing_strategy =
-    this->orb_core ()->flushing_strategy ();
-
-  (void) flushing_strategy->schedule_output (this);
-
-  return 1;
-}
-
-int
-TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_message,
-                                            ACE_Time_Value * /*max_wait_time*/)
-{
-  // @@todo: Need to send timeouts for writing..
-  int n = this->drain_queue_i ();
-
-  if (n == -1)
-    {
-      synch_message.remove_from_list (this->head_, this->tail_);
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
-      return -1; // Error while sending...
-    }
-  else if (n == 1)
-    {
-      ACE_ASSERT (synch_message.all_data_sent ());
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
-      return 1;  // Empty queue, message was sent..
-    }
-
-  ACE_ASSERT (n == 0); // Some data sent, but data remains.
-
-  if (synch_message.all_data_sent ())
-    {
-      ACE_ASSERT (synch_message.next () == 0);
-      ACE_ASSERT (synch_message.prev () == 0);
-      return 1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Transport::queue_is_empty_i (void)
-{
-  return (this->head_ == 0);
-}
-
-
-int
-TAO_Transport::schedule_output_i (void)
-{
-  ACE_Event_Handler *eh = this->event_handler_i ();
-  ACE_Reactor *reactor = eh->reactor ();
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::schedule_output_i\n",
-                  this->id ()));
-    }
-
-  return reactor->schedule_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
-}
-
-int
-TAO_Transport::cancel_output_i (void)
-{
-  ACE_Event_Handler *eh = this->event_handler_i ();
-  ACE_Reactor *reactor = eh->reactor ();
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::cancel_output_i\n",
-                  this->id ()));
-    }
-
-  return reactor->cancel_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
-}
-
-int
-TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */,
-                               const void *act)
-{
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, "
-                  "timer expired\n",
-                  this->id ()));
-    }
-
-  /// This is the only legal ACT in the current configuration....
-  if (act != &this->current_deadline_)
-    {
-      return -1;
-    }
-
-  if (this->flush_timer_pending ())
-    {
-      // The timer is always a oneshot timer, so mark is as not
-      // pending.
-      this->reset_flush_timer ();
-
-      TAO_Flushing_Strategy *flushing_strategy =
-        this->orb_core ()->flushing_strategy ();
-      (void) flushing_strategy->schedule_output (this);
-    }
-
-  return 0;
-}
-
-int
-TAO_Transport::drain_queue (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-  int retval = this->drain_queue_i ();
-
-  if (retval == 1)
-    {
-      // ... there is no current message or it was completely
-      // sent, cancel output...
-      TAO_Flushing_Strategy *flushing_strategy =
-        this->orb_core ()->flushing_strategy ();
-
-      flushing_strategy->cancel_output (this);
-
-      return 0;
-    }
-
-  return retval;
-}
-
-int
-TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
-{
-  size_t byte_count = 0;
-
-  // ... send the message ...
-  ssize_t retval =
-    this->send (iov, iovcnt, byte_count);
-
-  if (TAO_debug_level == 5)
-    {
-      dump_iov (iov, iovcnt, this->id (),
-                byte_count, "drain_queue_helper");
-    }
-
-  // ... now we need to update the queue, removing elements
-  // that have been sent, and updating the last element if it
-  // was only partially sent ...
-  this->cleanup_queue (byte_count);
-  iovcnt = 0;
-
-  if (retval == 0)
-    {
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                      "send() returns 0\n",
-                      this->id ()));
-        }
-      return -1;
-    }
-  else if (retval == -1)
-    {
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                      "error during %p\n",
-                      this->id (), ACE_TEXT ("send()")));
-        }
-
-      if (errno == EWOULDBLOCK || errno == EAGAIN)
-        {
-          return 0;
-        }
-
-      return -1;
-    }
-
-  // ... start over, how do we guarantee progress?  Because if
-  // no bytes are sent send() can only return 0 or -1
-  ACE_ASSERT (byte_count != 0);
-
-  // Total no. of bytes sent for a send call
-  this->sent_byte_count_ += byte_count;
-
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
-                  "byte_count = %d, head_is_empty = %d\n",
-                  this->id(), byte_count, (this->head_ == 0)));
-    }
-
-  return 1;
-}
-
-int
-TAO_Transport::drain_queue_i (void)
-{
-  // This is the vector used to send data, it must be declared outside
-  // the loop because after the loop there may still be data to be
-  // sent
-  int iovcnt = 0;
-  iovec iov[ACE_IOV_MAX];
-
-  // We loop over all the elements in the queue ...
-  TAO_Queued_Message *i = this->head_;
-
-  // reset the value so that the counting is done for each new send
-  // call.
-  this->sent_byte_count_ = 0;
-
-  while (i != 0)
-    {
-      // ... each element fills the iovector ...
-      i->fill_iov (ACE_IOV_MAX, iovcnt, iov);
-
-      // ... the vector is full, no choice but to send some data out.
-      // We need to loop because a single message can span multiple
-      // IOV_MAX elements ...
-      if (iovcnt == ACE_IOV_MAX)
-        {
-          int retval =
-            this->drain_queue_helper (iovcnt, iov);
-
-          if (TAO_debug_level > 4)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
-                          "helper retval = %d\n",
-                          this->id (), retval));
-            }
-
-          if (retval != 1)
-            {
-              return retval;
-            }
-
-          i = this->head_;
-          continue;
-        }
-      // ... notice that this line is only reached if there is still
-      // room in the iovector ...
-      i = i->next ();
-    }
-
-
-  if (iovcnt != 0)
-    {
-      int retval = this->drain_queue_helper (iovcnt, iov);
-
-          if (TAO_debug_level > 4)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
-                          "helper retval = %d\n",
-                          this->id (), retval));
-            }
-
-      if (retval != 1)
-        {
-          return retval;
-        }
-    }
-
-  if (this->head_ == 0)
-    {
-      if (this->flush_timer_pending ())
-        {
-          ACE_Event_Handler *eh = this->event_handler_i ();
-          ACE_Reactor *reactor = eh->reactor ();
-          reactor->cancel_timer (this->flush_timer_id_);
-          this->reset_flush_timer ();
-        }
-
-      return 1;
-    }
-
-  return 0;
-}
-
-void
-TAO_Transport::cleanup_queue_i ()
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, "
-                  "cleaning up complete queue\n",
-                  this->id ()));
-    }
-
-  // Cleanup all messages
-  while (this->head_ != 0)
-    {
-      TAO_Queued_Message *i = this->head_;
-
-       // @@ This is a good point to insert a flag to indicate that a
-       //    CloseConnection message was successfully received.
-      i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED);
-
-      i->remove_from_list (this->head_, this->tail_);
-
-      i->destroy ();
-   }
-}
-
-void
-TAO_Transport::cleanup_queue (size_t byte_count)
-{
-  while (this->head_ != 0 && byte_count > 0)
-    {
-      TAO_Queued_Message *i = this->head_;
-
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::cleanup_queue, "
-                      "byte_count = %d\n",
-                      this->id (), byte_count));
-        }
-
-      // Update the state of the first message
-      i->bytes_transferred (byte_count);
-
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::cleanup_queue, "
-                      "after transfer, bc = %d, all_sent = %d, ml = %d\n",
-                      this->id (), byte_count, i->all_data_sent (),
-                      i->message_length ()));
-        }
-
-      // ... if all the data was sent the message must be removed from
-      // the queue...
-      if (i->all_data_sent ())
-        {
-          i->remove_from_list (this->head_, this->tail_);
-          i->destroy ();
-        }
-    }
-}
-
-int
-TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub,
-                                              int &must_flush)
-{
-  // First let's compute the size of the queue:
-  size_t msg_count = 0;
-  size_t total_bytes = 0;
-
-  for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ())
-    {
-      msg_count++;
-      total_bytes += i->message_length ();
-    }
-
-  int set_timer;
-  ACE_Time_Value new_deadline;
-
-  int constraints_reached =
-    stub->sync_strategy ().buffering_constraints_reached (stub,
-                                                          msg_count,
-                                                          total_bytes,
-                                                          must_flush,
-                                                          this->current_deadline_,
-                                                          set_timer,
-                                                          new_deadline);
-
-  // ... set the new timer, also cancel any previous timers ...
-  if (set_timer)
-    {
-      ACE_Event_Handler *eh = this->event_handler_i ();
-      ACE_Reactor *reactor = eh->reactor ();
-      this->current_deadline_ = new_deadline;
-      ACE_Time_Value delay =
-        new_deadline - ACE_OS::gettimeofday ();
-
-      if (this->flush_timer_pending ())
-        {
-          reactor->cancel_timer (this->flush_timer_id_);
-        }
-
-      this->flush_timer_id_ =
-        reactor->schedule_timer (&this->transport_timer_,
-                                 &this->current_deadline_,
-                                 delay);
-    }
-
-  return constraints_reached;
-}
-
-void
-TAO_Transport::report_invalid_event_handler (const char *caller)
-{
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::report_invalid_event_handler"
-                  "(%s) no longer associated with handler [tag=%d]\n",
-                  this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_));
-    }
-}
-
-void
-TAO_Transport::send_connection_closed_notifications (void)
-{
-  {
-    ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->handler_lock_));
-
-    this->send_connection_closed_notifications_i ();
-  }
-
-  this->tms ()->connection_closed ();
-}
-
-void
-TAO_Transport::send_connection_closed_notifications_i (void)
-{
-  this->cleanup_queue_i ();
-
-  this->messaging_object ()->reset ();
-}
-
-int
-TAO_Transport::send_message_shared_i (TAO_Stub *stub,
-                                      int message_semantics,
-                                      const ACE_Message_Block *message_block,
-                                      ACE_Time_Value *max_wait_time)
-{
-
-// @todo Bala mentioned that this has to go out here
-// {
-  if (message_semantics == TAO_Transport::TAO_TWOWAY_REQUEST)
-    {
-      return this->send_synchronous_message_i (message_block,
-                                               max_wait_time);
-    }
-  else if (message_semantics == TAO_Transport::TAO_REPLY)
-    {
-      return this->send_reply_message_i (message_block,
-                                         max_wait_time);
-    }
- // }
-
-  // Let's figure out if the message should be queued without trying
-  // to send first:
-  int try_sending_first = 1;
-
-  const int queue_empty = (this->head_ == 0);
-
-  if (!queue_empty)
-    {
-      try_sending_first = 0;
-    }
-  else if (stub->sync_strategy ().must_queue (queue_empty))
-    {
-      try_sending_first = 0;
-    }
-
-  ssize_t n;
-
-  TAO_Flushing_Strategy *flushing_strategy =
-    this->orb_core ()->flushing_strategy ();
-
-  if (try_sending_first)
-    {
-      size_t byte_count = 0;
-      // ... in this case we must try to send the message first ...
-
-      const size_t total_length = message_block->total_length ();
-
-      if (TAO_debug_level > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                      "trying to send the message (ml = %d)\n",
-                      this->id (), total_length));
-        }
-
-      // @@ I don't think we want to hold the mutex here, however if
-      // we release it we need to recheck the status of the transport
-      // after we return... once I understand the final form for this
-      // code I will re-visit this decision
-      n = this->send_message_block_chain_i (message_block,
-                                            byte_count,
-                                            max_wait_time);
-      if (n == -1)
-        {
-          // ... if this is just an EWOULDBLOCK we must schedule the
-          // message for later, if it is ETIME we still have to send
-          // the complete message, because cutting off the message at
-          // this point will destroy the synchronization with the
-          // server ...
-          if (errno != EWOULDBLOCK && errno != ETIME)
-            {
-              if (TAO_debug_level > 0)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                              "fatal error in "
-                              "send_message_block_chain_i - %m\n",
-                              this->id ()));
-                }
-              return -1;
-            }
-        }
-
-      // ... let's figure out if the complete message was sent ...
-      if (total_length == byte_count)
-        {
-          // Done, just return.  Notice that there are no allocations
-          // or copies up to this point (though some fancy calling
-          // back and forth).
-          // This is the common case for the critical path, it should
-          // be fast.
-          return 0;
-        }
-
-      if (TAO_debug_level > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                      "partial send %d / %d bytes\n",
-                      this->id (), byte_count, total_length));
-        }
-
-      // ... part of the data was sent, need to figure out what piece
-      // of the message block chain must be queued ...
-      while (message_block != 0 && message_block->length () == 0)
-        {
-          message_block = message_block->cont ();
-        }
-
-      // ... at least some portion of the message block chain should
-      // remain ...
-      ACE_ASSERT (message_block != 0);
-    }
-
-  // ... either the message must be queued or we need to queue it
-  // because it was not completely sent out ...
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                  "message is queued\n",
-                  this->id ()));
-    }
-
-  if (this->queue_message_i(message_block) == -1)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Transport[%d]::send_message_shared_i, "
-                "cannot queue message for "
-                " - %m\n",
-                this->id ()));
-    return -1;
-  }
-
-  // ... if the queue is full we need to activate the output on the
-  // queue ...
-  int must_flush = 0;
-  const int constraints_reached =
-    this->check_buffering_constraints_i (stub,
-                                         must_flush);
-
-  // ... but we also want to activate it if the message was partially
-  // sent.... Plus, when we use the blocking flushing strategy the
-  // queue is flushed as a side-effect of 'schedule_output()'
-
-  if (constraints_reached || try_sending_first)
-    {
-      (void) flushing_strategy->schedule_output (this);
-    }
-
-  if (must_flush)
-    {
-      typedef ACE_Reverse_Lock<ACE_Lock> TAO_REVERSE_LOCK;
-      TAO_REVERSE_LOCK reverse (*this->handler_lock_);
-      ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, -1);
-
-      (void) flushing_strategy->flush_transport (this);
-    }
-
-  return 0;
-}
-
-int
-TAO_Transport::queue_message_i(const ACE_Message_Block *message_block)
-{
-  TAO_Queued_Message *queued_message = 0;
-  ACE_NEW_RETURN (queued_message,
-                  TAO_Asynch_Queued_Message (message_block,
-                                             0,
-                                             1),
-                  -1);
-  queued_message->push_back (this->head_, this->tail_);
-
-  return 0;
-}
-
-/*
- *
- * All the methods relevant to the incoming data path of the ORB are
- * defined below
- *
- */
-int
-TAO_Transport::handle_input (TAO_Resume_Handle &rh,
-                             ACE_Time_Value * max_wait_time,
-                             int /*block*/)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_input\n",
-                  this->id ()));
-    }
-
-  // First try to process messages of the head of the incoming queue.
-  int retval = this->process_queue_head (rh);
-
-  if (retval <= 0)
-    {
-      if (retval == -1)
-        {
-          if (TAO_debug_level > 2)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::handle_input, "
-                          "error while parsing the head of the queue\n",
-                          this->id()));
-            }
-        }
-
-      return retval;
-    }
-
-  // If there are no messages then we can go ahead to read from the
-  // handle for further reading..
-
-  // The buffer on the stack which will be used to hold the input
-  // messages
-  char buf [TAO_MAXBUFSIZE];
-
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  (void) ACE_OS::memset (buf,
-                         '\0',
-                         sizeof buf);
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-
-  // Create a data block
-  ACE_Data_Block db (sizeof (buf),
-                     ACE_Message_Block::MB_DATA,
-                     buf,
-                     this->orb_core_->input_cdr_buffer_allocator (),
-                     this->orb_core_->locking_strategy (),
-                     ACE_Message_Block::DONT_DELETE,
-                     this->orb_core_->input_cdr_dblock_allocator ());
-
-  // Create a message block
-  ACE_Message_Block message_block (&db,
-                                   ACE_Message_Block::DONT_DELETE,
-                                   this->orb_core_->input_cdr_msgblock_allocator ());
-
-
-  // Align the message block
-  ACE_CDR::mb_align (&message_block);
-
-  size_t recv_size = 0;
-
-  if (this->orb_core_->orb_params ()->single_read_optimization ())
-    {
-      recv_size =
-        message_block.space ();
-    }
-  else
-    {
-      recv_size =
-        this->messaging_object ()->header_length ();
-    }
-
-  // If we have a partial message, copy it into our message block
-  // and clear out the partial message.
-  if (this->partial_message_ != 0 && this->partial_message_->length () != 0)
-    {
-      if (message_block.copy (this->partial_message_->rd_ptr (),
-                              this->partial_message_->length ()) == 0)
-        {
-          recv_size -= this->partial_message_->length ();
-          this->partial_message_->reset ();
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) - Transport[%d]::handle_input, "
-                             "unable to copy the partial message\n",
-                             this->id ()),
-                             -1);
-        }
-    }
-
-  // Saving the size of the received buffer in case any one needs to
-  // get the size of the message thats received in the
-  // context. Obviously the value will be changed for each recv call
-  // and the user is supposed to invoke the accessor only in the
-  // invocation context to get meaningful information.
-  this->recv_buffer_size_ = recv_size;
-
-  // Read the message into the  message block that we have created on
-  // the stack.
-  ssize_t n = this->recv (message_block.wr_ptr (),
-                          recv_size,
-                          max_wait_time);
-
-  // If there is an error return to the reactor..
-  if (n <= 0)
-    {
-      return n;
-    }
-
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::handle_input, "
-                  "read %d bytes\n",
-                  this->id (), n));
-    }
-
-  // Set the write pointer in the stack buffer
-  message_block.wr_ptr (n);
-
-  // Parse the message and try consolidating the message if
-  // needed.
-  retval = this->parse_consolidate_messages (message_block,
-                                             rh,
-                                             max_wait_time);
-
-  if (retval <= 0)
-    {
-      if (retval == -1 && TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::handle_input, "
-                      "error while parsing and consolidating\n",
-                      this->id ()));
-        }
-      return retval;
-    }
-
-  if (message_block.length () > 0)
-    {
-      // Make a node of the message block..
-      TAO_Queued_Data qd (&message_block,
-                          this->orb_core_->transport_message_buffer_allocator ());
-
-      // Extract the data for the node..
-      this->messaging_object ()->get_message_data (&qd);
-
-      // Check whether the message was fragmented..
-      if (qd.more_fragments_ ||
-          (qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-        {
-          // Duplicate the node that we have as the node is on stack..
-          TAO_Queued_Data *nqd =
-            TAO_Queued_Data::duplicate (qd);
-
-          return this->consolidate_fragments (nqd, rh);
-        }
-
-      // Process the message
-      return this->process_parsed_messages (&qd,
-                                            rh);
-    }
-
-  return 0;
-}
-
-int
-TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
-                                           TAO_Resume_Handle &rh,
-                                           ACE_Time_Value *max_wait_time)
-{
-  // Parse the incoming message for validity. The check needs to be
-  // performed by the messaging objects.
-  switch (this->parse_incoming_messages (block))
-    {
-    // An error has occurred during message parsing
-    case -1:
-      return -1;
-
-    // This message block does not contain enough data to
-    // parse the header.  We do not need to grow the partial
-    // message block since we are guaranteed that it can hold
-    // at least a GIOP header plus a GIOP fragment header.
-    case 1:
-      if (this->partial_message_ == 0)
-        {
-          this->allocate_partial_message_block ();
-        }
-
-      if (this->partial_message_ != 0 &&
-          this->partial_message_->copy (block.rd_ptr (),
-                                        block.length ()) == 0)
-        {
-          block.rd_ptr (block.length ());
-          return 0;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
-                             "unable to save the partial message\n",
-                             this->id ()),
-                             -1);
-        }
-
-    case 0: // The normal case
-      break;
-
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, "
-                         "impossible return value from parse_incoming_messages\n",
-                         this->id ()),
-                         -1);
-    }
-
-  // Check whether we have a complete message for processing
-  const ssize_t missing_data = this->missing_data (block);
-
-
-  if (missing_data < 0)
-    {
-      // If we have more than one message
-      return this->consolidate_extra_messages (block,
-                                               rh);
-    }
-  else if (missing_data > 0)
-    {
-      // If we have missing data then try doing a read or try queueing
-      // them.
-      return this->consolidate_message (block,
-                                        missing_data,
-                                        rh,
-                                        max_wait_time);
-    }
-
-  return 1;
-}
-
-int
-TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
-{
-  // If we have a queue and if the last message is not complete a
-  // complete one, then this read will get us the remaining data. So
-  // do not try to parse the header if we have an incomplete message
-  // in the queue.
-  if (this->incoming_message_queue_.is_tail_complete () != 0)
-    {
-      //  As it looks like a new message has been read, process the
-      //  message. Call the messaging object to do the parsing..
-      int retval =
-        this->messaging_object ()->parse_incoming_messages (block);
-
-      if (retval == -1 && TAO_debug_level > 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::parse_incoming_messages, "
-                      "error in incoming message\n",
-                      this->id ()));
-        }
-
-      return retval;
-    }
-
-  return 0;
-}
-
-
-size_t
-TAO_Transport::missing_data (ACE_Message_Block &incoming)
-{
-  // If we have a incomplete message in the queue then find out how
-  // much of data is required to get a complete message.
-  if (this->incoming_message_queue_.is_tail_complete () == 0)
-    {
-      return this->incoming_message_queue_.missing_data_tail ();
-    }
-
-  return this->messaging_object ()->missing_data (incoming);
-}
-
-
-int
-TAO_Transport::consolidate_message (ACE_Message_Block &incoming,
-                                    ssize_t missing_data,
-                                    TAO_Resume_Handle &rh,
-                                    ACE_Time_Value *max_wait_time)
-{
-  // Check whether the last message in the queue is complete..
-  if (this->incoming_message_queue_.is_tail_complete () == 0)
-    {
-      return this->consolidate_message_queue (incoming,
-                                              missing_data,
-                                              rh,
-                                              max_wait_time);
-    }
-
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message\n",
-                  this->id ()));
-    }
-
-  // Calculate the actual length of the load that we are supposed to
-  // read which is equal to the <missing_data> + length of the buffer
-  // that we have..
-  const size_t payload = missing_data + incoming.size ();
-
-  // Grow the buffer to the size of the message
-  ACE_CDR::grow (&incoming,
-                 payload);
-
-  ssize_t n = 0;
-
-  // As this used for transports where things are available in one
-  // shot this looping should not create any problems.
-  for (ssize_t bytes = missing_data; bytes != 0; bytes -= n)
-    {
-      // .. do a read on the socket again.
-      n = this->recv (incoming.wr_ptr (),
-                      bytes,
-                      max_wait_time);
-
-      if (TAO_debug_level > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                      "read %d bytes on attempt\n",
-                      this->id(), n));
-        }
-
-      if (n == 0 || n == -1)
-        {
-          break;
-        }
-
-      incoming.wr_ptr (n);
-      missing_data -= n;
-    }
-
-  // If we got an error..
-  if (n == -1)
-    {
-      if (TAO_debug_level > 4)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                      "error while trying to consolidate\n",
-                      this->id ()));
-        }
-
-      return -1;
-    }
-
-  // If we had gotten a EWOULDBLOCK n would be equal to zero. But we
-  // have to put the message in the queue anyway. So let us proceed
-  // to do that and return...
-
-  // Check to see if we have messages in queue or if we have missing
-  // data . AT this point we cannot have have semi-complete messages
-  // in the queue as they would have been taken care before. Put
-  // ourselves in the queue and  then try processing one of the
-  // messages..
-  if (missing_data >= 0 ||
-      this->incoming_message_queue_.queue_length () != 0)
-    {
-      if (missing_data == 0 ||
-          !this->incoming_message_queue_.is_tail_fragmented ())
-        {
-          if (TAO_debug_level > 4)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                          "queueing up the message\n",
-                          this->id ()));
-            }
-
-          // Get a queued data
-          TAO_Queued_Data *qd =
-            this->make_queued_data (incoming);
-
-          // Add the missing data to the queue
-          qd->missing_data_ = missing_data;
-
-          // Get the rest of the messaging data
-          this->messaging_object ()->get_message_data (qd);
-
-          // If this is a full GIOP fragment, then we need only
-          // to consolidate the fragments
-          if (missing_data == 0 &&
-              (qd->more_fragments_ ||
-               qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-            {
-              this->consolidate_fragments (qd, rh);
-            }
-          else
-            {
-              // Add it to the tail of the queue..
-              this->incoming_message_queue_.enqueue_tail (qd);
-
-              if (this->incoming_message_queue_.is_head_complete ())
-                {
-                  return this->process_queue_head (rh);
-                }
-            }
-        }
-      else
-        {
-          // This block of code will only come into play when GIOP
-          // message fragmentation is employed.  If we have a fragment
-          // in the message queue, we can only chain message blocks
-          // onto the TAO_Queued_Data for that fragment.  Unless we have
-          // a full GIOP fragment, and since we know we're missing data,
-          // we need to save what we have until we can read in some more of
-          // the fragment until we get it all.  This bit of data could be
-          // larger than what the partial message block can hold, so we may
-          // need to grow the partial message block.
-          if (this->partial_message_ == 0)
-            {
-              this->allocate_partial_message_block ();
-            }
-
-          if (this->partial_message_ != 0)
-            {
-              const size_t incoming_length = incoming.length ();
-              ACE_CDR::grow (this->partial_message_,
-                             incoming_length);
-              if (this->partial_message_->copy (incoming.rd_ptr (),
-                                                incoming_length) == 0)
-                {
-                  incoming.rd_ptr (incoming_length);
-                }
-              else
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                                     "unable to save the partial message\n",
-                                     this->id ()),
-                                     -1);
-                }
-            }
-          else
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "TAO (%P|%t) - Transport[%d]::consolidate_message, "
-                                 "unable to allocate the partial message\n",
-                                 this->id ()),
-                                 -1);
-            }
-        }
-
-      return 0;
-    }
-
-  // We don't have any missing data. Just make a queued_data node with
-  // the existing message block and send it to the higher layers of
-  // the ORB.
-  TAO_Queued_Data pqd (&incoming,
-                       this->orb_core_->transport_message_buffer_allocator ());
-  pqd.missing_data_ = missing_data;
-  this->messaging_object ()->get_message_data (&pqd);
-
-  // Check whether the message was fragmented and try to consolidate
-  // the fragments..
-  if (pqd.more_fragments_ ||
-      (pqd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-    {
-        // Duplicate the queued data as it is on stack..
-        TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd);
-
-        return this->consolidate_fragments (nqd, rh);
-    }
-
-  // Now we have a full message in our buffer. Just go ahead and
-  // process that
-  return this->process_parsed_messages (&pqd,
-                                        rh);
-}
-
-int
-TAO_Transport::consolidate_fragments (TAO_Queued_Data *queueable_message,
-                                      TAO_Resume_Handle &rh)
-{
-  // Get the version numbers
-  CORBA::Octet major  = queueable_message->major_version_;
-  CORBA::Octet minor  = queueable_message->minor_version_;
-  CORBA::UShort whole = major << 8 | minor;
-
-  switch(whole)
-    {
-    case 0x0100:
-      if (!queueable_message->more_fragments_)
-        {
-          this->incoming_message_queue_.enqueue_tail (queueable_message);
-        }
-      else
-        {
-          // Fragments aren't supported in 1.0.  This is an error and
-          // we should reject it somehow.  What do we do here?  Do we throw
-          // an exception to the receiving side?  Do we throw an exception
-          // to the sending side?
-          //
-          // At the very least, we need to log the fact that we received
-          // nonsense.
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT("TAO (%P|%t) - ")
-                             ACE_TEXT("TAO_Transport::enqueue_incoming_message ")
-                             ACE_TEXT("detected a fragmented GIOP 1.0 message\n")),
-                            -1);
-        }
-      break;
-    case 0x0101:
-      {
-        // One note is that TAO_Queued_Data contains version numbers,
-        // but doesn't indicate the actual protocol to which those
-        // version numbers refer.  That's not a problem, though, because
-        // instances of TAO_Queued_Data live in a queue, and that queue
-        // lives in a particular instance of a Transport, and the
-        // transport instance has an association with a particular
-        // messaging_object.  The concrete messaging object embodies a
-        // messaging protocol, and must cover all versions of that
-        // protocol.  Therefore, we just need to cover the bases of all
-        // versions of that one protocol.
-
-        // In 1.1, fragments kinda suck because they don't have they're
-        // own message-specific header.  Therefore, we have to find the
-        // fragment based on the major and minor version.
-        TAO_Queued_Data* fragment_message_chain =
-            this->incoming_message_queue_.find_fragment_chain (major, minor);
-
-        // Deal with the fragment and the queueable message
-        this->process_fragment (fragment_message_chain,
-                                queueable_message,
-                                major, minor, rh);
-        break;
-      }
-    case 0x0102:
-      {
-        // In 1.2, we get a little more context.  There's a
-        // FRAGMENT message-specific header, and inside that is the
-        // request id with which the fragment is associated.
-        TAO_Queued_Data* fragment_message_chain =
-            this->incoming_message_queue_.find_fragment_chain (
-                                  queueable_message->request_id_);
-
-        // Deal with the fragment and the queueable message
-        this->process_fragment (fragment_message_chain,
-                                queueable_message,
-                                major, minor, rh);
-        break;
-      }
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - ")
-                  ACE_TEXT("TAO_Transport::consolidate_fragments ")
-                  ACE_TEXT("can not handle a GIOP %d.%d ")
-                  ACE_TEXT("message\n"), major, minor));
-      ACE_HEX_DUMP ((LM_DEBUG,
-                     queueable_message->msg_block_->rd_ptr (),
-                     queueable_message->msg_block_->length ()));
-      return -1;
-    }
-
-  return 0;
-}
-
-void
-TAO_Transport::process_fragment (TAO_Queued_Data* fragment_message_chain,
-                                 TAO_Queued_Data* queueable_message,
-                                 CORBA::Octet major,
-                                 CORBA::Octet minor,
-                                 TAO_Resume_Handle &rh)
-{
-  // No fragment was found
-  if (fragment_message_chain == 0)
-    {
-      this->incoming_message_queue_.enqueue_tail (queueable_message);
-    }
-  else
-    {
-      if (fragment_message_chain->major_version_ != major ||
-          fragment_message_chain->minor_version_ != minor)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("TAO (%P|%t) - ")
-                    ACE_TEXT("TAO_Transport::process_fragment ")
-                    ACE_TEXT("GIOP versions do not match ")
-                    ACE_TEXT("(%d.%d != %d.%d\n"),
-                    fragment_message_chain->major_version_,
-                    fragment_message_chain->minor_version_,
-                    major, minor));
-
-      // Find the last message block in the continuation
-      ACE_Message_Block* mb = fragment_message_chain->msg_block_;
-      while (mb->cont () != 0)
-        mb = mb->cont ();
-
-      // Add the current message block to the end of the chain
-      // after adjusting the read pointer to skip the header(s)
-      const size_t header_adjustment =
-         this->messaging_object ()->header_length () +
-         this->messaging_object ()->fragment_header_length (major, minor);
-      queueable_message->msg_block_->rd_ptr(header_adjustment);
-      mb->cont (queueable_message->msg_block_);
-
-      // Remove our reference to the message block.  At this point
-      // the message block of the fragment head owns it as part of a
-      // chain
-      queueable_message->msg_block_ = 0;
-
-      if (!queueable_message->more_fragments_)
-        {
-          // This is the end of the fragments for this request
-          fragment_message_chain->consolidate ();
-
-          // Process the queue head to make sure that the newly
-          // consolidated fragments get handled
-          this->process_queue_head (rh);
-        }
-
-      // Get rid of the queuable message
-      TAO_Queued_Data::release (queueable_message);
-    }
-}
-
-int
-TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
-                                          ssize_t missing_data,
-                                          TAO_Resume_Handle &rh,
-                                          ACE_Time_Value *max_wait_time)
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue\n",
-                  this->id ()));
-    }
-
-  // If the queue did not have a complete message put this piece of
-  // message in the queue. We know it did not have a complete
-  // message. That is why we are here.
-  const size_t n =
-    this->incoming_message_queue_.copy_tail (incoming);
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                  "copied [%d] bytes to the tail\n",
-                  this->id (),
-                  n));
-    }
-
-  // Update the missing data...
-  missing_data =
-    this->incoming_message_queue_.missing_data_tail ();
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                  "missing [%d] bytes in the tail message\n",
-                  this->id (),
-                  missing_data));
-    }
-
-  // Move the read pointer of the <incoming> message block to the end
-  // of the copied message and process the remaining portion...
-  incoming.rd_ptr (n);
-
-  // If we have some more information left in the message block..
-  if (incoming.length ())
-    {
-      // We may have to parse & consolidate. This part of the message
-      // doesn't seem to be part of the last message in the queue (as
-      // the copy () hasn't taken away this message).
-      const int retval = this->parse_consolidate_messages (incoming,
-                                                           rh,
-                                                           max_wait_time);
-
-      // If there is an error return
-      if (retval == -1)
-        {
-          if (TAO_debug_level)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                          "error while consolidating, part of the read message\n",
-                          this->id ()));
-            }
-          return retval;
-        }
-      else if (retval == 1)
-        {
-          // If the message in the <incoming> message block has only
-          // one message left we need to process that seperately.
-
-          // Get a queued data
-          TAO_Queued_Data *qd = this->make_queued_data (incoming);
-
-          // Get the rest of the message data
-          this->messaging_object ()->get_message_data (qd);
-
-          // Add the missing data to the queue
-          qd->missing_data_ = 0;
-
-          // Check whether the message was fragmented and try to consolidate
-          // the fragments..
-          if (qd->more_fragments_
-              || (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
-            {
-              return this->consolidate_fragments (qd, rh);
-            }
-
-          // Add it to the tail of the queue..
-          this->incoming_message_queue_.enqueue_tail (qd);
-
-          // We should surely have a message in queue now. So just
-          // process that.
-          return this->process_queue_head (rh);
-        }
-
-      // parse_consolidate_messages () would have processed one of the
-      // messages, so we better return as we dont want to starve other
-      // threads.
-      return 0;
-    }
-
-  // If we still have some missing data..
-  if (missing_data > 0)
-    {
-      // Get the last message from the Queue
-      TAO_Queued_Data *qd =
-        this->incoming_message_queue_.dequeue_tail ();
-
-      if (TAO_debug_level > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                      "trying recv, again\n",
-                      this->id ()));
-        }
-
-      // Try to do a read again. If we have some luck it would be
-      // great..
-      const ssize_t n = this->recv (qd->msg_block_->wr_ptr (),
-                                    missing_data,
-                                    max_wait_time);
-
-      if (TAO_debug_level > 5)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
-                      "recv retval [%d]\n",
-                      this->id (),
-                      n));
-        }
-
-      // Error...
-      if (n < 0)
-        {
-          return n;
-        }
-
-      // If we get a EWOULDBLOCK ie. n==0, we should anyway put the
-      //  message in queue before returning..
-      // Move the write pointer
-      qd->msg_block_->wr_ptr (n);
-
-      // Decrement the missing data
-      qd->missing_data_ -= n;
-
-      // Now put the TAO_Queued_Data back in the queue
-      this->incoming_message_queue_.enqueue_tail (qd);
-
-      // Any way as we have come this far and are about to return,
-      // just try to process a message if it is there in the queue.
-      if (this->incoming_message_queue_.is_head_complete ())
-        {
-          return this->process_queue_head (rh);
-        }
-
-      return 0;
-    }
-
-  // Process a message in the head of the queue if we have one..
-  return this->process_queue_head (rh);
-}
-
-
-int
-TAO_Transport::consolidate_extra_messages (ACE_Message_Block
-                                           &incoming,
-                                           TAO_Resume_Handle &rh)
-{
-  if (TAO_debug_level > 4)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages\n",
-                  this->id ()));
-    }
-
-  // Pick the tail of the queue
-  TAO_Queued_Data *tail =
-    this->incoming_message_queue_.dequeue_tail ();
-
-  if (tail)
-    {
-      // If we have a node in the tail, checek to see whether it needs
-      // consolidation. If so, just consolidate it.
-      if (this->messaging_object ()->consolidate_node (tail, incoming) == -1)
-        {
-          return -1;
-        }
-
-      // .. put the tail back in queue..
-      this->incoming_message_queue_.enqueue_tail (tail);
-    }
-
-  int retval = 1;
-
-  if (TAO_debug_level > 6)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages, "
-                  "extracting extra messages\n",
-                  this->id ()));
-    }
-
-  // Extract messages..
-  while (retval == 1)
-    {
-      TAO_Queued_Data *q_data = 0;
-
-      retval =
-        this->messaging_object ()->extract_next_message (incoming,
-                                                         q_data);
-      if (q_data)
-        {
-          // If we have read a framented message then...
-          if (q_data->more_fragments_ ||
-              q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
-            {
-              this->consolidate_fragments (q_data, rh);
-            }
-          else
-            {
-              this->incoming_message_queue_.enqueue_tail (q_data);
-            }
-        }
-    }
-
-  // In case of error return..
-  if (retval == -1)
-    {
-      return retval;
-    }
-
-  return this->process_queue_head (rh);
-}
-
-int
-TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
-                                        TAO_Resume_Handle &rh)
-{
-  // Get the <message_type> that we have received
-  const TAO_Pluggable_Message_Type t = qd->msg_type_;
-
-  // int result = 0;
-
-  if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                    "received CloseConnection message - %m\n",
-                    this->id()));
-
-      // Return a "-1" so that the next stage can take care of
-      // closing connection and the necessary memory management.
-      return -1;
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_REQUEST ||
-           t == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST)
-    {
-      // Let us resume the handle before we go ahead to process the
-      // request. This will open up the handle for other threads.
-      rh.resume_handle ();
-
-      if (this->messaging_object ()->process_request_message (
-            this,
-            qd) == -1)
-        {
-          // Return a "-1" so that the next stage can take care of
-          // closing connection and the necessary memory management.
-          return -1;
-        }
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_REPLY ||
-           t == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY)
-    {
-      rh.resume_handle ();
-
-      TAO_Pluggable_Reply_Params params (this);
-
-      if (this->messaging_object ()->process_reply_message (params,
-                                                            qd) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                        "error in process_reply_message - %m\n",
-                        this->id ()));
-
-          return -1;
-        }
-
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_MESSAGERROR)
-    {
-      if (TAO_debug_level)
-        {
-          ACE_ERROR ((LM_ERROR,
-                     "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
-                     "received MessageError, closing connection\n",
-                     this->id ()));
-        }
-      return -1;
-    }
-
-  // If not, just return back..
-  return 0;
-}
-
-TAO_Queued_Data *
-TAO_Transport::make_queued_data (ACE_Message_Block &incoming)
-{
-  // Get an instance of TAO_Queued_Data
-  TAO_Queued_Data *qd =
-    TAO_Queued_Data::make_queued_data (
-      this->orb_core_->transport_message_buffer_allocator ());
-
-  // Get the flag for the details of the data block...
-  ACE_Message_Block::Message_Flags flg =
-    incoming.self_flags ();
-
-  if (ACE_BIT_DISABLED (flg,
-                        ACE_Message_Block::DONT_DELETE))
-    {
-      // Duplicate the data block before putting it in the queue.
-      qd->msg_block_ = ACE_Message_Block::duplicate (&incoming);
-    }
-  else
-    {
-      // As we are in CORBA mode, all the data blocks would be aligned
-      // on an 8 byte boundary. Hence create a data block for more
-      // than the actual length
-      ACE_Data_Block *db =
-        this->orb_core_->create_input_cdr_data_block (incoming.length ()+
-                                                      ACE_CDR::MAX_ALIGNMENT);
-
-      // Get the allocator..
-      ACE_Allocator *alloc =
-        this->orb_core_->input_cdr_msgblock_allocator ();
-
-      // Make message block..
-      ACE_Message_Block mb (db,
-                            0,
-                            alloc);
-
-      // Duplicate the block..
-      qd->msg_block_ = mb.duplicate ();
-
-      // Align the message block
-      ACE_CDR::mb_align (qd->msg_block_);
-
-      // Copy the data..
-      qd->msg_block_->copy (incoming.rd_ptr (),
-                            incoming.length ());
-    }
-
-  return qd;
-}
-
-int
-TAO_Transport::process_queue_head (TAO_Resume_Handle &rh)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::process_queue_head\n",
-                  this->id ()));
-    }
-
-  // See if the message in the head of the queue is complete...
-  if (this->incoming_message_queue_.is_head_complete () > 0)
-    {
-      // Get the message on the head of the queue..
-      TAO_Queued_Data *qd =
-        this->incoming_message_queue_.dequeue_head ();
-
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Transport[%d]::process_queue_head, "
-                      "the size of the queue is [%d]\n",
-                      this->id (),
-                      this->incoming_message_queue_.queue_length()));
-        }
-      // Now that we have pulled out out one message out of the queue,
-      // check whether we have one more message in the queue...
-      if (this->incoming_message_queue_.is_head_complete () > 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO (%P|%t) - Transport[%d]::process_queue_head, "
-                          "notify reactor\n",
-                          this->id ()));
-
-            }
-
-          const int retval = this->notify_reactor ();
-
-          if (retval == 1)
-            {
-              // Let the class know that it doesn't need to resume  the
-              // handle..
-              rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED);
-            }
-          else if (retval < 0)
-            return -1;
-        }
-      else
-        {
-          // As we are ready to process the last message just resume
-          // the handle. Set the flag incase someone had reset the flag..
-          rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_RESUMABLE);
-        }
-
-      // Process the message...
-      if (this->process_parsed_messages (qd, rh) == -1)
-        {
-          return -1;
-        }
-
-      // Delete the Queued_Data..
-      TAO_Queued_Data::release (qd);
-
-      return 0;
-    }
-
-  return 1;
-}
-
-int
-TAO_Transport::notify_reactor (void)
-{
-  if (!this->ws_->is_registered ())
-    {
-      return 0;
-    }
-
-  ACE_Event_Handler *eh = this->event_handler_i ();
-
-  // Get the reactor associated with the event handler
-  ACE_Reactor *reactor = this->orb_core ()->reactor ();
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
-                  "notify to Reactor\n",
-                  this->id ()));
-    }
-
-
-  // Send a notification to the reactor...
-  const int retval = reactor->notify (eh,
-                                      ACE_Event_Handler::READ_MASK);
-
-  if (retval < 0 && TAO_debug_level > 2)
-    {
-      // @@todo: need to think about what is the action that
-      // we can take when we get here.
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
-                  "notify to the reactor failed..\n",
-                  this->id ()));
-    }
-
-  return 1;
-}
-
-TAO::Transport_Cache_Manager &
-TAO_Transport::transport_cache_manager (void)
-{
-  return this->orb_core_->lane_resources ().transport_cache ();
-}
-
-size_t
-TAO_Transport::recv_buffer_size (void)
-{
-  return this->recv_buffer_size_;
-}
-
-size_t
-TAO_Transport::sent_byte_count (void)
-{
-  return this->sent_byte_count_;
-}
-
-void
-TAO_Transport::assign_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp)
-{
-  if (this->char_translator_)
-    {
-      this->char_translator_->assign (inp);
-      this->char_translator_->assign (outp);
-    }
-  if (this->wchar_translator_)
-    {
-      this->wchar_translator_->assign (inp);
-      this->wchar_translator_->assign (outp);
-    }
-}
-
-void
-TAO_Transport::clear_translators (TAO_InputCDR *inp, TAO_OutputCDR *outp)
-{
-  if (inp)
-    {
-      inp->char_translator (0);
-      inp->wchar_translator (0);
-    }
-  if (outp)
-    {
-      outp->char_translator (0);
-      outp->wchar_translator (0);
-    }
-}
-
-ACE_Event_Handler::Reference_Count
-TAO_Transport::add_reference (void)
-{
-  return this->event_handler_i ()->add_reference ();
-}
-
-ACE_Event_Handler::Reference_Count
-TAO_Transport::remove_reference (void)
-{
-  return this->event_handler_i ()->remove_reference ();
-}
-
-TAO_OutputCDR &
-TAO_Transport::out_stream (void)
-{
-  return this->messaging_object ()->out_stream ();
-}
-
-bool
-TAO_Transport::post_open (size_t id)
-{
-  this->id_ = id;
-
-  {
-    ACE_GUARD_RETURN (ACE_Lock,
-                      ace_mon,
-                      *this->handler_lock_,
-                      false);
-
-    this->is_connected_ = true;
-  }
-
-  // When we have data in our outgoing queue schedule ourselves
-  // for output
-  if (this->queue_is_empty_i ())
-    return true;
-
-  // If the wait strategy wants us to be registered with the reactor
-  // then we do so. If registeration is required and it succeeds,
-  // #REFCOUNT# becomes two.
-  if (this->wait_strategy ()->register_handler () == 0)
-    {
-      TAO_Flushing_Strategy *flushing_strategy =
-        this->orb_core ()->flushing_strategy ();
-      (void) flushing_strategy->schedule_output (this);
-    }
-  else
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) this->purge_entry ();
-
-      // Close the handler.
-      (void) this->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport[%d]::post_connect , "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    this->id ()));
-
-      return false;
-    }
-
-  return true;
-}
-
-void
-TAO_Transport::allocate_partial_message_block (void)
-{
-  if (this->partial_message_ == 0)
-    {
-      // This value must be at least large enough to hold a GIOP message
-      // header plus a GIOP fragment header
-      const size_t partial_message_size = 16;
-      ACE_NEW (this->partial_message_,
-               ACE_Message_Block (partial_message_size));
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Reverse_Lock<ACE_Lock>;
-template class ACE_Guard<ACE_Reverse_Lock<ACE_Lock> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Reverse_Lock<ACE_Lock>
-#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_Lock> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
deleted file mode 100644
index e9739b312d6..00000000000
--- a/TAO/tao/Transport.h
+++ /dev/null
@@ -1,1049 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Transport.h
- *
- *  $Id$
- *
- *  Define the interface for the Transport component in TAO's
- *  pluggable protocol framework.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRANSPORT_H
-#define TAO_TRANSPORT_H
-
-#include /**/ "ace/pre.h"
-
-#include "Transport_Cache_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Transport_Timer.h"
-#include "tao/Incoming_Message_Queue.h"
-#include "ace/Time_Value.h"
-
-class TAO_ORB_Core;
-class TAO_Target_Specification;
-class TAO_Operation_Details;
-class TAO_Transport_Mux_Strategy;
-class TAO_Wait_Strategy;
-class TAO_Connection_Handler;
-class TAO_Pluggable_Messaging;
-class TAO_Codeset_Translator_Factory;
-
-class TAO_Queued_Message;
-class TAO_Synch_Queued_Message;
-class TAO_Resume_Handle;
-class TAO_Stub;
-struct iovec;
-
-namespace TAO
-{
-  /**
-   * @note Should this be in TAO namespace. Seems like a candidate
-   * that should be in the transport
-   */
-  enum Connection_Role
-    {
-      TAO_UNSPECIFIED_ROLE = 0,
-      TAO_SERVER_ROLE = 1,
-      TAO_CLIENT_ROLE = 2
-    };
-}
-
-/**
- * @class TAO_Transport
- *
- * @brief Generic definitions for the Transport class.
- *
- * The transport object is created in the Service handler
- * constructor and deleted in the Service Handler's destructor!!
- *
- * The main responsability of a Transport object is to encapsulate a
- * connection, and provide a transport independent way to send and
- * receive data.  Since TAO is heavily based on the Reactor for all if
- * not all its I/O the Transport class is usually implemented with a
- * helper Connection Handler that adapts the generic Transport
- * interface to the Reactor types.
- *
- * <H3>The outgoing data path:</H3>
- *
- * One of the responsibilities of the TAO_Transport class is to send
- * out GIOP messages as efficiently as possible.  In most cases
- * messages are put out in FIFO order, the transport object will put
- * out the message using a single system call and return control to
- * the application.  However, for oneways and AMI requests it may be
- * more efficient (or required if the SYNC_NONE policy is in effect)
- * to queue the messages until a large enough data set is available.
- * Another reason to queue is that some applications cannot block for
- * I/O, yet they want to send messages so large that a single write()
- * operation would not be able to cope with them.  In such cases we
- * need to queue the data and use the Reactor to drain the queue.
- *
- * Therefore, the Transport class may need to use a queue to
- * temporarily hold the messages, and, in some configurations, it may
- * need to use the Reactor to concurrently drain such queues.
- *
- * <H4>Out of order messages:</H4> TAO provides explicit policies to
- * send 'urgent' messages.  Such messages may put at the head of the
- * queue. However, they cannot be sent immediately because the
- * transport may already be sending another message in a reactive
- * fashion.
- *
- * Consequently, the Transport must also know if the head of the queue
- * has been partially sent.  In that case new messages can only follow
- * the head. Only once the head is completely sent we can start
- * sending new messages.
- *
- * <H4>Waiting threads:</H4> One or more threads can be blocked
- * waiting for the connection to completely send the message.
- * The thread should return as soon as its message has been sent, so a
- * per-thread condition is required.  This suggest that simply using a
- * ACE_Message_Queue would not be enough:  there is a significant
- * amount of ancillary information, to keep on each message that the
- * Message_Block class does not provide room for.
- *
- * Blocking I/O is still attractive for some applications.  First, my
- * eliminating the Reactor overhead performance is improved when
- * sending large blocks of data.  Second, using the Reactor to send
- * out data opens the door for nested upcalls, yet some applications
- * cannot deal with the reentrancy issues in this case.
- *
- * <H4>Timeouts:</H4> Some or all messages could have a timeout period
- * attached to them.  The timeout source could either be some
- * high-level policy or maybe some strategy to prevent denial of
- * service attacks.  In any case the timeouts are per-message, and
- * later messages could have shorter timeouts.
- * In fact, some kind of scheduling (such as EDF) could be required in
- * a few applications.
- *
- * <H4>Conclusions:</H4> The outgoing data path consist in several
- * components:
- *
- * - A queue of pending messages
- * - A message currently being transmitted
- * - A per-transport 'send strategy' to choose between blocking on
- *   write, blocking on the reactor or blockin on leader/follower.
- * - A per-message 'waiting object'
- * - A per-message timeout
- *
- * The Transport object provides a single method to send request
- * messages (send_request_message ()).
- *
- * <H3>The incoming data path:</H3>
- *
- * One of the main responsibilities of the transport is to read and
- * process the incoming GIOP message as quickly and efficiently as
- * possible. There are other forces that needs to be given due
- * consideration. They are
- *  - Multiple threads should be able to traverse along the same data
- *    path but should not be able to read from the same handle at the
- *    same time ie. the handle should not be shared between threads at
- *    any instant.
- *  - Reads on the handle could give one or more messages.
- *  - Minimise locking and copying overhead when trying to attack the
- *    above.
- *
- * <H3> Parsing messages (GIOP) & processing the message:</H3>
- *
- * The messages should be checked for validity and the right
- * information should be sent to the higher layer for processing. The
- * process of doing a sanity check and preparing the messages for the
- * higher layers of the ORB are done by the messaging protocol.
- *
- * <H3> Design forces and Challenges </H3>
- *
- * To keep things as efficient as possible for medium sized requests,
- * it would be good to minimise data copying and locking along the
- * incoming path ie. from the time of reading the data from the handle
- * to the application. We achieve this by creating a buffer on stack
- * and reading the data from the handle into the buffer. We then pass
- * the same data block (the buffer is encapsulated into a data block)
- * to the higher layers of the ORB. The problems stem from the
- * following
- *  (a) Data is bigger than the buffer that we have on stack
- *  (b) Transports like TCP do not guarantee availability of the whole
- *      chunk of data in one shot. Data could trickle in byte by byte.
- *  (c) Single read gives multiple messages
- *
- * We solve the problems as follows
- *
- *  (a) First do a read with the buffer on stack. Query the underlying
- *      messaging object whether the message has any incomplete
- *      portion. If so, we just grow the buffer for the missing size
- *      and read the rest of the message. We free the handle and then
- *      send the message to the higher layers of the ORB for
- *      processing.
- *
- *   (b) If we block (ie. if we receive a EWOULDBLOCK) while trying to
- *       do the above (ie. trying to read after growing the buffer
- *       size) we put the message in a queue and return back to the
- *       reactor. The reactor would call us back when the handle
- *       becomes read ready.
- *
- *   (c) If we get multiple messages (possible if the client connected
- *       to the server sends oneways or AMI requests), we parse and
- *       split the messages. Every message is put in the queue. Once
- *       the messages are queued, the thread picks up one message to
- *       send to the higher layers of the ORB. Before doing that, if
- *       it finds more messages, it sends a notify to the reactor
- *       without resuming the handle. The next thread picks up a
- *       message from the queue and processes that. Once the queue
- *       is drained the last thread resumes the handle.
- *
- * <H3> Sending Replies </H3>
- *
- * We could use the outgoing path of the ORB to send replies. This
- * would allow us to reuse most of the code in the outgoing data
- * path. We were doing this till TAO-1.2.3. We run in to
- * problems. When writing the reply the ORB gets flow controlled, and the
- * ORB tries to flush the message by going into the reactor. This
- * resulted in unnecessary nesting. The thread that gets into the
- * Reactor could potentially handle other messages (incoming or
- * outgoing) and the stack starts growing leading to crashes.
- *
- * <H4> Solution to the nesting problem </H4>
- *
- * The solution that we (plan to) adopt is pretty straight
- * forward. The thread sending replies will not block to send the
- * replies but queue the replies and return to the Reactor. (Note the
- * careful usages of the terms "blocking in the Reactor" as opposed to
- * "return back to the Reactor".
- *
- *
- * <B>See Also:</B>
- *
- * http://cvs.doc.wustl.edu/ace-latest.cgi/ACE_wrappers/TAO/docs/pluggable_protocols/index.html
- *
- */
-class TAO_Export TAO_Transport
-{
-public:
-
-  /// Default creator, requires the tag value be supplied.
-  TAO_Transport (CORBA::ULong tag,
-                 TAO_ORB_Core *orb_core);
-
-  /// Destructor
-  virtual ~TAO_Transport (void);
-
-  /// Return the protocol tag.
-  /**
-   * The OMG assigns unique tags (a 32-bit unsigned number) to each
-   * protocol. New protocol tags can be obtained free of charge from
-   * the OMG, check the documents in corbafwd.h for more details.
-   */
-  CORBA::ULong tag (void) const;
-
-  /// Access the ORB that owns this connection.
-  TAO_ORB_Core *orb_core (void) const;
-
-  /// Get the TAO_Tranport_Mux_Strategy used by this object.
-  /**
-   * The role of the TAO_Transport_Mux_Strategy is described in more
-   * detail in that class' documentation.  Enough is to say that the
-   * class is used to control how many threads can have pending
-   * requests over the same connection. Multiplexing multiple threads
-   * over the same connection conserves resources and is almost
-   * required for AMI, but having only one pending request per
-   * connection is more efficient and reduces the possibilities of
-   * priority inversions.
-   */
-  TAO_Transport_Mux_Strategy *tms (void) const;
-
-  /// Return the TAO_Wait_Strategy used by this object.
-  /**
-   * The role of the TAO_Wait_Strategy is described in more detail in
-   * that class' documentation. Enough is to say that the ORB can wait
-   * for a reply blocking on read(), using the Reactor to wait for
-   * multiple events concurrently or using the Leader/Followers
-   * protocol.
-   */
-  TAO_Wait_Strategy *wait_strategy (void) const;
-
-  /// Callback method to reactively drain the outgoing data queue
-  int handle_output (void);
-
-  /// Get the bidirectional flag
-  int bidirectional_flag (void) const;
-
-  /// Set the bidirectional flag
-  void bidirectional_flag (int flag);
-
-  /// Set the Cache Map entry
-  void cache_map_entry (TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry);
-
-  /// Get the Cache Map entry
-  TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void);
-
-  /// Set and Get the identifier for this transport instance.
-  /**
-   * If not set, this will return an integer representation of
-   * the <code>this</code> pointer for the instance on which
-   * it's called.
-   */
-  size_t id (void) const;
-  void id (size_t id);
-
-  /**
-   * Methods dealing with the role of the connection, e.g., CLIENT or SERVER.
-   * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions.
-   */
-  TAO::Connection_Role opened_as (void) const;
-  void opened_as (TAO::Connection_Role);
-
-  /// Get and Set the purging order. The purging strategy uses the set
-  /// version to set the purging order.
-  unsigned long purging_order (void) const;
-  void purging_order(unsigned long value);
-
-  /// Check if there are messages pending in the queue
-  /**
-   * @return 1 if the queue is empty
-   */
-  int queue_is_empty (void);
-
-  /// Added event handler to the handlers set.
-  /**
-   * Called by the cache when the cache is closing.
-   *
-   * @param handlers The TAO_Connection_Handler_Set into which the
-   *        transport should place its handler
-   */
-  void provide_handler (TAO::Connection_Handler_Set &handlers);
-
-  /// Add event handlers corresponding to transports that have RW wait
-  /// strategy to the handlers set.
-  /**
-   * Called by the cache when the ORB is shuting down.
-   *
-   * @param handlers The TAO_Connection_Handler_Set into which the
-   *        transport should place its handler if the transport has RW
-   *        strategy on.
-   *
-   * @return true indicates a handler was added to the handler set.
-   *         false indocates that the transport did not have a
-   *         blockable handler that could be added.
-   */
-  bool provide_blockable_handler (TAO::Connection_Handler_Set &handlers);
-
-  /// Register the handler with the reactor.
-  /**
-   * Register the handler with the reactor. This method is used by the
-   * Wait_On_Reactor strategy. The transport must register its event
-   * handler with the ORB's Reactor.
-   *
-   * @todo I think this method is pretty much useless, the
-   * connections are *always* registered with the Reactor, except in
-   * thread-per-connection mode.  In that case putting the connection
-   * in the Reactor would produce unpredictable results anyway.
-   */
-  virtual int register_handler (void);
-
-  /// Write the complete Message_Block chain to the connection.
-  /**
-   * This method serializes on handler_lock_, guaranteeing that only
-   * thread can execute it on the same instance concurrently.
-   *
-   * Often the implementation simply forwards the arguments to the
-   * underlying ACE_Svc_Handler class. Using the code factored out
-   * into ACE.
-   *
-   * Be careful with protocols that perform non-trivial
-   * transformations of the data, such as SSLIOP or protocols that
-   * compress the stream.
-   *
-   * @param mblk contains the data that must be sent.  For each
-   * message block in the cont() chain all the data between rd_ptr()
-   * and wr_ptr() should be delivered to the remote peer.
-   *
-   * @param timeout is the maximum time that the application is
-   * willing to wait for the data to be sent, useful in platforms that
-   * implement timed writes.
-   * The timeout value is obtained from the policies set by the
-   * application.
-   *
-   * @param bytes_transferred should return the total number of bytes
-   * successfully transferred before the connection blocked.  This is
-   * required because in some platforms and/or protocols multiple
-   * system calls may be required to send the chain of message
-   * blocks.  The first few calls can work successfully, but the final
-   * one can fail or signal a flow control situation (via EAGAIN).
-   * In this case the ORB expects the function to return -1, errno to
-   * be appropriately set and this argument to return the number of
-   * bytes already on the OS I/O subsystem.
-   *
-   * This call can also fail if the transport instance is no longer
-   * associated with a connection (e.g., the connection handler closed
-   * down).  In that case, it returns -1 and sets errno to
-   * <code>ENOENT</code>.
-   */
-  virtual ssize_t send (iovec *iov, int iovcnt,
-                        size_t &bytes_transferred,
-                        const ACE_Time_Value *timeout = 0) = 0;
-
-  /// Read len bytes from into buf.
-  /**
-   * This method serializes on handler_lock_, guaranteeing that only
-   * thread can execute it on the same instance concurrently.
-   *
-   * @param buffer ORB allocated buffer where the data should be
-   * @@ The ACE_Time_Value *s is just a place holder for now.  It is
-   * not clear this this is the best place to specify this.  The actual
-   * timeout values will be kept in the Policies.
-   */
-  virtual ssize_t recv (char *buffer,
-                        size_t len,
-                        const ACE_Time_Value *timeout = 0) = 0;
-
-  /**
-   * @name Control connection lifecycle
-   *
-   * These methods are routed through the TMS object. The TMS
-   * strategies implement them correctly.
-   */
-  //@{
-
-  /// Request has been just sent, but the reply is not received. Idle
-  /// the transport now.
-  bool idle_after_send (void);
-
-  /// Request is sent and the reply is received. Idle the transport
-  /// now.
-  bool idle_after_reply (void);
-
-  /// Call the implementation method after obtaining the lock.
-  virtual void close_connection (void);
-
-  //@}
-
-  /** @name Template methods
-   *
-   * The Transport class uses the Template Method Pattern to implement
-   * the protocol specific functionality.
-   * Implementors of a pluggable protocol should override the
-   * following methods with the semantics documented below.
-   */
-  /**
-   * Initialising the messaging object. This would be used by the
-   * connector side. On the acceptor side the connection handler
-   * would take care of the messaging objects.
-   */
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor) = 0;
-
-  /// Extracts the list of listen points from the @a cdr stream. The
-  /// list would have the protocol specific details of the
-  /// ListenPoints
-  virtual int tear_listen_point_list (TAO_InputCDR &cdr);
-
-  /// Hooks that can be overridden in concrete transports.
-  /**
-   * These hooks are invoked just after connection establishment (or
-   * after a connection is fetched from cache). The
-   * return value signifies whether the invoker should proceed  with
-   * post connection establishment activities. Protocols like SSLIOP
-   * need this to verify whether connections already established have
-   * valid certificates. There are no pre_connect_hooks () since the
-   * transport doesn't exist before a connection establishment. :-)
-   *
-   *
-   * @@NOTE: The methods are not made const with a reason.
-   */
-  virtual bool post_connect_hook (void);
-
-  /// Memory management routines.
-  /*
-   * Forwards to event handler.
-   */
-  ACE_Event_Handler::Reference_Count add_reference (void);
-  ACE_Event_Handler::Reference_Count remove_reference (void);
-
-  /// Return the messaging object that is used to format the data that
-  /// needs to be sent.
-  virtual TAO_Pluggable_Messaging * messaging_object (void) = 0;
-
-  /** @name Template methods
-   *
-   * The Transport class uses the Template Method Pattern to implement
-   * the protocol specific functionality.
-   * Implementors of a pluggable protocol should override the
-   * following methods with the semantics documented below.
-   */
-  //@{
-
-  /// Return the event handler used to receive notifications from the
-  /// Reactor.
-  /**
-   * Normally a concrete TAO_Transport object has-a ACE_Event_Handler
-   * member that functions as an adapter between the ACE_Reactor
-   * framework and the TAO pluggable protocol framework.
-   * In all the protocols implemented so far this role is fullfilled
-   * by an instance of ACE_Svc_Handler.
-   *
-   * @todo Since we only use a limited functionality of
-   * ACE_Svc_Handler we could probably implement a generic
-   * adapter class (TAO_Transport_Event_Handler or something), this
-   * will reduce footprint and simplify the process of implementing a
-   * pluggable protocol.
-   *
-   * @todo This method has to be renamed to event_handler()
-   */
-  virtual ACE_Event_Handler * event_handler_i (void) = 0;
-
-  /// Is this transport really connected
-  bool is_connected (void) const;
-
-  /// Perform all the actions when this transport get opened
-  bool post_open (size_t id);
-
-  /// Get the connection handler for this transport
-  TAO_Connection_Handler * connection_handler (void);
-
-  /// Accessor for the output CDR stream
-  TAO_OutputCDR &out_stream (void);
-
-protected:
-
-  virtual TAO_Connection_Handler * connection_handler_i (void) = 0;
-
-public:
-
-  /// This is a request for the transport object to write a
-  /// LocateRequest header before it is sent out.
-  int generate_locate_request (TAO_Target_Specification &spec,
-                               TAO_Operation_Details &opdetails,
-                               TAO_OutputCDR &output);
-
-  /// This is a request for the transport object to write a request
-  /// header before it sends out the request
-  virtual int generate_request_header (TAO_Operation_Details &opd,
-                                       TAO_Target_Specification &spec,
-                                       TAO_OutputCDR &msg);
-
-  /// Recache ourselves in the cache
-  int recache_transport (TAO_Transport_Descriptor_Interface* desc);
-
-  /// Callback to read incoming data
-  /**
-   * The ACE_Event_Handler adapter invokes this method as part of its
-   * handle_input() operation.
-   *
-   * @todo the method name is confusing! Calling it handle_input()
-   * would probably make things easier to understand and follow!
-   *
-   * Once a complete message is read the Transport class delegates on
-   * the Messaging layer to invoke the right upcall (on the server) or
-   * the TAO_Reply_Dispatcher (on the client side).
-   *
-   * @param max_wait_time In some cases the I/O is synchronous, e.g. a
-   * thread-per-connection server or when Wait_On_Read is enabled.  In
-   * those cases a maximum read time can be specified.
-   *
-   * @param block Is deprecated and ignored.
-   *
-   */
-  virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
-
-  enum
-    {
-      TAO_ONEWAY_REQUEST = 0,
-      TAO_TWOWAY_REQUEST = 1,
-      TAO_REPLY
-    };
-
-  /// Prepare the waiting and demuxing strategy to receive a reply for
-  /// a new request.
-  /**
-   * Preparing the ORB to receive the reply only once the request is
-   * completely sent opens the system to some subtle race conditions:
-   * suppose the ORB is running in a multi-threaded configuration,
-   * thread A makes a request while thread B is using the Reactor to
-   * process all incoming requests.
-   * Thread A could be implemented as follows:
-   * 1) send the request
-   * 2) setup the ORB to receive the reply
-   * 3) wait for the request
-   *
-   * but in this case thread B may receive the reply between step (1)
-   * and (2), and drop it as an invalid or unexpected message.
-   * Consequently the correct implementation is:
-   * 1) setup the ORB to receive the reply
-   * 2) send the request
-   * 3) wait for the reply
-   *
-   * The following method encapsulates this idiom.
-   *
-   * @todo This is generic code, it should be factored out into the
-   * Transport class.
-   */
-  // @nolock b/c this calls send_or_buffer
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int message_semantics,
-                            ACE_Time_Value *max_time_wait) = 0;
-
-
-
-  /// This method formats the stream and then sends the message on the
-  /// transport.
-  /**
-   * Once the ORB is prepared to receive a reply (see send_request()
-   * above), and all the arguments have been marshaled the CDR stream
-   * must be 'formatted', i.e. the message_size field in the GIOP
-   * header can finally be set to the proper value.
-   *
-   */
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST,
-                            ACE_Time_Value *max_time_wait = 0) = 0;
-
-
-  /// Sent the contents of @a message_block
-  /**
-   * @param stub The object reference used for this operation, useful
-   *             to obtain the current policies.
-   * @param message_semantics If this is set to TAO_TWO_REQUEST
-   *        this method will block until the operation is completely
-   *        written on the wire. If it is set to other values this
-   *        operation could return.
-   * @param message_block The CDR encapsulation of the GIOP message
-   *             that must be sent.  The message may consist of
-   *             multiple Message Blocks chained through the cont()
-   *             field.
-   * @param max_wait_time The maximum time that the operation can
-   *             block, used in the implementation of timeouts.
-   */
-  virtual int send_message_shared (TAO_Stub *stub,
-                                   int message_semantics,
-                                   const ACE_Message_Block *message_block,
-                                   ACE_Time_Value *max_wait_time);
-
-protected:
-
-  /// Called by the handle_input_i(). This method is used to parse
-  /// message read by the handle_input_i() call. It also decides
-  /// whether the message  needs consolidation before processing.
-  int parse_consolidate_messages (ACE_Message_Block &bl,
-                                  TAO_Resume_Handle &rh,
-                                  ACE_Time_Value *time = 0);
-
-
-  /// Method does parsing of the message if we have a fresh message in
-  /// the @a message_block or just returns if we have read part of the
-  /// previously stored message.
-  int parse_incoming_messages (ACE_Message_Block &message_block);
-
-  /// Return if we have any missing data in the queue of messages
-  /// or determine if we have more information left out in the
-  /// presently read message to make it complete.
-  size_t missing_data (ACE_Message_Block &message_block);
-
-  /// Consolidate the currently read message or consolidate the last
-  /// message in the queue. The consolidation of the last message in
-  /// the queue is done by calling consolidate_message_queue ().
-  virtual int consolidate_message (ACE_Message_Block &incoming,
-                                   ssize_t missing_data,
-                                   TAO_Resume_Handle &rh,
-                                   ACE_Time_Value *max_wait_time);
-
-  /// @@Bala: Docu???
-  int consolidate_fragments (TAO_Queued_Data *qd,
-                             TAO_Resume_Handle &rh);
-
-  /// First consolidate the message queue.  If the message is still not
-  /// complete, try to read from the handle again to make it
-  /// complete. If these dont help put the message back in the queue
-  /// and try to check the queue if we have message to process. (the
-  /// thread  needs to do some work anyway :-))
-  int consolidate_message_queue (ACE_Message_Block &incoming,
-                                 ssize_t missing_data,
-                                 TAO_Resume_Handle &rh,
-                                 ACE_Time_Value *max_wait_time);
-
-  /// Called by parse_consolidate_message () if we have more messages
-  /// in one read. Queue up the messages and try to process one of
-  /// them, atleast at the head of them.
-  int consolidate_extra_messages (ACE_Message_Block &incoming,
-                                  TAO_Resume_Handle &rh);
-
-  /// Process the message by sending it to the higher layers of the
-  /// ORB.
-  int process_parsed_messages (TAO_Queued_Data *qd,
-                               TAO_Resume_Handle &rh);
-
-  /// Make a queued data from the @a incoming message block
-  TAO_Queued_Data *make_queued_data (ACE_Message_Block &incoming);
-
-  /// Implement send_message_shared() assuming the handler_lock_ is
-  /// held.
-  int send_message_shared_i (TAO_Stub *stub,
-                             int message_semantics,
-                             const ACE_Message_Block *message_block,
-                             ACE_Time_Value *max_wait_time);
-
-  /// Queue a message for @a message_block
-  int queue_message_i (const ACE_Message_Block *message_block);
-
-public:
-  /// Format and queue a message for @a stream
-  int format_queue_message (TAO_OutputCDR &stream);
-
-  /// Send a message block chain,
-  int send_message_block_chain (const ACE_Message_Block *message_block,
-                                size_t &bytes_transferred,
-                                ACE_Time_Value *max_wait_time = 0);
-
-  /// Send a message block chain, assuming the lock is held
-  int send_message_block_chain_i (const ACE_Message_Block *message_block,
-                                  size_t &bytes_transferred,
-                                  ACE_Time_Value *max_wait_time);
-  /// Cache management
-  int purge_entry (void);
-
-  /// Cache management
-  int make_idle (void);
-
-  /// Cache management
-  int update_transport (void);
-
-  /// The timeout callback, invoked when any of the timers related to
-  /// this transport expire.
-  /**
-   * @param current_time The current time as reported from the Reactor
-   * @param act The Asynchronous Completion Token.  Currently it is
-   *            interpreted as follows:
-   * - If the ACT is the address of this->current_deadline_ the
-   *   queueing timeout has expired and the queue should start
-   *   flushing.
-   *
-   * @return Returns 0 if there are no problems, -1 if there is an
-   *         error
-   *
-   * @todo In the future this function could be used to expire
-   *       messages (oneways) that have been sitting for too long on
-   *       the queue.
-   */
-  int handle_timeout (const ACE_Time_Value &current_time,
-                      const void* act);
-
-  /// Accessor to recv_buffer_size_
-  size_t recv_buffer_size (void);
-
-  /// Accessor to sent_byte_count_
-  size_t sent_byte_count (void);
-
-  /// CodeSet Negotiation - Get the char codeset translator factory
-  TAO_Codeset_Translator_Factory *char_translator (void) const;
-
-  /// CodeSet Negotiation - Get the wchar codeset translator factory
-  TAO_Codeset_Translator_Factory *wchar_translator (void) const;
-
-  /// CodeSet negotiation - Set the char codeset translator factory
-  void char_translator (TAO_Codeset_Translator_Factory *);
-
-  /// CodeSet negotiation - Set the wchar codeset translator factory
-  void wchar_translator (TAO_Codeset_Translator_Factory *);
-
-  /// Use the Transport's codeset factories to set the translator for input
-  /// and output CDRs.
-  void assign_translators (TAO_InputCDR *, TAO_OutputCDR *);
-
-  /// It is necessary to clear the codeset translator when a CDR stream
-  /// is used for more than one GIOP message. This is required since the
-  /// header must not be translated, whereas the body must be.
-  void clear_translators (TAO_InputCDR *, TAO_OutputCDR *);
-
-  /// Return true if the tcs has been set
-  CORBA::Boolean is_tcs_set() const;
-
-  /// Set the state of the first_request_ flag to 0
-  void first_request_sent();
-
-  /// Notify all the components inside a Transport when the underlying
-  /// connection is closed.
-  void send_connection_closed_notifications (void);
-
-private:
-
-  /// Helper method that returns the Transport Cache Manager.
-  TAO::Transport_Cache_Manager &transport_cache_manager (void);
-
-  /// Send some of the data in the queue.
-  /**
-   * As the outgoing data is drained this method is invoked to send as
-   * much of the current message as possible.
-   *
-   * Returns 0 if there is more data to send, -1 if there was an error
-   * and 1 if the message was completely sent.
-   */
-  int drain_queue (void);
-
-  /// Implement drain_queue() assuming the lock is held
-  int drain_queue_i (void);
-
-  /// This class needs priviledged access to
-  /// - queue_is_empty_i()
-  /// - drain_queue_i()
-  friend class TAO_Block_Flushing_Strategy;
-
-  /// Check if there are messages pending in the queue
-  /**
-   * This version assumes that the lock is already held.  Use with
-   * care!
-   *
-   * @return 1 if the queue is empty
-   */
-  int queue_is_empty_i (void);
-
-  /// A helper routine used in drain_queue_i()
-  int drain_queue_helper (int &iovcnt, iovec iov[]);
-
-  /// These classes need privileged access to:
-  /// - schedule_output_i()
-  /// - cancel_output_i()
-  friend class TAO_Reactive_Flushing_Strategy;
-  friend class TAO_Leader_Follower_Flushing_Strategy;
-
-  /// Needs priveleged access to
-  /// event_handler_i ()
-  friend class TAO_Thread_Per_Connection_Handler;
-
-  /// Schedule handle_output() callbacks
-  int schedule_output_i (void);
-
-  /// Cancel handle_output() callbacks
-  int cancel_output_i (void);
-
-  /// Cleanup the queue.
-  /**
-   * Exactly @a byte_count bytes have been sent, the queue must be
-   * cleaned up as potentially several messages have been completely
-   * sent out.
-   * It leaves on head_ the next message to send out.
-   */
-  void cleanup_queue (size_t byte_count);
-
-  /// Cleanup the complete queue
-  void cleanup_queue_i ();
-
-  /// Check if the buffering constraints have been reached
-  int check_buffering_constraints_i (TAO_Stub *stub, int &must_flush);
-
-  /// Send a synchronous message, i.e. block until the message is on
-  /// the wire
-  int send_synchronous_message_i (const ACE_Message_Block *message_block,
-                                  ACE_Time_Value *max_wait_time);
-
-  /// Send a reply message, i.e. do not block until the message is on
-  /// the wire, but just return after adding them  to the queue.
-  int send_reply_message_i (const ACE_Message_Block *message_block,
-                            ACE_Time_Value *max_wait_time);
-
-  /// A helper method used by send_synchronous_message_i() and
-  /// send_reply_message_i(). Reusable code that could be used by both
-  /// the methods.
-  int send_synch_message_helper_i (TAO_Synch_Queued_Message &s,
-                                   ACE_Time_Value *max_wait_time);
-
-  /// Check if the flush timer is still pending
-  int flush_timer_pending (void) const;
-
-  /// The flush timer expired or was explicitly cancelled, mark it as
-  /// not pending
-  void reset_flush_timer (void);
-
-  /// Print out error messages if the event handler is not valid
-  void report_invalid_event_handler (const char *caller);
-
-  /*
-   * Process the message that is in the head of the incoming queue.
-   * If there are more messages in the queue, this method calls
-   * this->notify_reactor () to wake up a thread
-   */
-  int process_queue_head (TAO_Resume_Handle &rh);
-
-  /*
-   * This call prepares a new handler for the notify call and sends a
-   * notify () call to the reactor.
-   */
-  int notify_reactor (void);
-
-  /// Assume the lock is held
-  void send_connection_closed_notifications_i (void);
-
-  /// Process a non-version specific fragment by either consolidating
-  /// the fragments or enqueuing the queueable message
-  void process_fragment (TAO_Queued_Data* fragment_message,
-                         TAO_Queued_Data* queueable_message,
-                         CORBA::Octet major,
-                         CORBA::Octet minor,
-                         TAO_Resume_Handle &rh);
-
-  /// Allocate a partial message block and store it in our
-  /// partial_message_ data member.
-  void allocate_partial_message_block (void);
-
-  /// Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&))
-
-protected:
-
-  /// IOP protocol tag.
-  CORBA::ULong tag_;
-
-  /// Global orbcore resource.
-  TAO_ORB_Core *orb_core_;
-
-  /// Our entry in the cache. We dont own this. It is here for our
-  /// convenience. We cannot just change things around.
-  TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry_;
-
-  /// Strategy to decide whether multiple requests can be sent over the
-  /// same connection or the connection is exclusive for a request.
-  TAO_Transport_Mux_Strategy *tms_;
-
-  /// Strategy for waiting for the reply after sending the request.
-  TAO_Wait_Strategy *ws_;
-
-  /// Use to check if bidirectional info has been synchronized with
-  /// the peer.
-  /**
-   * Have we sent any info on bidirectional information or have we
-   * received any info regarding making the connection served by this
-   * transport bidirectional.
-   * The flag is used as follows:
-   * + We dont want to send the bidirectional context info more than
-   *   once on the connection. Why? Waste of marshalling and
-   *   demarshalling time on the client.
-   * + On the server side -- once a client that has established the
-   *   connection asks the server to use the connection both ways, we
-   *   *dont* want the server to pack service info to the client. That
-   *   is not allowed. We need a flag to prevent such a things from
-   *   happening.
-   *
-   * The value of this flag will be 0 if the client sends info and 1
-   * if the server receives the info.
-   */
-  int bidirectional_flag_;
-
-  TAO::Connection_Role opening_connection_role_;
-
-  /// Implement the outgoing data queue
-  TAO_Queued_Message *head_;
-  TAO_Queued_Message *tail_;
-
-  /// Queue of the incoming messages..
-  TAO_Incoming_Message_Queue incoming_message_queue_;
-
-  /// The queue will start draining no later than <queing_deadline_>
-  /// *if* the deadline is
-  ACE_Time_Value current_deadline_;
-
-  /// The timer ID
-  long flush_timer_id_;
-
-  /// The adapter used to receive timeout callbacks from the Reactor
-  TAO_Transport_Timer transport_timer_;
-
-  /// Lock that insures that activities that *might* use handler-related
-  /// resources (such as a connection handler) get serialized.
-  /**
-   * This is an <code>ACE_Lock</code> that gets initialized from
-   * @c TAO_ORB_Core::resource_factory()->create_cached_connection_lock().
-   * This way, one can use a lock appropriate for the type of system, i.e.,
-   * a null lock for single-threaded systems, and a real lock for
-   * multi-threaded systems.
-   */
-  mutable ACE_Lock *handler_lock_;
-
-  /// A unique identifier for the transport.
-  /**
-   * This never *never* changes over the lifespan, so we don't have to worry
-   * about locking it.
-   *
-   * HINT: Protocol-specific transports that use connection handler
-   * might choose to set this to the handle for their connection.
-   */
-  size_t id_;
-
-  /// Used by the LRU, LFU and FIFO Connection Purging Strategies.
-  unsigned long purging_order_;
-
-  /// Size of the buffer received.
-  size_t recv_buffer_size_;
-
-  /// Number of bytes sent.
-  size_t sent_byte_count_;
-
-  /// Is this transport really connected or not. In case of oneways with
-  /// SYNC_NONE Policy we don't wait until the connection is ready and we
-  /// buffer the requests in this transport until the connection is ready
-  bool is_connected_;
-
-private:
-
-  /// @@Phil, I think it would be nice if we could think of a way to
-  /// do the following.
-  /// We have been trying to use the transport for marking about
-  /// translator factories and such! IMHO this is a wrong encapulation
-  /// ie. trying to populate the transport object with these
-  /// details. We should probably have a class something like
-  /// TAO_Message_Property or TAO_Message_Translator or whatever (I am
-  /// sure you get the idea) and encapsulate all these
-  /// details. Coupling these seems odd. if I have to be more cynical
-  /// we can move this to the connection_handler and it may more sense
-  /// with the DSCP stuff around there. Do you agree?
-
-  /// Additional member values required to support codeset translation
-  TAO_Codeset_Translator_Factory *char_translator_;
-  TAO_Codeset_Translator_Factory *wchar_translator_;
-
-  /// The tcs_set_ flag indicates that negotiation has occured and so the
-  /// translators are correct, since a null translator is valid if both ends
-  /// are using the same codeset, whatever that codeset might be.
-  CORBA::Boolean tcs_set_;
-
-  /// First_request_ is true until the first request is sent or received. This
-  /// is necessary since codeset context information is necessary only on the
-  /// first request. After that, the translators are fixed for the life of the
-  /// connection.
-  CORBA::Boolean first_request_;
-
-  /// Holds the partial GIOP message (if there is one)
-  ACE_Message_Block* partial_message_;
-};
-
-/**
- * @class TAO_Transport_Refcount_Guard
- *
- * @brief Helper class that increments the refcount on construction
- *  and decrements the refcount on destruction.
- */
-class TAO_Export TAO_Transport_Refcount_Guard
-{
-public:
-  TAO_Transport_Refcount_Guard (TAO_Transport *);
-  ~TAO_Transport_Refcount_Guard (void);
-private:
-  TAO_Transport *tr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Transport.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRANSPORT_H */
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
deleted file mode 100644
index 843d863d658..00000000000
--- a/TAO/tao/Transport.inl
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_Transport::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-TAO_Transport::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE TAO_Transport_Mux_Strategy *
-TAO_Transport::tms (void) const
-{
-  return tms_;
-}
-
-// Return the Wait strategy used by the Transport.
-ACE_INLINE TAO_Wait_Strategy *
-TAO_Transport::wait_strategy (void) const
-{
-  return this->ws_;
-}
-
-ACE_INLINE int
-TAO_Transport::bidirectional_flag (void) const
-{
-  return this->bidirectional_flag_;
-}
-
-ACE_INLINE void
-TAO_Transport::bidirectional_flag (int flag)
-{
-  this->bidirectional_flag_ = flag;
-}
-
-ACE_INLINE TAO::Connection_Role
-TAO_Transport::opened_as () const
-{
-  return this->opening_connection_role_;
-}
-
-ACE_INLINE void
-TAO_Transport::opened_as (TAO::Connection_Role role)
-{
-  this->opening_connection_role_ = role;
-}
-
-ACE_INLINE TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *
-TAO_Transport::cache_map_entry (void)
-{
-  return this->cache_map_entry_;
-}
-
-ACE_INLINE void
-TAO_Transport::cache_map_entry (
-    TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry)
-{
-  this->cache_map_entry_ = entry;
-}
-
-ACE_INLINE unsigned long
-TAO_Transport::purging_order (void) const
-{
-  return this->purging_order_;
-}
-
-ACE_INLINE void
-TAO_Transport::purging_order (unsigned long value)
-{
-  // This should only be called by the Transport Cache Manager when
-  // it is holding it's lock.
-  // The transport should still be here since the cache manager still
-  // has a reference to it.
-  this->purging_order_ = value;
-}
-
-ACE_INLINE size_t
-TAO_Transport::id (void) const
-{
-  return this->id_;
-}
-
-ACE_INLINE void
-TAO_Transport::id (size_t id)
-{
-  this->id_ = id;
-}
-
-ACE_INLINE int
-TAO_Transport::queue_is_empty (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->handler_lock_,
-                    -1);
-  return this->queue_is_empty_i ();
-}
-
-ACE_INLINE int
-TAO_Transport::flush_timer_pending (void) const
-{
-  return this->flush_timer_id_ != -1;
-}
-
-ACE_INLINE void
-TAO_Transport::reset_flush_timer (void)
-{
-  this->flush_timer_id_ = -1;
-  this->current_deadline_ = ACE_Time_Value::zero;
-}
-
-//********************************************************************
-// codeset related methods
-
-
-ACE_INLINE TAO_Codeset_Translator_Factory *
-TAO_Transport::char_translator (void) const
-{
-  return this->char_translator_;
-}
-
-ACE_INLINE TAO_Codeset_Translator_Factory *
-TAO_Transport::wchar_translator (void) const
-{
-  return this->wchar_translator_;
-}
-
-ACE_INLINE void
-TAO_Transport::char_translator (TAO_Codeset_Translator_Factory *tf)
-{
-  this->char_translator_ = tf;
-  this->tcs_set_ = 1;
-}
-
-ACE_INLINE void
-TAO_Transport::wchar_translator (TAO_Codeset_Translator_Factory *tf)
-{
-  this->wchar_translator_ = tf;
-  this->tcs_set_ = 1;
-}
-
-/// CodeSet negotiation
-ACE_INLINE CORBA::Boolean
-TAO_Transport::is_tcs_set(void) const
-{
-  return tcs_set_;
-}
-
-ACE_INLINE void
-TAO_Transport::first_request_sent (void)
-{
-  this->first_request_ = 0;
-}
-
-ACE_INLINE bool
-TAO_Transport::is_connected (void) const
-{
-  ACE_GUARD_RETURN (ACE_Lock,
-                    ace_mon,
-                    *this->handler_lock_,
-                    false);
-
-  return this->is_connected_;
-}
-
-ACE_INLINE TAO_Connection_Handler *
-TAO_Transport::connection_handler (void)
-{
-  return this->connection_handler_i();
-}
-
-/*****************************************************/
-
-ACE_INLINE
-TAO_Transport_Refcount_Guard::TAO_Transport_Refcount_Guard (TAO_Transport *t)
-  : tr_ (t)
-{
-  this->tr_->add_reference ();
-}
-
-ACE_INLINE
-TAO_Transport_Refcount_Guard::~TAO_Transport_Refcount_Guard (void)
-{
-  this->tr_->remove_reference ();
-}
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
deleted file mode 100644
index ebc460afdd0..00000000000
--- a/TAO/tao/Transport_Acceptor.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Transport_Acceptor.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Transport_Acceptor.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Acceptor,
-           "$Id$")
-
-TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
-  : tag_ (tag)
-{
-}
-
-TAO_Acceptor::~TAO_Acceptor (void)
-{
-}
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
deleted file mode 100644
index f05ef48e4be..00000000000
--- a/TAO/tao/Transport_Acceptor.h
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Transport_Acceptor.h
- *
- *  $Id$
- *
- *  Interface for the Acceptor component of the TAO pluggable protocol
- *  framework.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ACCEPTOR_H
-#define TAO_ACCEPTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-// Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-class TAO_ORB_Core;
-class TAO_MProfile;
-class TAO_Endpoint;
-class TAO_Transport;
-
-namespace IOP
-{
-  struct TaggedProfile;
-}
-
-namespace TAO
-{
-  class ObjectKey;
-}
-
-// ****************************************************************
-
-/// The TAO-specific OMG assigned value for the TAG_ORB_TYPE tagged
-/// component.
-/**
- * This number was assigned by the OMG.  Do *NOT* change.  The ASCII
- * representation is "TA\x00".  If necessary, we can request more ORB
- * types later.
- */
-const CORBA::ULong TAO_ORB_TYPE = 0x54414f00U;
-
-// ****************************************************************
-
-/**
- * @class TAO_Acceptor
- *
- * @brief Abstract Acceptor class used for pluggable transports.
- *
- * Base class for the Acceptor bridge class.
- *
- * @todo Need to rename the class as TAO_Transport_Acceptor.
- */
-class TAO_Export TAO_Acceptor
-{
-public:
-  TAO_Acceptor (CORBA::ULong tag);
-
-  /// Destructor
-  virtual ~TAO_Acceptor (void);
-
-  /// The tag, each concrete class will have a specific tag value.
-  CORBA::ULong tag (void) const;
-
-  /// Method to initialize acceptor for address.
-  virtual int open (TAO_ORB_Core *orb_core,
-                    ACE_Reactor *reactor,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0) = 0;
-
-  /**
-   * Open an acceptor with the given protocol version on a default
-   * endpoint
-   */
-  virtual int open_default (TAO_ORB_Core *,
-                            ACE_Reactor *reactor,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0) = 0;
-
-  /// Closes the acceptor
-  virtual int close (void) = 0;
-
-  /**
-   * Create the corresponding profile for this endpoint.
-   * If share_profile is set to true, the pluggable protocol
-   * implementation should try to add the endpoint to a profile
-   * in the mprofile that is of the same type.  Currently, this
-   * is used when RT CORBA is enabled.
-   */
-  virtual int create_profile (const TAO::ObjectKey &object_key,
-                              TAO_MProfile &mprofile,
-                              CORBA::Short priority) = 0;
-
-  /// Return 1 if the @a endpoint has the same address as the acceptor.
-  virtual int is_collocated (const TAO_Endpoint* endpoint) = 0;
-
-  /**
-   * Returns the number of endpoints this acceptor is listening on.  This
-   * is used for determining how many profiles will be generated
-   * for this acceptor.
-   */
-  virtual CORBA::ULong endpoint_count (void) = 0;
-
-  /**
-   * This method fetches the @a key from the @a profile. Protocols that
-   * are pluggable can send data that are specific in the
-   * @c profile_data field encapsulated as a octet stream. This method
-   * allows those  protocols to get the object key from the
-   * encapsulation.
-   */
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO::ObjectKey &key) = 0;
-
-private:
-  /// IOP protocol tag.
-  CORBA::ULong tag_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Transport_Acceptor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_ACCEPTOR_H */
diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl
deleted file mode 100644
index 7d91a8330a3..00000000000
--- a/TAO/tao/Transport_Acceptor.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- C++ -*-
-// $Id$
-ACE_INLINE CORBA::ULong
-TAO_Acceptor::tag (void) const
-{
-  return this->tag_;
-}
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
deleted file mode 100644
index 22a34d5ce4f..00000000000
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ /dev/null
@@ -1,726 +0,0 @@
-//$Id$
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Transport.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Connection_Purging_Strategy.h"
-#include "tao/Condition.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Transport_Cache_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/ACE.h"
-
-
-ACE_RCSID (tao,
-           Transport_Cache_Manager,
-           "$Id$")
-
-namespace TAO
-{
-  Transport_Cache_Manager::Transport_Cache_Manager (TAO_ORB_Core &orb_core)
-    : percent_ (orb_core.resource_factory ()->purge_percentage ())
-    , purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ())
-    , cache_map_ (orb_core.resource_factory ()->cache_maximum ())
-    , condition_ (0)
-    , cache_lock_ (0)
-    , muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ())
-    , no_waiting_threads_ (0)
-    , last_entry_returned_ (0)
-  {
-    if (orb_core.resource_factory ()->locked_transport_cache ())
-      {
-        ACE_NEW (this->condition_,
-                 TAO_Condition <TAO_SYNCH_MUTEX>);
-
-        ACE_NEW (this->cache_lock_,
-                 ACE_Lock_Adapter <TAO_SYNCH_MUTEX> (*this->condition_->mutex ()));
-      }
-    else
-      {
-        /// If the cache is not going to be locked then dont create a
-        /// condition variable. Make the <muxed_number_> to 0, else a
-        /// single thread could get into waiting mode
-        this->muxed_number_ = 0;
-        ACE_NEW (this->cache_lock_,
-                 ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>);
-      }
-  }
-
-  Transport_Cache_Manager::~Transport_Cache_Manager (void)
-  {
-    // Wakeup all the waiting threads threads before we shutdown stuff
-    if (this->no_waiting_threads_)
-      {
-        this->condition_->broadcast ();
-      }
-
-    // Delete the lock that we have
-    if (this->cache_lock_)
-      {
-        delete this->cache_lock_;
-        this->cache_lock_ = 0;
-      }
-
-    // Delete the purging strategy
-    if (this->purging_strategy_)
-      {
-        delete this->purging_strategy_;
-        this->purging_strategy_ = 0;
-      }
-
-    // Delete the condition variable
-    if (this->condition_)
-      {
-        delete this->condition_;
-        this->condition_ = 0;
-      }
-  }
-
-
-  int
-  Transport_Cache_Manager::bind_i (Cache_ExtId &ext_id,
-                                   Cache_IntId &int_id)
-  {
-    if (TAO_debug_level > 0)
-       {
-         ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Cache_Manager::bind_i, "
-                    "0x%x -> 0x%x Transport[%d]\n",
-                     ext_id.property (),
-                    int_id.transport (),
-                    int_id.transport ()->id ()));
-       }
-
-    // Get the entry too
-    HASH_MAP_ENTRY *entry = 0;
-
-    // Update the purging strategy information while we
-    // are holding our lock
-    this->purging_strategy_->update_item (int_id.transport ());
-
-    int retval = this->cache_map_.bind (ext_id,
-                                        int_id,
-                                        entry);
-    if (retval == 0)
-      {
-        // The entry has been added to cache succesfully
-        // Add the cache_map_entry to the transport
-        int_id.transport ()->cache_map_entry (entry);
-      }
-    else if (retval == 1)
-      {
-        if (TAO_debug_level > 4)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport_Cache_Manager::bind_i, "
-                        "unable to bind in the first attempt. "
-                        "Trying with a new index\n"));
-          }
-
-        // There was an entry like this before, so let us do some
-        // minor adjustments and rebind
-        retval = this->get_last_index_bind (ext_id,
-                                            int_id,
-                                            entry);
-        if (retval == 0)
-          {
-            int_id.transport ()->cache_map_entry (entry);
-          }
-      }
-
-    if (TAO_debug_level > 5 && retval != 0)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Cache_Manager::bind_i, "
-                    "unable to bind\n"));
-      }
-    else if (TAO_debug_level > 3)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Cache_Manager::bind_i, "
-                    "cache size is [%d]\n",
-                    this->current_size ()));
-      }
-
-    return retval;
-  }
-
-  int
-  Transport_Cache_Manager::find_transport (
-    TAO_Transport_Descriptor_Interface *prop,
-    TAO_Transport *&transport)
-  {
-    if (prop == 0)
-      {
-        transport = 0;
-        return -1;
-      }
-
-    // Compose the ExternId
-    Cache_ExtId ext_id (prop);
-    Cache_IntId int_id;
-
-    int retval = this->find (ext_id,
-                             int_id);
-    if (retval == 0)
-      {
-        transport = int_id.relinquish_transport ();
-      }
-
-    return retval;
-  }
-
-  int
-  Transport_Cache_Manager::find (const Cache_ExtId &key,
-                                 Cache_IntId &value)
-  {
-    ACE_MT (ACE_GUARD_RETURN  (ACE_Lock,
-                               guard,
-                               *this->cache_lock_,
-                               -1));
-
-    int status =  this->find_i (key,
-                                value);
-
-    if (status == 0)
-      {
-        // Update the purging strategy information while we
-        // are holding our lock
-        this->purging_strategy_->update_item (value.transport ());
-      }
-
-    return status;
-  }
-
-  int
-  Transport_Cache_Manager::find_i (const Cache_ExtId &key,
-                                   Cache_IntId &value)
-  {
-    HASH_MAP_ENTRY *entry = 0;
-
-    // Get the entry from the Hash Map
-    int retval = 0;
-
-    // Make a temporary object. It does not do a copy.
-    Cache_ExtId tmp_key (key.property ());
-
-    while (retval == 0)
-      {
-        // Wait for a connection..
-        this->wait_for_connection (tmp_key);
-
-        // Look for an entry in the map
-        retval = this->cache_map_.find (tmp_key,
-                                        entry);
-
-        // We have an entry in the map, check whether it is idle.
-        if (entry)
-          {
-            CORBA::Boolean idle =
-              this->is_entry_idle (entry);
-
-            if (idle)
-              {
-                // Successfully found a TAO_Transport.
-
-                entry->int_id_.recycle_state (ENTRY_BUSY);
-
-                // NOTE: This assignment operator indirectly incurs two
-                //       lock operations since it duplicates and releases
-                //       TAO_Transport objects.
-                value = entry->int_id_;
-
-                if (TAO_debug_level > 4)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "TAO (%P|%t) - Transport_Cache_Manager::find_i, "
-                                "at index %d (Transport[%d]) - idle\n",
-                                entry->ext_id_.index (),
-                                entry->int_id_.transport ()->id ()));
-                  }
-
-                return 0;
-              }
-            else if (TAO_debug_level > 6)
-                  {
-                    ACE_DEBUG ((LM_DEBUG,
-                                "TAO (%P|%t) - Transport_Cache_Manager::find_i, "
-                                "at index %d (Transport[%d]) - not idle\n",
-                                entry->ext_id_.index (),
-                                entry->int_id_.transport ()->id ()));
-                  }
-          }
-
-        // Bump the index up
-        tmp_key.incr_index ();
-      }
-
-    // If we are here then it is an error
-    if (TAO_debug_level > 4 && retval != 0)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Cache_Manager::find_i, "
-                    "no idle transport is available\n"));
-      }
-
-    return retval;
-  }
-
-  int
-  Transport_Cache_Manager::make_idle_i (HASH_MAP_ENTRY *&entry)
-  {
-    if (entry == 0)
-      return -1;
-
-    entry->int_id_.recycle_state (ENTRY_IDLE_AND_PURGABLE);
-
-    // Does any one need waking?
-    if (this->no_waiting_threads_)
-      {
-        // We returned this entry to the map
-        this->last_entry_returned_ = &entry->ext_id_;
-
-        // Wake up a thread
-        this->condition_->signal ();
-      }
-
-    return 0;
-  }
-
-  int
-  Transport_Cache_Manager::update_entry (HASH_MAP_ENTRY *&entry)
-  {
-    if(entry == 0)
-      return -1;
-
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                              guard,
-                            *this->cache_lock_, -1));
-
-    if (entry == 0)
-      return -1;
-
-    TAO_Connection_Purging_Strategy *st = this->purging_strategy_;
-    (void) st->update_item (entry->int_id_.transport ());
-
-    return 0;
-  }
-
-  int
-  Transport_Cache_Manager::close_i (Connection_Handler_Set &handlers)
-  {
-    HASH_MAP_ITER end_iter = this->cache_map_.end ();
-
-    for (HASH_MAP_ITER iter = this->cache_map_.begin ();
-         iter != end_iter;
-         ++iter)
-      {
-        // Get the transport to fill its associated connection's handler.
-        (*iter).int_id_.transport ()->provide_handler (handlers);
-
-        // Inform the transport that has a reference to the entry in the
-        // map that we are *gone* now. So, the transport should not use
-        // the reference to the entry that he has, to acces us *at any
-        // time*.
-        (*iter).int_id_.transport ()->cache_map_entry (0);
-      }
-
-    // Unbind all the entries in the map
-    this->cache_map_.unbind_all ();
-
-    return 0;
-  }
-
-  bool
-  Transport_Cache_Manager::blockable_client_transports_i (
-    Connection_Handler_Set &h)
-  {
-    HASH_MAP_ITER end_iter = this->cache_map_.end ();
-
-    for (HASH_MAP_ITER iter = this->cache_map_.begin ();
-         iter != end_iter;
-         ++iter)
-      {
-        // Get the transport to fill its associated connection's
-        // handler.
-        bool retval =
-          (*iter).int_id_.transport ()->provide_blockable_handler (h);
-
-        // Do not mark the entry as closed if we don't have a
-        // blockable handler added
-        if (retval)
-          (*iter).int_id_.recycle_state (ENTRY_CLOSED);
-      }
-
-    return true;
-  }
-
-  int
-  Transport_Cache_Manager::purge_entry_i (HASH_MAP_ENTRY *&entry)
-  {
-    if (entry == 0)
-      {
-        return 0;
-      }
-
-    // Remove the entry from the Map
-    int retval = this->cache_map_.unbind (entry);
-
-    // Set the entry pointer to zero
-    entry = 0;
-
-    return retval;
-  }
-
-  void
-  Transport_Cache_Manager::mark_invalid_i (HASH_MAP_ENTRY *&entry)
-  {
-    if (entry == 0)
-      {
-        return;
-      }
-
-    // Mark the entry as not usable
-    entry->int_id_.recycle_state (ENTRY_PURGABLE_BUT_NOT_IDLE);
-  }
-
-  int
-  Transport_Cache_Manager::get_last_index_bind (Cache_ExtId &key,
-                                                Cache_IntId &val,
-                                                HASH_MAP_ENTRY *&entry)
-  {
-    CORBA::ULong ctr = entry->ext_id_.index ();
-    int retval = 0;
-
-    while (retval == 0)
-      {
-        // Set the index
-        key.index (++ctr);
-
-        // Check to see if an element exists in the Map. If it exists we
-        // loop, else we drop out of the loop
-        retval = this->cache_map_.find (key);
-      }
-
-    // Now do a bind again with the new index
-    return  this->cache_map_.bind (key,
-                                   val,
-                                   entry);
-  }
-
-
-  bool
-  Transport_Cache_Manager::is_entry_idle (HASH_MAP_ENTRY *&entry)
-  {
-    Cache_Entries_State entry_state =
-      entry->int_id_.recycle_state ();
-
-    if (TAO_debug_level)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Cache_Manager::is_entry_idle, "
-                    "state is [%d]\n",
-                    entry_state));
-      }
-
-    if (entry_state == ENTRY_IDLE_AND_PURGABLE ||
-        entry_state == ENTRY_IDLE_BUT_NOT_PURGABLE)
-      return true;
-
-    return false;
-  }
-
-#if !defined (ACE_LACKS_QSORT)
-  int
-  Transport_Cache_Manager::cpscmp(const void* a, const void* b)
-  {
-    const HASH_MAP_ENTRY** left  = (const HASH_MAP_ENTRY**)a;
-    const HASH_MAP_ENTRY** right = (const HASH_MAP_ENTRY**)b;
-
-    if ((*left)->int_id_.transport ()->purging_order () <
-        (*right)->int_id_.transport ()->purging_order ())
-      return -1;
-
-    if ((*left)->int_id_.transport ()->purging_order () >
-        (*right)->int_id_.transport ()->purging_order ())
-      return 1;
-
-    return 0;
-  }
-#endif /* ACE_LACKS_QSORT */
-
-  int
-  Transport_Cache_Manager::purge (void)
-  {
-    ACE_Unbounded_Stack<TAO_Transport*> transports_to_be_closed;
-
-    {
-      ACE_MT (ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->cache_lock_, 0));
-
-      DESCRIPTOR_SET sorted_set = 0;
-      int sorted_size = this->fill_set_i (sorted_set);
-
-      // Only call close_entries () if sorted_set != 0.  It takes
-      // control of sorted_set and cleans up any allocated memory.  If
-      // sorted_set == 0, then there is nothing to de-allocate.
-      if (sorted_set != 0)
-        {
-          // BEGIN FORMER close_entries
-          // Calculate the number of entries to purge
-          const int amount = (sorted_size * this->percent_) / 100;
-
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager::")
-                          ACE_TEXT ("purge,  purging %d of %d cache entries\n"),
-                          amount,
-                          sorted_size));
-            }
-
-          int count = 0;
-
-          for (int i = 0; count < amount && i < sorted_size; ++i)
-            {
-              if (this->is_entry_idle (sorted_set[i]))
-                {
-                  sorted_set[i]->int_id_.recycle_state (ENTRY_BUSY);
-
-                  TAO_Transport* transport =
-                    sorted_set[i]->int_id_.transport ();
-                  transport->add_reference ();
-
-                  if (transports_to_be_closed.push (transport) != 0)
-                    {
-                      ACE_DEBUG ((LM_INFO,
-                                  ACE_TEXT ("TAO (%P|%t) - ")
-                                  ACE_TEXT ("Unable to push transport %u ")
-                                  ACE_TEXT ("on the to-be-closed stack, so ")
-                                  ACE_TEXT ("it will leak\n"),
-                                transport->id ()));
-                    }
-
-                  if (TAO_debug_level > 0)
-                    {
-                      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ")
-                                  ACE_TEXT ("Idle transport found in ")
-                                  ACE_TEXT ("cache: [%d] \n"),
-                                  transport->id ()));
-                    }
-
-                  // Count this as a successful purged entry
-                  count++;
-                }
-            }
-
-          delete [] sorted_set;
-          sorted_set = 0;
-          // END FORMER close_entries
-        }
-    }
-
-    // Now, without the lock held, lets go through and close all the transports.
-    TAO_Transport *transport = 0;
-
-    while (! transports_to_be_closed.is_empty ())
-      {
-        if (transports_to_be_closed.pop (transport) == 0)
-          {
-            if (transport)
-              {
-                transport->close_connection ();
-                transport->remove_reference ();
-              }
-          }
-      }
-
-    return 0;
-  }
-
-
-  void
-  Transport_Cache_Manager::sort_set (DESCRIPTOR_SET& entries,
-                                     int current_size)
-  {
-#if defined (ACE_LACKS_QSORT)
-    // Use insertion sort if we don't have qsort
-    for(int i = 1; i < current_size; ++i)
-      {
-        if (entries[i]->int_id_.transport ()->purging_order () <
-            entries[i - 1]->int_id_.transport ()->purging_order ())
-          {
-            HASH_MAP_ENTRY* entry = entries[i];
-
-            for(int j = i; j > 0 &&
-                  entries[j - 1]->int_id_.transport ()->purging_order () >
-                  entry->int_id_.transport ()->purging_order (); --j)
-              {
-                HASH_MAP_ENTRY* holder = entries[j];
-                entries[j] = entries[j - 1];
-                entries[j - 1] = holder;
-              }
-          }
-      }
-#else
-    ACE_OS::qsort (entries, current_size,
-                   sizeof (HASH_MAP_ENTRY*), (ACE_COMPARE_FUNC)cpscmp);
-#endif /* ACE_LACKS_QSORT */
-  }
-
-
-  int
-  Transport_Cache_Manager::fill_set_i (DESCRIPTOR_SET& sorted_set)
-  {
-    int current_size = 0;
-    int cache_maximum = this->purging_strategy_->cache_maximum ();
-
-    // set sorted_set to 0.  This signifies nothing to purge.
-    sorted_set = 0;
-
-    // Do we need to worry about cache purging?
-    if (cache_maximum >= 0)
-      {
-        current_size = static_cast<int> (this->cache_map_.current_size ());
-
-        if (TAO_debug_level > 0)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport_Cache_Manager::fill_set_i, "
-                        "current_size = %d, cache_maximum = %d\n",
-                        current_size, cache_maximum));
-          }
-
-        if (current_size >= cache_maximum)
-          {
-            ACE_NEW_RETURN (sorted_set, HASH_MAP_ENTRY*[current_size], 0);
-
-            HASH_MAP_ITER iter = this->cache_map_.begin ();
-
-            for (int i = 0; i < current_size; ++i)
-              {
-                sorted_set[i] = &(*iter);
-                iter++;
-              }
-
-            this->sort_set (sorted_set, current_size);
-          }
-    }
-
-    return current_size;
-  }
-
-
-  int
-  Transport_Cache_Manager::wait_for_connection (Cache_ExtId &extid)
-  {
-    if (this->muxed_number_ && this->muxed_number_ == extid.index ())
-      {
-        // If we have a limit on the number of muxed connections for
-        // a particular endpoint just wait to get the connection
-        ++this->no_waiting_threads_;
-
-        if (TAO_debug_level > 2)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport_Cache_Manager"
-                        "::wait_for_connection, "
-                        "entering wait loop\n"));
-          }
-
-        int ready_togo = 0;
-
-        while (ready_togo == 0)
-          {
-            this->condition_->wait ();
-
-            // Check whether we are waiting for this connection
-            ready_togo = this->is_wakeup_useful (extid);
-          }
-
-        if (TAO_debug_level > 2)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) - Transport_Cache_Manager::wait_for_connection, "
-                      "left wait loop\n"));
-          }
-
-        // We are not waiting anymore
-        --this->no_waiting_threads_;
-      }
-
-    return 0;
-  }
-
-  int
-  Transport_Cache_Manager::is_wakeup_useful (Cache_ExtId &extid)
-  {
-    // Get the underlying property that we are looking for
-    TAO_Transport_Descriptor_Interface *prop = extid.property ();
-
-    // Just check the underlying property for equivalence. If the last
-    // connection that was returned  had the same property just return
-    // 1.
-    if (this->last_entry_returned_ &&
-        prop->is_equivalent (this->last_entry_returned_->property ()))
-      {
-        // Set the index to be right so that we can pick teh connection
-        // right away..
-        extid.index (this->last_entry_returned_->index ());
-
-        // There is no more use for it ...
-        this->last_entry_returned_ = 0;
-
-        return 1;
-      }
-
-    // If there  is an entry that was returned and if there are more
-    // threads just wake up the peer to check for the returned
-    // connection.
-    if (this->last_entry_returned_ &&
-        this->no_waiting_threads_ > 1)
-      {
-        this->condition_->signal ();
-      }
-
-    return 0;
-  }
-
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  // Instantiations for the Hash Map
-template class ACE_Equal_To<Cache_ExtId>;
-template class ACE_Hash<Cache_ExtId>;
-template class ACE_Hash_Map_Entry<Cache_ExtId, Cache_IntId>;
-template class ACE_Hash_Map_Manager_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>;
-template class ACE_Unbounded_Set<TAO_Connection_Handler*>;
-template class ACE_Unbounded_Set_Iterator<TAO_Connection_Handler*>;
-template class ACE_Node<TAO_Connection_Handler*>;
-template class ACE_Unbounded_Stack<TAO_Transport*>;
-template class ACE_Node <TAO_Transport *>;
-
-template class TAO_Condition<ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-  // Instantiations for the Hash Map
-#pragma instantiate ACE_Equal_To<Cache_ExtId>
-#pragma instantiate ACE_Hash<Cache_ExtId>
-#pragma instantiate ACE_Hash_Map_Entry<Cache_ExtId, Cache_IntId>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Unbounded_Set<TAO_Connection_Handler*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Connection_Handler*>
-#pragma instantiate ACE_Node<TAO_Connection_Handler*>
-#pragma instantiate ACE_Unbounded_Stack<TAO_Transport*>
-#pragma instantiate ACE_Node <TAO_Transport *>
-
-#pragma instantiate TAO_Condition<ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
deleted file mode 100644
index 7956e4bda45..00000000000
--- a/TAO/tao/Transport_Cache_Manager.h
+++ /dev/null
@@ -1,270 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Transport_Cache_Manager.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONNECTION_CACHE_MANAGER_H
-#define TAO_CONNECTION_CACHE_MANAGER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Null_Mutex.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define  ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager_T.h"
-
-#include "tao/Cache_Entries.h"
-#include "tao/orbconf.h"
-
-class ACE_Handle_Set;
-class TAO_Connection_Handler;
-class TAO_ORB_Core;
-class TAO_Resource_Factory;
-class TAO_Connection_Purging_Strategy;
-
-template <class ACE_COND_MUTEX> class TAO_Condition;
-template <class T> class ACE_Unbounded_Set;
-template <class T> class ACE_Unbounded_Set_Iterator;
-
-
-
-namespace TAO
-{
-  typedef ACE_Unbounded_Set<TAO_Connection_Handler*> Connection_Handler_Set;
-  /**
-   * @class Transport_Cache_Manager
-   *
-   * @brief The Transport Cache Manager for TAO
-   *
-   * This class provides interfaces associating a TAO_Cache_ExtId
-   * & TAO_Cache_IntId. This class is wrapper around the
-   * ACE_Hash_Map_Manager  class which is used as a container to Cache
-   * the connections. This class protects the entries with a lock. The
-   * map is updated only by holding the lock. The more compelling reason
-   * to have the lock in this class and not in the Hash_Map is that, we
-   * do quite a bit of work in this class for which we need a lock.
-   *
-   */
-  class TAO_Export Transport_Cache_Manager
-  {
-  public:
-    // Some useful typedef's
-    typedef ACE_Hash_Map_Manager_Ex <Cache_ExtId,
-                                     Cache_IntId,
-                                     ACE_Hash<Cache_ExtId>,
-                                     ACE_Equal_To<Cache_ExtId>,
-                                     ACE_Null_Mutex>
-    HASH_MAP;
-
-    typedef HASH_MAP::iterator HASH_MAP_ITER;
-
-    typedef ACE_Hash_Map_Entry <Cache_ExtId,
-                                Cache_IntId>
-    HASH_MAP_ENTRY;
-
-    typedef TAO_Condition<TAO_SYNCH_MUTEX> CONDITION;
-
-    // == Public methods
-    /// Constructor
-    Transport_Cache_Manager (TAO_ORB_Core &orb_core);
-
-    /// Destructor
-    virtual ~Transport_Cache_Manager (void);
-
-    /// Add the transport to the cache.
-    /**
-     * The transport has the property definition based on which caching
-     * can be done. This method marks the transport
-     * <CODE>ACE_RECYCLABLE_BUSY </CODE> which helps the threads
-     * opening up connections to use the  transport immediately.
-     */
-    int cache_transport (TAO_Transport_Descriptor_Interface *prop,
-                         TAO_Transport *transport);
-
-    /// Similar to the one above, but the transport is left in <CODE>
-    /// ENTRY_IDLE_AND_PURGABLE</CODE> state.
-    int cache_idle_transport (TAO_Transport_Descriptor_Interface *prop,
-                              TAO_Transport *transport);
-
-    /// Check the Transport Cache to check whether the connection exists
-    /// in the Cache and return the connection
-    int find_transport (TAO_Transport_Descriptor_Interface *prop,
-                        TAO_Transport *&transport);
-
-    /// Remove entries from the cache depending upon the strategy.
-    int purge (void);
-
-    /// Purge the entry from the Cache Map
-    int purge_entry (HASH_MAP_ENTRY *&);
-
-    /// Mark the entry as invalid for use but keep it in cache.
-    void mark_invalid (HASH_MAP_ENTRY *&);
-
-    /// Make the entry idle and ready for use.
-    int make_idle (HASH_MAP_ENTRY *&entry);
-
-    /// Mark the entry as touched. This call updates the purging
-    /// strategy policy information.
-    int update_entry (HASH_MAP_ENTRY *&entry);
-
-    /// Close the underlying hash map manager and return any handlers
-    /// still registered
-    int close (Connection_Handler_Set &handlers);
-
-    /// Return a set of connection handlers that belong to transports
-    /// that have a RW wait strategy.
-    /**
-     * This call is used for a specific use case by the ORB_Core
-     * during shutdown. The only way the ORB can wake up threads
-     * waiting on these sockstes for replies is to iterate over
-     * these blockable transports and close the socket
-     * handles. Without these the threads will continue to wait there
-     * for ever.
-     */
-    bool blockable_client_transports (Connection_Handler_Set &handlers);
-
-    /// Return the current size of the cache.
-    size_t current_size (void) const;
-
-    /// Return the total size of the cache.
-    size_t total_size (void) const;
-
-    /// Return the underlying cache map
-    HASH_MAP &map (void);
-
-  private:
-    /// Associate @a ext_id with @a int_id. Grabs the lock and calls the
-    /// implementation function bind_i.
-    int bind (Cache_ExtId &ext_id,
-              Cache_IntId &int_id);
-
-    /// Lookup entry<key,value> in the cache. Grabs the lock and calls the
-    /// implementation function find_i.
-    int find (const Cache_ExtId &key,
-              Cache_IntId &value);
-
-    /**
-     * Non-Locking version and actual implementation of bind ()
-     * call. Calls bind on the Hash_Map_Manager that it holds. If the
-     * bind succeeds, it adds the Hash_Map_Entry in to the
-     * Transport for its reference. If the bind fails because
-     * of an exiting entry, this method calls the get_last_index_bind
-     * ().
-     */
-    int bind_i (Cache_ExtId &ext_id,
-                Cache_IntId &int_id);
-
-    /**
-     * Non-locking version and actual implementation of find ()
-     * call. This calls the find () on the underlying
-     * Hash_Map_Manager. If the find succeeds, it calls the
-     * get_idle_transport ().
-     */
-    int find_i (const Cache_ExtId &key,
-                Cache_IntId &value);
-
-    /// Non-locking version and actual implementation of make_idle ().
-    int make_idle_i (HASH_MAP_ENTRY *&entry);
-
-    /// Non-locking version and actual implementation of close ()
-    int close_i (Connection_Handler_Set &handlers);
-
-    /// Purge the entry from the Cache Map
-    int purge_entry_i (HASH_MAP_ENTRY *&entry);
-
-    /// Mark the entry as invalid for use but keep it in cache.
-    void mark_invalid_i (HASH_MAP_ENTRY *&);
-
-  private:
-    /**
-     * This is called by the bind () call when a bind fails with a
-     * available entry. When a new connection is created in TAO with an
-     * already existing endpoint, in addition to an exisitng one, we
-     * mark the connections with an index. This method, finds out the
-     * last highest index and binds the entry with an index = (last
-     * highest index + 1).
-     */
-    int get_last_index_bind (Cache_ExtId &key,
-                             Cache_IntId &val,
-                             HASH_MAP_ENTRY *&entry);
-
-  /**
-   * Tries to find if the <int_id_> in entry is idle for use. If it is
-   * idle it is immediately markes as busy and returns a value of
-   * 1, else it returns a value of 0
-   */
-    bool is_entry_idle (HASH_MAP_ENTRY *&entry);
-
-#if !defined(ACE_LACKS_QSORT)
-    /// Used by qsort
-    static int cpscmp(const void* a, const void* b);
-#endif
-
-    typedef HASH_MAP_ENTRY** DESCRIPTOR_SET;
-
-    /// Sort the list of entries
-    void sort_set (DESCRIPTOR_SET& entries, int size);
-
-    /// Fill sorted_set in with the TAO_Transport_Descriptor_Interface's in
-    /// a sorted order.
-    int fill_set_i (DESCRIPTOR_SET& sorted_set);
-
-    /// Wait for connections if we have reached the limit on the number
-    /// of muxed connections. If not (ie. if we dont use a muxed
-    /// connection or if we have not reached the limit) this just
-    /// behaves as a no-op. <extid> has all the information about the
-    /// connection that is being searched.
-    int wait_for_connection (Cache_ExtId &extid);
-
-    /// Is the wakeup useful todo some work?
-    int is_wakeup_useful (Cache_ExtId &extid);
-
-    /// Non-locking version of blockable_client_transports ().
-    bool blockable_client_transports_i (Connection_Handler_Set &handlers);
-
-  private:
-    /// The percentage of the cache to purge at one time
-    int percent_;
-
-    /// The underlying connection purging strategy
-    TAO_Connection_Purging_Strategy *purging_strategy_;
-
-    /// The hash map that has the connections
-    HASH_MAP cache_map_;
-
-    /// The condition variable
-    CONDITION *condition_;
-
-    /// The lock that is used by the cache map
-    ACE_Lock *cache_lock_;
-
-    /// Number of allowed muxed connections
-    CORBA::ULong muxed_number_;
-
-    /// Number of threads waiting for connections
-    int no_waiting_threads_;
-
-    /// This is for optimization purposes. In a situation where number
-    /// of threads are waiting for connections, the last connection that
-    /// is put back is cached here. This should prevent all th threads
-    /// trying to search for their required entry.
-    Cache_ExtId *last_entry_returned_;
-  };
-
-}
-#if defined (__ACE_INLINE__)
-# include "tao/Transport_Cache_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_CONNECTION_CACHE_MANAGER_H*/
diff --git a/TAO/tao/Transport_Cache_Manager.inl b/TAO/tao/Transport_Cache_Manager.inl
deleted file mode 100644
index 08c81369837..00000000000
--- a/TAO/tao/Transport_Cache_Manager.inl
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-namespace TAO
-{
-  ACE_INLINE int
-  Transport_Cache_Manager::bind (Cache_ExtId &ext_id,
-                                 Cache_IntId &int_id)
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                              guard,
-                              *this->cache_lock_,
-                              -1));
-
-    return this->bind_i (ext_id,
-                         int_id);
-  }
-
-  ACE_INLINE int
-  Transport_Cache_Manager::cache_transport (
-    TAO_Transport_Descriptor_Interface *prop,
-    TAO_Transport *transport)
-  {
-    // Compose the ExternId & Intid
-    Cache_ExtId ext_id (prop);
-    Cache_IntId int_id (transport);
-
-    int retval = 0;
-    {
-      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                                guard,
-                                *this->cache_lock_,
-                                -1));
-
-      // Do as the semantics of this method dictates
-      int_id.recycle_state (ENTRY_BUSY);
-
-      retval = this->bind_i (ext_id,
-                             int_id);
-    }
-
-    return retval;
-  }
-
-  ACE_INLINE int
-  Transport_Cache_Manager::cache_idle_transport (
-    TAO_Transport_Descriptor_Interface *prop,
-    TAO_Transport *transport)
-  {
-    // Compose the ExternId & Intid
-    Cache_ExtId ext_id (prop);
-    Cache_IntId int_id (transport);
-
-    int retval = 0;
-    {
-      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                                guard,
-                                *this->cache_lock_,
-                                -1));
-
-      // Do as the semantics of this method dictates
-      int_id.recycle_state (ENTRY_IDLE_AND_PURGABLE);
-      retval = this->bind_i (ext_id,
-                             int_id);
-    }
-
-    return retval;
-  }
-
-  ACE_INLINE int
-  Transport_Cache_Manager::purge_entry (HASH_MAP_ENTRY *&entry)
-  {
-    // Double checked locking
-    if(entry == 0)
-      return 0;
-
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->cache_lock_, -1));
-
-    return this->purge_entry_i (entry);
-  }
-
-  ACE_INLINE void
-  Transport_Cache_Manager::mark_invalid (HASH_MAP_ENTRY *&entry)
-  {
-    if(entry == 0)
-      return;
-
-    // Double checked locking
-    ACE_MT (ACE_GUARD (ACE_Lock, guard, *this->cache_lock_));
-
-    this->mark_invalid_i (entry);
-  }
-
-  ACE_INLINE int
-  Transport_Cache_Manager::make_idle (HASH_MAP_ENTRY *&entry)
-  {
-    if(entry == 0)
-      return -1;
-
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, *this->cache_lock_, -1));
-    return this->make_idle_i (entry);
-  }
-
-  ACE_INLINE int
-  Transport_Cache_Manager::close (Connection_Handler_Set &handlers)
-  {
-    // The cache lock pointer should only be zero if
-    // Transport_Cache_Manager::open() was never called.  Note that
-    // only one thread opens the Transport_Cache_Manager at any given
-    // time, so it is safe to check for a non-zero lock pointer.
-    if (this->cache_lock_ == 0)
-      return -1;
-
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                              guard,
-                              *this->cache_lock_,
-                              -1));
-
-    return this->close_i (handlers);
-  }
-
-  ACE_INLINE bool
-  Transport_Cache_Manager::blockable_client_transports (
-    Connection_Handler_Set &handlers)
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                              guard,
-                              *this->cache_lock_,
-                              false));
-
-    return this->blockable_client_transports_i (handlers);
-  }
-
-  ACE_INLINE size_t
-  Transport_Cache_Manager::current_size (void) const
-  {
-    return this->cache_map_.current_size ();
-  }
-
-  ACE_INLINE size_t
-  Transport_Cache_Manager::total_size (void) const
-  {
-    return this->cache_map_.total_size ();
-  }
-
-  ACE_INLINE Transport_Cache_Manager::HASH_MAP &
-  Transport_Cache_Manager::map (void)
-  {
-    return this->cache_map_;
-  }
-}
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
deleted file mode 100644
index f88b55c0091..00000000000
--- a/TAO/tao/Transport_Connector.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-#include "Transport_Connector.h"
-#include "Transport.h"
-#include "ORB_Core.h"
-#include "MProfile.h"
-#include "Profile.h"
-#include "Environment.h"
-#include "Thread_Lane_Resources.h"
-#include "debug.h"
-#include "Connect_Strategy.h"
-#include "Client_Strategy_Factory.h"
-#include "Connection_Handler.h"
-#include "Profile_Transport_Resolver.h"
-#include "Wait_Strategy.h"
-#include "SystemException.h"
-
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Transport_Connector.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Connector,
-           "$Id$")
-
-// Connector
-TAO_Connector::TAO_Connector (CORBA::ULong tag)
-  : active_connect_strategy_ (0),
-    tag_(tag),
-    orb_core_ (0)
-{
-}
-
-TAO_Connector::~TAO_Connector (void)
-{
-  delete this->active_connect_strategy_;
-}
-
-TAO_Profile *
-TAO_Connector::corbaloc_scan (const char *str,
-                              size_t &len
-                              ACE_ENV_ARG_DECL)
-{
-  if (this->check_prefix (str) != 0)
-    return 0;
-  const char *comma_pos = ACE_OS::strchr (str,',');
-  const char *slash_pos = ACE_OS::strchr (str,'/');
-  if (comma_pos == 0 && slash_pos == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("(%P|%t) TAO_CONNECTOR::corbaloc_scan warning: ")
-                    ACE_TEXT("supplied string contains no comma or slash: %s\n"),
-                    str));
-      len = ACE_OS::strlen (str);
-    }
-  else if (comma_pos == 0 || comma_pos > slash_pos)
-    len = (slash_pos - str);
-  else len = comma_pos - str;
-  return this->make_profile(ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-int
-TAO_Connector::make_mprofile (const char *string,
-                              TAO_MProfile &mprofile
-                              ACE_ENV_ARG_DECL)
-{
-  // This method utilizes the "Template Method" design pattern to
-  // parse the given URL style IOR for the protocol being used
-  // and create an mprofile from it.
-  //
-  // The methods that must be defined by all Connector sub-classes are:
-  //      make_profile
-  //      check_prefix
-
-  // Check for a valid string
-  if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            0,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  if (this->check_prefix (string) != 0)
-    {
-      return 1;
-      // Failure: not the correct IOR for this protocol.
-      // DO NOT throw an exception here since the Connector_Registry
-      // should be allowed the opportunity to continue looking for
-      // an appropriate connector.
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ")
-                  ACE_TEXT ("<%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (string)));
-    }
-
-  ACE_CString ior;
-
-  ior.set (string, ACE_OS::strlen (string), 1);
-
-  // Find out where the protocol ends
-  int ior_index = ior.find ("://");
-
-  if (ior_index == ACE_CString::npos)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-      // No colon ':' in the IOR!
-    }
-  else
-    {
-      ior_index += 3;
-      // Add the length of the colon and the two forward slashes `://'
-      // to the IOR string index (i.e. 3)
-    }
-
-  // Find the object key
-  const int objkey_index =
-    ior.find (this->object_key_delimiter (), ior_index);
-
-  if (objkey_index == 0 || objkey_index == ACE_CString::npos)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-      // Failure: No endpoints specified or no object key specified.
-    }
-
-  const char endpoint_delimiter = ',';
-  // The delimiter used to seperate inidividual addresses.
-
-  // Count the number of endpoints in the IOR.  This will be the number
-  // of entries in the MProfile.
-
-  CORBA::ULong profile_count = 1;
-  // Number of endpoints in the IOR  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (int i = ior_index; i < objkey_index; ++i)
-    {
-      if (ior[i] == endpoint_delimiter)
-        ++profile_count;
-    }
-
-  // Tell the MProfile object how many Profiles it should hold.
-  // MProfile::set(size) returns the number profiles it can hold.
-  if (mprofile.set (profile_count) != static_cast<int> (profile_count))
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_MPROFILE_CREATION_ERROR,
-                            0),
-                          CORBA::COMPLETED_NO),
-                        -1);
-      // Error while setting the MProfile size!
-    }
-
-  // The idea behind the following loop is to split the IOR into several
-  // strings that can be parsed by each profile.
-  // For example,
-  //    `1.3@moo,shu,1.1@chicken/arf'
-  // will be parsed into:
-  //    `1.3@moo/arf'
-  //    `shu/arf'
-  //    `1.1@chicken/arf'
-
-  int begin = 0;
-  int end = ior_index - 1;
-  // Initialize the end of the endpoint index
-
-  for (CORBA::ULong j = 0; j < profile_count; ++j)
-    {
-      begin = end + 1;
-
-      if (j < profile_count - 1)
-        {
-          end = ior.find (endpoint_delimiter, begin);
-        }
-      else
-        {
-          end = objkey_index;  // Handle last endpoint differently
-        }
-
-      if (end < static_cast<int> (ior.length ()) && end != ior.npos)
-        {
-          ACE_CString endpoint = ior.substring (begin, end - begin);
-
-          // Add the object key to the string.
-          endpoint += ior.substring (objkey_index);
-
-          // The endpoint should now be of the form:
-          //    `N.n@endpoint/object_key'
-          // or
-          //    `endpoint/object_key'
-
-          TAO_Profile *profile =
-            this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-          // Failure:  Problem during profile creation
-
-          // Initialize a Profile using the individual endpoint
-          // string.
-          // @@ Not exception safe!  We need a TAO_Profile_var!
-          profile->parse_string (endpoint.c_str ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          // Give up ownership of the profile.
-          if (mprofile.give_profile (profile) == -1)
-            {
-              profile->_decr_refcnt ();
-
-              ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                                  CORBA::SystemException::_tao_minor_code (
-                                     TAO_MPROFILE_CREATION_ERROR,
-                                     0),
-                                  CORBA::COMPLETED_NO),
-                                -1);
-              // Failure presumably only occurs when MProfile is full!
-              // This should never happen.
-            }
-        }
-      else
-        {
-          ACE_THROW_RETURN (CORBA::INV_OBJREF (), -1);
-          // Unable to seperate endpoints
-        }
-    }
-
-  return 0;  // Success
-}
-
-
-TAO_Transport*
-TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
-                        TAO_Transport_Descriptor_Interface *desc,
-                        ACE_Time_Value *timeout
-                        ACE_ENV_ARG_DECL)
-{
-  if (desc == 0 ||
-      (this->set_validate_endpoint (desc->endpoint ()) == -1))
-    return 0;
-
-  TAO_Transport *base_transport = 0;
-
-  TAO::Transport_Cache_Manager &tcm =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Check the Cache first for connections
-  // If transport found, reference count is incremented on assignment
-  // @@todo: We need to send the timeout value to the cache registry
-  // too. That should be the next step!
-  if (tcm.find_transport (desc,
-                          base_transport) != 0)
-    {
-      // @@TODO: This is not the right place for this!
-      // Purge connections (if necessary)
-      tcm.purge ();
-
-      TAO_Transport* t = this->make_connection (r,
-                                                *desc,
-                                                timeout);
-
-      if (t == 0)
-        return t;
-
-      t->opened_as (TAO::TAO_CLIENT_ROLE);
-
-      if (TAO_debug_level > 4)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Connector::connect, "
-                    "opening Transport[%d] in TAO_CLIENT_ROLE\n",
-                    t->id ()));
-
-      // Call post connect hook. If the post_connect_hook () returns
-      // false, just purge the entry.
-      if (!t->post_connect_hook ())
-        {
-          (void) t->purge_entry ();
-
-          // Call connect again
-          return this->connect (r,
-                                desc,
-                                timeout
-                                ACE_ENV_ARG_PARAMETER);
-        }
-
-      return t;
-    }
-
-  if (TAO_debug_level > 4)
-    {
-      TAO::Connection_Role cr =
-        base_transport->opened_as ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport_Connector::connect, "
-                  "got an existing %s Transport[%d] in role %s\n",
-                  base_transport->is_connected () ? "connected" : "unconnected",
-                  base_transport->id (),
-                  cr == TAO::TAO_SERVER_ROLE ? "TAO_SERVER_ROLE" :
-                  cr == TAO::TAO_CLIENT_ROLE ? "TAO_CLIENT_ROLE" :
-                  "TAO_UNSPECIFIED_ROLE" ));
-    }
-
-  // If connected return..
-  if (base_transport->is_connected ())
-    return base_transport;
-
-  if (!this->wait_for_connection_completion (r,
-                                             base_transport,
-                                             timeout))
-    {
-      if (TAO_debug_level > 2)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Connector::"
-                    "connect, "
-                    "wait for completion failed\n"));
-      return 0;
-    }
-
-  if (base_transport->is_connected () &&
-      base_transport->wait_strategy ()->register_handler () != 0)
-    {
-      // Registration failures.
-
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      (void) base_transport->purge_entry ();
-
-      // Close the handler.
-      (void) base_transport->close_connection ();
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO (%P|%t) - Transport_Connector [%d]::connect, "
-                    "could not register the transport "
-                    "in the reactor.\n",
-                    base_transport->id ()));
-
-      return 0;
-    }
-
-  return base_transport;
-}
-
-bool
-TAO_Connector::wait_for_connection_completion (
-    TAO::Profile_Transport_Resolver *r,
-    TAO_Transport *&transport,
-    ACE_Time_Value *timeout)
-{
-  if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, "
-                  "going to wait for connection completion on transport"
-                  "[%d]\n",
-                  transport->id ()));
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked_connect ())
-    {
-      timeout = &tmp_zero;
-    }
-
-  // Wait until the connection is ready, when non-blocking we just do a wait
-  // with zero time
-  int result =
-    this->active_connect_strategy_->wait (
-      transport,
-      timeout);
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - Transport_Connector::wait_for_connection_completion, "
-                "transport [%d], wait done result = %d\n",
-                transport->id (), result));
-
-  // There are three possibilities when wait() returns: (a)
-  // connection succeeded; (b) connection failed; (c) wait()
-  // failed because of some other error.  It is easy to deal with
-  // (a) and (b).  (c) is tricky since the connection is still
-  // pending and may get completed by some other thread.  The
-  // following method deals with (c).
-
-  if (result == -1)
-    {
-      if (!r->blocked_connect () && errno == ETIME)
-        {
-          // If we did a non blocking connect, just ignore
-          // any timeout errors
-          result = 0;
-        }
-      else
-        {
-          // When we need to get a connected transport
-          result =
-            this->check_connection_closure (
-              transport->connection_handler ());
-        }
-
-      // In case of errors.
-      if (result == -1)
-        {
-          // Report that making the connection failed, don't print errno
-          // because we touched the reactor and errno could be changed
-          if (TAO_debug_level > 2)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) - Transport_Connector::"
-                        "wait_for_connection_completion, "
-                        "transport [%d], wait for completion failed\n",
-                        transport->id()));
-
-          // Set transport to zero, it is not usable
-          transport = 0;
-
-          return false;
-        }
-    }
-
-  // Fix for a subtle problem. What happens if we are supposed to do
-  // blocked connect but the transport is NOT connected? Force close
-  // the connections
-  if (r->blocked_connect () && !transport->is_connected ())
-    {
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Transport_Connector::"
-                    "wait_for_connection_completion, "
-                    "no connected transport for a blocked connection, "
-                    "cancelling connections and reverting things \n"));
-
-      // Forget the return value. We are busted anyway. Try our best
-      // here.
-      (void) this->cancel_svc_handler (transport->connection_handler ());
-      transport = 0;
-      return false;
-    }
-
-  // Connection may not ready for SYNC_NONE cases but we can use this
-  // transport, if we need a connected one we will block later to make
-  // sure it is connected
-  return true;
-}
-
-int
-TAO_Connector::create_connect_strategy (void)
-{
-  if (this->active_connect_strategy_ == 0)
-    {
-      this->active_connect_strategy_ =
-        this->orb_core_->client_factory ()->create_connect_strategy (
-          this->orb_core_);
-    }
-
-  if (this->active_connect_strategy_ == 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-TAO_Connector::check_connection_closure (
-  TAO_Connection_Handler *connection_handler)
-{
-  int result = -1;
-
-  // Check if the handler has been closed.
-  bool closed =
-    connection_handler->is_closed ();
-
-  // In case of failures and close() has not be called.
-  if (!closed)
-    {
-      // First, cancel from connector.
-      if (this->cancel_svc_handler (connection_handler) == -1)
-        return -1;
-
-      // Double check to make sure the handler has not been closed
-      // yet.  This double check is required to ensure that the
-      // connection handler was not closed yet by some other
-      // thread since it was still registered with the connector.
-      // Once connector.cancel() has been processed, we are
-      // assured that the connector will no longer open/close this
-      // handler.
-      closed = connection_handler->is_closed ();
-
-      // If closed, there is nothing to do here.  If not closed,
-      // it was either opened or is still pending.
-      if (!closed)
-        {
-          // Check if the handler has been opened.
-          const bool open = connection_handler->is_open ();
-
-          // Some other thread was able to open the handler even
-          // though wait failed for this thread.
-          if (open)
-            {
-              // Set the result to 0, we have an open connection
-              result = 0;
-            }
-          else
-            {
-              // Assert that it is still connecting.
-              ACE_ASSERT (connection_handler->is_connecting ());
-
-              // Force close the handler now.
-              connection_handler->close_handler ();
-            }
-        }
-    }
-
-  return result;
-}
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
deleted file mode 100644
index e05a3c1eed3..00000000000
--- a/TAO/tao/Transport_Connector.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Transport_Connector.h
- *
- *  $Id$
- *
- *  Define the interface for the Connector component in TAO's
- *  pluggable protocol framework.
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CONNECTOR_H
-#define TAO_CONNECTOR_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TAO_Export.h"
-#include "Basic_Types.h"
-
-class ACE_Time_Value;
-class TAO_Transport_Descriptor_Interface;
-class TAO_InputCDR;
-class TAO_Endpoint;
-class TAO_Profile;
-class TAO_MProfile;
-class TAO_ORB_Core;
-class TAO_Connect_Strategy;
-class TAO_Transport;
-class TAO_Connection_Handler;
-
-namespace TAO
-{
-  class Profile_Transport_Resolver;
-}
-
-namespace CORBA
-{
-  class Environment;
-}
-/**
- * @class TAO_Connector
- *
- * @brief Generic Connector interface definitions.
- *
- * Base class for connector bridge object.
- *
- * @todo Need to rename the class as TAO_Transport_Connector.
- */
-class TAO_Export TAO_Connector
-{
-public:
-
-  /// Default constructor.
-  TAO_Connector (CORBA::ULong tag);
-
-  /// The destructor.
-  virtual ~TAO_Connector (void);
-
-  /**
-   * The tag identifying the specific ORB transport layer protocol.
-   * For example IOP::TAG_INTERNET_IOP == 0.  The tag is used in the
-   * IOR to identify the type of profile included. IOR -> {{tag0,
-   * profile0} {tag1, profile1} ...}.  The IOP module defines the
-   * ProfileId typedef to be a CORBA::ULong.
-   */
-  CORBA::ULong tag (void) const;
-
-  /// Parse a string containing a URL style IOR and return an
-  /// MProfile.  Verify that ior is in the correct format.
-  int make_mprofile (
-      const char *ior,
-      TAO_MProfile &mprofile
-      ACE_ENV_ARG_DECL);
-
-  /// Helper function to assist corbaloc parsing. The default simply validates
-  /// the protocol identifyier and scans up to the next comma or slash.
-  /// Any protocol that has a specific need, such as uiop, can override this
-  /// method to  provide a custom scanner.
-  /// The profile returned is either null if this the ior does not match or an
-  /// empty profile of the correct type, obtained from make_profile().
-  virtual TAO_Profile * corbaloc_scan (const char *ior,
-                                       size_t &len
-                                       ACE_ENV_ARG_DECL);
-
-  ///  Initialize object and register with reactor.
-  virtual int open (
-      TAO_ORB_Core *orb_core) = 0;
-
-  /// Shutdown Connector bridge and concrete Connector.
-  virtual int close (void) = 0;
-
-  /**
-   * To support pluggable we need to abstract away the details of the
-   * connect ()  method so it can be called from the invocation code
-   * independent of the actual transport protocol in use.
-   */
-  virtual TAO_Transport* connect (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface *desc,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL);
-
-  /// Create a profile for this protocol and initialize it based on the
-  /// encapsulation in @a cdr
-  virtual TAO_Profile *create_profile (
-      TAO_InputCDR& cdr) = 0;
-
-  /// Check that the prefix of the provided endpoint is valid for use
-  /// with a given pluggable protocol.
-  virtual int check_prefix (
-      const char *endpoint) = 0;
-
-  /// Return the object key delimiter to use or expect.
-  virtual char object_key_delimiter (void) const = 0;
-
-protected:
-
-  /// Create a profile with a given endpoint.
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0;
-
-  /// Set and validate endpoint. We need to do this to initialize our
-  /// remote *_Addr's which have not been done during IOR decode.
-  virtual int set_validate_endpoint (TAO_Endpoint *endpoint) = 0;
-
-  /// Make a connection
-  virtual TAO_Transport* make_connection (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface &desc,
-      ACE_Time_Value *timeout) = 0;
-
-  /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (
-      TAO_Connection_Handler *svc_handler) = 0;
-
-  /// Check whether the connection is not closed
-  /**
-   * @retval 0 The connection happens to be not closed, but is now open
-   * because an other thread managed to open the handler
-   * @retval -1 The connection is closed
-   */
-  virtual int check_connection_closure (
-      TAO_Connection_Handler *connection_handler);
-
-  /**
-   * Wait for connection completion. We have a transport that is not
-   * connected yet, wait until it is connected.
-   * @retval true When we could use @a transport
-   * @return false When we can't use the @a transport
-   */
-  virtual bool wait_for_connection_completion(
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport *&transport,
-      ACE_Time_Value *timeout);
-
-  /// Set the ORB Core pointer
-  void orb_core (TAO_ORB_Core *orb_core);
-
-  /// Create a connect strategy
-  int create_connect_strategy (void);
-
-  /// Return the TAO_ORB_Core pointer
-  TAO_ORB_Core *orb_core (void);
-
-protected:
-
-  /// The (a)synch connect strategy
-  TAO_Connect_Strategy *active_connect_strategy_;
-
-private:
-
-  /// IOP protocol tag.
-  CORBA::ULong tag_;
-
-  /// Pointer to our ORB core
-  TAO_ORB_Core *orb_core_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "Transport_Connector.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_CONNECTOR_H*/
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
deleted file mode 100644
index c25d96057fb..00000000000
--- a/TAO/tao/Transport_Connector.inl
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- C++ -*-
-// $Id$
-ACE_INLINE TAO_ORB_Core *
-TAO_Connector::orb_core (void)
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE void
-TAO_Connector::orb_core (TAO_ORB_Core *orb_core)
-{
-  this->orb_core_ = orb_core;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Connector::tag (void) const
-{
-  return this->tag_;
-}
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
deleted file mode 100644
index 6882cc3b8a6..00000000000
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "tao/Transport_Descriptor_Interface.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Transport_Descriptor_Interface.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "tao/Endpoint.h"
-
-ACE_RCSID (tao,
-           Transport_Descriptor_Interface,
-           "$Id$")
-
-TAO_Transport_Descriptor_Interface::
-    ~TAO_Transport_Descriptor_Interface (void)
-{
-  if (this->endpoint_from_heap_)
-    {
-      delete this->endpoint_;
-    }
-}
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
deleted file mode 100644
index 7eba381787f..00000000000
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-// ===================================================================
-/**
- *  @file   Transport_Descriptor_Interface.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_CONNECTION_DESCRIPTOR_INTERFACE_H
-#define TAO_CONNECTION_DESCRIPTOR_INTERFACE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_Endpoint;
-
-/**
- * @class TAO_Transport_Descriptor_Interface
- *
- * @brief An abstract base class for Transport Property
- *
- * This class provides an abstract interface and holds minimal info
- * on which the Transport Caching scheme is based on. Concrete
- * connection properties can be got by inheriting from this class and
- * implementing the virtual functions.
- * Note 1: Additional properties for connection like Qos,
- * Priority that the RT folks would need, can be added by
- * inheriting from this class and providing the following
- * methods.
- * 1. duplicate ()
- * 2. is_equivalent ()
- * 3. hash ()
- */
-class TAO_Export TAO_Transport_Descriptor_Interface
-{
-public:
-  /// Destructor
-  virtual ~TAO_Transport_Descriptor_Interface (void);
-
-  /// This call allocates and copies the contents of this class and
-  /// returns the pointer
-  virtual  TAO_Transport_Descriptor_Interface *duplicate (void) = 0;
-
-  /// Try to determine if this object is same as the @a other_prop.
-  virtual CORBA::Boolean is_equivalent (
-      const TAO_Transport_Descriptor_Interface *other_prop) = 0;
-
-  /// Generate hash value for our class
-  virtual u_long hash (void) const = 0;
-
-  /// Return the underlying endpoint object
-  TAO_Endpoint *endpoint (void);
-
-  /// Set the BiDir flag
-  void set_bidir_flag (CORBA::Boolean flag);
-
-protected:
-  /// Default Constructor
-  TAO_Transport_Descriptor_Interface (void);
-
-  /// Constructor
-  TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
-                                      CORBA::Boolean flag = 0);
-
-  /// The base property of the connection ie. the peer's endpoint
-  TAO_Endpoint *endpoint_;
-
-  /// Should the endpoint be used in either direction?
-  CORBA::Boolean bidir_flag_;
-
-  /// Is the endpoint allocated on the heap? If so, we will have to
-  /// delete it when we destruct ourselves.
-  CORBA::Boolean endpoint_from_heap_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Transport_Descriptor_Interface.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_CONNECTION_DESCRIPTOR_INTERFACE_H*/
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
deleted file mode 100644
index 97bcf5291f4..00000000000
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ /dev/null
@@ -1,34 +0,0 @@
-//$Id$
-
-ACE_INLINE
-TAO_Transport_Descriptor_Interface::
-    TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
-                                        CORBA::Boolean flag)
-      : endpoint_ (endpoint),
-        bidir_flag_ (0),
-        endpoint_from_heap_ (flag)
-{
-}
-
-ACE_INLINE
-TAO_Transport_Descriptor_Interface::
-    TAO_Transport_Descriptor_Interface (void)
-      : endpoint_ (0),
-        bidir_flag_ (0),
-        endpoint_from_heap_ (0)
-{
-}
-
-
-ACE_INLINE TAO_Endpoint *
-TAO_Transport_Descriptor_Interface::endpoint (void)
-{
-  return this->endpoint_;
-}
-
-
-ACE_INLINE void
-TAO_Transport_Descriptor_Interface::set_bidir_flag (CORBA::Boolean flag)
-{
-  this->bidir_flag_ = flag;
-}
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
deleted file mode 100644
index e11ed482657..00000000000
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-#include "tao/Transport_Mux_Strategy.h"
-
-ACE_RCSID (tao,
-           Transport_Mux_Strategy,
-           "$Id$")
-
-TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy (
-  TAO_Transport *transport)
-  : transport_ (transport)
-  , lock_ (0)
-{
-}
-
-TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void)
-{
-}
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
deleted file mode 100644
index 9e019e5311c..00000000000
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Transport_Mux_Strategy.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRANSPORT_MUX_STRATEGY_H
-#define TAO_TRANSPORT_MUX_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-class TAO_Reply_Dispatcher;
-class TAO_Transport;
-class TAO_Pluggable_Reply_Params;
-class ACE_Lock;
-
-/**
- * @class TAO_Transport_Mux_Strategy
- *
- * @brief Strategy to determine whether the connection should be
- * multiplexed for multiple requests or it is exclusive for a
- * single request at a time.
- *
- */
-class TAO_Export TAO_Transport_Mux_Strategy
-{
-
-public:
-  /// Base class constructor.
-  TAO_Transport_Mux_Strategy (TAO_Transport *transport);
-
-  /// Base class destructor.
-  virtual ~TAO_Transport_Mux_Strategy (void);
-
-  /// Generate and return an unique request id for the current
-  /// invocation.
-  virtual CORBA::ULong request_id (void) = 0;
-
-  // = Bind and Find methods for the <Request ID, ReplyDispatcher>
-  //   pairs.
-
-  /// Bind the dispatcher with the request id. Commonalities in the
-  /// derived class implementations is kept here.
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_Reply_Dispatcher *rd) = 0;
-
-  /**
-   * Unbind the dispatcher, the client is no longer waiting for the
-   * request, for example, because the request timedout.
-   * The strategy can (must) cleanup any resources associated with the
-   * request.
-   * A later reply for that request should be ignored.
-   */
-  virtual int unbind_dispatcher (CORBA::ULong request_id) = 0;
-
-  /// Dispatch the reply for <request_id>, cleanup any resources
-  /// allocated for that request.
-  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params) = 0;
-
-  /// Request has been just sent, but the reply is not received. Idle
-  /// the transport now. The return value indicates whether idling was
-  /// successful or not.
-  virtual bool idle_after_send (void) = 0;
-
-  /// Request is sent and the reply is received. Idle the transport
-  /// now. The return value indicates whether idling was successful or
-  /// not.
-  virtual bool idle_after_reply (void) = 0;
-
-  /// The transport object has closed the connection, inform all Reply
-  /// dispatchers and waiting strategies.
-  virtual void connection_closed (void) = 0;
-
-protected:
-  /// Cache the transport reference.
-  TAO_Transport *transport_;
-
-  /// Lock to protect the state of the object
-  ACE_Lock *lock_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TRANSPORT_MUX_STRATEGY_H */
diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp
deleted file mode 100644
index 0d592fb8459..00000000000
--- a/TAO/tao/Transport_Timer.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Transport_Timer.h"
-#include "Transport.h"
-
-ACE_RCSID (tao, 
-           Transport_Timer, 
-           "$Id$")
-
-TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport)
-  : transport_ (transport)
-{
-}
-
-int
-TAO_Transport_Timer::handle_timeout (const ACE_Time_Value &current_time,
-                                     const void *act)
-{
-  return this->transport_->handle_timeout (current_time, act);
-}
diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h
deleted file mode 100644
index b951456e0cb..00000000000
--- a/TAO/tao/Transport_Timer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Transport_Timer.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRANSPORT_TIMER_H
-#define TAO_TRANSPORT_TIMER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Event_Handler.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TAO_Export.h"
-
-class TAO_Transport;
-
-/**
- * @class TAO_Transport_Timer
- *
- * @brief Allows TAO_Transport instances to receive timeout
- *        notifications from the Reactor.  In other words, implements
- *        the Adapter Role, of the Adapter Pattern, where the Adaptee
- *        is a TAO_Transport and the client is the Reactor.
- *
- */
-class TAO_Export TAO_Transport_Timer : public ACE_Event_Handler
-{
-public:
-  /// Constructor
-  /**
-   * @param transport The adaptee
-   */
-  TAO_Transport_Timer (TAO_Transport *transport);
-
-  /// Receive timeout events from the Reactor and forward them to the
-  /// TAO_Transport
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
-private:
-  /// The Adaptee
-  TAO_Transport *transport_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_TRANSPORT_TIMER_H */
diff --git a/TAO/tao/True_RefCount_Policy.cpp b/TAO/tao/True_RefCount_Policy.cpp
deleted file mode 100644
index 3b5b3fab354..00000000000
--- a/TAO/tao/True_RefCount_Policy.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "True_RefCount_Policy.h"
-
-#ifndef  __ACE_INLINE__
-# include  "True_RefCount_Policy.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           True_RefCount_Policy,
-           "$Id$")
-
-
-TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
-{
-}
diff --git a/TAO/tao/True_RefCount_Policy.h b/TAO/tao/True_RefCount_Policy.h
deleted file mode 100644
index 64efa5220f5..00000000000
--- a/TAO/tao/True_RefCount_Policy.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    True_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's true reference count policy (unrelated to
- *  CORBA policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRUE_REFCOUNT_POLICY_H
-#define TAO_TRUE_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#include "ace/Thread_Mutex.h"
-
-
-namespace TAO
-{
-  /**
-   * @class True_RefCount_Policy
-   *
-   * @brief True reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that requires true/functional reference
-   * counting.  That class would then inherit privately from it like
-   * so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::True_RefCount_Policy> MyRefCountedClass;
-   *   MyRefCountedClass * p = new MyRefCountedClass;
-   *   ...
-   *   p->my_remove_ref ();
-   * @endcode
-   *
-   * @note Ideally, the host class should declare a protected
-   *       destructor to enforce proper memory management through the
-   *       reference counting mechanism, i.e. to prevent clients from
-   *       calling @c operator @c delete() directly on the host class
-   *       object.
-   */
-  class TAO_Export True_RefCount_Policy
-  {
-  public:
-
-    /// Increase the reference count on this object.
-    void add_ref (void);
-
-    /// Decrease the reference count on this object.
-    /**
-     * Decrease the reference count on this object.  Once the
-     * reference count drops to zero, call @c operator @c delete()
-     * on this object.
-     */
-    void remove_ref (void);
-
-  protected:
-
-    /// Constructor.
-    /**
-     * @note This constructor is protected since it not meant to be
-     *       instantiated/used as a standalone object.
-     */
-    True_RefCount_Policy (void);
-
-    /// Destructor.
-    /**
-     * @note The destructor must be virtual to ensure that subclass
-     *       destructors are called when the reference count drops to
-     *       zero, i.e. when @c remove_ref() calls @c operator
-     *       @c delete @c this.
-     */
-    virtual ~True_RefCount_Policy (void);
-
-  private:
-
-    /// Lock used to synchronize reference count.
-    TAO_SYNCH_MUTEX lock_;
-
-    /// Reference count.
-    unsigned int refcount_;
-
-  };
-
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/True_RefCount_Policy.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRUE_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/True_RefCount_Policy.inl b/TAO/tao/True_RefCount_Policy.inl
deleted file mode 100644
index a6db939e129..00000000000
--- a/TAO/tao/True_RefCount_Policy.inl
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-#include "ace/Guard_T.h"
-
-
-ACE_INLINE
-TAO::True_RefCount_Policy::True_RefCount_Policy (void)
-  : lock_ (),
-    refcount_ (1)
-{
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
-
-  ++this->refcount_;
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
-
-    --this->refcount_;
-
-    if (this->refcount_ != 0)
-      return;
-  }
-
-  delete this;
-}
diff --git a/TAO/tao/TypeCode.cpp b/TAO/tao/TypeCode.cpp
deleted file mode 100644
index ac3f034832b..00000000000
--- a/TAO/tao/TypeCode.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// $Id$
-
-#include "TypeCode.h"
-
-
-ACE_RCSID (tao,
-           TypeCode,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "TypeCode.inl"
-#endif /* ! __ACE_INLINE__ */
-
-#include "SystemException.h"
-#include "CDR.h"
-#include "ORB_Constants.h"
-
-#include "debug.h"
-
-#include "ace/OS_NS_string.h"
-
-
-CORBA::TypeCode::~TypeCode (void)
-{
-}
-
-bool
-CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const
-{
-  return cdr << this->kind_;
-}
-
-CORBA::Boolean
-CORBA::TypeCode::equal (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const
-{
-  if (this == tc)
-    {
-      return true;
-    }
-  else if (CORBA::is_nil (tc))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_kind != this->kind_)
-    return 0;
-
-  ACE_TRY
-    {
-      char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (this_id, tc_id) != 0)
-        return 0;
-
-      char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strcmp (this_name, tc_name) != 0)
-        return 0;
-    }
-  ACE_CATCH (CORBA::TypeCode::BadKind, ex)
-    {
-      // Some TypeCodes do not support the id() and name()
-      // operations.  Ignore the failure, and continue equality
-      // verification using TypeCode subclass-specific techniques
-      // below.
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::TypeCode::equivalent (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const
-{
-  if (this == tc)
-    {
-      return true;
-    }
-  else if (CORBA::is_nil (tc))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  CORBA::TypeCode_ptr const mutable_this =
-    const_cast<CORBA::TypeCode_ptr> (this);
-
-  CORBA::TypeCode_var unaliased_this =
-    TAO::unaliased_typecode (mutable_this
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-
-  CORBA::TCKind const this_kind =
-    unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::TCKind const tc_kind =
-    unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_kind != this_kind)
-    return false;
-
-  ACE_TRY
-    {
-      char const * const this_id =
-        unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      char const * const tc_id =
-        unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ACE_OS::strlen (this_id) == 0
-          || ACE_OS::strlen (tc_id) == 0)
-        {
-          return this->equivalent_i (unaliased_tc.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-        }
-      else if (ACE_OS::strcmp (this_id, tc_id) != 0)
-        {
-          return false;
-        }
-    }
-  ACE_CATCH (CORBA::TypeCode::BadKind, ex)
-    {
-      // Some TypeCodes do not support the id() operation.  Ignore the
-      // failure, and continue equivalence verification using TypeCode
-      // subclass-specific techniques.
-      return this->equivalent_i (unaliased_tc.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
-
-  return true;
-}
-
-char const *
-CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-char const *
-CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::ULong
-CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-char const *
-CORBA::TypeCode::member_name_i (CORBA::ULong /* index */
-                                ACE_ENV_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type_i (CORBA::ULong /* index */
-                                ACE_ENV_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
-}
-
-CORBA::Any *
-CORBA::TypeCode::member_label_i (CORBA::ULong /* index */
-                                 ACE_ENV_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
-}
-
-CORBA::Long
-CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::ULong
-CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
-}
-
-CORBA::UShort
-CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::UShort
-CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
-}
-
-CORBA::Visibility
-CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */
-                                      ACE_ENV_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::PRIVATE_MEMBER);
-}
-
-CORBA::ValueModifier
-CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::VM_NONE);
-}
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
-                    CORBA::TypeCode::_nil ());
-}
-
-// ---------------------------------------------------------------
-
-CORBA::TypeCode::Bounds::Bounds (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
-                          "Bounds")
-{
-}
-
-CORBA::TypeCode::Bounds*
-CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
-{
-   return dynamic_cast <CORBA::TypeCode::Bounds*> (ex);
-}
-
-CORBA::Exception *
-CORBA::TypeCode::Bounds::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::TypeCode::Bounds::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (result,
-                  CORBA::TypeCode::Bounds (*this),
-                  0);
-  return result;
-}
-
-void
-CORBA::TypeCode::Bounds::_raise (void) const
-{
-  TAO_RAISE(*this);
-}
-
-void
-CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
-                                      ACE_ENV_ARG_DECL) const
-{
-  if (cdr << this->_rep_id ())
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &
-                                      ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-// ****************************************************************
-
-CORBA::TypeCode::BadKind::BadKind (void)
-  : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
-                          "BadKind")
-{
-}
-
-CORBA::TypeCode::BadKind*
-CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
-{
-  return dynamic_cast <CORBA::TypeCode::BadKind*> (ex);
-}
-
-CORBA::Exception *
-CORBA::TypeCode::BadKind::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (result,
-                  CORBA::TypeCode::BadKind (*this),
-                  0);
-  return result;
-}
-
-void
-CORBA::TypeCode::BadKind::_raise (void) const
-{
-  TAO_RAISE(*this);
-}
-
-void
-CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
-                                       ACE_ENV_ARG_DECL) const
-{
-  if (cdr << this->_rep_id ())
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void
-CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &
-                                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-// ---------------------------------------------------------------
-
-bool
-TAO::TypeCode::marshal (TAO_OutputCDR & cdr,
-                        CORBA::TypeCode_ptr tc,
-                        CORBA::ULong offset)
-{
-  // Marshal the TypeCode TCKind and TypeCode body.
-  //
-  // Update the offset value in case a recursive TypeCode is being
-  // marshaled.
-
-  return
-    tc != 0
-    && tc->tao_marshal_kind (cdr)
-    && tc->tao_marshal (cdr, aligned_offset (offset) + sizeof (CORBA::ULong));
-}
-
-CORBA::ULong
-TAO::TypeCode::aligned_offset (CORBA::ULong offset)
-{
-  ptrdiff_t const unaligned_offset =
-    static_cast<ptrdiff_t> (offset);
-
-  return
-    static_cast<CORBA::ULong> (ACE_align_binary (unaligned_offset,
-                                                 ACE_CDR::LONG_ALIGN));
-}
-
-// ---------------------------------------------------------------
-
-CORBA::TypeCode_ptr
-TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
-                         ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (tc))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
-
-  if (tc_kind == CORBA::tk_alias)
-    {
-      CORBA::TypeCode_var tc_content =
-        CORBA::TypeCode::_duplicate (tc);
-
-      // Iterate until we get to the actual unaliased type.
-      do
-        {
-          tc_content =
-            tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
-
-          tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
-        }
-      while (tc_kind == CORBA::tk_alias);
-
-      return tc_content._retn ();
-    }
-
-  return CORBA::TypeCode::_duplicate (tc);
-}
-
-// =========================================================
-
-// Traits specializations for CORBA::TypeCode.
-namespace TAO
-{
-  CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p)
-  {
-    return CORBA::TypeCode::_duplicate (p);
-  }
-
-  void
-  Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p)
-  {
-    CORBA::release (p);
-  }
-
-  CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::nil (void)
-  {
-    return CORBA::TypeCode::_nil ();
-  }
-
-  CORBA::Boolean
-  Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p,
-                                           TAO_OutputCDR & cdr)
-  {
-    return cdr << p;
-  }
-}
diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h
deleted file mode 100644
index 4f27232bcd5..00000000000
--- a/TAO/tao/TypeCode.h
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode.h
- *
- *  $Id$
- *
- *  Header file the @c CORBA::TypeCode class.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author DOC group at Vanderbilt University, Washington University
- *          and the University of California at Irvine.
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_H
-#define TAO_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/UserException.h"
-#include "tao/Basic_Types.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Typecode_typesC.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-
-  /**
-   * @class TypeCode
-   *
-   * @brief A representation of the structure of a given OMG
-   *        IDL-declared type.
-   *
-   * @c TypeCodes are primarily used by @c CORBA::Anys, the CORBA
-   * Interface Repository and the CORBA Dynamic Invocation Interface.
-   */
-  class TAO_Export TypeCode
-  {
-  public:
-
-    /**
-     * @class Bounds
-     *
-     * @brief Out-of-bounds member index exception.
-     *
-     * Exception thrown when attempting to pass an out-of-bounds index
-     * value to a @c TypeCode operation that accepts a member index
-     * argument.
-     */
-    class TAO_Export Bounds : public UserException
-    {
-    public:
-
-      /// Constructor.
-      Bounds (void);
-
-      static Bounds * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    /**
-     * @class BadKind
-     *
-     * @brief Invalid @c TypeCode operation exception.
-     *
-     * Exception thrown when attempting to invoke a @c TypeCode
-     * operation that is not valid for the type represented by the
-     * @c TypeCode.
-     */
-    class TAO_Export BadKind : public CORBA::UserException
-    {
-    public:
-
-      BadKind (void);
-
-      static BadKind * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    static CORBA::TypeCode_ptr const _tc_Bounds;
-    static CORBA::TypeCode_ptr const _tc_BadKind;
-
-    /// Duplicate this @c TypeCode.
-    /**
-     * Statically instantiated @c TypeCodes incur no reference count
-     * manipulation, i.e. reference counting is a no-op.
-     *
-     * Dynamically instantiated @c TypeCodes will have their reference
-     * count incremented by one each time this function is called.
-     */
-    static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-
-    /// Returns a NULL typecode.
-    static CORBA::TypeCode_ptr _nil (void);
-
-    /**
-     * @name @c CORBA::TypeCode Methods
-     *
-     * These methods are part of the public interface of @c
-     * CORBA::TypeCode class, as defined by the OMG CORBA
-     * specification and C++ mapping.
-     *
-     * The C++ mapping does not declare the methods in the public
-     * @c CORBA::TypeCode API as @c virtual, so work around that by
-     * making these methods inlined to forward all calls to the
-     * corresponding protected template method (i.e. the design
-     * pattern, not the C++ feature) listed below in the @c protected
-     * block.
-     */
-    //@{
-    /// Equality of two @c TypeCodes.
-    /**
-     * @return @c true if and only if the set of legal operations is
-     *         the same and invoking any operation on the this
-     *         @c TypeCode and @a tc returns identical results.
-     */
-    Boolean equal (TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL) const;
-
-    /// Equivalence of two @c TypeCodes.
-    /**
-     * Equivalence of two @c TypeCodes satisfies a subset of the
-     * requirements necessary for equality.
-     *
-     * @see equal
-     */
-    Boolean equivalent (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The kind of @c TypeCode.
-    TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// Return @c TypeCode stripped of optional @c name and
-    /// @c member_name fields.
-    /**
-     * @note Calling this method will incur additional run-time memory
-     *       consumption since TAO's implementation relies on the
-     *       TypeCodeFactory to dynamically create a compact @c
-     *       TypeCode; the exception being @c TypeCodes with empty
-     *       parameter lists.  Those @c TypeCodes are already compact,
-     *       meaning that call this method on such @c TypeCodes incurs
-     *       no additional run-time memory requirements.
-     *
-     *       Unless you need to send compact @c TypeCodes
-     *       "over-the-wire" or your @c TypeCode corresponds to a
-     *       type with a large number of members, try to stick with
-     *       the existing potentially non-compact @c TypeCode.
-     *
-     * @note Compact @c TypeCodes may also be generated statically by
-     *       the TAO_IDL compiler by invoking it with its "-Gt"
-     *       (i.e. enable optimized TypeCodes) command line option.
-     */
-    TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c RepositoryId globally identifying the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::id() does not follow the usual parameter
-     *       passing rules defined by the C++ mapping.  This behavior
-     *       is required by the C++ mapping.  In particular, ownership
-     *       is maintained by the @c TypeCode.
-     */
-    char const * id (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The simple name identifying the type within its enclosing
-    /// scope.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * name (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member count.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member name.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::member_name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * member_name (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The type member @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    TypeCode_ptr member_type (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The union member label.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Any * member_label (ULong index
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The type of all non-default union member labels.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The index of the default union member.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Long default_index (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The length of the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_string
-     * @li @c tk_wstring
-     * @li @c tk_sequence
-     * @li @c tk_array
-     */
-    ULong length (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The underlying content type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_sequence
-     * @li @c tk_array
-     * @li @c tk_value_box
-     * @li @c tk_alias
-     */
-    TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The number of significant digits.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The scale factor.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c Visibility of the @c valuetype or @c eventtype member
-    /// corresponding to index @a index.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    Visibility member_visibility (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-
-    /// The @c ValueModifier of the @c valuetype of @c eventtype
-    /// represented by this @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c TypeCode corresponding to the concrete base
-    /// @c valuetype or @c eventtype.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     *
-     * @return @c TypeCode corresponding to the concrete base
-     *         @c valuetype or @c eventtype.
-     *         @c CORBA::TypeCode::_nil() if no concrete base exists.
-     */
-    TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-    /// Marshal the @c TypeCode @c TCKind.
-    /**
-     *
-     */
-    virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-
-    /// Marshal this @c TypeCode into a CDR output stream.
-    /**
-     * Marshal this @c TypeCode into the @a cdr output CDR stream,
-     * excluding the @c TypeCode kind.  Existing @a cdr contents will
-     * not be altered.  The marshaled @c TypeCode will be appended to
-     * the given @a cdr CDR output stream.
-     *
-     * @param cdr    Output CDR stream into which the @c TypeCode will be
-     *               marshaled.
-     *
-     * @param offset Number of bytes currently in the output CDR
-     *               stream, including the top-level TypeCode @c
-     *               TCKind.  This argument is useful for recursive
-     *               @c TypeCodes.  @c TypeCodes that contain other
-     *               @c TypeCodes should pass an updated @a offset
-     *               value to the marshaling operation for those
-     *               contained @c TypeCodes.
-     *
-     * @return @c true if marshaling was successful.
-     *
-     * @note This is a TAO-specific method that is not part of the
-     *       standard @c CORBA::TypeCode interface.
-     *
-     * @note If this method returns @false, the contents of the @a cdr
-     *       output CDR stream are undefined.
-     */
-    virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                              CORBA::ULong offset) const = 0;
-
-    /// Increase the reference count on this @c TypeCode.
-    virtual void tao_duplicate (void) = 0;
-
-    /// Decrease the reference count on this object.
-    virtual void tao_release (void) = 0;
-
-    /// Destruction callback for Anys.
-    static void _tao_any_destructor (void * x);
-
-    typedef CORBA::TypeCode_var _var_type;
-
-  protected:
-
-    /// Constructor.
-    TypeCode (CORBA::TCKind kind);
-
-    /// Destructor.
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    virtual ~TypeCode (void);
-
-    /**
-     * @name @c TypeCode Template Methods
-     *
-     * Methods that must be implemented by @c CORBA::TypeCode
-     * subclasses if valid for those subclasses.
-     *
-     * The default implementations of the non-pure virtual methods
-     * throw the @c CORBA::TypeCode::BadKind exception since many of
-     * these methods are @c TypeCode type-specific.  This reduces code
-     * duplication and bloat.
-     *
-     * The @c TypeCode @c equal(), @c equivalent(), @c kind() and
-     * @c get_compact_typecode() methods are valid for all
-     * @c TypeCodes which is why their template method "@c _i"
-     * counterparts are pure virtual.
-     */
-    //@{
-    virtual Boolean equal_i (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const = 0;
-    virtual Boolean equivalent_i (TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL) const = 0;
-    virtual TypeCode_ptr get_compact_typecode_i (
-      ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-    virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * member_name_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr member_type_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual Any * member_label_i (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Visibility member_visibility_i (ULong index
-                                            ACE_ENV_ARG_DECL) const;
-    virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr concrete_base_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-  private:
-
-    // Prevent copying and assignment.
-    TypeCode (TypeCode const &);
-    void operator= (TypeCode const &);
-
-  protected:
-
-    /// The kind of TypeCode.
-    TCKind const kind_;
-
-  };
-
-}  // End namespace CORBA
-
-
-TAO_NAMESPACE_INLINE_FUNCTION
-bool operator<< (TAO_OutputCDR & cdr,
-                            CORBA::TypeCode_ptr tc);
-
-TAO_Export bool operator>> (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc);
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /// Marshal the @c TypeCode @a tc in to the output CDR stream @a
-    /// cdr.
-    /**
-     * @see @CORBA::TypeCode::tao_marshal() description for details.
-     */
-    
-    TAO_Export bool marshal (TAO_OutputCDR & cdr,
-                             CORBA::TypeCode_ptr tc,
-                             CORBA::ULong offset);
-
-    /// Return @a offset aligned on the appropriate CDR boundary.
-    TAO_Export CORBA::ULong aligned_offset (CORBA::ULong offset);
-  }
-
-  /// Return the unaliased content @c TypeCode of the given
-  /// @c TypeCode.
-  TAO_Export CORBA::TypeCode_ptr unaliased_typecode (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL);
-
-  /// Return the unaliased @c TCKind of the given @c TypeCode.
-  /**
-   * @note This is a convenience function that simply calls @c kind()
-   *       on the unaliased @c TypeCode returned from
-   *       @c unaliased_typecode().
-   */
-  TAO_NAMESPACE_INLINE_FUNCTION
-  CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
-
-  // ---------------------------------------------------------------
-
-  // Used in generated code if CORBA::TypeCode is an argument or
-  // return type.
-  template<>
-  class TAO_Export Arg_Traits<CORBA::TypeCode>
-    : public Object_Arg_Traits_T<CORBA::TypeCode_ptr,
-                                 CORBA::TypeCode_var,
-                                 CORBA::TypeCode_out,
-                                 TAO::Objref_Traits<CORBA::TypeCode> >
-  {
-  };
-
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::TypeCode>
-  {
-    static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr);
-    static void release (::CORBA::TypeCode_ptr);
-    static ::CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
-  };
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/TypeCode.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/TypeCode.inl b/TAO/tao/TypeCode.inl
deleted file mode 100644
index 4126fdb565c..00000000000
--- a/TAO/tao/TypeCode.inl
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-#include "tao/CORBA_methods.h"
-#include "tao/Environment.h"
-
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::TypeCode_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::TypeCode_ptr obj)
-{
-  if (obj)
-    obj->tao_release ();
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE
-CORBA::TypeCode::TypeCode (CORBA::TCKind k)
-  : kind_ (k)
-{
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (!CORBA::is_nil (tc))
-    tc->tao_duplicate ();
-
-  return tc;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return static_cast<CORBA::TypeCode_ptr> (0);
-}
-
-ACE_INLINE CORBA::TCKind
-CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->kind_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::member_name (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_name_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_type_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::TypeCode::member_label (ULong index
-                               ACE_ENV_ARG_DECL) const
-{
-  return this->member_label_i (index
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Long
-CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Visibility
-CORBA::TypeCode::member_visibility (ULong index
-                                    ACE_ENV_ARG_DECL) const
-{
-  return this->member_visibility_i (index
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ValueModifier
-CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-CORBA::TypeCode::_tao_any_destructor (void * x)
-{
-  CORBA::release (static_cast <CORBA::TypeCode_ptr> (x));
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE bool
-operator<< (TAO_OutputCDR & cdr,
-            CORBA::TypeCode_ptr tc)
-{
-  return TAO::TypeCode::marshal (cdr, tc, 0);
-}
-
-// ---------------------------------------------------------------
-
-ACE_INLINE CORBA::TCKind
-TAO::unaliased_kind (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT);
-
-  return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
diff --git a/TAO/tao/TypeCodeA.cpp b/TAO/tao/TypeCodeA.cpp
deleted file mode 100644
index 6ff09fdf2cc..00000000000
--- a/TAO/tao/TypeCodeA.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-
-
-ACE_RCSID (tao,
-           TypeCode,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.
-
-    char const tc_bounds_id[]   = "IDL:omg.org/CORBA/TypeCode/Bounds:1.0";
-    char const tc_bounds_name[] = "Bounds";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_Bounds (CORBA::tk_except,
-                                                 tc_bounds_id,
-                                                 tc_bounds_name,
-                                                 0,
-                                                 0);
-
-    char const tc_bad_kind_id[]   = "IDL:omg.org/CORBA/TypeCode/BadKind:1.0";
-    char const tc_bad_kind_name[] = "BadKind";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_BadKind (CORBA::tk_except,
-                                                  tc_bad_kind_id,
-                                                  tc_bad_kind_name,
-                                                  0,
-                                                  0);
-  }
-}
-
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-// Notice that these are constant TypeCode references/pointers, not
-// constant TypeCodes.  TypeCodes are effectively read-only since
-// all non-static TypeCode operations are const.
-
-
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind =
-  &TAO::TypeCode::tc_BadKind;
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds =
-  &TAO::TypeCode::tc_Bounds;
-
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
deleted file mode 100644
index 2b4b00c59bb..00000000000
--- a/TAO/tao/TypeCodeFactory.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-project : taolib, core, ifr_client {
-  sharedname   = TAO_TypeCodeFactory
-  dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL
-
-  Source_Files {
-    TypeCodeFactory
-  }
-
-  Header_Files {
-    TypeCodeFactory
-  }
-
-  Inline_Files {
-    TypeCodeFactory
-  }
-
-  Template_Files {
-    TypeCodeFactory
-  }
-
-  Resource_Files {
-    TypeCodeFactory
-  }
-
-  PIDL_Files {
-    TypeCodeFactory
-  }
-
-  Pkgconfig_Files {
-    TypeCodeFactory/TAO_TypeCodeFactory.pc.in
-  }
-}
diff --git a/TAO/tao/TypeCodeFactory/README b/TAO/tao/TypeCodeFactory/README
deleted file mode 100644
index 97d0b2546b2..00000000000
--- a/TAO/tao/TypeCodeFactory/README
+++ /dev/null
@@ -1,27 +0,0 @@
-$Id$
-
-TypeCodeFactory -------
-
-This library is used by the Interface Repository and
-by CORBA::ORB to create typecodes. To minimize 
-dependencies and footprint, this library need not be
-built or linked by an application. However, if an
-application needs to call CORBA::ORB::create_*_tc(),
-then it should #include the library's header file
-TypeCodeFactory_Adapter_Impl.h and link the library.
-This will automatically load the library, assuming
-it has been compiled. If an application is using the
-Interface Repository, nothing special need be done -
-the IFR will link the TypeCodeFactory library in its
-own build.
-
-Since the TypeCodeFactory must deal with Interface
-Repository data types, it depends on the 
-TAO_IFR_Client library.
-
-Support has now been added for valuetypes, components,
-homes, eventtypes and recursive types. For an example 
-of how to create a typecode for a recursive type, see
-the OMG CORBA specification section on typecode creation
-(in version 3.0, section 4.11.3).
-
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
deleted file mode 100644
index e74548609e5..00000000000
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// $Id$
-
-#include "Recursive_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "Recursive_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-#include "tao/ORB_Constants.h"
-
-
-ACE_RCSID (TypeCodeFactory,
-           Recursive_TypeCode,
-           "$Id$")
-
-
-bool
-TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      // Marshaling an incomplete recursive TypeCode placeholder is
-      // not allowed.
-
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  return this->the_typecode_->tao_marshal (cdr, offset);
-}
-
-bool
-TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal_kind (
-  TAO_OutputCDR & cdr) const
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      // Marshaling an incomplete recursive TypeCode placeholder is
-      // not allowed.
-
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 1,
-                                             CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  return this->the_typecode_->tao_marshal_kind (cdr);
-}
-
-void
-TAO::TypeCodeFactory::Recursive_TypeCode::tao_duplicate (void)
-{
-  this->add_ref ();
-}
-
-void
-TAO::TypeCodeFactory::Recursive_TypeCode::tao_release (void)
-{
-  this->remove_ref ();
-}
-
-CORBA::Boolean
-TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc
-                                                   ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      // Nothing to compare yet.
-
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  return this->the_typecode_->equal (tc
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc
-                                                        ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      // Nothing to compare yet.
-
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        false);
-    }
-
-  return this->the_typecode_->equivalent (tc
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      // Nothing to compare yet.
-
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    this->the_typecode_->get_compact_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCodeFactory::Recursive_TypeCode::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->id_.in ();
-}
-
-char const *
-TAO::TypeCodeFactory::Recursive_TypeCode::name_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return this->the_typecode_->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::ULong
-TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return this->the_typecode_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return this->the_typecode_->member_name (index
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return this->the_typecode_->member_type (index
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Any *
-TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return
-    this->the_typecode_->member_label (index
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    this->the_typecode_->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Long
-TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return this->the_typecode_->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::Visibility
-TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::PRIVATE_MEMBER);
-    }
-
-  return this->the_typecode_->member_visibility (index
-                                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::ValueModifier
-TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::VM_NONE);
-    }
-
-  return this->the_typecode_->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  if (CORBA::is_nil (this->the_typecode_.in ()))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (0,
-                                             CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
deleted file mode 100644
index d9ca30b3758..00000000000
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Recursive_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a intermediate recursive CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_RECURSIVE_TYPECODE_H
-#define TAO_RECURSIVE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    /**
-     * @class Recursive_TypeCode
-     *
-     * @brief Recursive @c TypeCode placeholder.
-     *
-     * This class implements a placeholder for recursive TypeCodes.
-     * It is meant solely for use as an intermediate TypeCode, and
-     * merely forwards all operations to the actual recursive TypeCode
-     * that is set by the TypeCodeFactory.
-     *
-     * @note This class serves a purpose different than the one served
-     *       by the @c TAO::TypeCode::Recursive class.
-     */
-    class Recursive_TypeCode
-      : public CORBA::TypeCode,
-        private TAO::True_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Recursive_TypeCode (char const * id);
-
-      /// Set the actual recursive TypeCode to which all TypeCode
-      /// operations will be forwarded.
-      void the_typecode (CORBA::TypeCode_ptr tc);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name TAO @c CORBA::TypeCode Template Methods
-       *
-       * Recursive type-capable (i.e. @c struct, @c union,
-       * @c valuetype and @c eventtype) @c CORBA::TypeCode -specific
-       * template methods
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-      //@}
-
-    private:
-
-      /// Repository ID.
-      CORBA::String_var id_;
-
-      /// The actual recursive TypeCode.
-      CORBA::TypeCode_var the_typecode_;
-
-    };
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCodeFactory/Recursive_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_RECURSIVE_TYPECODE_H */
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
deleted file mode 100644
index a053fbddf5d..00000000000
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id)
-  : CORBA::TypeCode (CORBA::TAO_TC_KIND_COUNT)
-  , ACE_NESTED_CLASS (TAO, True_RefCount_Policy) ()
-  , id_ (id)
-  , the_typecode_ ()
-{
-}
-
-ACE_INLINE void
-TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc)
-{
-  this->the_typecode_ = CORBA::TypeCode::_duplicate (tc);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // @@ Lazy, I know.  :(
-  CORBA::TCKind & mutable_kind =
-    const_cast<CORBA::TCKind &> (this->kind_);
-
-  mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/tao/TypeCodeFactory/TAO_TypeCodeFactory.pc.in b/TAO/tao/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
deleted file mode 100644
index 18d0ca26605..00000000000
--- a/TAO/tao/TypeCodeFactory/TAO_TypeCodeFactory.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_TypeCodeFactory
-Description: TAO TypeCode Factory Library
-Requires: TAO_IFR_Client, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_TypeCodeFactory
-Cflags: -I${includedir}
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
deleted file mode 100644
index 5e393fa8a56..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO/tao/TypeCodeFactory
-//
-// = FILENAME
-//   TypeCodeFactory.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in TypeCodeFactoryC.{h,i,cpp}.
-//   It was originally part of Interface.idl, but since the TypeCodeFactory
-//   has been made into a separate library, and the TypeCodeFactory interface
-//   has been made local, it is simpler to generate the necessary stub
-//   code in TypeCodeFactoryC.* by splitting Interface.idl into two
-//   parts.
-//
-//   1. Patch this pidl file with
-//
-//      patch < diffs/TypeCodeFactory.pidl.diff
-//
-//   This will remove the CORBA module, rename most types foo
-//   declared in it as CORBA_foo, unalias the simple typedefs
-//   which don't have a CORBA_ analog in corbafwd.h.
-//
-//   2. Generate the code. The command used to generate code from this
-//   IDL file is:
-//
-//     tao_idl -o orig -Sc -Ge 1 -I../.. -Sci \
-//          -Wb,export_macro=TAO_TypeCodeFactory_Export \
-//          -Wb,export_include=typecodefactory_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          TypeCodeFactory.pidl
-//
-//   3. Copy the generated files to the current directory.
-//
-//   4. Patch the generated files, using
-//
-//      patch < diffs/TypeCodeFactoryC.h.diff
-//      patch < diffs/TypeCodeFactoryC.cpp.diff
-//
-//   If this fails for some reason, the files must be patched
-//   by hand, and the diff files regenerated with
-//
-//      diff -wbu orig/TypeCodeFactoryC.h TypeCodeFactoryC.h > diffs/TypeCodeFactoryC.h.diff
-//      diff -wbu orig/TypeCodeFactoryC.cpp TypeCodeFactoryC.cpp > diffs/TypeCodeFactoryC.cpp.diff
-//
-//   5. Restore TypeCodeFactory.pidl.
-//
-// ================================================================
-
-#ifndef _TYPECODEFACTORY_IDL_
-#define _TYPECODEFACTORY_IDL_
-
-#include "tao/IFR_Client/IFR_Extended.pidl"
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-// These are pulled in from #includes.
-/*
-  typedef string Identifier;
-  typedef string RepositoryId;
-  typedef short ValueModifier;
-*/
-  local interface TypeCodeFactory
-  {
-    TypeCode create_struct_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in StructMemberSeq members
-      );
-
-    TypeCode create_union_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in TypeCode discriminator_type,
-        in UnionMemberSeq members
-      );
-
-    TypeCode create_enum_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in EnumMemberSeq members
-      );
-
-    TypeCode create_alias_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in TypeCode original_type
-      );
-
-    TypeCode create_exception_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in StructMemberSeq members
-      );
-
-    TypeCode create_interface_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_string_tc (
-        in unsigned long bound
-      );
-
-    TypeCode create_wstring_tc (
-        in unsigned long bound
-      );
-
-    TypeCode create_fixed_tc (
-        in unsigned short digits,
-        in unsigned short scale
-      );
-
-    TypeCode create_sequence_tc (
-        in unsigned long bound,
-        in TypeCode element_type
-      );
-
-    TypeCode create_array_tc (
-        in unsigned long length,
-        in TypeCode element_type
-      );
-
-    TypeCode create_value_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in ValueModifier type_modifier,
-        in TypeCode concrete_base,
-        in ValueMemberSeq members
-      );
-
-    TypeCode create_value_box_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in TypeCode boxed_type
-      );
-
-    TypeCode create_native_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_recursive_tc (
-        in RepositoryId id
-      );
-
-    TypeCode create_abstract_interface_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_local_interface_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_component_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_home_tc (
-        in RepositoryId id,
-        in Identifier name
-      );
-
-    TypeCode create_event_tc (
-        in RepositoryId id,
-        in Identifier name,
-        in ValueModifier type_modifier,
-        in TypeCode concrete_base,
-        in ValueMemberSeq members
-      );
-  };
-};
-
-#endif // _TYPECODEFACTORY_IDL_
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc
deleted file mode 100644
index 87bd0426914..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "TypeCodeFactory\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_TypeCodeFactoryDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_TypeCodeFactory.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
deleted file mode 100644
index 4111fe39297..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TypeCodeFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypeCodeFactory (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/TypeCodeFactory:1.0",
-    "TypeCodeFactory");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory =
-    &_tao_tc_CORBA_TypeCodeFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypeCodeFactory>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypeCodeFactory_ptr _tao_elem
-  )
-{
-  CORBA::TypeCodeFactory_ptr _tao_objptr =
-    CORBA::TypeCodeFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypeCodeFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::TypeCodeFactory>::insert (
-      _tao_any,
-      CORBA::TypeCodeFactory::_tao_any_destructor,
-      CORBA::_tc_TypeCodeFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypeCodeFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::TypeCodeFactory>::extract (
-        _tao_any,
-        CORBA::TypeCodeFactory::_tao_any_destructor,
-        CORBA::_tc_TypeCodeFactory,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
deleted file mode 100644
index abf38c85ea0..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "TypeCodeFactoryC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::TypeCodeFactory.
-
-CORBA::TypeCodeFactory_ptr
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::duplicate (
-    CORBA::TypeCodeFactory_ptr p
-  )
-{
-  return CORBA::TypeCodeFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::release (
-    CORBA::TypeCodeFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CORBA::TypeCodeFactory_ptr
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::nil (void)
-{
-  return CORBA::TypeCodeFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal (
-    CORBA::TypeCodeFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-CORBA::TypeCodeFactory::TypeCodeFactory (void)
-{}
-
-CORBA::TypeCodeFactory::~TypeCodeFactory (void)
-{}
-
-void 
-CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  TypeCodeFactory *_tao_tmp_pointer =
-    static_cast<TypeCodeFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TypeCodeFactory::_nil ();
-    }
-  
-  TypeCodeFactory_ptr proxy =
-    dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-  
-  return TypeCodeFactory::_duplicate (proxy);
-}
-
-CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return TypeCodeFactory::_nil ();
-    }
-  
-  TypeCodeFactory_ptr proxy =
-    dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-  
-  return TypeCodeFactory::_duplicate (proxy);
-}
-
-CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CORBA::TypeCodeFactory::_tao_release (TypeCodeFactory_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::TypeCodeFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/TypeCodeFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/TypeCodeFactory:1.0";
-}
-
-CORBA::Boolean
-CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
deleted file mode 100644
index e5f114a4261..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ /dev/null
@@ -1,469 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
-#define _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "typecodefactory_export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/IFR_Client/IFR_ExtendedC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_TypeCodeFactory_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
-#define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
-  
-  class TypeCodeFactory;
-  typedef TypeCodeFactory *TypeCodeFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        TypeCodeFactory
-      >
-    TypeCodeFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        TypeCodeFactory
-      >
-    TypeCodeFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_TYPECODEFACTORY_CH_)
-#define _CORBA_TYPECODEFACTORY_CH_
-  
-  class TAO_TypeCodeFactory_Export TypeCodeFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef TypeCodeFactory_ptr _ptr_type;
-    typedef TypeCodeFactory_var _var_type;
-    
-    // The static operations.
-    static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-    
-    static void _tao_release (TypeCodeFactory_ptr obj);
-    
-    static TypeCodeFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TypeCodeFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static TypeCodeFactory_ptr _nil (void)
-    {
-      return static_cast<TypeCodeFactory_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_struct_tc (
-        const char * id,
-        const char * name,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_union_tc (
-        const char * id,
-        const char * name,
-        ::CORBA::TypeCode_ptr discriminator_type,
-        const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_enum_tc (
-        const char * id,
-        const char * name,
-        const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_alias_tc (
-        const char * id,
-        const char * name,
-        ::CORBA::TypeCode_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_exception_tc (
-        const char * id,
-        const char * name,
-        const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_interface_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_string_tc (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_wstring_tc (
-        ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_fixed_tc (
-        ::CORBA::UShort digits,
-        ::CORBA::UShort scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_sequence_tc (
-        ::CORBA::ULong bound,
-        ::CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_array_tc (
-        ::CORBA::ULong length,
-        ::CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_value_tc (
-        const char * id,
-        const char * name,
-        ::CORBA::ValueModifier type_modifier,
-        ::CORBA::TypeCode_ptr concrete_base,
-        const ::CORBA::ValueMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_value_box_tc (
-        const char * id,
-        const char * name,
-        ::CORBA::TypeCode_ptr boxed_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_native_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_recursive_tc (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_local_interface_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_component_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_home_tc (
-        const char * id,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::TypeCode_ptr create_event_tc (
-        const char * id,
-        const char * name,
-        ::CORBA::ValueModifier type_modifier,
-        ::CORBA::TypeCode_ptr concrete_base,
-        const ::CORBA::ValueMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    TypeCodeFactory (void);
-    
-    virtual ~TypeCodeFactory (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    TypeCodeFactory (const TypeCodeFactory &);
-    
-    void operator= (const TypeCodeFactory &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_TypeCodeFactory_Export ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_)
-#define _CORBA_TYPECODEFACTORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_TypeCodeFactory_Export Objref_Traits< ::CORBA::TypeCodeFactory>
-  {
-    static ::CORBA::TypeCodeFactory_ptr duplicate (
-        ::CORBA::TypeCodeFactory_ptr
-      );
-    static void release (
-        ::CORBA::TypeCodeFactory_ptr
-      );
-    static ::CORBA::TypeCodeFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::TypeCodeFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr); // copying
-TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactory_ptr *); // non-copying
-TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCodeFactory_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
deleted file mode 100644
index a05ece0076a..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-// $Id$
-
-#include "TypeCodeFactory_Adapter_Impl.h"
-#include "TypeCodeFactory_i.h"
-
-#include "tao/ORB_Core.h"
-
-
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_Adapter_Impl,
-           "$Id$")
-
-
-TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
-{
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
-    const char * id,
-    const char * name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_struct_tc (id,
-                               name,
-                               members
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
-    const char * id,
-    const char * name,
-    CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_union_tc (id,
-                              name,
-                              discriminator_type,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
-    const char * id,
-    const char * name,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_enum_tc (id,
-                             name,
-                             members
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
-    const char * id,
-    const char * name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_alias_tc (id,
-                              name,
-                              original_type
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
-    const char * id,
-    const char * name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_exception_tc (id,
-                                  name,
-                                  members
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
-    const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_interface_tc (id,
-                                  name
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_string_tc (bound
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_wstring_tc (bound
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
-    CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_fixed_tc (digits,
-                              scale
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
-    CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_sequence_tc (bound,
-                                 element_type
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_array_tc (length,
-                              element_type
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
-    const char * id,
-    const char * name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_value_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
-    const char * id,
-    const char * name,
-    CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_value_box_tc (id,
-                                  name,
-                                  boxed_type
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
-    const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_native_tc (id,
-                               name
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_recursive_tc (id
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
-    const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_abstract_interface_tc (id,
-                                           name
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
-    const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_local_interface_tc (id,
-                                        name
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_component_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_component_tc (id,
-                                  name
-                                  ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_home_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_home_tc (id,
-                             name
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_event_tc (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_TypeCodeFactory_i tcf;
-
-  return tcf.create_event_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-// --
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
-  char const * /* id */,
-  char const * /* name */,
-  ACE_Array_Base<CORBA::String_var> const & /* enumerators */,
-  CORBA::ULong /* ncases */
-  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc (
-  CORBA::TCKind /* kind */,
-  char const * /* id */,
-  char const * /* name */,
-  ACE_Array_Base<
-    TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                CORBA::TypeCode_var> > const & /* fields */,
-  CORBA::ULong /* nfields */
-  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
-  char const * /* id */,
-  char const * /* name */,
-  CORBA::TypeCode_ptr /* discriminant_type */,
-  ACE_Array_Base<TAO::TypeCode::Case<CORBA::String_var,
-                                     CORBA::TypeCode_var> > const & /* cases */,
-  CORBA::ULong /* ncases */,
-  CORBA::Long /* default_index */,
-  char const * /* default_case_name */,
-  CORBA::TypeCode_ptr /* default_case_type */
-  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
-  CORBA::TCKind /* kind */,
-  char const * /* id */,
-  char const * /* name */,
-  CORBA::ValueModifier /* modifier */,
-  CORBA::TypeCode_ptr /* concrete_base */,
-  ACE_Array_Base<
-    TAO::TypeCode::Value_Field<CORBA::String_var,
-                               CORBA::TypeCode_var> > const & /* fields */,
-  CORBA::ULong /* nfields */
-  ACE_ENV_ARG_DECL)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-// *********************************************************************
-
-// Initialization and registration of dynamic service object.
-
-int
-TAO_TypeCodeFactory_Adapter_Impl::Initializer (void)
-{
-  TAO_ORB_Core::typecodefactory_adapter_name ("Concrete_TypeCodeFactory_Adapter");
-
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Adapter_Impl);
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_TypeCodeFactory_Adapter_Impl,
-    ACE_TEXT ("Concrete_TypeCodeFactory_Adapter"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_TypeCodeFactory_Adapter_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
deleted file mode 100644
index 4ce6eed861c..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCodeFactory_Adapter_Impl.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_TYPECODEFACTORY_ADAPTER_IMPL_H
-#define TAO_TYPECODEFACTORY_ADAPTER_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "typecodefactory_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "ace/Service_Config.h"
-#include "tao/default_environment.h"
-
-/**
- * @class TAO_TypeCodeFactory_Adapter_Impl
- *
- * @brief TAO_TypeCodeFactory_Adapter_Impl.
- *
- * Class that adapts the CORBA::ORB create_*_tc functions
- * to use the TypeCodeFactory. This is the derived class
- * that contains the actual implementations.
- */
-class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl
-  : public TAO_TypeCodeFactory_Adapter
-{
-public:
-  virtual ~TAO_TypeCodeFactory_Adapter_Impl (void);
-
-  virtual CORBA::TypeCode_ptr create_struct_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_union_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_enum_tc (
-      const char *id,
-      const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_alias_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_exception_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_fixed_tc (
-      CORBA::UShort digits,
-      CORBA::UShort scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_sequence_tc (
-      CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_array_tc (
-      CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_value_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_value_box_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_native_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_local_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_component_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_home_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_event_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * @name TAO-specific TypeCode factory methods.
-   *
-   * Factory methods that has no corresponding TypeCodeFactory IDL,
-   * i.e. they are specific to TAO.
-   */
-  //@{
-  /// Create an enumeration TypeCode.
-  virtual CORBA::TypeCode_ptr create_enum_tc (
-    char const * id,
-    char const * name,
-    ACE_Array_Base<CORBA::String_var> const & enumerators,
-    CORBA::ULong ncases
-    ACE_ENV_ARG_DECL);
-
-  /// Create a structure or exception TypeCode.
-  virtual CORBA::TypeCode_ptr create_struct_except_tc (
-    CORBA::TCKind,
-    char const * id,
-    char const * name,
-    ACE_Array_Base<
-      TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                  CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL);
-
-  /// Create a union TypeCode.
-  virtual CORBA::TypeCode_ptr create_union_tc (
-    char const * id,
-    char const * name,
-    CORBA::TypeCode_ptr discriminant_type,
-    ACE_Array_Base<TAO::TypeCode::Case<CORBA::String_var,
-                                       CORBA::TypeCode_var> > const & cases,
-    CORBA::ULong ncases,
-    CORBA::Long default_index,
-    char const * default_case_name,
-    CORBA::TypeCode_ptr default_case_type
-    ACE_ENV_ARG_DECL);
-
-  /// Create a valuetype or eventtype TypeCode.
-  virtual CORBA::TypeCode_ptr create_value_event_tc (
-    CORBA::TCKind,
-    char const * id,
-    char const * name,
-    CORBA::ValueModifier modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    ACE_Array_Base<
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL);
-  //@}
-
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_TypeCodeFactory_Initializer =
-  &TAO_TypeCodeFactory_Adapter_Impl::Initializer;
-
-#else
-
-static int
-TAO_Requires_TypeCodeFactory_Initializer =
-  TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_TYPECODEFACTORY_ADAPTER_IMPL_H */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
deleted file mode 100644
index b6fcd5eb57e..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// =================================================================
-//
-// = LIBRARY
-//    TAO/tao/TypeCodeFactory
-//
-// = FILENAME
-//    TypeCodeFactory_Loader.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =================================================================
-
-#include "TypeCodeFactory_Loader.h"
-#include "TypeCodeFactory_i.h"
-
-ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$")
-
-TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
-                                           int,
-                                           ACE_TCHAR * []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Object_ptr obj;
-  ACE_NEW_RETURN (obj,
-                  TAO_TypeCodeFactory_i,
-                  CORBA::Object::_nil ());
-  return obj;
-}
-
-int
-TAO_TypeCodeFactory_Loader::Initializer (void)
-{
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader);
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_TypeCodeFactory_Loader,
-    ACE_TEXT ("TypeCodeFactory_Loader"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_TypeCodeFactory_Loader),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
deleted file mode 100644
index 71072442319..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCodeFactory_Loader.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODEFACTORY_LOADER_H
-#define TAO_TYPECODEFACTORY_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "typecodefactory_export.h"
-#include "tao/Object_Loader.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-
-/**
- * @class TAO_TypeCodeFactory_Loader
- *
- * @brief Create an instance of TypeCodeFactory and return it to the caller.
- */
-class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Loader
-  : public TAO_Object_Loader
-{
-public:
-  /// Constructor.
-  TAO_TypeCodeFactory_Loader (void);
-
-  /// Overload the base class method to create a new instance
-  /// of a TypeCodeFactory object.
-  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                           int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
-ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_TCF_Initializer = &TAO_TypeCodeFactory_Loader::Initializer;
-
-#else
-
-static int
-TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#define TAO_TYPECODEFACTORY_SAFE_INCLUDE
-#include "TypeCodeFactoryC.h"
-#undef TAO_TYPECODEFACTORY_SAFE_INCLUDE
-
-#include /**/ "ace/post.h"
-#endif /* TAO_TYPECODEFACTORY_LOADER_H */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
deleted file mode 100644
index 02772abddb2..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ /dev/null
@@ -1,2160 +0,0 @@
-// $Id$
-
-#include "TypeCodeFactory_i.h"
-#include "Recursive_TypeCode.h"
-
-#include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/Marshal.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CDR.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/SystemException.h"
-
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "tao/Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
-
-#include "tao/True_RefCount_Policy.h"
-
-
-#include "ace/SString.h"
-#include "ace/Containers_T.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Null_Mutex.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Value_Ptr.h"
-
-#include "ace/os_include/os_ctype.h"
-
-
-ACE_RCSID (TypeCodeFactory,
-           TypeCodeFactory_i,
-           "$Id$")
-
-
-namespace TCF
-{
-  namespace Struct
-  {
-    typedef
-      ACE_Array_Base<TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                                 CORBA::TypeCode_var> >
-        field_array_type;
-
-    typedef TAO::TypeCode::Struct<CORBA::String_var,
-                                  CORBA::TypeCode_var,
-                                  field_array_type,
-                                  TAO::True_RefCount_Policy> typecode_type;
-
-    typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                          CORBA::TypeCode_var,
-                                          field_array_type>
-      recursive_typecode_type;
-
-  }  // End namespace Struct
-
-  namespace Union
-  {
-    // Use an ACE::Value_Ptr to provide exception safety and proper
-    // copying semantics.
-    typedef ACE::Value_Ptr<TAO::TypeCode::Case_Dynamic> elem_type;
-    typedef ACE_Array_Base<elem_type> case_array_type;
-
-    typedef TAO::TypeCode::Union<CORBA::String_var,
-                                 CORBA::TypeCode_var,
-                                 case_array_type,
-                                 TAO::True_RefCount_Policy> typecode_type;
-
-    typedef TAO::TypeCode::Recursive_Type<
-      typecode_type,
-      CORBA::TypeCode_var,
-      case_array_type> recursive_typecode_type;
-  }  // End namespace Union
-
-  namespace Value
-  {
-    typedef
-      ACE_Array_Base<TAO::TypeCode::Value_Field<CORBA::String_var,
-                                                CORBA::TypeCode_var> >
-        field_array_type;
-
-    typedef TAO::TypeCode::Value<CORBA::String_var,
-                                 CORBA::TypeCode_var,
-                                 field_array_type,
-                                 TAO::True_RefCount_Policy> typecode_type;
-
-    typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                          CORBA::TypeCode_var,
-                                          field_array_type>
-      recursive_typecode_type;
-  }  // End namespace Value
-}
-
-
-TAO_TypeCodeFactory_i::TAO_TypeCodeFactory_i (void)
-{
-}
-
-TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
-{
-}
-
-TAO_TypeCodeFactory_i *
-TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr _tao_objref
-                                ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return 0;
-    }
-
-  return dynamic_cast<TAO_TypeCodeFactory_i *> (_tao_objref);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_struct_tc (
-    const char *id,
-    const char *name,
-    const CORBA::StructMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->struct_except_tc_common (id,
-                                        name,
-                                        members,
-                                        CORBA::tk_struct
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_union_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::Boolean const good_disc_type =
-    this->valid_disc_type (discriminator_type
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
-
-  if (!good_disc_type)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 20,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::ULong const len = members.length ();
-  CORBA::ULong dups = 0;
-  CORBA::ULong raw_default_index = ACE_UINT32_MAX;
-  CORBA::Long default_index = -1;
-  CORBA::Octet value = ACE_OCTET_MAX;
-  ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-
-  // No getting around iterating over the members twice. We have
-  // to do it once *before* the overall length is written to the
-  // CDR stream, to know by how much, if any, the number of members
-  // differs from the number of labels.
-  //
-  // @@ Now that the TypeCode implementation has been rewritten, do we
-  // still need to iterate over the members twice?
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      CORBA::UnionMember const & member = members[i];
-      char const * const member_name = member.name;
-
-      int trybind_status = 0;
-
-      if (i > 0)
-        {
-          // Is this a duplicate case label? If so, we have to adjust
-          // the 'length' we encode - a member gets encoded only once.
-          if (ACE_OS::strcmp (member_name, members[i - 1].name) == 0)
-            {
-              CORBA::Boolean const equiv =
-                member.type.in ()->equivalent (members[i - 1].type.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (tc);
-
-              // If adjacent names are the same and their types are
-              // equivalent, then they are duplicate case labels. If
-              // the types are not equivalent, then they are separate
-              // members with the same name, which is not allowed.
-              if (equiv)
-                {
-                  ++dups;
-                }
-              else
-                {
-                  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                                      CORBA::COMPLETED_NO),
-                                    tc);
-                }
-            }
-          else
-            {
-              // Only if we do not have a duplicate case label do we
-              // check for a duplicate member name.
-              ACE_CString ext_id (member_name);
-              int int_id = 0;
-
-              trybind_status = map.trybind (ext_id, int_id);
-            }
-        }
-      else
-        {
-          ACE_CString ext_id (member_name);
-          int int_id = 0;
-
-          trybind_status = map.trybind (ext_id, int_id);
-        }
-
-      // Duplicate member name?
-      if (trybind_status != 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      CORBA::TypeCode_ptr const tc_holder = member.type.in ();
-
-      // Valid member type?
-      CORBA::Boolean const valid_member =
-        this->valid_content_type (tc_holder
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
-
-      if (!valid_member)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      // Reset the default index, if we have a default case label.
-      if ((member.label >>= CORBA::Any::to_octet (value)) == 1)
-        {
-          if (value == 0)
-            {
-              raw_default_index = i;
-              // Only the multiple labels that come before the
-              // default label affect its adjusted value.
-              default_index = static_cast<CORBA::Long> (i - dups);
-            }
-        }
-      else
-        {
-          // Else check that the label type is equivalent to the
-          // given discriminator type.
-          CORBA::TypeCode_var const tmp = member.label.type ();
-
-          CORBA::Boolean const equiv =
-            discriminator_type->equivalent (tmp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
-
-          if (!equiv)
-            {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                  CORBA::COMPLETED_NO),
-                                tc);
-            }
-        }
-    }
-
-  CORBA::Boolean const unique_labels =
-    this->unique_label_values (members,
-                               discriminator_type,
-                               raw_default_index
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
-
-  if (!unique_labels)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 18,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  using namespace TCF::Union;
-
-  case_array_type cases (len - dups);
-
-  CORBA::TCKind const kind =
-    discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  CORBA::ULong ci = 0;  // Case array index.
-
-  bool is_recursive = false;
-  CORBA::TypeCode_var recursive_tc;
-
-  for (CORBA::ULong index = 0; index < len; ++index)
-    {
-      CORBA::UnionMember const & member = members[index];
-
-      if (index > 0)
-        {
-          // Is this a duplicate case label? If so, skip it - a member
-          // goes into the TypeCode only once.
-          if (ACE_OS::strcmp (member.name,
-                              members[index - 1].name) == 0)
-            {
-              continue;
-            }
-        }
-
-      // Check if recursive.
-      bool const recursion_detected =
-        this->check_recursion (CORBA::tk_union,
-                               id,
-                               member.type.in (),
-                               recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
-
-      // Do not clobber previous positive detection.
-      if (recursion_detected)
-        is_recursive = true;
-
-      elem_type & element = cases[ci];
-
-      TAO::TypeCode::Case_Dynamic * the_case = 0;
-
-      if (index == raw_default_index)
-        {
-          // This is the default label - we have to find a legal value.
-          this->compute_default_label (kind,
-                                       index,
-                                       members,
-                                       the_case);
-
-          if (the_case == 0)
-            {
-              // Should never throw since label kind was
-              // verified earlier.
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::TypeCode::_nil ());
-            }
-        }
-      else
-        {
-          // Ugly.  *sigh*
-          switch (kind)
-            {
-            case CORBA::tk_enum:
-              {
-                TAO::Any_Impl * const impl = member.label.impl ();
-                TAO_InputCDR for_reading (
-                  static_cast<ACE_Message_Block *> (0));
-
-                if (impl->encoded ())
-                  {
-                    TAO::Unknown_IDL_Type * const unk =
-                      dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                    // We don't want unk's rd_ptr to move, in case we
-                    // are shared by another Any, so we use this to
-                    // copy the state, not the buffer.
-                    for_reading = unk->_tao_get_cdr ();
-                  }
-                else
-                  {
-                    TAO_OutputCDR out;
-                    impl->marshal_value (out);
-                    TAO_InputCDR tmp (out);
-                    for_reading = tmp;
-                  }
-
-                CORBA::ULong label;
-                for_reading.read_ulong (label);
-
-                typedef TAO::TypeCode::Case_T<CORBA::ULong,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_ulong:
-              {
-                CORBA::ULong label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::ULong,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_long:
-              {
-                CORBA::Long label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::Long,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_ushort:
-              {
-                CORBA::UShort label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::UShort,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_short:
-              {
-                CORBA::Short label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::Short,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_char:
-              {
-                CORBA::Char label;
-                if (!(member.label >>= CORBA::Any::to_char (label)))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::Char,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_boolean:
-              {
-                CORBA::Boolean label;
-                if (!(member.label >>= CORBA::Any::to_boolean (label)))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::Boolean,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-            case CORBA::tk_longlong:
-              {
-                CORBA::LongLong label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::LongLong,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-            case CORBA::tk_ulonglong:
-              {
-                CORBA::ULongLong label;
-                if (!(member.label >>= label))
-                  {
-                    // Should never throw since label kind was
-                    // verified earlier.
-                    ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 19,
-                                                        CORBA::COMPLETED_NO),
-                                      CORBA::TypeCode::_nil ());
-                  }
-
-                typedef TAO::TypeCode::Case_T<CORBA::ULongLong,
-                                              CORBA::String_var,
-                                              CORBA::TypeCode_var> case_type;
-
-                ACE_NEW_THROW_EX (the_case,
-                                  case_type (label),
-                                  CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-              }
-              break;
-#endif  /* !ACE_LACKS_LONGLONG_T */
-            default:
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 20,
-                                                  CORBA::COMPLETED_NO),
-                                CORBA::TypeCode::_nil ());
-            }
-        }
-
-      ++ci;
-
-      elem_type case_value (the_case);
-      element.swap (case_value);  // Exception-safe
-
-      element->name (member.name.in ());
-      element->type (member.type.in ());
-    }
-
-  // @@ Blame this on MSVC++ 6 workarounds.  *sigh*
-  CORBA::TypeCode_var duped_disc_type (
-    CORBA::TypeCode::_duplicate (discriminator_type));
-
-  if (is_recursive)
-    {
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
-
-      ACE_ASSERT (rtc);
-
-      rtc->union_parameters (name,
-                             duped_disc_type,
-                             cases,     // Will be copied.
-                             cases.size (),
-                             default_index);
-
-      return recursive_tc._retn ();
-    }
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (id,
-                                   name,
-                                   duped_disc_type,
-                                   cases,     // Will be copied.
-                                   cases.size (),
-                                   default_index),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_enum_tc (
-    const char *id,
-    const char *name,
-    const CORBA::EnumMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::ULong const len = members.length ();
-
-  ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-
-  ACE_Array_Base<CORBA::String_var> enumerators (len);
-
-  for (CORBA::ULong index = 0; index < len; ++index)
-    {
-      ACE_CString ext_id (members[index]);
-      int int_id = 0;
-
-      // Is there a duplicate member name?
-      if (map.trybind (ext_id, int_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      enumerators[index] = members[index].in ();
-
-//       cdr << members[index].in ();
-    }
-
-//   return this->assemble_tc (cdr,
-//                             CORBA::tk_enum,
-//                             0
-//                             ACE_ENV_ARG_PARAMETER);
-
-  typedef TAO::TypeCode::Enum<
-    CORBA::String_var,
-    ACE_Array_Base<CORBA::String_var>,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (id,
-                                   name,
-                                   enumerators,
-                                   len),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_alias_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->alias_value_box_tc_common (id,
-                                          name,
-                                          original_type,
-                                          CORBA::tk_alias
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_exception_tc (
-    const char *id,
-    const char *name,
-    const CORBA::StructMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->struct_except_tc_common (id,
-                                        name,
-                                        members,
-                                        CORBA::tk_except
-                                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_objref
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->string_wstring_tc_common (bound,
-                                         CORBA::tk_string
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->string_wstring_tc_common (bound,
-                                         CORBA::tk_wstring
-                                         ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_fixed_tc (
-    CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc;
-  ACE_NEW_THROW_EX (tc,
-                    TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> (digits,
-                                                                     scale),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_sequence_tc (
-    CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return sequence_array_tc_common (bound,
-                                   element_type,
-                                   CORBA::tk_sequence
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_array_tc (
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return sequence_array_tc_common (length,
-                                   element_type,
-                                   CORBA::tk_array
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_value_tc (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_event_tc_common (id,
-                                      name,
-                                      type_modifier,
-                                      concrete_base,
-                                      members,
-                                      CORBA::tk_value
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_value_box_tc (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->alias_value_box_tc_common (id,
-                                          name,
-                                          boxed_type,
-                                          CORBA::tk_value_box
-                                          ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_native_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_native
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_recursive_tc (
-    const char *id
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  ACE_NEW_THROW_EX (tc,
-                    TAO::TypeCodeFactory::Recursive_TypeCode (id),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_abstract_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_abstract_interface
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_local_interface_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_local_interface
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_component_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_component
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_home_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->create_tc_common (id,
-                                 name,
-                                 CORBA::tk_home
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_event_tc (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_event_tc_common (id,
-                                      name,
-                                      type_modifier,
-                                      concrete_base,
-                                      members,
-                                      CORBA::tk_event
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-// =====================================================================
-
-void
-TAO_TypeCodeFactory_i::compute_default_label (
-  CORBA::TCKind kind,
-  CORBA::ULong skip_slot,
-  const CORBA::UnionMemberSeq &members,
-  TAO::TypeCode::Case_Dynamic *& the_case)
-{
-  // One to hold the current default value, one to
-  // hold the curent label's extracted value.
-  struct disc_types
-  {
-    CORBA::Char char_val;
-    CORBA::Boolean bool_val;
-    CORBA::Short short_val;
-    CORBA::UShort ushort_val;
-    CORBA::Long long_val;
-    CORBA::ULong ulong_val;
-#if !defined (ACE_LACKS_LONGLONG_T)
-    CORBA::ULongLong ulonglong_val;
-#endif /* ACE_LACKS_LONGLONG_T */
-    CORBA::ULong enum_val;
-    // TODO - handle (u)longlong types
-  } dv, u;
-
-  dv.char_val = 0;
-  dv.bool_val = 0;
-  dv.short_val = ACE_INT16_MIN;
-  dv.ushort_val = 0;
-  dv.long_val = ACE_INT32_MIN;
-  dv.ulong_val = 0;
-#if !defined (ACE_LACKS_LONGLONG_T)
-  dv.ulonglong_val = 0;
-#endif /* ACE_LACKS_LONGLONG_T */
-  dv.enum_val = 0;
-
-  CORBA::ULong const len = members.length ();
-  int success = 0;
-
-  // A collision forces us to start over, because the label
-  // values need not be in sorted order.
-  while (success == 0)
-    {
-      success = 1;
-
-      for (CORBA::ULong i = 0; i < len; ++i)
-        {
-          // This is the one we're trying to find a legal value for.
-          if (i == skip_slot)
-            {
-              continue;
-            }
-
-          // If there's a collision, we increment the default value.
-          switch (kind)
-          {
-            case CORBA::tk_char:
-              members[i].label >>= CORBA::Any::to_char (u.char_val);
-
-              if (u.char_val == dv.char_val)
-                {
-                  dv.char_val++;
-                  success = 0;
-                }
-              break;
-            case CORBA::tk_boolean:
-              members[i].label >>= CORBA::Any::to_boolean (u.bool_val);
-
-              if (u.bool_val == dv.bool_val)
-                {
-                  dv.bool_val = !dv.bool_val;
-                  success = 0;
-                }
-              break;
-            case CORBA::tk_short:
-              members[i].label >>= u.short_val;
-
-              if (u.short_val == dv.short_val)
-                {
-                  dv.short_val++;
-                  success = 0;
-                }
-              break;
-            case CORBA::tk_ushort:
-              members[i].label >>= u.ushort_val;
-
-              if (u.ushort_val == dv.ushort_val)
-                {
-                  dv.ushort_val++;
-                  success = 0;
-                }
-              break;
-            case CORBA::tk_long:
-              members[i].label >>= u.long_val;
-
-              if (u.long_val == dv.long_val)
-                {
-                  dv.long_val++;
-                  success = 0;
-                }
-              break;
-            case CORBA::tk_ulong:
-              members[i].label >>= u.ulong_val;
-
-              if (u.ulong_val == dv.ulong_val)
-                {
-                  dv.ulong_val++;
-                  success = 0;
-                }
-              break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-            case CORBA::tk_ulonglong:
-              members[i].label >>= u.ulonglong_val;
-
-              if (u.ulonglong_val == dv.ulonglong_val)
-                {
-                  dv.ulonglong_val++;
-                  success = 0;
-                }
-              break;
-#endif /* ACE_LACKS_LONGLONG_T */
-            case CORBA::tk_enum:
-            {
-              TAO::Any_Impl *impl = members[i].label.impl ();
-              TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
-
-              if (impl->encoded ())
-                {
-                  TAO::Unknown_IDL_Type *unk =
-                    dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                  // We don't want unk's rd_ptr to move, in case
-                  // we are shared by another Any, so we use this
-                  // to copy the state, not the buffer.
-                  for_reading = unk->_tao_get_cdr ();
-                }
-              else
-                {
-                  TAO_OutputCDR out;
-                  impl->marshal_value (out);
-                  TAO_InputCDR tmp (out);
-                  for_reading = tmp;
-                }
-
-              for_reading.read_ulong (u.enum_val);
-
-              if (u.enum_val == dv.enum_val)
-                {
-                  dv.enum_val++;
-                  success = 0;
-                }
-              break;
-            }
-            default:
-              break;
-          }
-
-          // If there's been a collision, we should start over right away.
-          if (success == 0)
-            {
-              break;
-            }
-        }
-    }
-
-  // Add the default value to the encapsulation.
-  switch (kind)
-  {
-    case CORBA::tk_char:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::Char,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.char_val));
-      }
-      break;
-    case CORBA::tk_boolean:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::Boolean,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.bool_val));
-      }
-      break;
-    case CORBA::tk_short:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::Short,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.short_val));
-      }
-      break;
-    case CORBA::tk_ushort:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::UShort,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.ushort_val));
-      }
-      break;
-    case CORBA::tk_long:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::Long,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.long_val));
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::ULong,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.ulong_val));
-      }
-      break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-    case CORBA::tk_ulonglong:
-      {
-        typedef TAO::TypeCode::Case_T<CORBA::ULongLong,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.ulonglong_val));
-      }
-      break;
-#endif /* ACE_LACKS_LONGLONG_T */
-    case CORBA::tk_enum:
-      {
-        // Enumerators are encoded as CORBA::ULong.
-        typedef TAO::TypeCode::Case_T<CORBA::ULong,
-                                      CORBA::String_var,
-                                      CORBA::TypeCode_var> case_type;
-
-        ACE_NEW (the_case,
-                 case_type (dv.enum_val));
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_tc_common (
-    const char *id,
-    const char *name,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  // Repo id may not be null for object or native type.
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_ptr tc;
-
-  typedef TAO::TypeCode::Objref<CORBA::String_var,
-                                TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (kind, id, name),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::string_wstring_tc_common (
-    CORBA::ULong bound,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc;
-  ACE_NEW_THROW_EX (tc,
-                    TAO::TypeCode::String<TAO::True_RefCount_Policy> (kind,
-                                                                      bound),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::sequence_array_tc_common (
-    CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  CORBA::Boolean const valid_element =
-    this->valid_content_type (element_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
-
-  if (!valid_element)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                             CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::TypeCode_var tmp (CORBA::TypeCode::_duplicate (element_type));
-
-  typedef TAO::TypeCode::Sequence<CORBA::TypeCode_var,
-                                  TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (kind, tmp, bound),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::struct_except_tc_common (
-    const char *id,
-    const char *name,
-    const CORBA::StructMemberSeq & members,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::ULong const len = members.length ();
-
-  ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-
-  using namespace TCF::Struct;
-
-  field_array_type fields (len);
-
-  bool is_recursive = false;
-
-  CORBA::TypeCode_var recursive_tc;
-
-  for (CORBA::ULong index = 0; index < len; ++index)
-    {
-      // Valid member type?
-      CORBA::TypeCode_ptr const member_tc = members[index].type.in ();
-
-      CORBA::Boolean const valid_member =
-        this->valid_content_type (member_tc
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
-
-      if (!valid_member)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      char const * const member_name = members[index].name;
-
-      if (member_name == 0 || !this->valid_name (member_name))
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      ACE_CString ext_id (member_name);
-      int int_id = 0;
-
-      // Is there a duplicate member name?
-      if (map.trybind (ext_id, int_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                  CORBA::TypeCode_var> & field = fields[index];
-
-      // Check if recursive.
-      bool const recursion_detected =
-        this->check_recursion (kind,
-                               id,
-                               member_tc,
-                               recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
-
-      // Do not clobber previous positive detection.
-      if (recursion_detected)
-        is_recursive = true;
-
-      field.name = member_name;
-      field.type = CORBA::TypeCode::_duplicate (member_tc);
-    }
-
-  if (is_recursive)
-    {
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
-
-      ACE_ASSERT (rtc);
-
-      rtc->struct_parameters (name, fields, len);
-
-      return recursive_tc._retn ();
-    }
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (kind,
-                                   id,
-                                   name,
-                                   fields,
-                                   len),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::alias_value_box_tc_common (
-    const char *id,
-    const char *name,
-    CORBA::TypeCode_ptr underlying_type,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::Boolean const valid_content =
-    this->valid_content_type (underlying_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
-
-  if (!valid_content)
-    {
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                             CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::TypeCode_var tmp (CORBA::TypeCode::_duplicate (underlying_type));
-
-  typedef TAO::TypeCode::Alias<CORBA::String_var,
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (kind, id, name, tmp),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::value_event_tc_common (
-    const char *id,
-    const char *name,
-    CORBA::ValueModifier type_modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members,
-    CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  if (name == 0 || !this->valid_name (name))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  if (id == 0 || !this->valid_id (id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 16,
-                                          CORBA::COMPLETED_NO),
-                        tc);
-    }
-
-  CORBA::ULong const len = members.length ();
-
-  using namespace TCF::Value;
-
-  field_array_type fields (len);
-
-  ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-
-  bool is_recursive = false;
-  CORBA::TypeCode_var recursive_tc;
-
-  for (CORBA::ULong index = 0; index < len; ++index)
-    {
-      // Valid member type?
-      CORBA::TypeCode_ptr const member_tc = members[index].type.in ();
-
-      CORBA::Boolean const valid_member =
-        this->valid_content_type (member_tc
-                                  ACE_ENV_ARG_PARAMETER);
-
-      if (!valid_member)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::OMGVMCID | 2,
-                                                 CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      const char * const member_name = members[index].name;
-
-      if (member_name == 0 || !this->valid_name (member_name))
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 15,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      ACE_CString ext_id (member_name);
-      int int_id = 0;
-
-      // Is there a duplicate member name?
-      if (map.trybind (ext_id, int_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 17,
-                                              CORBA::COMPLETED_NO),
-                            tc);
-        }
-
-      // Check if recursive.
-      bool const recursion_detected =
-        this->check_recursion (kind,
-                               id,
-                               member_tc,
-                               recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
-
-      // Do not clobber previous positive detection.
-      if (recursion_detected)
-        is_recursive = true;
-
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> & field = fields[index];
-
-      field.name       = member_name;
-      field.type       = CORBA::TypeCode::_duplicate (member_tc);
-      field.visibility = members[index].access;
-    }
-
-  CORBA::TypeCode_var tmp (
-    CORBA::TypeCode::_duplicate (CORBA::is_nil (concrete_base)
-                                 ? CORBA::_tc_null
-                                 : concrete_base));
-
-  if (is_recursive)
-    {
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (recursive_tc.in ());
-
-      ACE_ASSERT (rtc);
-
-      rtc->valuetype_parameters (name,
-                                 type_modifier,
-                                 tmp,
-                                 fields,
-                                 len);
-
-      return recursive_tc._retn ();
-    }
-
-  ACE_NEW_THROW_EX (tc,
-                    typecode_type (kind,
-                                   id,
-                                   name,
-                                   type_modifier,
-                                   tmp,
-                                   fields,
-                                   len),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
-
-  return tc;
-}
-
-CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_name (const char *name)
-{
-  // Empty string is valid for name.
-  if (*name == '\0')
-    {
-      return 1;
-    }
-
-  if (!isalpha (*name))
-    {
-      return 0;
-    }
-
-  const char *tmp = name + 1;
-
-  for (; *tmp; ++tmp)
-    {
-      if (isalnum (*tmp) || *tmp == '_')
-        {
-          continue;
-        }
-      else
-        {
-          return 0;
-        }
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_id (const char *id)
-{
-  ACE_CString safety (id,
-                      0,
-                      0);
-
-  int pos = safety.find (':');
-
-  if (pos == ACE_CString::npos)
-    {
-      return 0;
-    }
-
-  ACE_CString format (safety.substr (0, pos));
-
-  if (format == "IDL"
-      || format == "RMI"
-      || format == "DCE"
-      || format == "LOCAL")
-    {
-      return 1;
-    }
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind const kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  switch (kind)
-  {
-    case CORBA::TAO_TC_KIND_COUNT:
-      return 1;  // Recursive TypeCode.
-    case CORBA::tk_void:
-    case CORBA::tk_except:
-      return 0;
-    default:
-      return 1;
-  }
-}
-
-CORBA::Boolean
-TAO_TypeCodeFactory_i::unique_label_values (
-  const CORBA::UnionMemberSeq &members,
-  CORBA::TypeCode_ptr disc_tc,
-  CORBA::ULong default_index_slot
-  ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind disc_kind = disc_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ULong length = members.length ();
-
-  // We have already checked for valid discriminator type
-  // and valid label types, so we won't check for any of that here.
-
-  struct label_types
-  {
-    CORBA::Char char_val;
-    CORBA::Boolean bool_val;
-    CORBA::Short short_val;
-    CORBA::UShort ushort_val;
-    CORBA::Long long_val;
-    CORBA::ULong ulong_val;
-    CORBA::ULong enum_val;
-    CORBA::ULongLong ulonglong_val;
-    CORBA::LongLong longlong_val;
-  } s = {0, 0, 0, 0, 0, 0, 0, 0, ACE_CDR_LONGLONG_INITIALIZER };
-
-  // Two cases - one for signed and one for unsigned discriminator types.
-  if (disc_kind == CORBA::tk_long
-      || disc_kind == CORBA::tk_short)
-    {
-      ACE_Bounded_Set<CORBA::Long> checker (length);
-
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          if (i == default_index_slot)
-            {
-              continue;
-            }
-
-          switch (disc_kind)
-          {
-            case CORBA::tk_long:
-              members[i].label >>= s.long_val;
-
-              if (checker.insert (s.long_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            case CORBA::tk_short:
-              members[i].label >>= s.short_val;
-
-              if (checker.insert (s.short_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            default:
-              break;
-          }
-        }
-    }
-  else
-    {
-      ACE_Bounded_Set<CORBA::ULong> checker (length);
-
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          if (i == default_index_slot)
-            {
-              continue;
-            }
-
-          switch (disc_kind)
-          {
-            case CORBA::tk_boolean:
-              members[i].label >>= CORBA::Any::to_boolean (s.bool_val);
-
-              if (checker.insert (s.bool_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            case CORBA::tk_char:
-              members[i].label >>= CORBA::Any::to_char (s.char_val);
-
-              if (checker.insert (s.char_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            case CORBA::tk_ushort:
-              members[i].label >>= s.ushort_val;
-
-              if (checker.insert (s.ushort_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            case CORBA::tk_ulong:
-              members[i].label >>= s.ulong_val;
-
-              if (checker.insert (s.ulong_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            case CORBA::tk_enum:
-            {
-              TAO::Any_Impl *impl = members[i].label.impl ();
-              TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
-
-              if (impl->encoded ())
-                {
-                  TAO::Unknown_IDL_Type *unk =
-                    dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                  // We don't want unk's rd_ptr to move, in case
-                  // we are shared by another Any, so we use this
-                  // to copy the state, not the buffer.
-                  for_reading = unk->_tao_get_cdr ();
-                }
-              else
-                {
-                  TAO_OutputCDR out;
-                  impl->marshal_value (out);
-                  TAO_InputCDR tmp (out);
-                  for_reading = tmp;
-                }
-
-              for_reading.read_ulong (s.enum_val);
-
-              if (checker.insert (s.enum_val) != 0)
-                {
-                  return 0;
-                }
-
-              break;
-            }
-            default:
-              break;
-          }
-        }
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
-                                        ACE_ENV_ARG_DECL)
-{
-  CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    (kind == CORBA::tk_enum
-     || kind == CORBA::tk_ulong
-     || kind == CORBA::tk_long
-     || kind == CORBA::tk_ushort
-     || kind == CORBA::tk_short
-     || kind == CORBA::tk_char
-     || kind == CORBA::tk_boolean
-     || kind == CORBA::tk_longlong
-     || kind == CORBA::tk_ulonglong);
-}
-
-bool
-TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
-                                        char const * id,
-                                        CORBA::TypeCode_ptr member,
-                                        CORBA::TypeCode_ptr & recursive_tc
-                                        ACE_ENV_ARG_DECL)
-{
-  if (kind != CORBA::tk_struct
-      && kind != CORBA::tk_union
-      && kind != CORBA::tk_value
-      && kind != CORBA::tk_event)
-    return false;
-
-  CORBA::TypeCode_var unaliased_member =
-    TAO::unaliased_typecode (member
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::TCKind const unaliased_member_kind =
-    unaliased_member->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Recursively iterate through the member and content types until
-  // we've exhausted all TypeCodes capable of containing other
-  // TypeCodes.
-  switch (unaliased_member_kind)
-    {
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_value:
-    case CORBA::tk_event:
-      {
-        CORBA::ULong const nfields =
-          unaliased_member->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
-
-        for (CORBA::ULong i = 0; i < nfields; ++i)
-          {
-            CORBA::TypeCode_var member_tc =
-              unaliased_member->member_type (i
-                                             ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
-
-            CORBA::TCKind const member_tc_kind =
-              member_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
-
-            if (member_tc_kind == CORBA::TAO_TC_KIND_COUNT)
-              {
-                // Valuetypes can directly contain a recursive member
-                // (e.g. valuetype V { public V member; };).  Check if
-                // the member TypeCode is the recursive TypeCode
-                // placeholder.
-                if (kind == CORBA::tk_value || kind == CORBA::tk_event)
-                  {
-                    char const * member_tc_id =
-                      member_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    ACE_CHECK_RETURN (false);
-
-                    if (ACE_OS::strcmp (id, member_tc_id) == 0)
-                      {
-                        TAO::TypeCodeFactory::Recursive_TypeCode * const rtc =
-                          dynamic_cast<
-                            TAO::TypeCodeFactory::Recursive_TypeCode *> (
-                              member_tc.in ());
-
-                        ACE_ASSERT (rtc);
-
-                        if (CORBA::is_nil (recursive_tc))
-                          {
-                            recursive_tc =
-                              this->make_recursive_tc (kind,
-                                                       id
-                                                       ACE_ENV_ARG_PARAMETER);
-                            ACE_CHECK_RETURN (false);
-                          }
-
-                        // Set the actual recursive TypeCode.
-                        rtc->the_typecode (recursive_tc);
-
-                        return true;
-                      }
-
-                    // Different recursive TypeCode.  Let it be.
-                  }
-                else
-                  {
-                    // @@ structs and unions may not directly contain
-                    //    recursive members.  They must be indirectly
-                    //    recursive through a member sequence (which
-                    //    itself may be contained inside a nested
-                    //    struct, union, etc).
-                        ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), false);
-                  }
-              }
-            else
-              {
-                bool const recursion_detected =
-                  this->check_recursion (kind,
-                                         id,
-                                         member_tc.in (),
-                                         recursive_tc
-                                         ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (false);
-
-                if (recursion_detected)
-                  {
-                    return true;
-                  }
-              }
-
-            // Not recursive or not the recursive TypeCode we want.
-            // Try the next member.
-          }
-      }
-      break;
-
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-        CORBA::TypeCode_var content_tc =
-          unaliased_member->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
-
-        CORBA::TCKind const content_tc_kind =
-          content_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
-
-        if (content_tc_kind == CORBA::TAO_TC_KIND_COUNT)
-          {
-            char const * content_tc_id =
-              content_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
-
-            if (ACE_OS::strcmp (id, content_tc_id) == 0)
-              {
-                TAO::TypeCodeFactory::Recursive_TypeCode * const rtc =
-                  dynamic_cast<TAO::TypeCodeFactory::Recursive_TypeCode *>
-                  (content_tc.in ());
-
-                ACE_ASSERT (rtc);
-
-                if (CORBA::is_nil (recursive_tc))
-                  {
-                    recursive_tc =
-                      this->make_recursive_tc (kind,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-                    ACE_CHECK_RETURN (false);
-                  }
-
-                // Set the actual recursive TypeCode.
-                rtc->the_typecode (recursive_tc);
-
-                return true;
-              }
-
-            // Different recursive TypeCode.  Let it be.
-          }
-
-        return this->check_recursion (kind,
-                                      id,
-                                      content_tc.in (),
-                                      recursive_tc
-                                      ACE_ENV_ARG_PARAMETER);
-      }
-
-    default:
-      break;  // Not a recursion-capable TypeCode.
-    }
-
-  return false;
-}
-
-CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
-                                          char const * id
-                                          ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-
-  switch (kind)
-    {
-    case CORBA::tk_struct:
-      ACE_NEW_THROW_EX (tc,
-                        TCF::Struct::recursive_typecode_type (kind, id),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
-      break;
-
-    case CORBA::tk_union:
-      ACE_NEW_THROW_EX (tc,
-                        TCF::Union::recursive_typecode_type (kind, id),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
-      break;
-
-    case CORBA::tk_value:
-    case CORBA::tk_event:
-      ACE_NEW_THROW_EX (tc,
-                        TCF::Value::recursive_typecode_type (kind, id),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
-      break;
-
-    default:  // Should never hit this case.
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        tc);
-    }
-
-  return tc;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Entry<ACE_CString, int>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString,
-                                             int,
-                                             ACE_Hash<ACE_CString>,
-                                             ACE_Equal_To<ACE_CString>,
-                                             ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString,
-                                        int,
-                                        ACE_Hash<ACE_CString>,
-                                        ACE_Equal_To<ACE_CString>,
-                                        ACE_Null_Mutex>;
-template class ACE_Equal_To<ACE_CString>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString,
-                                                int,
-                                                ACE_Hash<ACE_CString>,
-                                                ACE_Equal_To<ACE_CString>,
-                                                ACE_Null_Mutex>;
-template class ACE_Hash<ACE_CString>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                       int,
-                                       ACE_Hash<ACE_CString>,
-                                       ACE_Equal_To<ACE_CString>,
-                                       ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex>;
-template class ACE_Bounded_Set<CORBA::Long>;
-template class ACE_Bounded_Set<CORBA::ULong>;
-template class ACE_Bounded_Set_Iterator<CORBA::Long>;
-template class ACE_Bounded_Set_Iterator<CORBA::ULong>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, int>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, \
-                                                  int, \
-                                                  ACE_Hash<ACE_CString>, \
-                                                  ACE_Equal_To<ACE_CString>, \
-                                                  ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, \
-                                             int, \
-                                             ACE_Hash<ACE_CString>, \
-                                             ACE_Equal_To<ACE_CString>, \
-                                             ACE_Null_Mutex>
-#pragma instantiate ACE_Equal_To<ACE_CString>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, \
-                                                     int, \
-                                                     ACE_Hash<ACE_CString>, \
-                                                     ACE_Equal_To<ACE_CString>, \
-                                                     ACE_Null_Mutex>
-#pragma instantiate ACE_Hash<ACE_CString>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, \
-                                            int, \
-                                            ACE_Hash<ACE_CString>, \
-                                            ACE_Equal_To<ACE_CString>, \
-                                            ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex>
-#pragma instantiate ACE_Bounded_Set<CORBA::Long>
-#pragma instantiate ACE_Bounded_Set<CORBA::ULong>
-#pragma instantiate ACE_Bounded_Set_Iterator<CORBA::Long>
-#pragma instantiate ACE_Bounded_Set_Iterator<CORBA::ULong>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
deleted file mode 100644
index 82a138ef191..00000000000
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCodeFactory_i.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODEFACTORY_I_H
-#define TAO_TYPECODEFACTORY_I_H
-
-#include /**/ "ace/pre.h"
-#include "TypeCodeFactory_Loader.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType, typename TypeCodeType> class Case;
-
-    typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-  }
-}
-
-
-class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i
-    : public virtual CORBA::TypeCodeFactory,
-      public virtual TAO_Local_RefCounted_Object
-{
-/**
- * @class TAO_TypeCodeFactory_i
- *
- * @brief TAO_TypeCodeFactory_i.
- *
- * Implementation of the CORBA::TypeCodeFactory interface
- */
-public:
-  /// ctor
-  TAO_TypeCodeFactory_i (void);
-
-  /// dtor
-  ~TAO_TypeCodeFactory_i (void);
-
-  /// = LocalObject methods
-  static TAO_TypeCodeFactory_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL);
-
-  virtual CORBA::TypeCode_ptr create_struct_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_union_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_enum_tc (
-      const char *id,
-      const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_alias_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_exception_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_fixed_tc (
-      CORBA::UShort digits,
-      CORBA::UShort scale
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_sequence_tc (
-      CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_array_tc (
-      CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_value_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_value_box_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_native_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_local_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_component_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_home_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::TypeCode_ptr create_event_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Finds a legal default label value.
-  void compute_default_label (CORBA::TCKind kind,
-                              CORBA::ULong skip_slot,
-                              const CORBA::UnionMemberSeq &members,
-                              TAO::TypeCode::Case_Dynamic *& the_case);
-
-  /// Called for all types that take just an id and a name.
-  CORBA::TypeCode_ptr create_tc_common (
-      const char *id,
-      const char *name,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Code for strings and wstrings is identical except for TCKind.
-  CORBA::TypeCode_ptr string_wstring_tc_common (
-      CORBA::ULong bound,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Code for arrays and sequences is identical except for TCKind.
-  CORBA::TypeCode_ptr sequence_array_tc_common (
-      CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Code for structs and unions is identical except for TCKind.
-  CORBA::TypeCode_ptr struct_except_tc_common (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Code for aliases and boxed valuetypes is identical except for TCKind.
-  CORBA::TypeCode_ptr alias_value_box_tc_common (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr underlying_type,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::TypeCode_ptr value_event_tc_common (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// If any of these fail, we raise a spec-defined minor code
-  /// of BAD_PARAM or BAD_TYPECODE.
-  CORBA::Boolean valid_name (const char *name);
-  CORBA::Boolean valid_id (const char *id);
-  CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc
-                                     ACE_ENV_ARG_DECL);
-  CORBA::Boolean unique_label_values (const CORBA::UnionMemberSeq &members,
-                                      CORBA::TypeCode_ptr disc_tc,
-                                      CORBA::ULong default_index_slot
-                                      ACE_ENV_ARG_DECL);
-  CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL);
-
-  /// Check @a member for recursive @c TypeCode.
-  /**
-   * @return @c true if @a member contains a recursive @c TypeCode,
-   *         and set @a recursive_tc to the actual recursive
-   *         @c TypeCode that was represented by the recursive
-   *         @c TypeCode placeholder.
-   */
-  bool check_recursion (CORBA::TCKind kind,
-                        char const * id,
-                        CORBA::TypeCode_ptr member,
-                        CORBA::TypeCode_ptr & recursive_tc
-                        ACE_ENV_ARG_DECL);
-
-  /// Make a recursive TypeCode with the given kind and repository ID.
-  CORBA::TypeCode_ptr make_recursive_tc (CORBA::TCKind kind,
-                                         char const * id
-                                         ACE_ENV_ARG_DECL);
-
-  /// Prohibited
-  TAO_TypeCodeFactory_i (const TAO_TypeCodeFactory_i &src);
-  TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src);
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_TYPECODEFACTORY_I_H */
diff --git a/TAO/tao/TypeCodeFactory/typecodefactory_export.h b/TAO/tao/TypeCodeFactory/typecodefactory_export.h
deleted file mode 100644
index 03bfa7334ab..00000000000
--- a/TAO/tao/TypeCodeFactory/typecodefactory_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_TYPECODEFACTORY_EXPORT_H
-#define TAO_TYPECODEFACTORY_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_TYPECODEFACTORY_HAS_DLL)
-#    define TAO_TYPECODEFACTORY_HAS_DLL 0
-#  endif /* ! TAO_TYPECODEFACTORY_HAS_DLL */
-#else
-#  if !defined (TAO_TYPECODEFACTORY_HAS_DLL)
-#    define TAO_TYPECODEFACTORY_HAS_DLL 1
-#  endif /* ! TAO_TYPECODEFACTORY_HAS_DLL */
-#endif
-
-#if defined (TAO_TYPECODEFACTORY_HAS_DLL) && (TAO_TYPECODEFACTORY_HAS_DLL == 1)
-#  if defined (TAO_TYPECODEFACTORY_BUILD_DLL)
-#    define TAO_TypeCodeFactory_Export ACE_Proper_Export_Flag
-#    define TAO_TYPECODEFACTORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TYPECODEFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_TYPECODEFACTORY_BUILD_DLL */
-#    define TAO_TypeCodeFactory_Export ACE_Proper_Import_Flag
-#    define TAO_TYPECODEFACTORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TYPECODEFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_TYPECODEFACTORY_BUILD_DLL */
-#else /* TAO_TYPECODEFACTORY_HAS_DLL == 1 */
-#  define TAO_TypeCodeFactory_Export
-#  define TAO_TYPECODEFACTORY_SINGLETON_DECLARATION(T)
-#  define TAO_TYPECODEFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_TYPECODEFACTORY_HAS_DLL == 1 */
-
-#endif /* TAO_TYPECODEFACTORY_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
deleted file mode 100644
index da87219834c..00000000000
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// @(#) $Id$
-
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           TypeCodeFactory_Adapter, 
-           "$Id$")
-
-TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
deleted file mode 100644
index 2b266ba61c0..00000000000
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCodeFactory_Adapter.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODEFACTORY_ADAPTER_H
-#define TAO_TYPECODEFACTORY_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/ValueModifierC.h"
-#include "tao/Typecode_typesC.h"
-
-
-template<class T> class ACE_Array_Base;
-
-namespace CORBA
-{
-  class EnumMemberSeq;
-  class StructMemberSeq;
-  class UnionMemberSeq;
-  class ValueMemberSeq;
-
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> class Case;
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-  }
-}
-
-
-/**
- * @class TAO_TypeCodeFactory_Adapter
- *
- * @brief TAO_TypeCodeFactory_Adapter.
- *
- * Class that adapts the CORBA::ORB create_*_tc functions
- * to use the TypeCodeFactory. This is a base class for
- * the actual implementation in the TypeCodeFactory_DLL library.
- */
-class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_TypeCodeFactory_Adapter (void);
-
-  virtual CORBA::TypeCode_ptr create_struct_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_union_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_enum_tc (
-      const char *id,
-      const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_alias_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL
-    )
-
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  virtual CORBA::TypeCode_ptr create_exception_tc (
-      const char *id,
-      const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_fixed_tc (
-      CORBA::UShort digits,
-      CORBA::UShort scale
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_sequence_tc (
-      CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_array_tc (
-      CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_value_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_value_box_tc (
-      const char *id,
-      const char *name,
-      CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_native_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_local_interface_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_component_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_home_tc (
-      const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  virtual CORBA::TypeCode_ptr create_event_tc (
-      const char *id,
-      const char *name,
-      CORBA::ValueModifier type_modifier,
-      CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-  // --
-
-  /**
-   * @name TAO-specific TypeCode factory methods.
-   *
-   * Factory methods that has no corresponding TypeCodeFactory IDL,
-   * i.e. they are specific to TAO.
-   */
-  //@{
-  /// Create an enumeration TypeCode.
-  virtual CORBA::TypeCode_ptr create_enum_tc (
-    char const * id,
-    char const * name,
-    ACE_Array_Base<CORBA::String_var> const & enumerators,
-    CORBA::ULong ncases
-    ACE_ENV_ARG_DECL) = 0;
-
-  /// Create a structure or exception TypeCode.
-  virtual CORBA::TypeCode_ptr create_struct_except_tc (
-    CORBA::TCKind,
-    char const * id,
-    char const * name,
-    ACE_Array_Base<
-      TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                  CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL) = 0;
-
-  /// Create a union TypeCode.
-  virtual CORBA::TypeCode_ptr create_union_tc (
-    char const * id,
-    char const * name,
-    CORBA::TypeCode_ptr discriminant_type,
-    ACE_Array_Base<TAO::TypeCode::Case<CORBA::String_var,
-                                       CORBA::TypeCode_var> > const & cases,
-    CORBA::ULong ncases,
-    CORBA::Long default_index,
-    char const * default_case_name,
-    CORBA::TypeCode_ptr default_case_type
-    ACE_ENV_ARG_DECL) = 0;
-
-  /// Create a valuetype or eventtype TypeCode.
-  virtual CORBA::TypeCode_ptr create_value_event_tc (
-    CORBA::TCKind,
-    char const * id,
-    char const * name,
-    CORBA::ValueModifier modifier,
-    CORBA::TypeCode_ptr concrete_base,
-    ACE_Array_Base<
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL) = 0;
-  //@}
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODEFACTORY_ADAPTER_H */
diff --git a/TAO/tao/TypeCode_Base_Attributes.cpp b/TAO/tao/TypeCode_Base_Attributes.cpp
deleted file mode 100644
index 9a8728a12e8..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-#define TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* !__ACE_INLINE__ */
-
-#endif  /* TAO_TYPECODE_BASE_ATTRIBUTES_CPP */
diff --git a/TAO/tao/TypeCode_Base_Attributes.h b/TAO/tao/TypeCode_Base_Attributes.h
deleted file mode 100644
index 797c4373f47..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Base_Attributes.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_H
-#define TAO_TYPECODE_BASE_ATTRIBUTES_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Base_Attributes
-     *
-     * @brief Attributes contained by most @c TypeCodes with complex
-     *        parameter lists.
-     *
-     * Most @c TypeCodes with complex parameter lists (see Section
-     * 15.3.5.1 "TypeCode" in the CORBA specification) contain these
-     * attributes, namely a repository ID and a name.
-     */
-    template <typename STRING_TYPE>
-    class Base_Attributes
-    {
-    public:
-
-      /// Constructor.
-      Base_Attributes (char const * id,
-                       char const * name);
-
-      /// Constructor used by recursive @c TypeCodes.
-      Base_Attributes (char const * id);
-
-      /// Get the @c RepositoryId globally identifying the type.
-      char const * id (void) const;
-
-      /// Get the simple name identifying the type within its
-      /// enclosing scope.
-      char const * name (void) const;
-
-      /// Set the simple name identifying the type within its
-      /// enclosing scope.
-      /**
-       * @note This method only used when creating a recursive
-       *       TypeCode.
-       */
-      void name (char const * the_name);
-
-    private:
-
-      /// The @c RepositoryId globally identifying the type.
-      STRING_TYPE const id_;
-
-      /// The simple name identifying the type within its enclosing
-      /// scope.
-      STRING_TYPE name_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Base_Attributes.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Base_Attributes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_BASE_ATTRIBUTES_H */
diff --git a/TAO/tao/TypeCode_Base_Attributes.inl b/TAO/tao/TypeCode_Base_Attributes.inl
deleted file mode 100644
index 0582fb7352f..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id,
-  char const * name)
-  : id_ (id),
-    name_ (name)
-{
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id)
-  : id_ (id),
-    name_ ()
-{
-  // Only used in the dynamic (when STRING_TYPE == CORBA::String_var)
-  // recursive TypeCode case.
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::id (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->id_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->name_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE void
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name)
-{
-  // This method will only be instantiated in the dynamic TypeCode
-  // case, i.e. when STRING_TYPE is CORBA::String_var.
-
-  this->name_ = the_name;
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.cpp b/TAO/tao/TypeCode_CDR_Extraction.cpp
deleted file mode 100644
index 4ce1faadfb3..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.cpp
+++ /dev/null
@@ -1,1325 +0,0 @@
-// $Id$
-
-#include "TypeCode_CDR_Extraction.h"
-
-#include "tao/CDR.h"
-
-#include "tao/TypeCode_Constants.h"
-#include "tao/True_RefCount_Policy.h"
-
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
-
-#include "ace/Array_Base.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_CDR_Extraction,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    // An array of TC_Info objects is used instead of a map of
-    // repository IDs to TypeCodes since it is presumed that the
-    // number of directly or indirectly embedded types in a TypeCode
-    // capable of holding another TypeCode will be small enough to
-    // make traversing a list faster than performing a map lookup.
-    // Use a simple array also reduces static and run-time footprint.
-
-    struct TC_Info
-    {
-      /// Constructor.
-      TC_Info (void) : id (0), type () {}
-
-      /// Repository ID.
-      char const * id;
-
-      /// TypeCode
-      CORBA::TypeCode_ptr type;
-    };
-
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-  }
-}
-
-namespace
-{
-  bool start_cdr_encap_extraction (TAO_InputCDR & cdr)
-  {
-    CORBA::Boolean byte_order;
-
-    // Don't bother demarshaling the encapsulation length.  Prefer
-    // speed over early error checking.  Any CDR length related
-    // failures will be detected when demarshaling the remainder of
-    // the complex parameter list TypeCode.
-
-    if (!(cdr.skip_ulong () // Skip encapsulation length.
-          && cdr >> TAO_InputCDR::to_boolean (byte_order)))
-      return false;
-
-    cdr.reset_byte_order (byte_order);
-
-    return true;
-  }
-
-  // ---------------------------------------------------------
-
-  CORBA::ULong const TYPECODE_INDIRECTION = 0xffffffff;
-
-  // ---------------------------------------------------------
-
-  // Use an ACE::Value_Ptr to provide exception safety and proper
-  // copying semantics.
-  typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> > union_elem_type;
-  typedef ACE_Array_Base<union_elem_type> union_case_array_type;
-
-  // ------------------------------------------------------------
-
-  /// Demarshal a TypeCode.
-  bool tc_demarshal (TAO_InputCDR & cdr,
-                     CORBA::TypeCode_ptr & tc,
-                     TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  /// Demarshal an indirected TypeCode.
-  bool tc_demarshal_indirection (TAO_InputCDR & cdr,
-                                 CORBA::TypeCode_ptr & tc,
-                                 TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  bool find_recursive_tc (char const * id,
-                          CORBA::TypeCode_ptr & tc,
-                          TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // See comments above for rationale behind using an array instead
-    // of a map.
-
-    size_t const len = infos.size ();
-
-    for (size_t i = 0; i < len; ++i)
-      {
-        TAO::TypeCodeFactory::TC_Info & info = infos[i];
-
-        if (ACE_OS::strcmp (info.id, id) == 0)
-          {
-            tc = info.type;
-            return true;
-          }
-      }
-
-    return false;
-  }
-}
-
-bool
-TAO::TypeCodeFactory::tc_null_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_void_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_short_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_long_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ushort_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulong_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_float_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_double_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_boolean_factory (CORBA::TCKind,
-                                          TAO_InputCDR &,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_char_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_octet_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_any_factory (CORBA::TCKind,
-                                      TAO_InputCDR &,
-                                      CORBA::TypeCode_ptr & tc,
-                                      TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_TypeCode_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_Principal_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_Principal);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_objref_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // The remainder of a tk_objref TypeCode is encoded in a CDR
-  // encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID and name.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-  static char const Object_id[]    = "IDL:omg.org/CORBA/Object:1.0";
-  static char const CCMObject_id[] = "IDL:omg.org/CORBA/CCMObject:1.0";
-  static char const CCMHome_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-
-  char const * tc_constant_id = "";
-
-  switch (kind)
-    {
-    case CORBA::tk_component:
-      tc_constant_id = CCMObject_id;
-      break;
-    case CORBA::tk_home:
-      tc_constant_id = CCMHome_id;
-      break;
-    case CORBA::tk_objref:
-      tc_constant_id = Object_id;
-      break;
-    default:
-      break;
-    }
-
-  if (ACE_OS::strcmp (id.in (),  // len >= 0!!!
-                      tc_constant_id) == 0)
-    {
-      if (!cdr.skip_string ())  // No need to demarshal the name.
-        return false;
-
-      CORBA::TypeCode_ptr tc_constant = CORBA::TypeCode::_nil ();
-      switch (kind)
-        {
-        case CORBA::tk_component:
-          tc_constant = CORBA::_tc_Component;
-          break;
-        case CORBA::tk_home:
-          tc_constant = CORBA::_tc_Home;
-          break;
-        case CORBA::tk_objref:
-          tc_constant = CORBA::_tc_Object;
-          break;
-        default:
-          break;
-        }
-
-      // No need to create a TypeCode.  Just use the TypeCode
-      // constant.
-      tc =
-        CORBA::TypeCode::_duplicate (tc_constant);
-    }
-  else
-    {
-      CORBA::String_var name;
-
-      if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)))
-        return false;
-
-      typedef TAO::TypeCode::Objref<CORBA::String_var,
-                                    TAO::True_RefCount_Policy> typecode_type;
-
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in ()),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_struct || kind == CORBA::tk_except);
-
-  // The remainder of a tk_struct/tk_except TypeCode is encoded in
-  // a CDR encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                                     CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (fields[i].name.out (), 0)
-            && tc_demarshal (cdr, fields[i].type.out (), infos)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Struct<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-
-  // Check if struct TypeCode is recursive.
-  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->struct_parameters (name.in (),
-                              fields,
-                              nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name, discriminant type, default index
-  // and case count.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var discriminant_type;
-  CORBA::Long default_index = -1;
-  CORBA::ULong ncases = 0;  // Just 'n case :-)
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> discriminant_type.out ())) // No need to use tc_demarshal()
-    return false;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::TCKind const discriminant_kind =
-    discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Check for valid discriminant type.
-  if (!(discriminant_kind == CORBA::tk_enum
-        || discriminant_kind == CORBA::tk_ulong
-        || discriminant_kind == CORBA::tk_long
-        || discriminant_kind == CORBA::tk_ushort
-        || discriminant_kind == CORBA::tk_short
-        || discriminant_kind == CORBA::tk_char
-        || discriminant_kind == CORBA::tk_boolean
-        || discriminant_kind == CORBA::tk_longlong
-        || discriminant_kind == CORBA::tk_ulonglong))
-    return false;
-
-  if (!(cdr >> default_index
-        && default_index >= -1
-        && cdr >> ncases))
-    return false;
-
-  typedef union_elem_type       elem_type;
-  typedef union_case_array_type case_array_type;
-
-  case_array_type cases (ncases);
-
-  for (CORBA::ULong i = 0; i < ncases; ++i)
-    {
-      elem_type & member = cases[i];
-
-      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case;
-
-      // Ugly.  *sigh*
-      switch (discriminant_kind)
-        {
-        case CORBA::tk_enum:  // Enumerators are encoded as unsigned longs.
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            CORBA::Long label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Long,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::UShort,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            CORBA::Short label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Short,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            CORBA::Char label;
-            if (!(cdr >> CORBA::Any::to_char (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean label;
-            if (!(cdr >> CORBA::Any::to_boolean (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Boolean,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            CORBA::LongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::LongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-        case CORBA::tk_ulonglong:
-          {
-            CORBA::ULongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#endif  /* !ACE_LACKS_LONGLONG_T */
-        default:
-          return false;
-        }
-
-      elem_type case_value (the_case);
-      member.swap (case_value);  // Exception-safe
-
-      CORBA::String_var the_name;
-      CORBA::TypeCode_var the_type;
-
-      if (!(cdr >> TAO_InputCDR::to_string (the_name.out (), 0)
-            && tc_demarshal (cdr, the_type.out (), infos)))
-        return false;
-
-      member->name (the_name.in ());
-      member->type (the_type.in ());
-    }
-
-  typedef TAO::TypeCode::Union<CORBA::String_var,
-                               CORBA::TypeCode_var,
-                               case_array_type,
-                               TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if union TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            case_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->union_parameters (name.in (),
-                             discriminant_type,
-                             cases,     // Will be copied.
-                             ncases,
-                             default_index);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (id.in (),
-                                     name.in (),
-                                     discriminant_type,
-                                     cases,     // Will be copied.
-                                     ncases,
-                                     default_index),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_enum_factory (CORBA::TCKind /* kind */,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nenumerators;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nenumerators))
-    return false;
-
-  ACE_Array_Base<CORBA::String_var> enumerators (nenumerators);
-
-  for (CORBA::ULong i = 0; i < nenumerators; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (enumerators[i].out (), 0)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Enum<
-    CORBA::String_var,
-    ACE_Array_Base<CORBA::String_var>,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (id.in (),
-                                 name.in (),
-                                 enumerators,     // Will be copied.
-                                 nenumerators),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_string_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // A tk_string/tk_wstring TypeCode has a simple parameter list,
-  // i.e. it is not encoded in a CDR encapsulation.
-
-  CORBA::ULong bound;
-  if (!(cdr >> bound))
-    return false;
-
-  if (bound == 0)
-    {
-      // Just use the TypeCode constant.
-      if (kind == CORBA::tk_string)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-      else if (kind == CORBA::tk_wstring)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-      else
-        return false;
-
-      return true;
-    }
-
-  typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, bound),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_sequence_factory (CORBA::TCKind kind,
-                                           TAO_InputCDR & cdr,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_sequence || kind == CORBA::tk_array);
-
-  // The remainder of a tk_sequence TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::TypeCode_var content_type;
-  CORBA::ULong length;
-
-  if (!(tc_demarshal (cdr, content_type.out (), infos)
-        && cdr >> length))
-    return false;
-
-  typedef TAO::TypeCode::Sequence<
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, content_type, length),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_array_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_sequence_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_alias_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_alias or tk_value_box TypeCode is encoded
-  // in a CDR encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var content_type;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && tc_demarshal (cdr, content_type.out (), infos)))
-    return false;
-
-  typedef TAO::TypeCode::Alias<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind,
-                                 id.in (),
-                                 name.in (),
-                                 content_type),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_except_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_struct_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_longlong_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulonglong_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_longdouble_factory (CORBA::TCKind,
-                                             TAO_InputCDR &,
-                                             CORBA::TypeCode_ptr & tc,
-                                             TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wchar_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wstring_factory (CORBA::TCKind kind,
-                                          TAO_InputCDR & cdr,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List & infos)
-{
-  return tc_string_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_fixed_factory (CORBA::TCKind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  // A tk_fixed TypeCode has a simple parameter list, i.e. it is not
-  // encoded in a CDR encapsulation.
-
-  CORBA::UShort digits, scale;
-  if (!(cdr >> digits && cdr >> scale))
-    return false;
-
-  typedef TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (digits, scale),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_value/tk_event TypeCode is encoded in a
-  // CDR encapsulation
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-//   if (ACE_OS::strcmp (id.in (), "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ValueBase);
-
-//       return true;
-//     }
-//   else if (ACE_OS::strcmp (id.in (),
-//                            "IDL:omg.org/CORBA/EventBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_EventBase);
-
-//       return true;
-//     }
-
-  CORBA::String_var name;
-  CORBA::ValueModifier type_modifier;
-  CORBA::TypeCode_var concrete_base;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> type_modifier
-        && cdr >> concrete_base.out ()
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Value_Field<CORBA::String_var,
-                                                    CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> & field = fields[i];
-
-      if (!(cdr >> TAO_InputCDR::to_string (field.name.out (), 0)
-            && tc_demarshal (cdr, field.type.out (), infos)
-            && cdr >> field.visibility))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Value<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if valuetype/eventtype TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->valuetype_parameters (name.in (),
-                                 type_modifier,
-                                 concrete_base,
-                                 fields,     // Will be copied.
-                                 nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     type_modifier,
-                                     concrete_base,
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_box_factory (CORBA::TCKind kind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_alias_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_native_factory (CORBA::TCKind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_native, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_abstract_interface_factory (CORBA::TCKind,
-                                                     TAO_InputCDR & cdr,
-                                                     CORBA::TypeCode_ptr & tc,
-                                                     TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_abstract_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_local_interface_factory (CORBA::TCKind,
-                                                  TAO_InputCDR & cdr,
-                                                  CORBA::TypeCode_ptr & tc,
-                                                  TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_local_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_component_factory (CORBA::TCKind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_component, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_home_factory (CORBA::TCKind,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_home, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_event_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_value_factory (kind, cdr, tc, infos);
-}
-
-// ---------------------------------------------------------------
-
-namespace
-{
-  bool
-  tc_demarshal (TAO_InputCDR & cdr,
-                CORBA::TypeCode_ptr & tc,
-                TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // ULong since we need to detect indirected TypeCodes, too.
-
-    CORBA::ULong kind;
-    if (!(cdr >> kind)
-        || (kind >= static_cast<CORBA::ULong> (CORBA::TAO_TC_KIND_COUNT)
-            && kind != TYPECODE_INDIRECTION))
-      return false;
-
-    if (kind == TYPECODE_INDIRECTION)
-      return tc_demarshal_indirection (cdr, tc, infos);
-
-    using namespace TAO::TypeCodeFactory;
-
-    static factory const factory_map[] =
-      {
-        tc_null_factory,
-        tc_void_factory,
-        tc_short_factory,
-        tc_long_factory,
-        tc_ushort_factory,
-        tc_ulong_factory,
-        tc_float_factory,
-        tc_double_factory,
-        tc_boolean_factory,
-        tc_char_factory,
-        tc_octet_factory,
-        tc_any_factory,
-        tc_TypeCode_factory,
-        tc_Principal_factory,
-        tc_objref_factory,
-        tc_struct_factory,
-        tc_union_factory,
-        tc_enum_factory,
-        tc_string_factory,
-        tc_sequence_factory,
-        tc_array_factory,
-        tc_alias_factory,
-        tc_except_factory,
-        tc_longlong_factory,
-        tc_ulonglong_factory,
-        tc_longdouble_factory,
-        tc_wchar_factory,
-        tc_wstring_factory,
-        tc_fixed_factory,
-        tc_value_factory,
-        tc_value_box_factory,
-        tc_native_factory,
-        tc_abstract_interface_factory,
-        tc_local_interface_factory,
-        tc_component_factory,
-        tc_home_factory,
-        tc_event_factory
-      };
-
-    return factory_map[kind] (static_cast<CORBA::TCKind> (kind),
-                              cdr,
-                              tc,
-                              infos);
-  }
-
-  bool
-  tc_demarshal_indirection (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc,
-                            TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    CORBA::Long offset;
-
-    if (!(cdr >> offset) || offset >= -4)
-      {
-        // Offsets must be negative since they point back to a
-        // TypeCode found earlier in the CDR stream.  They must be
-        // less than -4 since an offset of -4 points back to the
-        // indirection TypeCode itself, meaning that it would be
-        // self-indirecting.
-        return false;
-      }
-
-//     ACE_Message_Block * const mb =
-//       const_cast<ACE_Message_Block *> (cdr.start ());
-
-//     TAO_InputCDR indir_stream (mb->rd_ptr () + offset - 4,
-    TAO_InputCDR indir_stream (cdr.rd_ptr () + offset - sizeof (CORBA::Long),
-                               (-offset) + sizeof (CORBA::Long),
-                               cdr.byte_order ());
-
-    if (!indir_stream.good_bit ())
-      {
-        return false;
-      }
-
-    CORBA::TCKind kind;
-    if (!(indir_stream >> kind)
-
-        // Indirected TypeCode must point to top-level TypeCode.
-        || static_cast<CORBA::ULong> (kind) == TYPECODE_INDIRECTION
-
-        // Only struct, union and valuetype TypeCodes may be recursive.
-        || !(kind == CORBA::tk_struct
-             || kind == CORBA::tk_union
-             || kind == CORBA::tk_value
-             || kind == CORBA::tk_event)
-
-        // Currently all recursive TypeCodes have complex parameter
-        // lists, meaning they are encoded as CDR encapsulations.
-        || !start_cdr_encap_extraction (indir_stream))
-      {
-        return false;
-      }
-
-    /**
-     * @todo Recursive TypeCode demarshaling is currently suboptimal
-     *       due to redundant demarshaling of TypeCode parameters,
-     *       such as repository ID, and excessive
-     *       allocations/copying.
-     */
-
-    CORBA::String_var id;
-    if (!(indir_stream >> TAO_InputCDR::to_string (id.out (), 0)))
-      return false;
-
-    // Don't bother demarshaling the rest of the parameters.  They will
-    // be handled by the top-level TypeCode demarshaling call.
-
-    switch (kind)
-      {
-      case CORBA::tk_struct:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Struct_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Struct<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_union:
-        {
-          typedef union_case_array_type member_array_type;
-
-          typedef TAO::TypeCode::Union<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_value:
-      case CORBA::tk_event:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Value_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Value<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      default:
-        return false;  // We should never get here.
-      };
-
-    size_t const old_size = infos.size ();
-    if (infos.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
-      return false;
-
-    TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-    info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);  // Should never throw!
-
-    info.type = tc;
-
-    return true;
-  }
-}
-
-// ----------------------------------------------------------------
-
-bool
-operator>> (TAO_InputCDR & cdr,
-            CORBA::TypeCode_ptr & tc)
-{
-  TAO::TypeCodeFactory::TC_Info_List infos;
-
-  return tc_demarshal (cdr, tc, infos);
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.h b/TAO/tao/TypeCode_CDR_Extraction.h
deleted file mode 100644
index b7571fbfbf4..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_CDR_Extraction.h
- *
- *  $Id$
- *
- *  Header file for TAO TypeCode CDR extraction operations.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CDR_EXTRACTION_H
-#define TAO_TYPECODE_CDR_EXTRACTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-template <class T> class ACE_Array_Base;
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    struct TC_Info;
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-
-    typedef bool (*factory) (CORBA::TCKind,
-                             TAO_InputCDR &,
-                             CORBA::TypeCode_ptr &,
-                             TC_Info_List &);
-
-    bool tc_null_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_void_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_short_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_long_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ushort_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulong_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_float_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_double_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_boolean_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_char_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_octet_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_any_factory        (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_TypeCode_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_Principal_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_objref_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_struct_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_union_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_enum_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_string_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_sequence_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_array_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_alias_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_except_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longlong_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulonglong_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longdouble_factory (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wchar_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wstring_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_fixed_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_box_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_native_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_abstract_interface_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos);
-    bool tc_local_interface_factory (CORBA::TCKind kind,
-                                     TAO_InputCDR & cdr,
-                                     CORBA::TypeCode_ptr & tc,
-                                     TC_Info_List & infos);
-    bool tc_component_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_home_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_event_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CDR_EXTRACTION_H */
diff --git a/TAO/tao/TypeCode_Case.cpp b/TAO/tao/TypeCode_Case.cpp
deleted file mode 100644
index 078071e2287..00000000000
--- a/TAO/tao/TypeCode_Case.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_CPP
-#define TAO_TYPECODE_CASE_CPP
-
-#include "TypeCode_Case.h"
-#include "ace/OS_NS_string.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template <typename StringType, typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
-                                                      CORBA::TypeCode_ptr tc
-                                                      ACE_ENV_ARG_DECL) const
-{
-  // Check case names.
-  char const * const lhs_name = this->name ();
-  char const * const rhs_name = tc->member_name (index
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-    return 0;
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_members =
-    lhs_tc->equal (rhs_tc.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_members)
-    return 0;
-
-  // Check case label.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
-  CORBA::ULong index,
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Member names are ignore when determining equivalence.
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_members =
-    lhs_tc->equivalent (rhs_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_members)
-    return 0;
-
-  // Check case label.
-  // The label must be equal when determining equivalence, too.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-#endif  /* TAO_TYPECODE_CASE_CPP */
diff --git a/TAO/tao/TypeCode_Case.h b/TAO/tao/TypeCode_Case.h
deleted file mode 100644
index 258b3ce299f..00000000000
--- a/TAO/tao/TypeCode_Case.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case type.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_H
-#define TAO_TYPECODE_CASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-
-  class Any;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Case
-     *
-     * @brief Abstract base class for that represents an IDL @c union
-     *        case/member.
-     *
-     * This class hides the actual IDL @c union member label value
-     * from the @c TAO::TypeCode::Union class by relying on a
-     * CORBA::Any return value that corresponds to the @c
-     * CORBA::TypeCode::member_label() return type.  It also allows
-     * the @c TAO::TypeCode::Union class to marshal the member label
-     * values into a CDR stream without knowledge of the underlying
-     * member label values.
-     */
-    template <typename StringType, typename TypeCodeType>
-    class Case
-    {
-    public:
-
-      /// Constructor.
-      /**
-       * Constructor used when creating static @c union @c TypeCodes.
-       */
-      Case (char const * name,
-            TypeCodeType tc);
-
-      /// Constructor.
-      /**
-       * Constructor used when creating dynamic @c union @c TypeCodes.
-       */
-      Case (void);
-
-      /// Destructor.
-      virtual ~Case (void);
-
-      /// Cloning/copying operation.
-      virtual Case * clone (void) const = 0;
-
-      /// Return the IDL @c union case label value embedded within a
-      /// @c CORBA::Any.
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-      /// Get the name of the @c union case/member.
-      char const * name (void) const;
-
-      /// Set the name of the @c union case/member.
-      void name (char const * the_name);
-
-      /// Get the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note The reference count is not manipulated by this method,
-       *       i.e., ownership is retained by this class.
-       */
-      CORBA::TypeCode_ptr type (void) const;
-
-      /// Set the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note @c CORBA::TypeCode::_duplicate() is called on the
-       *       @c TypeCode @a tc.
-       */
-      void type (CORBA::TypeCode_ptr tc);
-
-      /// Marshal this IDL @c union member into the given output CDR
-      /// stream.
-      bool marshal (TAO_OutputCDR & cdr,
-                    CORBA::ULong offset) const;
-
-      /// Check for equality of the @c case attributes contained by this
-      /// class and the corresponding member attributes at index "@a
-      /// index" in the given @c TypeCode @a tc.
-      bool equal (CORBA::ULong index,
-                  CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL) const;
-
-      /// Check for equivalence of the @c case attributes contained by
-      /// this class and the corresponding member attributes at index
-      /// "@a index" in the given @c TypeCode @a tc.
-      bool equivalent (CORBA::ULong index,
-                       CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL) const;
-
-    protected:
-
-      /// Marshal the IDL @c union @c case label value into the given
-      /// output CDR stream.
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const = 0;
-
-      /// Verify equality of member labels.
-      /**
-       * Performing member label equality comparisons in the @c Case
-       * subclass allows us to avoid performing interpretive
-       * extraction of the value from the @c Any returned from the
-       * "right hand side" operand @c TypeCode since the @c Case
-       * subclass already knows what type and value should be
-       * extracted from the @c Any.
-       *
-       * @param index Member index of given @c TypeCode @a tc being
-       *              tested.
-       * @param tc    The @c TypeCode whose member "@a index" label is
-       *              being tested.
-       */
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const = 0;
-
-    private:
-
-      /// The name of the case.
-      StringType name_;
-
-      /// Pointer to the @c CORBA::TypeCode of the case.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Case statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c Case.
-       */
-      TypeCodeType type_;
-
-    };
-
-    typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-namespace ACE
-{
-  /// @see ace/Value_Ptr.h.
-  template <typename T> struct VP_traits;
-
-  template <>
-  struct TAO_Export VP_traits<TAO::TypeCode::Case_Dynamic>
-  {
-    /// Copy the given object.
-    static TAO::TypeCode::Case_Dynamic * clone (
-      TAO::TypeCode::Case_Dynamic const * p)
-    {
-      return p->clone ();
-    }
-  };
-
-} // End namespace ACE namespace.
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_H */
diff --git a/TAO/tao/TypeCode_Case.inl b/TAO/tao/TypeCode_Case.inl
deleted file mode 100644
index 1601ec87967..00000000000
--- a/TAO/tao/TypeCode_Case.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (
-  char const * member_name,
-  TypeCodeType member_type)
-  : name_ (member_name)
-  , type_ (member_type)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void)
-  : name_ ()
-  , type_ ()
-{
-  // Only used when StringType and TypeCodeType are CORBA::String_var
-  // and CORBA::TypeCode_var, respectively.
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  return
-    this->marshal_label (cdr)
-    && (cdr << TAO_OutputCDR::from_string (
-         Traits<StringType>::get_string (this->name_), 0))
-    && TAO::TypeCode::marshal (cdr,
-                               Traits<StringType>::get_typecode (this->type_),
-                               offset + cdr.total_length ());
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE char const *
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (void) const
-{
-  return
-    Traits<StringType>::get_string (this->name_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (
-  char const * the_name)
-{
-  this->name_ = the_name;
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE CORBA::TypeCode_ptr
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (void) const
-{
-  return
-    Traits<StringType>::get_typecode (this->type_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc)
-{
-  // This assignment works since it is only used when TypeCodeType is
-  // "CORBA::TypeCode_var", not in the "CORBA::TypeCode_ptr const *"
-  // case.
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
diff --git a/TAO/tao/TypeCode_Case_T.cpp b/TAO/tao/TypeCode_Case_T.cpp
deleted file mode 100644
index 204f85a2a1a..00000000000
--- a/TAO/tao/TypeCode_Case_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_T_CPP
-#define TAO_TYPECODE_CASE_T_CPP
-
-#include "TypeCode_Case_T.h"
-
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/SystemException.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename T>
-    struct Case_Traits
-    {
-      inline static T any_from (T v)
-      {
-        return v;
-      }
-
-      inline static T & any_to (T & v)
-      {
-        return v;
-      }
-    };
-
-    // Specializations for types that require wrapper for Any
-    // insertion.  Note that we only define specializations for types
-    // that can be used in an IDL union discriminator.
-
-    template <>
-    struct Case_Traits<CORBA::Boolean>
-    {
-      inline static CORBA::Any::from_boolean any_from (CORBA::Boolean v)
-      {
-        return CORBA::Any::from_boolean (v);
-      }
-
-      inline static CORBA::Any::to_boolean any_to (CORBA::Boolean & v)
-      {
-        return CORBA::Any::to_boolean (v);
-      }
-    };
-
-    template <>
-    struct Case_Traits<CORBA::Char>
-    {
-      inline static CORBA::Any::from_char any_from (CORBA::Char v)
-      {
-        return CORBA::Any::from_char (v);
-      }
-
-      inline static CORBA::Any::to_char any_to (CORBA::Char & v)
-      {
-        return CORBA::Any::to_char (v);
-      }
-    };
-
-  } // End TypeCode namespace
-}  // End TAO namespace
-
-// ----------------------------------------------------------------
-
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType> *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::clone (void) const
-{
-  Case<StringType, TypeCodeType> * p = 0;
-
-  typedef Case_T<DiscriminatorType,
-                 StringType,
-                 TypeCodeType> case_type;
-
-  // The compiler generated memberwise copy constructor is sufficient.
-  ACE_NEW_RETURN (p,
-                  case_type (*this),
-                  p);
-
-  return p;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::marshal_label (TAO_OutputCDR & cdr) const
-{
-  return
-    (cdr <<
-     TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_));
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::equal_label (CORBA::ULong index,
-                                                  CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  CORBA::Any_var const any = tc->member_label (index
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // The equality operator == below is guaranteed to be defined for
-  // the discriminator type since an IDL union discriminator type must
-  // be any of the following: (1) an integer, (2) a character, (3) a
-  // boolean, or (4) an enumeration.
-
-  DiscriminatorType tc_label;
-  if ((any.in ()
-       >>= TAO::TypeCode::Case_Traits<DiscriminatorType>::any_to (tc_label))
-      && this->label_ == tc_label)
-    {
-      return true;
-    }
-
-  return false;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-CORBA::Any *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  CORBA::Any * value;
-
-  ACE_NEW_THROW_EX (value,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_value (value);
-
-  *value <<=
-    TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_);
-
-  return safe_value._retn ();
-}
-
-
-#endif  /* TAO_TYPECODE_CASE_T_CPP */
diff --git a/TAO/tao/TypeCode_Case_T.h b/TAO/tao/TypeCode_Case_T.h
deleted file mode 100644
index ea36c766bc7..00000000000
--- a/TAO/tao/TypeCode_Case_T.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case_T.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case_T template.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_T_H
-#define TAO_TYPECODE_CASE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Case.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Case_T
-     *
-     * @brief Representation of an OMG IDL defined @c union @c case.
-     *
-     * A @c Case_T contains the corresponding case label value, name and
-     * pointer to the @c CORBA::TypeCode for a given OMG IDL @c union
-     * @c case.  For
-     * example, the cases in following OMG IDL @c union:
-     *
-     * \code
-     *   union Foo switch (short)
-     *   {
-     *     case 0:
-     *     case 1:  short a;
-     *     case 2:  long  b;
-     *     default: octet c;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Case_T array:
-     *
-     * \code
-     *   typedef TAO::TypeCode::Case_T<CORBA::Short, char const *> Foo_Case;
-     *   Foo_Case _tao_cases_Foo[] =
-     *     {
-     *       Foo_Case (0, "a", &CORBA::_tc_short),
-     *       Foo_Case (1, "a", &CORBA::_tc_short),
-     *       Foo_Case (2, "b", &CORBA::_tc_long),
-     *       Foo_Case (0, "c", &CORBA::_tc_octet)
-     *     };
-     * \endcode
-     *
-     * The @c default index is passed directly to the
-     * @c TAO::TypeCode::Union constructor.
-     *
-     * The template parameter @a DISCRIMINATOR_TYPE is the
-     * corresponding C++ type for the IDL defined @c union
-     * discriminator type.  For example, a @c union with an IDL @c
-     * short discriminator will have a corresponding @c CORBA::Short
-     * C++ type.  This template parameter is necessary to allow the
-     * actual @c case label value to be stored as its actual type,
-     * which is particularly important when marshaling that value into
-     * a CDR stream.
-     *
-     * The template parameter @a StringType is either @c char @c
-     * const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_union @c TypeCode dynamically, such
-     * as through the TypeCodeFactory.
-     */
-    template <typename DiscriminatorType,
-              typename StringType,
-              typename TypeCodeType>
-    class Case_T : public Case<StringType, TypeCodeType>
-    {
-    public:
-
-      /// Constructor.
-      Case_T (DiscriminatorType member_label,
-              char const * member_name,
-              TypeCodeType member_type);
-
-      /// Constructor.
-      /**
-       * Constructor only used in the dynamically constructed @c union
-       * @c TypeCode case.
-       */
-      Case_T (DiscriminatorType member_label);
-
-      /**
-       * @name @c TAO::TypeCode::Case Methods
-       *
-       * Methods required by the @c TAO::TypeCode::Case abstract base
-       * class.
-       *
-       * @see @c TAO::TypeCode::Case
-       */
-      //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const;
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /// IDL @c union case/member label value.
-      DiscriminatorType const label_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_T_H */
diff --git a/TAO/tao/TypeCode_Case_T.inl b/TAO/tao/TypeCode_Case_T.inl
deleted file mode 100644
index b6ac33bd18e..00000000000
--- a/TAO/tao/TypeCode_Case_T.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label,
-                                             char const * member_name,
-                                             TypeCodeType member_type)
-  : Case<StringType, TypeCodeType> (member_name, member_type)
-  , label_ (member_label)
-{
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label)
-  : Case<StringType, TypeCodeType> ()
-  , label_ (member_label)
-{
-}
diff --git a/TAO/tao/TypeCode_Constants.cpp b/TAO/tao/TypeCode_Constants.cpp
deleted file mode 100644
index fe6b46d2c1f..00000000000
--- a/TAO/tao/TypeCode_Constants.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-
-#include "TypeCode_Constants.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_Constants,
-           "$Id$")
-
-
-#include "Null_RefCount_Policy.h"
-#include "Empty_Param_TypeCode.h"
-#include "Objref_TypeCode_Static.h"
-#include "String_TypeCode_Static.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.  There CORBA::TypeCode_ptr counterparts are, however,
-    // exported.
-
-    Empty_Param tc_null       (CORBA::tk_null);
-    Empty_Param tc_void       (CORBA::tk_void);
-    Empty_Param tc_boolean    (CORBA::tk_boolean);
-    Empty_Param tc_char       (CORBA::tk_char);
-    Empty_Param tc_wchar      (CORBA::tk_wchar);
-    Empty_Param tc_short      (CORBA::tk_short);
-    Empty_Param tc_ushort     (CORBA::tk_ushort);
-    Empty_Param tc_long       (CORBA::tk_long);
-    Empty_Param tc_ulong      (CORBA::tk_ulong);
-    Empty_Param tc_longlong   (CORBA::tk_longlong);
-    Empty_Param tc_ulonglong  (CORBA::tk_ulonglong);
-    Empty_Param tc_float      (CORBA::tk_float);
-    Empty_Param tc_double     (CORBA::tk_double);
-    Empty_Param tc_longdouble (CORBA::tk_longdouble);
-    Empty_Param tc_octet      (CORBA::tk_octet);
-    Empty_Param tc_any        (CORBA::tk_any);
-    Empty_Param tc_TypeCode   (CORBA::tk_TypeCode);
-    Empty_Param tc_Principal  (CORBA::tk_Principal);
-
-    // --------------
-
-    String<TAO::Null_RefCount_Policy> tc_string  (CORBA::tk_string, 0);
-    String<TAO::Null_RefCount_Policy> tc_wstring (CORBA::tk_wstring, 0);
-
-    // --------------
-
-    char const tc_object_id[]   = "IDL:omg.org/CORBA/Object:1.0";
-    char const tc_object_name[] = "Object";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Object (CORBA::tk_objref,
-                                                 tc_object_id,
-                                                 tc_object_name);
-
-    char const tc_component_id[]   = "IDL:omg.org/CORBA/CCMObject:1.0";
-    char const tc_component_name[] = "CCMObject";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Component (CORBA::tk_component,
-                                                    tc_component_id,
-                                                    tc_component_name);
-
-    char const tc_home_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-    char const tc_home_name[] = "CCMHome";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Home (CORBA::tk_home,
-                                               tc_home_id,
-                                               tc_home_name);
-  }  // End TypeCode namespace
-}  // End TAO namespace
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-namespace CORBA
-{
-  // Notice that these are constant TypeCode references/pointers, not
-  // constant TypeCodes.  TypeCodes are effectively read-only since
-  // all non-static TypeCode operations are const.
-
-  TypeCode_ptr const _tc_null       = &TAO::TypeCode::tc_null;
-  TypeCode_ptr const _tc_void       = &TAO::TypeCode::tc_void;
-  TypeCode_ptr const _tc_boolean    = &TAO::TypeCode::tc_boolean;
-  TypeCode_ptr const _tc_char       = &TAO::TypeCode::tc_char;
-  TypeCode_ptr const _tc_wchar      = &TAO::TypeCode::tc_wchar;
-  TypeCode_ptr const _tc_short      = &TAO::TypeCode::tc_short;
-  TypeCode_ptr const _tc_ushort     = &TAO::TypeCode::tc_ushort;
-  TypeCode_ptr const _tc_long       = &TAO::TypeCode::tc_long;
-  TypeCode_ptr const _tc_ulong      = &TAO::TypeCode::tc_ulong;
-  TypeCode_ptr const _tc_longlong   = &TAO::TypeCode::tc_longlong;
-  TypeCode_ptr const _tc_ulonglong  = &TAO::TypeCode::tc_ulonglong;
-  TypeCode_ptr const _tc_float      = &TAO::TypeCode::tc_float;
-  TypeCode_ptr const _tc_double     = &TAO::TypeCode::tc_double;
-  TypeCode_ptr const _tc_longdouble = &TAO::TypeCode::tc_longdouble;
-  TypeCode_ptr const _tc_octet      = &TAO::TypeCode::tc_octet;
-  TypeCode_ptr const _tc_any        = &TAO::TypeCode::tc_any;
-  TypeCode_ptr const _tc_TypeCode   = &TAO::TypeCode::tc_TypeCode;
-  TypeCode_ptr const _tc_Principal  = &TAO::TypeCode::tc_Principal;
-
-  TypeCode_ptr const _tc_string     = &TAO::TypeCode::tc_string;
-  TypeCode_ptr const _tc_wstring    = &TAO::TypeCode::tc_wstring;
-
-  TypeCode_ptr const _tc_Object     = &TAO::TypeCode::tc_Object;
-  TypeCode_ptr const _tc_Component  = &TAO::TypeCode::tc_Component;
-  TypeCode_ptr const _tc_Home       = &TAO::TypeCode::tc_Home;
-
-}
diff --git a/TAO/tao/TypeCode_Constants.h b/TAO/tao/TypeCode_Constants.h
deleted file mode 100644
index a5b29c32841..00000000000
--- a/TAO/tao/TypeCode_Constants.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TypeCode_Constants.h
- *
- *  $Id$
- *
- *  Declare the @c TypeCode constants available to the ORB and user
- *  applications.
- *
- *  @author Jeff Parsons
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CONSTANTS_H
-#define TAO_TYPECODE_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
-
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_Component;
-  extern TAO_Export TypeCode_ptr const _tc_Home;
-  //@}
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CONSTANTS_H */
diff --git a/TAO/tao/TypeCode_Struct_Field.h b/TAO/tao/TypeCode_Struct_Field.h
deleted file mode 100644
index ad1fb0b35c2..00000000000
--- a/TAO/tao/TypeCode_Struct_Field.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Struct_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Struct_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_STRUCT_FIELD_H
-#define TAO_TYPECODE_STRUCT_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Struct_Field
-     *
-     * @brief Name/type pair for fields of an OMG IDL defined
-     *        structure or exception.
-     *
-     * A @c Struct_Field contains the corresponding name and pointer
-     * to the @c CORBA::TypeCode for a given OMG IDL defined type.
-     * For example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Struct_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Struct_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_struct or @c CORBA::tk_except
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Struct_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_STRUCT_FIELD_H */
diff --git a/TAO/tao/TypeCode_Traits.h b/TAO/tao/TypeCode_Traits.h
deleted file mode 100644
index b1eae5d2c13..00000000000
--- a/TAO/tao/TypeCode_Traits.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Traits.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_TRAITS_H
-#define TAO_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_String.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-  namespace TypeCode
-  {
-
-//     enum Storage { STATIC_TYPECODE, DYNAMIC_TYPECODE };
-
-//     template<Storage S> struct Traits;
-
-    // ----
-    // @@ Work around limitations in MSVC++ 6.
-    typedef char const * STATIC_TYPECODE;
-    typedef CORBA::String_var DYNAMIC_TYPECODE;
-
-    template<typename S> struct Traits;
-    // ----
-
-    template<>
-    struct Traits<STATIC_TYPECODE>
-    {
-      typedef char const * string_type;
-
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the
-       * @c CORBA::TypeCode_ptr when creating a static object that
-       * refers to it, hence the indirection.
-       */
-      typedef CORBA::TypeCode_ptr const * typecode_type;
-
-      typedef TAO::Null_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str;
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<DYNAMIC_TYPECODE>
-    {
-      typedef CORBA::String_var string_type;
-      typedef CORBA::TypeCode_var typecode_type;
-      typedef TAO::True_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str.in ();
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-    };
-
-    // ---------------
-
-    // Traits based on TypeCode type template parameters.
-
-    template<>
-    struct Traits<Traits<STATIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<STATIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<Traits<DYNAMIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<DYNAMIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/TypeCode_Value_Field.h b/TAO/tao/TypeCode_Value_Field.h
deleted file mode 100644
index 7fbfcb20501..00000000000
--- a/TAO/tao/TypeCode_Value_Field.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Value_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Value_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_VALUE_FIELD_H
-#define TAO_TYPECODE_VALUE_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Value_Field
-     *
-     * @brief Name/type/visibility tuple fields of an OMG IDL defined
-     *        @c valuetype or @c eventtype.
-     *
-     * A @c Value_Field contains the corresponding name and pointer to the
-     * @c CORBA::TypeCode for a given OMG IDL defined type.  For
-     * example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Value_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Value_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_value or @c CORBA::tk_event
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Value_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-      /// The visibility of the field.
-      CORBA::Visibility visibility;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_VALUE_FIELD_H */
diff --git a/TAO/tao/Typecode_types.pidl b/TAO/tao/Typecode_types.pidl
deleted file mode 100644
index af1802d6d9d..00000000000
--- a/TAO/tao/Typecode_types.pidl
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- IDL -*-
-
-// $Id$
-
-// Typecode stuff, originall in orb.idl
-
-#ifndef TAO_TYPECODE_TYPES_IDL
-#define TAO_TYPECODE_TYPES_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface TypeCode;
-
-  enum TCKind
-  {
-    tk_null,
-    tk_void,
-    tk_short,
-    tk_long,
-    tk_ushort,
-    tk_ulong,
-    tk_float,
-    tk_double,
-    tk_boolean,
-    tk_char,
-    tk_octet,
-    tk_any,
-    tk_TypeCode,
-    tk_Principal,
-    tk_objref,
-    tk_struct,
-    tk_union,
-    tk_enum,
-    tk_string,
-    tk_sequence,
-    tk_array,
-    tk_alias,
-    tk_except,
-    tk_longlong,
-    tk_ulonglong,
-    tk_longdouble,
-    tk_wchar,
-    tk_wstring,
-    tk_fixed,
-    tk_value,
-    tk_value_box,
-    tk_native,
-    tk_abstract_interface,
-    tk_local_interface,
-    tk_component,
-    tk_home,
-    tk_event
-  };
-};
-
-#endif /* TAO_TYPECODE_TYPES_IDL */
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
deleted file mode 100644
index a924b9f021a..00000000000
--- a/TAO/tao/Typecode_typesC.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Typecode_typesC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::TCKind _tao_enumerator)
-{
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::TCKind & _tao_enumerator)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
-  
-  if (_tao_success)
-    {
-      _tao_enumerator = static_cast<CORBA::TCKind> (_tao_temp);
-    }
-  
-  return _tao_success;
-}
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
deleted file mode 100644
index 5ca14029cdd..00000000000
--- a/TAO/tao/Typecode_typesC.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_TYPECODE_TYPESC_H_
-#define _TAO_IDL_ORIG_TYPECODE_TYPESC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Objref_VarOut_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
-  enum TCKind
-  {
-    tk_null,
-    tk_void,
-    tk_short,
-    tk_long,
-    tk_ushort,
-    tk_ulong,
-    tk_float,
-    tk_double,
-    tk_boolean,
-    tk_char,
-    tk_octet,
-    tk_any,
-    tk_TypeCode,
-    tk_Principal,
-    tk_objref,
-    tk_struct,
-    tk_union,
-    tk_enum,
-    tk_string,
-    tk_sequence,
-    tk_array,
-    tk_alias,
-    tk_except,
-    tk_longlong,
-    tk_ulonglong,
-    tk_longdouble,
-    tk_wchar,
-    tk_wstring,
-    tk_fixed,
-    tk_value,
-    tk_value_box,
-    tk_native,
-    tk_abstract_interface,
-    tk_local_interface,
-    tk_component,
-    tk_home,
-    tk_event
-
-    // This symbol is not defined by CORBA 3.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-    , TAO_TC_KIND_COUNT
-  };
-  
-  typedef TCKind &TCKind_out;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::TCKind);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Typecode_typesS.h b/TAO/tao/Typecode_typesS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/Typecode_typesS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
deleted file mode 100644
index a22d029b64c..00000000000
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#ifndef TAO_UB_STRING_ARGUMENT_T_C
-#define TAO_UB_STRING_ARGUMENT_T_C
-
-#include "tao/UB_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/UB_String_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-//#include "tao/DynamicC.h"
-
-ACE_RCSID (tao,
-           UB_String_Argument_T,
-           "$Id$")
-
-template<typename S>
-CORBA::Boolean
-TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  delete [] this->x_;
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_out>
-CORBA::Boolean
-TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_out>
-void
-TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> this->x_.out ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_UB_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
deleted file mode 100644
index 02c1c948b6c..00000000000
--- a/TAO/tao/UB_String_Argument_T.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UB_String_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_UB_STRING_ARGUMENT_T_H
-#define TAO_UB_STRING_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_UB_String_Argument_T
-   *
-   * @brief Template class for IN unbounded (w)string argument.
-   *
-   */
-  template<typename S>
-  class In_UB_String_Argument_T : public Argument
-  {
-  public:
-    In_UB_String_Argument_T (const S * x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const * arg (void) const;
-
-  private:
-    S const * x_;
-  };
-
-  /**
-   * @class Inout_UB_String_Argument_T
-   *
-   * @brief Template class for INOUT unbounded (w)string argument.
-   *
-   */
-  template<typename S>
-  class Inout_UB_String_Argument_T : public Argument
-  {
-  public:
-    Inout_UB_String_Argument_T (S *& x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S *& x_;
-  };
-
-  /**
-   * @class Out_UB_String_Argument_T
-   *
-   * @brief Template class for INOUT unbounded (w)string argument.
-   *
-   */
-  template<typename S, typename S_out>
-  class Out_UB_String_Argument_T : public Argument
-  {
-  public:
-    Out_UB_String_Argument_T (S_out & x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S *& x_;
-  };
-
-  /**
-   * @class Ret_UB_String_Argument_T
-   *
-   * @brief Template class for return stub value of ub (w)string argument.
-   *
-   */
-  template<typename S, typename S_var>
-  class Ret_UB_String_Argument_T : public Argument
-  {
-  public:
-    Ret_UB_String_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-    S * excp (void);
-    S * retn (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct UB_String_Tag
-   *
-   * @brief Struct for unbounded (w)string arguments id tag.
-   *
-   */
-  struct TAO_Export UB_String_Tag {};
-
-  /**
-   * @struct UB_String_Arg_Traits_T
-   *
-   * @brief Template class for argument traits of unbounded (w)strings.
-   *
-   */
-  template<typename T, typename T_var, typename T_out>
-  struct UB_String_Arg_Traits_T
-  {
-    typedef T *                                         ret_type;
-    typedef T const *                                   in_type;
-    typedef T *&                                        inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_UB_String_Argument_T<T>                  in_arg_val;
-    typedef Inout_UB_String_Argument_T<T>               inout_arg_val;
-    typedef Out_UB_String_Argument_T<T,T_out>           out_arg_val;
-    typedef Ret_UB_String_Argument_T<T,T_var>           ret_val;
-
-    typedef UB_String_Tag                               idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/UB_String_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/UB_String_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("UB_String_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UB_STRING_ARGUMENT_T_H */
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
deleted file mode 100644
index b5fbd2a4b60..00000000000
--- a/TAO/tao/UB_String_Argument_T.inl
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-template<typename S>
-ACE_INLINE
-TAO::In_UB_String_Argument_T<S>::In_UB_String_Argument_T (const S * x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-const S *
-TAO::In_UB_String_Argument_T<S>::arg (void) const
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_UB_String_Argument_T<S>::Inout_UB_String_Argument_T (S *& x)
-  : x_ (x)
-{}
-
-template<typename S>
-ACE_INLINE
-S *&
-TAO::Inout_UB_String_Argument_T<S>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename S_out>
-ACE_INLINE
-TAO::Out_UB_String_Argument_T<S,S_out>::Out_UB_String_Argument_T (S_out & x)
-  : x_ (x.ptr ())
-{}
-
-template<typename S, typename S_out>
-ACE_INLINE
-S *&
-TAO::Out_UB_String_Argument_T<S,S_out>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Ret_UB_String_Argument_T<S,S_var>::Ret_UB_String_Argument_T (void)
-{}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *&
-TAO::Ret_UB_String_Argument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::retn (void)
-{
-  return this->x_._retn ();
-}
-
diff --git a/TAO/tao/UB_String_Arguments.cpp b/TAO/tao/UB_String_Arguments.cpp
deleted file mode 100644
index de92e283c89..00000000000
--- a/TAO/tao/UB_String_Arguments.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-#include "UB_String_Arguments.h"
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// Inclusions only if explicit templates are enabled.
-#include "CORBA_String.h"
-#include "CDR.h"
-#endif /*ACE_HAS_TEMPLATE_INSTANTIATION ||
-         ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-ACE_RCSID (tao,
-           Special_Basic_Arguments,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if 0
-template class TAO::Arg_Traits<CORBA::String>;
-template class TAO::Arg_Traits<CORBA::WString>;
-#endif /*if 0*/
-
-template class TAO::UB_String_Arg_Traits_T<CORBA::Char,
-                                           CORBA::String_var,
-                                           CORBA::String_out>;
-template class TAO::UB_String_Arg_Traits_T<CORBA::WChar,
-                                           CORBA::WString_var,
-                                           CORBA::WString_out>;
-
-template class TAO::In_UB_String_Argument_T<CORBA::Char>;
-template class TAO::Inout_UB_String_Argument_T<CORBA::Char>;
-template class TAO::Out_UB_String_Argument_T<CORBA::Char,
-                                             CORBA::String_out>;
-template class TAO::Ret_UB_String_Argument_T<CORBA::Char,
-                                             CORBA::String_var>;
-
-template class TAO::In_UB_String_Argument_T<CORBA::WChar>;
-template class TAO::Inout_UB_String_Argument_T<CORBA::WChar>;
-template class TAO::Out_UB_String_Argument_T<CORBA::WChar,
-                                             CORBA::WString_out>;
-template class TAO::Ret_UB_String_Argument_T<CORBA::WChar,
-                                             CORBA::WString_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if 0
-#pragma instantiate TAO::Arg_Traits<CORBA::String>
-#pragma instantiate TAO::Arg_Traits<CORBA::WString>
-#endif /*if 0*/
-#pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::Char, \
-                                                CORBA::String_var, \
-                                                CORBA::String_out>
-#pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::WChar, \
-                                                CORBA::WString_var, \
-                                                CORBA::WString_out>
-
-#pragma instantiate TAO::In_UB_String_Argument_T<CORBA::Char>
-#pragma instantiate TAO::Inout_UB_String_Argument_T<CORBA::Char>
-#pragma instantiate TAO::Out_UB_String_Argument_T<CORBA::Char, \
-                                                  CORBA::String_out>
-#pragma instantiate TAO::Ret_UB_String_Argument_T<CORBA::Char, \
-                                                  CORBA::String_var>
-
-#pragma instantiate TAO::In_UB_String_Argument_T<CORBA::WChar>
-#pragma instantiate TAO::Inout_UB_String_Argument_T<CORBA::WChar>
-#pragma instantiate TAO::Out_UB_String_Argument_T<CORBA::WChar, \
-                                                  CORBA::WString_out>
-#pragma instantiate TAO::Ret_UB_String_Argument_T<CORBA::WChar, \
-                                                  CORBA::WString_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
deleted file mode 100644
index 9da4c15be57..00000000000
--- a/TAO/tao/UB_String_Arguments.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UB_String_Arguments.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_UB_STRING_ARGUMENTS_H
-#define TAO_UB_STRING_ARGUMENTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/UB_String_Argument_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Arg_Traits_T.h"
-
-namespace TAO
-{
-  /**
-   *
-   * @brief Specializatons for unbounded (w)strings.
-   *
-   */
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Char *>
-    : public UB_String_Arg_Traits_T<CORBA::Char,
-                                    CORBA::String_var,
-                                    CORBA::String_out>
-  {
-  };
-
-  template<>
-  class TAO_Export Arg_Traits<CORBA::WChar *>
-    : public UB_String_Arg_Traits_T<CORBA::WChar,
-                                    CORBA::WString_var,
-                                    CORBA::WString_out>
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_UB_STRING_ARGUMENTS_H */
diff --git a/TAO/tao/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl
deleted file mode 100644
index 523d77da3f9..00000000000
--- a/TAO/tao/ULongLongSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in ULongLongSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ULongLongSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_ULONGLONG_SEQ_IDL
-#define TAO_CORBA_ULONGLONG_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<unsigned long long> ULongLongSeq;
-};
-
-#endif  /* TAO_CORBA_ULONGLONG_SEQ_IDL */
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
deleted file mode 100644
index ae0aa44533d..00000000000
--- a/TAO/tao/ULongLongSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulonglong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongLongSeq_0 =
-      &CORBA_ULongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongLongSeq:1.0",
-    "ULongLongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongLongSeq =
-    &_tao_tc_CORBA_ULongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::extract (
-        _tao_any,
-        CORBA::ULongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
deleted file mode 100644
index 4ce340c1cdb..00000000000
--- a/TAO/tao/ULongLongSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ULongLongSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ULONGLONGSEQ_CS_)
-#define _CORBA_ULONGLONGSEQ_CS_
-
-CORBA::ULongLongSeq::ULongLongSeq (void)
-{}
-
-CORBA::ULongLongSeq::ULongLongSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULongLong
-      >
-    (max)
-{}
-
-CORBA::ULongLongSeq::ULongLongSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULongLong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULongLong
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ULongLongSeq::ULongLongSeq (
-    const ULongLongSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULongLong
-      >
-    (seq)
-{}
-
-CORBA::ULongLongSeq::~ULongLongSeq (void)
-{}
-
-void CORBA::ULongLongSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ULongLongSeq * _tao_tmp_pointer =
-    static_cast<ULongLongSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ULongLongSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ULongLongSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */
diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h
deleted file mode 100644
index b00d1dea657..00000000000
--- a/TAO/tao/ULongLongSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ULONGLONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGLONGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ULONGLONGSEQ_CH_)
-#define _CORBA_ULONGLONGSEQ_CH_
-  
-  class ULongLongSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ULongLongSeq,
-        CORBA::ULongLong
-      >
-    ULongLongSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ULongLongSeq,
-        ULongLongSeq_var,
-        CORBA::ULongLong
-      >
-    ULongLongSeq_out;
-  
-  class TAO_Export ULongLongSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::ULongLong
-          >
-  {
-  public:
-    ULongLongSeq (void);
-    ULongLongSeq (CORBA::ULong max);
-    ULongLongSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULongLong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ULongLongSeq (const ULongLongSeq &);
-    ~ULongLongSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ULongLongSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongLongSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongLongSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_H_
-#define _TAO_CDR_OP_CORBA_ULongLongSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ULongLongSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ULongLongSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ULongLongSeqS.h b/TAO/tao/ULongLongSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ULongLongSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/ULongSeq.pidl b/TAO/tao/ULongSeq.pidl
deleted file mode 100644
index a9bf1f63c98..00000000000
--- a/TAO/tao/ULongSeq.pidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- *
- * This file was used to generate the code in ULongSeq*.*
- * The command used to generate code is:
- *
- * tao_idl
- *   -o orig -Ge 1 -Sc -GA -SS -Sci
- *      -Wb,export_macro=TAO_Export
- *      -Wb,export_include=tao/TAO_Export.h
- *      -Wb,pre_include="ace/pre.h"
- *      -Wb,post_include="ace/post.h"
- *      ULongSeq.pidl
- *
- */
-// ================================================================
-
-
-#ifndef TAO_CORBA_ULONG_SEQ_IDL
-#define TAO_CORBA_ULONG_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<unsigned long> ULongSeq;
-};
-
-#endif  /* TAO_CORBA_ULONG_SEQ_IDL */
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
deleted file mode 100644
index 7ceac7bfd8f..00000000000
--- a/TAO/tao/ULongSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongSeq_0 =
-      &CORBA_ULongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongSeq:1.0",
-    "ULongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongSeq =
-    &_tao_tc_CORBA_ULongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::extract (
-        _tao_any,
-        CORBA::ULongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
deleted file mode 100644
index 989c3d1deef..00000000000
--- a/TAO/tao/ULongSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ULongSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ULONGSEQ_CS_)
-#define _CORBA_ULONGSEQ_CS_
-
-CORBA::ULongSeq::ULongSeq (void)
-{}
-
-CORBA::ULongSeq::ULongSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULong
-      >
-    (max)
-{}
-
-CORBA::ULongSeq::ULongSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULong
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::ULongSeq::ULongSeq (
-    const ULongSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::ULong
-      >
-    (seq)
-{}
-
-CORBA::ULongSeq::~ULongSeq (void)
-{}
-
-void CORBA::ULongSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ULongSeq * _tao_tmp_pointer =
-    static_cast<ULongSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_ULongSeq_CPP_
-#define _TAO_CDR_OP_CORBA_ULongSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ULongSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ULongSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
deleted file mode 100644
index 31621d2d610..00000000000
--- a/TAO/tao/ULongSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ULONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ULONGSEQ_CH_)
-#define _CORBA_ULONGSEQ_CH_
-  
-  class ULongSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        ULongSeq,
-        CORBA::ULong
-      >
-    ULongSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ULongSeq,
-        ULongSeq_var,
-        CORBA::ULong
-      >
-    ULongSeq_out;
-  
-  class TAO_Export ULongSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::ULong
-          >
-  {
-  public:
-    ULongSeq (void);
-    ULongSeq (CORBA::ULong max);
-    ULongSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ULongSeq (const ULongSeq &);
-    ~ULongSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ULongSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_ULongSeq_H_
-#define _TAO_CDR_OP_CORBA_ULongSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ULongSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ULongSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ULongSeqS.h b/TAO/tao/ULongSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ULongSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl
deleted file mode 100644
index 14e88891383..00000000000
--- a/TAO/tao/UShortSeq.pidl
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in UShortSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          UShortSeq.pidl
- *
- * Patches for changes to the generated code are available in the
- * `diffs' directory.
- */
-// ================================================================
-
-#ifndef TAO_CORBA_USHORT_SEQ_IDL
-#define TAO_CORBA_USHORT_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<unsigned short> UShortSeq;
-};
-
-#endif  /* TAO_CORBA_U_SHORT_SEQ_IDL */
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
deleted file mode 100644
index 98a36bb9e5a..00000000000
--- a/TAO/tao/UShortSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "UShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ushort,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 =
-      &CORBA_UShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UShortSeq:1.0",
-    "UShortSeq",
-    &TAO::TypeCode::tc_CORBA_UShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UShortSeq =
-    &_tao_tc_CORBA_UShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract (
-        _tao_any,
-        CORBA::UShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
deleted file mode 100644
index 1f25cad14f7..00000000000
--- a/TAO/tao/UShortSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "UShortSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_USHORTSEQ_CS_)
-#define _CORBA_USHORTSEQ_CS_
-
-CORBA::UShortSeq::UShortSeq (void)
-{}
-
-CORBA::UShortSeq::UShortSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UShort
-      >
-    (max)
-{}
-
-CORBA::UShortSeq::UShortSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UShort * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UShort
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::UShortSeq::UShortSeq (
-    const UShortSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::UShort
-      >
-    (seq)
-{}
-
-CORBA::UShortSeq::~UShortSeq (void)
-{}
-
-void CORBA::UShortSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  UShortSeq * _tao_tmp_pointer =
-    static_cast<UShortSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_
-#define _TAO_CDR_OP_CORBA_UShortSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UShortSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UShortSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
deleted file mode 100644
index c7f63e0258a..00000000000
--- a/TAO/tao/UShortSeqC.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_USHORTSEQC_H_
-#define _TAO_IDL_ORIG_USHORTSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_USHORTSEQ_CH_)
-#define _CORBA_USHORTSEQ_CH_
-  
-  class UShortSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        UShortSeq,
-        CORBA::UShort
-      >
-    UShortSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        UShortSeq,
-        UShortSeq_var,
-        CORBA::UShort
-      >
-    UShortSeq_out;
-  
-  class TAO_Export UShortSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::UShort
-          >
-  {
-  public:
-    UShortSeq (void);
-    UShortSeq (CORBA::ULong max);
-    UShortSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::UShort* buffer, 
-        CORBA::Boolean release = 0
-      );
-    UShortSeq (const UShortSeq &);
-    ~UShortSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef UShortSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// Workaround for a Visual Studio .NET bug where this class is not
-// properly imported by an application if typedef'd or subclassed,
-// resulting in 'multiply defined' link errors. The export macro
-// here forces an explicit import by the application. Please see
-// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-// The problem stems from use of the type below in DsLogAdmin,
-// but we put the instantiation here because the application will
-// need to see it in *C.h to avoid the error.
-#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-  template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_
-#define _TAO_CDR_OP_CORBA_UShortSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UShortSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::UShortSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/UShortSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/UTF16_BOM_Factory.cpp b/TAO/tao/UTF16_BOM_Factory.cpp
deleted file mode 100644
index 9bf0443682a..00000000000
--- a/TAO/tao/UTF16_BOM_Factory.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = FILENAME
-//    UTF16_BOM_Factory.cpp
-//
-// = DESCRIPTION
-//    Loader for an instance of the UTF16_BOM_Translator.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
-
-#include "UTF16_BOM_Factory.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-
-// Instantiate templates that allow discovery of this factory
-// via the Service Manager.
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<UTF16_BOM_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<UTF16_BOM_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-ACE_STATIC_SVC_DEFINE (UTF16_BOM_Factory,
-                       ACE_TEXT ("UTF16_BOM_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (UTF16_BOM_Factory),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, UTF16_BOM_Factory)
-ACE_STATIC_SVC_REQUIRE (UTF16_BOM_Factory)
-
-UTF16_BOM_Factory::UTF16_BOM_Factory ()
-  : translator_ (0)
-  , forceBE_ (false)
-{
-}
-
-UTF16_BOM_Factory::~UTF16_BOM_Factory ()
-{
-  delete this->translator_;
-}
-
-int
-UTF16_BOM_Factory::init (int argc, ACE_TCHAR *argv[])
-{
-  TAO_Codeset_Translator_Factory::init (argc, argv);
-
-  for (int narg = 0; narg < argc;)
-  {
-    int consumed = parse_one_arg (argc - narg, &argv[narg]);
-    if (consumed > 0)
-    {
-      narg += consumed;
-    }
-    else
-    {
-      ACE_ERROR ((LM_ERROR,
-        ACE_TEXT ("(%P|%t)UTF16_BOM_Factory parameter error: %s\n")
-        ACE_TEXT ("Usage: UTF16_BOM_Factory \"-forceBE\"\n")
-        , argv[narg]
-        ));
-      return -1;
-    }
-  }
-  return 0;
-}
-
-int
-UTF16_BOM_Factory::parse_one_arg (int argc, ACE_TCHAR *argv[])
-{
-  int consumed = 0;
-  if ((argc > 0) && (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-forcebe")) == 0))
-  {
-    this->forceBE_ = true;
-    consumed = 1;
-  }
-  return consumed;
-}
-
-CONV_FRAME::CodeSetId
-UTF16_BOM_Factory::ncs () const
-{
-  create_translator();
-  return this->translator_->ncs();
-}
-
-CONV_FRAME::CodeSetId
-UTF16_BOM_Factory::tcs () const
-{
-  create_translator();
-  return this->translator_->tcs();
-}
-
-// Assign either a reference to the existing translator or a new translator
-// for input CDR streams
-void
-UTF16_BOM_Factory::assign (TAO_InputCDR *cdr) const
-{
-  if (cdr)
-    {
-      create_translator ();
-      this->assign_i (cdr, this->translator_);
-    }
-}
-
-// Assign either a reference to the existing translator or a new translator
-// for output CDR streams
-void
-UTF16_BOM_Factory::assign (TAO_OutputCDR *cdr) const
-{
-  if (cdr)
-    {
-      create_translator ();
-      this->assign_i (cdr, this->translator_);
-    }
-}
-
-void
-UTF16_BOM_Factory::create_translator () const
-{
-  if (this->translator_ == 0)
-  {
-    UTF16_BOM_Factory * pthis = const_cast<UTF16_BOM_Factory *> (this);
-    ACE_NEW (pthis->translator_, UTF16_BOM_Translator (this->forceBE_));
-    if (this->translator_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) UTF16_BOM_Factory cannot create UTF16_BOM_Translator\n")
-        ));
-    }
-  }
-}
diff --git a/TAO/tao/UTF16_BOM_Factory.h b/TAO/tao/UTF16_BOM_Factory.h
deleted file mode 100644
index 98261fe35cc..00000000000
--- a/TAO/tao/UTF16_BOM_Factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UTF16_BOM_Factory.h
-//
-// = DESCRIPTION
-//    Loader for an instance of the UTF16_BOM_Translator.
-//
-// = AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
-
-#ifndef UTF16_BOM_FACTORY_H
-#define UTF16_BOM_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-#include "tao/Codeset_Translator_Factory.h"
-
-#include "UTF16_BOM_Translator.h"
-
-class TAO_Export UTF16_BOM_Factory : public  TAO_Codeset_Translator_Factory
-{
-public:
-  UTF16_BOM_Factory ();
-  virtual ~UTF16_BOM_Factory ();
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// ncs returns the translator's native codeset ID.
-  CONV_FRAME::CodeSetId ncs () const;
-  /// tcs returns the translator's transmission codeset ID.
-  CONV_FRAME::CodeSetId tcs () const;
-
-  /// Assign the translator to the input CDR. The inherited assign_i is used
-  /// to assign either a char or wchar translator, depending on the base type
-  /// of NCS_TO_TCS. A null input CDR is permitted, in which case assign is a
-  /// no-op.
-  virtual void assign (TAO_InputCDR *) const;
-  /// Assign the translator to the output CDR. The inherited assign_i is used
-  /// to assign either a char or wchar translator, depending on the base type
-  /// of NCS_TO_TCS. A null output CDR is permitted, in which case assign is a
-  /// no-op.
-  virtual void assign (TAO_OutputCDR *) const;
-
-private:
-  void create_translator () const;
-  int parse_one_arg (int argc, ACE_TCHAR *argv[]);
-
-private:
-  UTF16_BOM_Translator *translator_;
-  bool forceBE_;    // force big endian wchar, warray, & wstring
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, UTF16_BOM_Factory)
-ACE_FACTORY_DECLARE (TAO, UTF16_BOM_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* UTF16_BOM_FACTORY_H */
diff --git a/TAO/tao/UTF16_BOM_Translator.cpp b/TAO/tao/UTF16_BOM_Translator.cpp
deleted file mode 100644
index 69cd26bf188..00000000000
--- a/TAO/tao/UTF16_BOM_Translator.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-// $Id$
-
-// ============================================================================
-//    Manages the transformation between native and transmitted UTF-16. It is
-//    Required because transmitted UTF-16 may carry a byte order marker (BOM)
-//    that is not part of the data contents. If no BOM is present, then the
-//    serialized UTF-16 data is big-endian, regardless of the byte order of
-//    the containing encapsulation.
-//
-// AUTHOR
-//    Phil Mesnier <mesnier_p@ociweb.com>
-//
-// ============================================================================
-
-#include "UTF16_BOM_Translator.h"
-#include "ace/OS_Memory.h"
-#include "tao/debug.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (tao,
-           UTF16_BOM_Translator,
-           "$Id$")
-
-
-// ****************************************************************
-
-
-typedef ACE_CDR::UShort ACE_UTF16_T;
-static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T);
-static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU;
-static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU;
-
-/////////////////////////////
-// UTF16_BOM_Translator implementation
-
-UTF16_BOM_Translator::UTF16_BOM_Translator (bool forceBE)
-  : forceBE_(forceBE)
-{
-  if (TAO_debug_level > 1)
-    ACE_DEBUG((LM_DEBUG,
-               ACE_TEXT ("TAO (%P|%t) - UTF16_BOM_Translator:forceBE %d\n"),
-               this->forceBE_?1:0 ));
-}
-
-UTF16_BOM_Translator::~UTF16_BOM_Translator (void)
-{
-}
-
-// = Documented in $ACE_ROOT/ace/CDR_Stream.h
-ACE_CDR::Boolean
-UTF16_BOM_Translator::read_wchar (ACE_InputCDR &cdr, ACE_CDR::WChar &x)
-{
-  if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 &&
-      static_cast<ACE_CDR::Short> (this->minor_version (cdr)) == 2)
-    {
-      ACE_CDR::Octet len;
-      if (! this->read_1 (cdr, &len))
-        return 0;
-
-      if (len == 2) // no BOM present
-        {
-          ACE_CDR::Short sx;
-
-          if (!this->read_array (cdr,
-                                 reinterpret_cast<char *> (&sx), 1,1,2))
-            return 0;
-
-#if defined (ACE_LITTLE_ENDIAN)
-          ACE_CDR::Short ux;
-          ACE_CDR::swap_2 (reinterpret_cast<const char*> (&sx),
-                           reinterpret_cast<char *> (&ux));
-          x = static_cast<ACE_CDR::WChar> (ux);
-#else
-          x = static_cast<ACE_CDR::WChar> (sx);
-#endif // ACE_LITTLE_ENDIAN
-          return 1;
-        }
-
-      ACE_UTF16_T buf[2];
-      if (len != 4 || !this->read_array (cdr,
-                                         reinterpret_cast<char *> (buf),
-                                         1,1,4)) // get BO & payload
-        return 0;
-      // Check for byte order mark, if found, consume and honor it.
-      if (buf[0] == ACE_UNICODE_BOM_CORRECT ||
-          buf[0] == ACE_UNICODE_BOM_SWAPPED)
-        {
-          // if we found it, but it came in in the wrong order
-          // invert the byte order flag for the duration of this method
-          if (buf[0] == ACE_UNICODE_BOM_SWAPPED)
-            {
-              ACE_CDR::Short ux;
-              ACE_CDR::swap_2 (reinterpret_cast<const char*> (&buf[1]),
-                               reinterpret_cast<char *> (&ux));
-              x = static_cast<ACE_CDR::WChar> (ux);
-            }
-          else
-            x = static_cast<ACE_CDR::WChar> (buf[1]);
-          return 1;
-        }
-      // What do we do here? The length is > 2 but the first word
-      // is not a BOM. Just return an error I suppose
-      return 0;
-    }
-
-  ACE_UTF16_T sx;
-  if (this->read_2 (cdr, &sx))
-    {
-      x = static_cast<ACE_CDR::WChar> (sx);
-      return 1;
-    }
-  return 0;
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr,
-                                    ACE_CDR::WChar *&x)
-{
-  ACE_CDR::ULong len;
-  if (!this->read_4 (cdr, &len))
-    return 0;
-
-  // A check for the length being too great is done later in the
-  // call to read_char_array but we want to have it done before
-  // the memory is allocated.
-  if (len > 0 && len <= cdr.length ())
-    {
-      if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
-          && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
-        {
-          len /= ACE_UTF16_CODEPOINT_SIZE;
-
-          //allocating one extra for the null character needed by applications
-          ACE_NEW_RETURN (x,
-                          ACE_CDR::WChar [len + 1],
-                          0);
-
-          x[len] = L'\x00';
-          if (this->read_wchar_array_i (cdr, x, len, 1))
-            {
-              // Since reading the array may have adjusted the length,
-              // we simply rewrite the null terminator
-              x[len] = L'\x00';
-              return 1;
-            }
-        }
-      else
-        {
-          ACE_NEW_RETURN (x,
-                          ACE_CDR::WChar [len],
-                          0);
-          if (this->read_wchar_array (cdr, x, len))
-            return 1;
-        }
-      delete [] x;
-    }
-  else if (len == 0)
-    {
-      // Convert any null strings to empty strings since empty
-      // strings can cause crashes. (See bug 58.)
-      ACE_NEW_RETURN (x,
-                      ACE_CDR::WChar[1],
-                      0);
-      x[0] = '\x00';
-      return 1;
-    }
-  x = 0;
-  return 0;
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::read_wchar_array_i (ACE_InputCDR & cdr,
-                                          ACE_CDR::WChar *x,
-                                          ACE_CDR::ULong &length,
-                                          int adjust_len)
-{
-  int has_bom = 0;
-  int must_swap = 0;
-  char* buf;
-  static const size_t align = ACE_CDR::SHORT_ALIGN;
-  if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf) == 0)
-    {
-      // check for byte order mark.  If found, honor it then discard it
-      ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf);
-      if (*sb == ACE_UNICODE_BOM_CORRECT || *sb == ACE_UNICODE_BOM_SWAPPED)
-        {
-          must_swap = (*sb == ACE_UNICODE_BOM_SWAPPED);
-          has_bom = 1;
-        }
-      else
-        {
-#if defined (ACE_LITTLE_ENDIAN)
-          must_swap = 1;
-#endif // ACE_LITTLE_ENDIAN
-        }
-
-      if (has_bom)
-        {
-          buf += ACE_UTF16_CODEPOINT_SIZE;
-          ++sb;
-
-          if (adjust_len)
-            length -= 1;
-        }
-
-      for (size_t i = 0; i < length; ++i)
-#if defined (ACE_DISABLE_SWAP_ON_READ)
-        x[i] = static_cast<ACE_CDR::WChar> (sb[i]);
-#else
-      if (!must_swap)
-        {
-          x[i] = static_cast<ACE_CDR::WChar> (sb[i]);
-        }
-      else
-        {
-          ACE_CDR::UShort sx;
-          ACE_CDR::swap_2 (&buf[i*2], reinterpret_cast<char *> (&sx));
-          x[i] = static_cast<ACE_CDR::WChar> (sx);
-        }
-#endif /* ACE_DISABLE_SWAP_ON_READ */
-
-      if (has_bom && !adjust_len)
-        {
-          cdr.adjust (ACE_UTF16_CODEPOINT_SIZE, align, buf);
-        }
-      return 1;
-    }
-  return 0;
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::read_wchar_array (ACE_InputCDR & cdr,
-                                        ACE_CDR::WChar *x,
-                                        ACE_CDR::ULong length)
-{
-  if (length == 0)
-    return 1;
-
-  if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
-      && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
-    {
-      for (size_t i = 0; i < length; ++i)
-        if (!this->read_wchar (cdr, x[i]))
-          return 0;
-
-      return 1;
-    }
-  else
-    return this->read_wchar_array_i (cdr, x, length);
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_wchar (ACE_OutputCDR &cdr,
-                                   ACE_CDR::WChar x)
-{
-  return this->write_wchar_i (cdr, x, true);
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_wchar_i (ACE_OutputCDR &cdr,
-                                     ACE_CDR::WChar x,
-                                     bool allow_BOM)
-{
-  if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
-      && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
-    {
-      int len = 0;
-      ACE_CDR::UShort buffer[2];
-
-      if( allow_BOM && cdr.byte_order())
-        {
-          len = 2;
-#if defined (ACE_LITTLE_ENDIAN)
-          if (this->forceBE_)
-            {
-              // force both the byte order mark and the data to Big Endian order
-              buffer[0] = ACE_UNICODE_BOM_SWAPPED;
-              ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x),
-                              reinterpret_cast<char *> (&buffer[1]));
-            }
-          else
-#endif
-            {
-              // store both the byte order mark and the data in native order
-              buffer[0] = ACE_UNICODE_BOM_CORRECT;
-              buffer[1] = static_cast<ACE_CDR::Short> (x);
-            }
-        }
-      else
-        {
-          // not using a byte order mark
-          // force it to be big endian w/o BOM
-          len = 1;
-          if (cdr.byte_order ())
-            ACE_CDR::swap_2 (reinterpret_cast<const char *> (&x),
-                             reinterpret_cast<char *> (buffer));
-          else
-            buffer[0] = static_cast<ACE_CDR::Short> (x);
-        }
-
-      unsigned char tcsize =
-        static_cast<unsigned char> (len * ACE_UTF16_CODEPOINT_SIZE);
-
-      if (this->write_1 (cdr, &tcsize))
-        return this->write_array(cdr, &buffer, tcsize, 1, 1);
-      else
-        return 0;
-    }
-  else if (static_cast<ACE_CDR::Short> (this->minor_version (cdr)) != 0)
-    {
-      // GIOP 1.1 simple support
-      ACE_UTF16_T sx = static_cast<ACE_UTF16_T> (x);
-      return this->write_2 (cdr, &sx);
-    }
-  else
-    { // wchar is not allowed with GIOP 1.0.
-      errno = EINVAL;
-      return 0;
-    }
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr,
-                                     ACE_CDR::ULong len,
-                                     const ACE_CDR::WChar *x)
-{
-  // we'll accept a null pointer but only for an empty string
-  ACE_ASSERT (x != 0 || len == 0);
-  if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
-      && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
-    {
-      if (len == 0) // for zero length strings, only write a length of
-                    // zero. The BOM is not needed in this case.
-        return this->write_4(cdr, &len);
-
-      if (this->forceBE_ && cdr.byte_order())
-        {
-          ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE;
-          if (this->write_4 (cdr, &l) &&
-              this->write_2 (cdr, &ACE_UNICODE_BOM_SWAPPED) &&
-              x != 0)
-            return this->write_swapped_wchar_array_i (cdr, x, len);
-        }
-      else
-        {
-          ACE_CDR::ULong l = (len+1) * ACE_UTF16_CODEPOINT_SIZE;
-          if (this->write_4 (cdr, &l) &&
-              this->write_2 (cdr, &ACE_UNICODE_BOM_CORRECT) &&
-              x != 0)
-            return this->write_wchar_array_i (cdr, x, len);
-        }
-    }
-  else
-    {
-      // pre GIOP 1.2:  include null terminator in length
-      ACE_CDR::ULong l = len + 1;
-      if (this->write_4 (cdr, &l))
-        if (x != 0)
-          return this->write_wchar_array_i (cdr, x, len + 1);
-        else
-          {
-            ACE_UTF16_T s = 0;
-            return this->write_2 (cdr,&s);
-          }
-    }
-
-  return 0;
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_wchar_array (ACE_OutputCDR & cdr,
-                                         const ACE_CDR::WChar *x,
-                                         ACE_CDR::ULong length)
-{
-  if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1
-      && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1)
-    {
-      for (size_t i = 0; i < length; ++i)
-        if (this->write_wchar_i (cdr, x[i], false) == 0)
-          return 0;
-
-      return 1;
-    }
-
-  return this->write_wchar_array_i (cdr, x, length);
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr,
-                                           const ACE_CDR::WChar *x,
-                                           ACE_CDR::ULong length)
-{
-  if (length == 0)
-    return 1;
-  char* buf;
-  static const size_t align = ACE_CDR::SHORT_ALIGN;
-  if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf)
-      != 0)
-    {
-      return 0;
-    }
-
-  ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf);
-
-  for (size_t i = 0; i < length; ++i)
-    {
-      sb[i] = static_cast<ACE_UTF16_T> (x[i]);
-    }
-  return 1;
-
-}
-
-ACE_CDR::Boolean
-UTF16_BOM_Translator::write_swapped_wchar_array_i (ACE_OutputCDR & cdr,
-                                           const ACE_CDR::WChar *x,
-                                           ACE_CDR::ULong length)
-{
-  if (length == 0)
-    return 1;
-  char* buf;
-  static const size_t align = ACE_CDR::SHORT_ALIGN;
-  if (cdr.adjust (ACE_UTF16_CODEPOINT_SIZE * length, align, buf)
-      != 0)
-    {
-      return 0;
-    }
-
-  ACE_UTF16_T *sb = reinterpret_cast<ACE_UTF16_T *> (buf);
-
-  for (size_t i = 0; i < length; ++i)
-    {
-      ACE_CDR::swap_2 (reinterpret_cast<const char*> (&x[i]),
-                       reinterpret_cast<char *> (&sb[i]));
-    }
-  return 1;
-}
diff --git a/TAO/tao/UTF16_BOM_Translator.h b/TAO/tao/UTF16_BOM_Translator.h
deleted file mode 100644
index 9a6e534cd9a..00000000000
--- a/TAO/tao/UTF16_BOM_Translator.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file  UTF16_BOM_Translator.h
- *
- *  $Id$
- *
- *
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef UTF16_BOM_TRANSLATOR_H
-#define UTF16_BOM_TRANSLATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CDR_Stream.h"
-#include "TAO_Export.h"
-
-// ****************************************************************
-
-/**
- * @class UTF16_BOM_Translator
- *
- * @brief Codeset translation specialization - Manages Byte Order Marker
- *
- * This class performs the codeset translation:
- *   - Native:        UTF16 (i.e. Unicode)
- *   - Stream:        UTF16 with Byte Order Marker
- */
-class TAO_Export UTF16_BOM_Translator : public ACE_WChar_Codeset_Translator
-{
-public:
-  /// constructor
-  /// @param forceBE: true forces all wchar, warray, and wstrings to big-endian byte order
-  UTF16_BOM_Translator (bool forceBE);
-
-  /// Virtual destruction
-  virtual ~UTF16_BOM_Translator (void);
-
-  // = Documented in $ACE_ROOT/ace/CDR_Stream.h
-  virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
-                                      ACE_CDR::WChar &);
-  virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR &,
-                                        ACE_CDR::WChar *&);
-  virtual ACE_CDR::Boolean read_wchar_array (ACE_InputCDR &,
-                                            ACE_CDR::WChar *,
-                                            ACE_CDR::ULong);
-  virtual ACE_CDR::Boolean write_wchar (ACE_OutputCDR &,
-                                       ACE_CDR::WChar);
-  virtual ACE_CDR::Boolean write_wstring (ACE_OutputCDR &,
-                                         ACE_CDR::ULong,
-                                         const ACE_CDR::WChar *);
-  virtual ACE_CDR::Boolean write_wchar_array (ACE_OutputCDR &,
-                                             const ACE_CDR::WChar *,
-                                             ACE_CDR::ULong);
-  virtual ACE_CDR::ULong ncs () {return 0x00010109;}
-  virtual ACE_CDR::ULong tcs () {return 0x00010109;}
-
-private:
-  ACE_CDR::Boolean read_wchar_array_i (ACE_InputCDR &,
-                                       ACE_CDR::WChar *,
-                                       ACE_CDR::ULong&,
-                                       int adjust_len = 0);
-
-  ACE_CDR::Boolean write_wchar_array_i (ACE_OutputCDR &,
-                                        const ACE_CDR::WChar *,
-                                        ACE_CDR::ULong);
-
-  ACE_CDR::Boolean write_swapped_wchar_array_i (ACE_OutputCDR & cdr,
-                                            const ACE_CDR::WChar *x,
-                                            ACE_CDR::ULong length);
-
-
-  ACE_CDR::Boolean write_wchar_i (ACE_OutputCDR &,
-                                  ACE_CDR::WChar ,
-                                  bool allow_BOM);
-
-private:
-  /// if this flag is true, force wchar's to big endian order
-  bool forceBE_;
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* UTF16_BOM_TRANSLATOR_H */
diff --git a/TAO/tao/Union_TypeCode.cpp b/TAO/tao/Union_TypeCode.cpp
deleted file mode 100644
index e0a167eca80..00000000000
--- a/TAO/tao/Union_TypeCode.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// $Id$
-
-#ifndef TAO_UNION_TYPECODE_CPP
-#define TAO_UNION_TYPECODE_CPP
-
-#include "tao/Union_TypeCode.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<StringType>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<StringType>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_nil ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                      CaseArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_name_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_type_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Any *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_label_i (CORBA::ULong index
-                                                      ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->discriminant_type_));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Long
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
-
-#endif  /* TAO_UNION_TYPECODE_CPP */
diff --git a/TAO/tao/Union_TypeCode.h b/TAO/tao/Union_TypeCode.h
deleted file mode 100644
index 6890f3776a5..00000000000
--- a/TAO/tao/Union_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_H
-#define TAO_UNION_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy>
-    class Union
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<StringType, TypeCodeType> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType discriminant_type,
-#else
-             TypeCodeType const & discriminant_type,
-#endif
-             CaseArrayType const & cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /// Constructor used for recursive TypeCodes.
-      Union (CORBA::TCKind kind,
-             char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      TypeCodeType discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      CaseArrayType cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Union_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Union_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_H */
diff --git a/TAO/tao/Union_TypeCode.inl b/TAO/tao/Union_TypeCode.inl
deleted file mode 100644
index 84dfb32fa0b..00000000000
--- a/TAO/tao/Union_TypeCode.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  CaseArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  CORBA::TCKind,
-  char const * id)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , discriminant_type_ (0)
-  , default_index_ (-1)
-  , ncases_ (0)
-  , cases_ ()
-{
-}
diff --git a/TAO/tao/Union_TypeCode_Static.cpp b/TAO/tao/Union_TypeCode_Static.cpp
deleted file mode 100644
index 0e434cf7806..00000000000
--- a/TAO/tao/Union_TypeCode_Static.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-// $Id$
-
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Union_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  // Note that we handle the default case below, too.
-
-  for (unsigned int i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<char const *>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<char const *>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_nil ();
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-CORBA::Any *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_label_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->discriminant_type_));
-}
-
-CORBA::Long
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
diff --git a/TAO/tao/Union_TypeCode_Static.h b/TAO/tao/Union_TypeCode_Static.h
deleted file mode 100644
index 60bc6a77364..00000000000
--- a/TAO/tao/Union_TypeCode_Static.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_STATIC_H
-#define TAO_UNION_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy> class Union;
-    template <typename StringType, typename TypeCodeType> class Case;
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template<>
-    class TAO_Export Union<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Case<char const *,
-                                CORBA::TypeCode_ptr const *> const * const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<char const *,
-                                  CORBA::TypeCode_ptr const *> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * discriminant_type,
-             Case<char const *,
-                  CORBA::TypeCode_ptr const *> const * const * cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      CORBA::TypeCode_ptr const * const discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long const default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong const ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      Case<char const *,
-           CORBA::TypeCode_ptr const *> const * const * const cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Union_TypeCode_Static.inl b/TAO/tao/Union_TypeCode_Static.inl
deleted file mode 100644
index 019a8ba2a2f..00000000000
--- a/TAO/tao/Union_TypeCode_Static.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::Union (
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * discriminant_type,
-  Case<char const *, CORBA::TypeCode_ptr const *> const * const * cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
deleted file mode 100644
index 73bc0efb5b8..00000000000
--- a/TAO/tao/UserException.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-#include "UserException.h"
-
-#include "ace/SString.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/UserException.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           UserException,
-           "$Id$")
-
-
-CORBA::UserException::UserException (void)
-{
-}
-
-CORBA::UserException::UserException (char const * repository_id,
-                                     char const * local_name)
-  : CORBA::Exception (repository_id,
-                      local_name)
-{
-}
-
-CORBA::UserException::~UserException (void)
-{
-}
-
-CORBA::UserException &
-CORBA::UserException::operator= (CORBA::UserException const & rhs)
-{
-  this->Exception::operator= (rhs);
-  return *this;
-}
-
-int
-CORBA::UserException::_is_a (char const * interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:omg.org/CORBA/UserException:1.0") == 0
-    || this->Exception::_is_a (interface_id);
-}
-
-ACE_CString
-CORBA::UserException::_info (void) const
-{
-  // @@ we can use the exception's typecode to dump all the data held
-  // within it ...
-
-  ACE_CString user_exception_info = "user exception, ID '";
-  user_exception_info += this->_rep_id ();
-  user_exception_info += "'";
-  return user_exception_info;
-}
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
deleted file mode 100644
index 80b1c85ee1a..00000000000
--- a/TAO/tao/UserException.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    UserException.h
- *
- *  $Id$
- *
- *  CORBA::UserException class header.
- *
- *  @author DOC Group at Vanderbilt U, Wash U, and UCI
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_USER_EXCEPTION_H
-#define TAO_USER_EXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Exception.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  /**
-   * @class UserException
-   *
-   * @brief Application- or OMG- defined CORBA exception sub-class.
-   *
-   * User exceptions can be defined in application OMG IDL or by the
-   * OMG itself for IDL interfaces and services it defines.
-   */
-  class TAO_Export UserException : public Exception
-  {
-  public:
-
-    /// Copy constructor.
-    UserException (UserException const & rhs);
-
-    /// Destructor.
-    ~UserException (void);
-
-    /// Assignment operator.
-    UserException & operator= (UserException const & rhs);
-
-    /// The narrow operation.
-    static UserException * _downcast (CORBA::Exception * exception);
-
-        /// The const version of narrow operation
-    static const UserException * _downcast (
-      CORBA::Exception const * exception);
-
-    virtual void _raise (void) const = 0;
-
-    // = TAO specific extension.
-
-    /// Constructor from a repository id.
-    UserException (char const * repository_id,
-                   char const * local_name);
-
-    virtual int _is_a (char const * interface_id) const;
-
-    // Used for narrowing
-
-    /// Returns a string containing information about the exception. This
-    /// function is not CORBA compliant.
-    virtual ACE_CString _info (void) const;
-
-    //protected:
-    /// Default constructor.
-    UserException (void);
-
-  };
-
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/UserException.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/"ace/post.h"
-
-#endif /* TAO_USER_EXCEPTION_H */
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
deleted file mode 100644
index 4b3730615c8..00000000000
--- a/TAO/tao/UserException.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-CORBA::UserException::UserException (CORBA::UserException const & rhs)
-  : CORBA::Exception (rhs)
-{
-}
-
-ACE_INLINE CORBA::UserException *
-CORBA::UserException::_downcast (CORBA::Exception * exception)
-{
-  return dynamic_cast<CORBA::UserException *> (exception);
-}
-
-ACE_INLINE const CORBA::UserException *
-CORBA::UserException::_downcast (CORBA::Exception const * exception)
-{
-  return dynamic_cast<const CORBA::UserException *> (exception);
-}
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
deleted file mode 100644
index 423012a91c9..00000000000
--- a/TAO/tao/Utils.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-project : taolib, core, portableserver {
-  sharedname    = TAO_Utils
-  dynamicflags  = TAO_UTILS_BUILD_DLL
-
-  Source_Files {
-    Utils
-  }
-
-  Header_Files {
-    Utils
-  }
-
-  Inline_Files {
-    Utils
-  }
-
-  Template_Files {
-    Utils
-  }
-
-  Resource_Files {
-    Utils
-  }
-
-  PIDL_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_Utils.pc.in
-  }
-}
diff --git a/TAO/tao/Utils/Auto_Functor.h b/TAO/tao/Utils/Auto_Functor.h
deleted file mode 100644
index 321938bd4b7..00000000000
--- a/TAO/tao/Utils/Auto_Functor.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Auto_Functor.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_AUTO_FUNCTOR_H
-#define TAO_UTILS_AUTO_FUNCTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Auto_Functor.h"
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-  using namespace ACE_Utils;
-
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_UTILS_AUTO_FUNCTOR_H */
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
deleted file mode 100644
index e5d3c35d594..00000000000
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "Implicit_Deactivator.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-ACE_RCSID (Utils,
-           Implicit_Deactivator,
-           "$Id$")
-void
-TAO::Utils::Implicit_Deactivation_Functor::operator () (
-   PortableServer::ServantBase * servant)
-  ACE_THROW_SPEC (())
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      PortableServer::POA_var poa (servant->_default_POA (
-          ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var id (poa->servant_to_id (servant
-                                                           ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
-
-      poa->deactivate_object (id.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHALL
-    {
-      // @@ Cannot let exceptions escape, yet we need to log them!
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
deleted file mode 100644
index bb172759571..00000000000
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Implicit_Deactivator.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_IMPLICIT_DEACTIVATOR_H
-#define TAO_UTILS_IMPLICIT_DEACTIVATOR_H
-#include /**/ "ace/pre.h"
-#include "utils_export.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/PortableServer.h"
-#include "ace/Auto_Functor.h"
-
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @struct Implicit_Deactivation_Functor
-     *
-     * @brief Implements a functor for the Implicit_Deactivator class.
-     */
-    struct TAO_UTILS_Export Implicit_Deactivation_Functor
-    {
-      typedef PortableServer::ServantBase * argument;
-
-      // Deactivate an implicitly activated servant
-      void operator() (PortableServer::ServantBase * servant)
-        ACE_THROW_SPEC (());
-    };
-
-    /**
-     * @class Implicit_Deactivator
-     *
-     * @brief Helper class to deactivate implicitly activated servants.
-     *
-     */
-    typedef ACE_Utils::Auto_Functor<
-      PortableServer::ServantBase,
-      Implicit_Deactivation_Functor>
-    Implicit_Deactivator;
-
-  } // namespace Utils
-} // namespace TAO
-
-#include /**/ "ace/post.h"
-#endif /*TAO_UTILS_IMPLICIT_DEACTIVATOR_H*/
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
deleted file mode 100644
index c3e198c9828..00000000000
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "ORB_Destroyer.h"
-
-
-ACE_RCSID (Utils,
-           ORB_Destroyer,
-           "$Id$")
-void
-TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC (())
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHALL
-    {
-      // @@ Cannot let exceptions escape, yet we need to log them!
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
deleted file mode 100644
index 6e414d99ead..00000000000
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file ORB_Destroyer.h
- *
- * $Id$
- *
- * @author Marina Spivak <marina@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_ORB_DESTROYER_H
-#define TAO_UTILS_ORB_DESTROYER_H
-#include /**/ "ace/pre.h"
-#include "utils_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-#include "ace/Auto_Functor.h"
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @struct ORB_Destroyer_Functor
-     *
-     * @brief Implements a functor for the ORB_Destroyer class.
-     */
-    struct TAO_UTILS_Export ORB_Destroyer_Functor
-    {
-      typedef CORBA::ORB_ptr argument;
-
-      /// Destroy the ORB
-      void operator() (CORBA::ORB_ptr orb)
-        ACE_THROW_SPEC (());
-    };
-
-    /**
-     * @class ORB_Destroyer
-     *
-     * @brief Helper class to destroy an ORB.
-     *
-     */
-    typedef ACE_Utils::Auto_Functor<
-      CORBA::ORB,
-      ORB_Destroyer_Functor>
-    ORB_Destroyer;
-
-  } // namespace Utils
-} // namespace TAO
-
-#include /**/ "ace/post.h"
-#endif /* TAO_UTILS_ORB_DESTROYER_H*/
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
deleted file mode 100644
index 08618700659..00000000000
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tao
-//
-// = AUTHOR
-//    Sumedh Mungee <sumedh@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ORB_Manager.h"
-
-#include "tao/PortableServer/POAManagerC.h"
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
-#include "tao/PortableServer/LifespanPolicyC.h"
-
-#include "tao/Environment.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "ace/Log_Msg.h"
-
-ACE_RCSID (PortableServer,
-           ORB_Manager,
-           "$Id$")
-
-// constructor
-TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa,
-                                  PortableServer::POAManager_ptr poa_manager)
-  : orb_ (orb),
-    poa_ (poa),
-    poa_manager_ (poa_manager)
-{
-}
-
-int
-TAO_ORB_Manager::init (int &argc,
-                       char **argv
-                       ACE_ENV_ARG_DECL)
-{
-  return this->init (argc,
-                     argv,
-                     0
-                     ACE_ENV_ARG_PARAMETER);
-}
-
-int
-TAO_ORB_Manager::init (int &argc,
-                       char **argv,
-                       const char *orb_name
-                       ACE_ENV_ARG_DECL)
-{
-  if (CORBA::is_nil (this->orb_.in ()))
-    {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    orb_name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  if (CORBA::is_nil (this->poa_.in ()))
-    {
-      // Get the POA from the ORB.
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")),
-                          -1);
-
-      // Get the POA object.
-      this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (-1);
-    }
-
-  if (CORBA::is_nil (this->poa_manager_.in ()))
-    {
-      // Get the POA_Manager.
-      this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return 0;
-}
-
-int
-TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name
-                                 ACE_ENV_ARG_DECL)
-{
-  return this->init_child_poa (argc,
-                               argv,
-                               poa_name,
-                               0
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-int
-TAO_ORB_Manager::init_child_poa (int& argc,
-                                 char **argv,
-                                 const char *poa_name,
-                                 const char *orb_name
-                                 ACE_ENV_ARG_DECL)
-{
-  int init_result;
-
-  // check to see if root poa has to be created.
-  init_result = this->init (argc,
-                            argv,
-                            orb_name
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (init_result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT (" (%P|%t) Error in init.\n")),
-                      -1);
-
-  // Create the default policies - user-supplied ID, and persistent
-  // objects.
-  CORBA::PolicyList policies (2);
-  policies.length (2);
-
-  // Id Assignment policy
-  policies[0] =
-    this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Lifespan policy
-  policies[1] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // We use a different POA, otherwise the user would have to change
-  // the object key each time it invokes the server.
-
-  this->child_poa_ =
-    this->poa_->create_POA (poa_name,
-                            this->poa_manager_.in (),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-  // Warning!  If create_POA fails, then the policies won't be
-  // destroyed and there will be hell to pay in memory leaks!
-  ACE_CHECK_RETURN (-1);
-
-  // Creation of the new POAs over, so destroy the Policy_ptr's.
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-  return 0;
-}
-
-// Activate POA manager.
-
-int
-TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  return 0;
-}
-
-// Activate servant in the POA.
-
-char *
-TAO_ORB_Manager::activate (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL)
-{
-  PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::String_var str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return str._retn ();
-}
-
-void
-TAO_ORB_Manager::deactivate (const char *id
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id =
-    this->poa_->reference_to_id (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->poa_->deactivate_object (object_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-}
-
-// Activate the object with the object_name under the child POA.
-
-char *
-TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
-                                           PortableServer::Servant servant
-                                           ACE_ENV_ARG_DECL)
-{
-  if (object_name == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("\n(%P|%t) TAO_ORB_Manager::register: ")
-                       ACE_TEXT ("object_name is null!")),
-                      0);
-
-  PortableServer::ObjectId_var id =
-    PortableServer::string_to_ObjectId (object_name);
-
-  this->child_poa_->activate_object_with_id (id.in (),
-                                             servant
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Object_var obj =
-    this->child_poa_->id_to_reference (id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  char * str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-
-  ACE_CHECK_RETURN (0);
-
-  return str;
-}
-
-void
-TAO_ORB_Manager::deactivate_under_child_poa (const char *id
-                                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id =
-    this->child_poa_->reference_to_id (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->child_poa_->deactivate_object (object_id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-// Enter the ORB event loop.
-
-int
-TAO_ORB_Manager::run (ACE_Time_Value &tv
-                      ACE_ENV_ARG_DECL)
-{
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_ = 0;
-
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->orb_ = 0;
-  return 0;
-}
-
-int
-TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-// Return the corba orb reference.
-
-CORBA::ORB_ptr
-TAO_ORB_Manager::orb (void)
-{
-  return CORBA::ORB::_duplicate (this->orb_.in ());
-}
-
-// Return the root POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::root_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-// Return the child POA reference
-PortableServer::POA_ptr
-TAO_ORB_Manager::child_poa (void)
-{
-  return PortableServer::POA::_duplicate (this->child_poa_.in ());
-}
-
-PortableServer::POAManager_ptr
-TAO_ORB_Manager::poa_manager (void)
-{
-  return PortableServer::POAManager::_duplicate (this->poa_manager_.in ());
-}
-
-// Destructor.
-
-TAO_ORB_Manager::~TAO_ORB_Manager (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      if (!CORBA::is_nil (this->poa_.in ()))
-        {
-          this->poa_->destroy (1,
-                               1
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // ignore any exceptions..
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
deleted file mode 100644
index a181e1c5d12..00000000000
--- a/TAO/tao/Utils/ORB_Manager.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   ORB_Manager.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland <cleeland@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ORB_MANAGER_H
-#define TAO_ORB_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "utils_export.h"
-#include "tao/PortableServer/PortableServer.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-
-/**
- * @class TAO_ORB_Manager
- *
- * @brief Helper class for simple ORB/POA initialization and
- * registering servants with the POA.
- *
- * This class is a TAO extension that makes it easier to write
- * CORBA applications.  It's just a wrapper and doesn't do
- * anything special within the ORB itself.
- */
-class TAO_UTILS_Export TAO_ORB_Manager
-{
-public:
-  // = Initialization and termination methods.
-  /** Constructor.
-   *
-   *  @param orb  pointer to an ORB which is duplicated an stored
-   *              internally in an ORB_var.  If pointer is 0,
-   *              a new ORB pointer is created internally in the init()
-   *              call.
-   *
-   *  @param poa  pointer to a POA which is duplicated and stored
-   *              internally in a POA_var.  If pointer is 0,
-   *              a pointer to the Root POA is obtained from the ORB.
-   *
-   *  @param poa_manager pointer to a POA Manager which is duplicated
-   *                     and stored internally in a POAManager_var.
-   *                     If pointer is 0, a new POAManager is created
-   *                     internally in the init() call.
-   */
-  TAO_ORB_Manager (CORBA::ORB_ptr orb = 0,
-                   PortableServer::POA_ptr poa = 0,
-                   PortableServer::POAManager_ptr poa_manager = 0);
-
-  /**
-   * Initialize the ORB/root POA, using the supplied command line
-   * arguments or the default ORB components.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int init (int &argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Initialize the ORB/root POA, using the supplied command line
-   * arguments or the default ORB components.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int init (int &argc,
-            char *argv[],
-            const char *orb_name
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Creates a child poa under the root poa with PERSISTENT and
-   * USER_ID policies.  Call this if you want a @c child_poa with the
-   * above policies, otherwise call init.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int init_child_poa (int &argc,
-                      char *argv[],
-                      const char *poa_name
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Creates a child poa under the root poa with PERSISTENT and
-   * USER_ID policies.  Call this if you want a @a child_poa with the
-   * above policies, otherwise call init.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int init_child_poa (int &argc,
-                      char *argv[],
-                      const char *poa_name,
-                      const char *orb_name
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Shut down.  Invoke the destroy() methods on the orb and poa.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// Destructor.
-  ~TAO_ORB_Manager (void);
-
-  // = Accessor methods.
-
-  /**
-   *  Put POA manager into the <Active> state, so that incoming corba
-   *  requests are processed.  This method is useful for clients,
-   *  which are not going to enter "orb->run" loop, yet may want to
-   *  service incoming requests while waiting for a result of CORBA
-   *  call on a server.
-   *
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Activate <servant>, using the POA <activate_object> call.  Users
-   * can call this method multiple times to activate multiple objects.
-   *
-   * @return 0 on failure, a string representation of the object ID if
-   *         successful.  Caller of this method is responsible for
-   *         memory deallocation of the string.
-   */
-  char *activate (PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /** Deactivate object in RootPOA.
-   *
-   *  @param id  A string representation of the Object ID
-   *             of the servant to deactivate in the POA
-   */
-  void deactivate (const char *id
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Precondition: init_child_poa has been called.  Activate <servant>
-   * using the POA <activate_object_with_id> created from the string
-   * <object_name>. Users should call this to activate objects under
-   * the child_poa.
-   *
-   * @param object_name  String name which will be used to create
-   *                     an Object ID for the servant.
-   * @param servant  The servant to activate under the child POA.
-   *
-   * @return 0 on failure, a string representation of the object ID if
-   *           successful.  Caller of this method is responsible for
-   *           memory deallocation of the string.
-   */
-  char *activate_under_child_poa (const char *object_name,
-                                  PortableServer::Servant servant
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Deactivate object in child POA.
-   *
-   * @param id  string representation of the object ID, which represents
-   *            the object to deactivate in the POA
-   */
-  void deactivate_under_child_poa (const char *id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Run the ORB event loop with the specified @a tv time value.
-   *
-   * @param tv  the time interval for how long to run the ORB event loop.
-   * @retval -1 Failure
-   * @retval 0 Success
-   */
-  int run (ACE_Time_Value &tv
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Run the ORB event loop.
-   */
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  /**
-   * Accessor which returns the ORB pointer.  Following the normal
-   * CORBA memory management rules of return values from functions,
-   * this function duplicates the orb return value before returning
-   * it.
-   *
-   * @return ORB pointer which has been duplicated, so caller
-   *         must release pointer when done.
-   */
-  CORBA::ORB_ptr orb (void);
-
-  /**
-   * Accessor which returns the root poa. Following the normal CORBA
-   * memory management rules of return values from functions, this
-   * function duplicates the poa return value before returning it.
-   *
-   * @return Root POA pointer which has been duplicated.  Caller
-   *         must release pointer when done.
-   */
-  PortableServer::POA_ptr root_poa (void);
-
-  /**
-   * Accessor which returns the child poa. Following the normal CORBA
-   * memory management rules of return values from functions, this
-   * function duplicates the poa return value before returning it.
-   *
-   * @return Child POA pointer which has been duplicated.  Caller
-   *         must release pointer when done.
-   */
-  PortableServer::POA_ptr child_poa (void);
-
-  /**
-   * Accessor which returns the poa manager. Following the normal
-   * CORBA memory management rules of return values from functions,
-   * this function duplicates the poa manager return value before
-   * returning it.
-   *
-   * @return POAManager pointer which has been duplicated.  Caller
-   *         must release pointer when done.
-   */
-  PortableServer::POAManager_ptr poa_manager (void);
-
-protected:
-  /// The ORB.
-  CORBA::ORB_var orb_;
-
-  /// The POA for this ORB.
-  PortableServer::POA_var poa_;
-
-  /// Child poa under the root POA.
-  PortableServer::POA_var child_poa_;
-
-  /// The POA manager of poa_.
-  PortableServer::POAManager_var poa_manager_;
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ORB_MANAGER_H */
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
deleted file mode 100644
index e2aaab09b5e..00000000000
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "PolicyList_Destroyer.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-# include "PolicyList_Destroyer.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Utils,
-           PolicyList_Deactivator,
-           "$Id$")
-
-TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
-  ACE_THROW_SPEC (())
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  for (CORBA::ULong i = 0; i != length(); ++i)
-    {
-      CORBA::Policy_ptr policy = (*this)[i];
-      if (CORBA::is_nil (policy))
-        {
-          continue;
-        }
-
-      ACE_TRY
-        {
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHALL
-        {
-        }
-      ACE_ENDTRY;
-
-      (*this)[i] = CORBA::Policy::_nil();
-    }
-}
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
deleted file mode 100644
index 7fdb607652d..00000000000
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file PolicyList_Destroyer.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_POLICYLIST_DESTROYER_H
-#define TAO_UTILS_POLICYLIST_DESTROYER_H
-#include /**/ "ace/pre.h"
-#include "utils_export.h"
-
-#include "tao/PolicyC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @class PolicyList_Destroyer
-     *
-     * @brief Automatically destroy all the policies set in a PolicyList
-     *
-     */
-    class TAO_UTILS_Export PolicyList_Destroyer
-      : public CORBA::PolicyList
-    {
-    public:
-      PolicyList_Destroyer(CORBA::ULong length_hint);
-      ~PolicyList_Destroyer()
-        ACE_THROW_SPEC (());
-    };
-
-  } // namespace Utils
-} // namespace TAO
-
-#if defined (__ACE_INLINE__)
-# include "PolicyList_Destroyer.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_UTILS_POLICYLIST_DESTROYER_H*/
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.inl b/TAO/tao/Utils/PolicyList_Destroyer.inl
deleted file mode 100644
index 1bc3d224276..00000000000
--- a/TAO/tao/Utils/PolicyList_Destroyer.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO::Utils::PolicyList_Destroyer::PolicyList_Destroyer (CORBA::ULong length_hint)
-  : CORBA::PolicyList(length_hint)
-{
-}
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
deleted file mode 100644
index 18299880b5a..00000000000
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef TAO_UTILS_RIR_NARROW_CPP
-#define TAO_UTILS_RIR_NARROW_CPP
-
-#include "RIR_Narrow.h"
-#include "tao/SystemException.h"
-#if defined (ACE_HAS_EXCEPTIONS)
-  #include <stdexcept>
-#endif
-
-ACE_RCSID (Utils,
-           RIR_Narror,
-           "$Id$")
-
-template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
-TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
-                                   char const * id
-                                   ACE_ENV_ARG_DECL)
-{
-  CORBA::Object_var object =
-    orb->resolve_initial_references (id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
-
-  return RIR_Narrow<T>::narrow_object (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
-TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
-                                   char const * id
-                                   ACE_ENV_ARG_DECL)
-{
-  CORBA::Object_var object =
-    info->resolve_initial_references (id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
-
-  return RIR_Narrow<T>::narrow_object (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
-TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
-                                          ACE_ENV_ARG_DECL)
-{
-  _var_type narrowed_object = T::_narrow (object
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
-
-  if (CORBA::is_nil (narrowed_object.in ()))
-  {
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (),
-                      T::_nil ());
-  }
-  return narrowed_object._retn ();
-}
-
-#endif /*TAO_UTILS_RIR_NARROW_CPP*/
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
deleted file mode 100644
index 7f71ac52c87..00000000000
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file RIR_Narrow.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_RIR_NARROW_H
-#define TAO_UTILS_RIR_NARROW_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @class RIR_Narrow
-     *
-     * @brief Helper class to obtain an initial reference and narrow it
-     *        to the proper object reference.
-     */
-    template<class T> class RIR_Narrow
-    {
-    public:
-      typedef typename T::_ptr_type _ptr_type;
-      typedef typename T::_var_type _var_type;
-
-      /// Use resolve_initial_references to find an object and then
-      /// narrow it.
-      static _ptr_type narrow (CORBA::ORB_ptr orb,
-                               char const * id
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-      /// Use resolve_initial_references to find an object and then
-      /// narrow it.
-      static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb,
-                               char const * id
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    private:
-      static _ptr_type narrow_object (CORBA::Object_ptr object
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    };
-
-  } // namespace Utils
-} // namespace TAO
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "RIR_Narrow.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_UTILS_RIR_NARROW_H*/
diff --git a/TAO/tao/Utils/Servant_Var.cpp b/TAO/tao/Utils/Servant_Var.cpp
deleted file mode 100644
index a6f63b15d51..00000000000
--- a/TAO/tao/Utils/Servant_Var.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef TAO_UTILS_SERVANT_VAR_CPP
-#define TAO_UTILS_SERVANT_VAR_CPP
-
-#include "Servant_Var.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Servant_Var.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Utils,
-           Servant_Var,
-           "$Id$")
-
-#endif /*TAO_UTILS_SERVANT_VAR_CPP*/
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
deleted file mode 100644
index 8655ddb9a07..00000000000
--- a/TAO/tao/Utils/Servant_Var.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Servant_Var.h
- *
- * $Id$
- *
- * @author Jody Hagins <jody@atdesk.com>
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_SERVANT_VAR_H
-#define TAO_UTILS_SERVANT_VAR_H
-#include /**/ "ace/pre.h"
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @class Servant_Var
-     *
-     * @brief Provides a type safe counted reference to servants.
-     *
-     * @author Jody Hagins
-     *
-     * @todo Life would be much easier if _add_ref() and _remove_ref() had
-     *       throw specs of "throw ()", that can be hidden in static
-     *       methods though.
-     */
-    template<class T>
-    class Servant_Var
-    {
-    public:
-      typedef T Servant_Type;
-
-      /// Constructor.  Assumes ownership of @c p.
-      Servant_Var(T * p = 0);
-
-      /// Copy constructor.  Adds reference to @c rhs.
-      Servant_Var(Servant_Var<T> const & rhs);
-
-      /// Assignment operator.  Adds reference to @c rhs.
-      Servant_Var<T> & operator=(Servant_Var<T> const & rhs);
-
-      /// Destructor.  Removes a reference from the underlying object,
-      /// possibly destroying it.
-      ~Servant_Var()
-        ACE_THROW_SPEC (());
-
-      /// Assignment operator.  Assumes ownership of @c p.
-      Servant_Var<T> & operator=(T * p);
-
-# if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-      /// Template member constructor from a pointer that will implicitly
-      /// cast to type T.  Assumes ownership of @c p.
-      /// This constructor allows constructs such as:
-      /// Servant_Base<Base> p(new Derived);
-      template <class Y>
-      Servant_Var(Y * p);
-
-      /// Template member copy constructor from a Servant_Var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var(Servant_Var<Y> const & rhs);
-
-      /// Template member assignment operator from a Servant_Var<Y>, where
-      /// Y can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var<T> & operator=(Servant_Var<Y> const & rhs);
-
-      /// Template member assignment operator from a pointer to Y, where Y
-      /// can be implicitly cast to type T.
-      template <class Y>
-      Servant_Var<T> & operator=(Y * p);
-# endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-      /// Smart pointer operator-> provides access to the underlying object.
-      T const * operator->() const;
-
-      /// Smart pointer operator-> provides access to the underlying object.
-      T * operator->();
-
-      /// Dereference the underlying object.
-      T const & operator*() const;
-
-      /// Dereference the underlying object.
-      T & operator*();
-
-      /// Return a void pointer to the underlying object.  This allows
-      /// it to be used in conditional code and tested against 0.
-      operator void const * () const;
-
-      /// As an IN parameter.
-      T * in() const;
-
-      /// As an INOUT parameter.
-      T *& inout();
-
-      /// As an OUT parameter.
-      T *& out();
-
-      // Return a pointer to the underlying object, and this counted
-      // reference will no longer own the object.
-      T * _retn();
-
-      /// Increment the reference count and return the servant.
-      /**
-       * It is safe to pass in a null pointer, the pointer is simply
-       * returned in that case.
-       *
-       * @todo We might want to add a throw spec and catch all (potential)
-       *       exceptions in _add_ref()
-       *
-       * @todo It might be useful to add an _release() method that handles
-       *       any potential exceptions...
-       */
-      static T * _duplicate (T *);
-
-      /// Swap the contents of a Servant_Var<T> with another
-      /// Servant_Var<T>
-      /**
-       * Often used to implement strong exception safety.
-       */
-      void swap(Servant_Var<T> & rhs)
-        ACE_THROW_SPEC(());
-
-    private:
-      T * ptr_;
-    };
-
-    /// Compare two Servant_Vars for equivalence.
-    template <class X, class Y>
-    bool operator==(Servant_Var<X> const & x,
-                    Servant_Var<Y> const & y);
-
-    /// Compare two Servant_Vars for non-equivalence.
-    template <class X, class Y>
-    bool operator!=(Servant_Var<X> const & x,
-                    Servant_Var<Y> const & y);
-
-  } // namespace Utils
-} // namespace TAO
-
-#if defined (__ACE_INLINE__)
-# include "Servant_Var.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Servant_Var.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Servant_Var.cpp")
-#endif
-
-#include /**/ "ace/post.h"
-#endif /*TAO_UTILS_SERVANT_VAR_H*/
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
deleted file mode 100644
index 8716ed46cdf..00000000000
--- a/TAO/tao/Utils/Servant_Var.inl
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/Exception.h"
-#include "ace/Swap.h"
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_duplicate (T * p)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      if (p != 0)
-        {
-          p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return p;
-}
-
-template <class T>
-ACE_INLINE void
-TAO::Utils::Servant_Var<T>::swap (Servant_Var<T> & rhs) ACE_THROW_SPEC(())
-{
-  ACE_Swap<T*>::swap (this->ptr_, rhs.ptr_);
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (T * p)
-  : ptr_ (p)
-{
-}
-
-// If _add_ref throws, this object will not be completely constructed
-// so the destructor will not be called.
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<T> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate(rhs.ptr_))
-{
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Servant_Var<T> const & rhs)
-{
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
-  return *this;
-}
-
-template <class T>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (T * p)
-{
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
-  return *this;
-}
-
-template <class T> ACE_INLINE
-TAO::Utils::Servant_Var<T>::~Servant_Var (void)
-  ACE_THROW_SPEC (())
-{
-  // Unfortunately, there is no throw spec on _remove_ref, so we
-  // can't assume that it will not throw.  If it does, then we are in
-  // trouble.  In any event, we can't let the exception escape our
-  // destructor.
-  ACE_TRY_NEW_ENV
-    {
-      if (ptr_ != 0)
-        {
-          ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHALL
-    {
-      // Forget the exception..
-    }
-  ACE_ENDTRY;
-}
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Y * p)
-  : ptr_ (p)
-{
-}
-
-template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T>::Servant_Var (Servant_Var<Y> const & rhs)
-  : ptr_ (Servant_Var<T>::_duplicate (rhs.in ()))
-{
-}
-
-template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::
-operator=(Servant_Var<Y> const & rhs)
-{
-  TAO::Utils::Servant_Var<T> tmp (rhs);
-  this->swap (tmp);
-  return *this;
-}
-
-template <class T> template <class Y>
-ACE_INLINE typename TAO::Utils::Servant_Var<T> &
-TAO::Utils::Servant_Var<T>::operator= (Y * p)
-{
-  TAO::Utils::Servant_Var<T> tmp (p);
-  this->swap (tmp);
-  return *this;
-}
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-template <class T>
-ACE_INLINE T const *
-TAO::Utils::Servant_Var<T>::operator->() const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::operator->()
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T const & TAO::Utils::Servant_Var<T>::operator*() const
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE T & TAO::Utils::Servant_Var<T>::operator*()
-{
-  return *ptr_;
-}
-
-template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T>::operator void const * () const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::in (void) const
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::inout (void)
-{
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *&
-TAO::Utils::Servant_Var<T>::out (void)
-{
-  TAO::Utils::Servant_Var<T> tmp;
-  this->swap (tmp);
-  return ptr_;
-}
-
-template <class T>
-ACE_INLINE T *
-TAO::Utils::Servant_Var<T>::_retn (void)
-{
-  T * rval = ptr_;
-  ptr_ = 0;
-  return rval;
-}
-
-template <class X, class Y>
-ACE_INLINE bool
-operator== (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
-{
-  return x.in () == y.in ();
-}
-
-template <class X, class Y>
-ACE_INLINE bool
-operator!= (typename TAO::Utils::Servant_Var<X> const & x,
-            typename TAO::Utils::Servant_Var<Y> const & y)
-{
-  return x.in () != y.in ();
-}
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
deleted file mode 100644
index b1e44418fae..00000000000
--- a/TAO/tao/Utils/Server_Main.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Server_Main.cpp
- *
- *  $Id$
- *
- *  Implements a generic object that acts as "main" for a CORBA server.
- *
- *  @author Dale Wilson <wilson_d@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_UTILS_SERVER_MAIN_T_CPP
-#define TAO_UTILS_SERVER_MAIN_T_CPP
-
-#include "Server_Main.h"
-
-
-ACE_RCSID (Utils,
-           Server_Main,
-           "$Id$")
-
-
-#include "tao/ORB.h"
-
-#include "ace/Argv_Type_Converter.h"
-#include "ace/Log_Msg.h"
-#include "ace/Time_Value.h"
-
-
-template <typename SERVANT>
-TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name)
-  : name_(name)
-{
-}
-
-template <typename SERVANT>
-TAO::Utils::Server_Main<SERVANT>::~Server_Main ()
-{
-}
-
-template <typename SERVANT>
-int
-TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
-{
-  int result = 0;
-  // hide unicode if necessary.
-  ACE_Argv_Type_Converter command_line (argc, argv);
-
-  char ** asciiArgv = command_line.get_ASCII_argv ();
-
-  ACE_TRY_NEW_ENV
-  {
-    // Initialize the orb
-
-    CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (! CORBA::is_nil(orb.in ()))
-    {
-      // create an instance of the servant object and give it a
-      // chance at the arguments.
-      SERVANT servant;
-      result = servant.parse_args (argc, asciiArgv);
-      if (result == 0)
-      {
-        //////////////////////////////////
-        // let the servant register itself
-        result = servant.init (orb.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (result == 0)
-        {
-          ACE_ERROR ((LM_INFO,
-            "%T %s (%P|%t) Ready %s\n", name_, servant.identity ()
-            ));
-
-          //////////////////////////////////
-          // Run the event loop for the ORB.
-          // Initial run to initialize the orb
-          ACE_Time_Value tv (1,0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // now run event loop
-          int quit = 0;
-          while (result == 0 && ! quit )
-          {
-            ACE_Time_Value work_tv (1,0);
-            orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            quit = servant.idle (result ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-          servant.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_ERROR ((LM_INFO,
-                      "%T %s (%P|%t) Terminated normally. %s\n",
-                      name_,
-                      servant.identity ()
-            ));
-        }
-        else
-        {
-          ACE_ERROR ((LM_ERROR,
-            "%T %s (%P|%t) Registration failed: %m\n", name_
-            ));
-          result = -1;
-        }
-      }
-      else
-      {
-        ACE_ERROR ((LM_ERROR,
-          "%T %s (%P|%t) ORB manager init failed\n", name_
-        ));
-        result = -1;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      name_);
-    result = -1;
-  }
-  ACE_ENDTRY;
-  return result;
-}
-
-#endif //TAO_UTILS_SERVER_MAIN_T_CPP
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
deleted file mode 100644
index 99016b8052c..00000000000
--- a/TAO/tao/Utils/Server_Main.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    Server_Main.h
- *
- *  $Id$
- *
- *  Declares a generic object that acts as "main" for a CORBA server.
- *  @author Dale Wilson <wilson_d@ociweb.com>
- *
- *  This object supports creation of a relatively simple CORBA server.
- *  The object implements "main" for a process.
- *  A single servant is created and initialized as the process begins
- *  execution.  The lifetime of this initial servant is the lifetime of
- *  the process.
- *  The servant is free to create other servants as necessary.
- *  The servant can capture command line options.
- *  A callback method in the ORB event loop allows the servant to act
- *  asynchronously if necessary.
- *  The callback method allows the servant to request process termination
- *  and specify the status to be returned from the process.
- *
- *  The application should create a C/C++ main that looks something like:
- *    #include <tao/Utils/Server_Main.h>
- *    #include "Xyzzy_i.h"
- *    int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
- *    {
- *      Server_Main<Xyzzy_i> servant ("Xyzzy");
- *      return servant.run(argc, argv);
- *    }
- *
- *  The servant implementation (Xyzzy_i in this case) must implement
- *  the following methods:
- *      Xyzzy_i (); // null constructor
- *      ~Xyzzy_i (); // destructor
- *      int parse_args (int argc, char * argv[]);
- *      int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
- *      int idle(int &result);
- *      int fini (ACE_ENV_SINGLE_ARG_DECL);
- *      const char * identity () const;
- *
- *      parse_args, self_register, self_unregister return 0 if ok, nonzero for error.
- *      idle returns 0 to continue execution; nonzero to exit -- returning "result" from the process
- *      identity provides a string to identify this servant in log messages.
- *
- */
-//=============================================================================
-
-#ifndef TAO_UTILS_SERVANTMAIN_H
-#define TAO_UTILS_SERVANTMAIN_H
-
-#include <ace/ACE.h>
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ <ace/pre.h>
-namespace TAO
-{
-  namespace Utils
-  {
-    template <typename SERVANT>
-    class Server_Main
-    {
-    public:
-      Server_Main(const char * name);
-      ~Server_Main();
-
-      int run (int argc, ACE_TCHAR *argv[]);
-
-    private:
-      Server_Main( const Server_Main &);
-      Server_Main & operator = (const Server_Main &);
-
-    private:
-      const char * name_;
-    };
-  } // namespace UTILS
-} // namespace TAO
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "Server_Main.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-# pragma implementation "Server_Main.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ <ace/post.h>
-
-#endif //TAO_UTILS_SERVANTMAIN_H
diff --git a/TAO/tao/Utils/utils_export.h b/TAO/tao/Utils/utils_export.h
deleted file mode 100644
index 5cf8c0c40a0..00000000000
--- a/TAO/tao/Utils/utils_export.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TAO_UTILS
-// ------------------------------
-#ifndef TAO_UTILS_EXPORT_H
-#define TAO_UTILS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_UTILS_HAS_DLL)
-#    define TAO_UTILS_HAS_DLL 0
-#  endif /* ! TAO_UTILS_HAS_DLL */
-#else
-#  if !defined (TAO_UTILS_HAS_DLL)
-#    define TAO_UTILS_HAS_DLL 1
-#  endif /* ! TAO_UTILS_HAS_DLL */
-#endif
-
-#if defined (TAO_UTILS_HAS_DLL) && (TAO_UTILS_HAS_DLL == 1)
-#  if defined (TAO_UTILS_BUILD_DLL)
-#    define TAO_UTILS_Export ACE_Proper_Export_Flag
-#    define TAO_UTILS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_UTILS_BUILD_DLL */
-#    define TAO_UTILS_Export ACE_Proper_Import_Flag
-#    define TAO_UTILS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_UTILS_BUILD_DLL */
-#else /* TAO_UTILS_HAS_DLL == 1 */
-#  define TAO_UTILS_Export
-#  define TAO_UTILS_SINGLETON_DECLARATION(T)
-#  define TAO_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_UTILS_HAS_DLL == 1 */
-
-// Set TAO_UTILS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_UTILS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_UTILS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_UTILS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_UTILS_NTRACE */
-
-#if (TAO_UTILS_NTRACE == 1)
-#  define TAO_UTILS_TRACE(X)
-#else /* (TAO_UTILS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_UTILS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_UTILS_NTRACE == 1) */
-
-#endif /* TAO_UTILS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/ValueModifier.pidl b/TAO/tao/ValueModifier.pidl
deleted file mode 100644
index 4cd346c5049..00000000000
--- a/TAO/tao/ValueModifier.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   ValueModifier.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in ValueModifierC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -SS -Sci -St
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ValueModifier.pidl
- */
-// ================================================================
-
-#ifndef TAO_VALUEMODIFIER_PIDL
-#define TAO_VALUEMODIFIER_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short ValueModifier;
-  const ValueModifier VM_NONE = 0;
-  const ValueModifier VM_CUSTOM = 1;
-  const ValueModifier VM_ABSTRACT = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-};
-
-#endif /* TAO_VALUEMODIFIER_PIDL */
diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/ValueModifierC.cpp
deleted file mode 100644
index 5dc8ed0dcdc..00000000000
--- a/TAO/tao/ValueModifierC.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "ValueModifierC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/ValueModifierC.h
deleted file mode 100644
index 2bfe5a25b4e..00000000000
--- a/TAO/tao/ValueModifierC.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_VALUEMODIFIERC_H_
-#define _TAO_IDL_ORIG_VALUEMODIFIERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ValueModifier;
-  typedef CORBA::Short_out ValueModifier_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_NONE = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_CUSTOM = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_ABSTRACT = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_TRUNCATABLE = 3;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/ValueModifierS.h b/TAO/tao/ValueModifierS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ValueModifierS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Value_TypeCode.cpp b/TAO/tao/Value_TypeCode.cpp
deleted file mode 100644
index 310cec78183..00000000000
--- a/TAO/tao/Value_TypeCode.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-// $Id$
-
-#ifndef TAO_VALUE_TYPECODE_CPP
-#define TAO_VALUE_TYPECODE_CPP
-
-#include "tao/Value_TypeCode.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Value_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << Traits<StringType>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<StringType>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Visibility
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ValueModifier
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->concrete_base_));
-}
-
-
-#endif  /* TAO_VALUE_TYPECODE_CPP */
diff --git a/TAO/tao/Value_TypeCode.h b/TAO/tao/Value_TypeCode.h
deleted file mode 100644
index 7bb386579fc..00000000000
--- a/TAO/tao/Value_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_H
-#define TAO_VALUE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Value
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType concrete_base,
-#else
-             TypeCodeType const & concrete_base,
-#endif
-             FieldArrayType const & fields,
-             CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Value (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      TypeCodeType concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Value_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Value_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_H */
diff --git a/TAO/tao/Value_TypeCode.inl b/TAO/tao/Value_TypeCode.inl
deleted file mode 100644
index 9a8b31f0ddb..00000000000
--- a/TAO/tao/Value_TypeCode.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , type_modifier_ (CORBA::VM_NONE)
-  , concrete_base_ ()
-  , nfields_ (0)
-  , fields_ ()
-{
-}
diff --git a/TAO/tao/Value_TypeCode_Static.cpp b/TAO/tao/Value_TypeCode_Static.cpp
deleted file mode 100644
index 4820610d9ad..00000000000
--- a/TAO/tao/Value_TypeCode_Static.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// $Id$
-
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Value_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & field = *i;
-
-      if (!(enc << Traits<char const *>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<char const *>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
-
-CORBA::Visibility
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-CORBA::ValueModifier
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->concrete_base_));
-}
diff --git a/TAO/tao/Value_TypeCode_Static.h b/TAO/tao/Value_TypeCode_Static.h
deleted file mode 100644
index 4c44af4d5d0..00000000000
--- a/TAO/tao/Value_TypeCode_Static.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_STATIC_H
-#define TAO_VALUE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Value;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template<>
-    class TAO_Export Value<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Value_Field<char const *,
-                                       CORBA::TypeCode_ptr const *> const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-             CORBA::TypeCode_ptr const * concrete_base,
-             Value_Field<char const *,
-                         CORBA::TypeCode_ptr const *> const * fields,
-             CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier const type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      CORBA::TypeCode_ptr const * const concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Value_TypeCode_Static.inl b/TAO/tao/Value_TypeCode_Static.inl
deleted file mode 100644
index 70c7d6cf1b1..00000000000
--- a/TAO/tao/Value_TypeCode_Static.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-  CORBA::TypeCode_ptr const * concrete_base,
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
deleted file mode 100644
index 3d05f7a1d48..00000000000
--- a/TAO/tao/Valuetype.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-project : taolib, core {
-  sharedname    = TAO_Valuetype
-  dynamicflags  = TAO_VALUETYPE_BUILD_DLL
-
-  Source_Files {
-    Valuetype
-  }
-
-  Header_Files {
-    Valuetype
-  }
-
-  Inline_Files {
-    Valuetype
-  }
-
-  Template_Files {
-    Valuetype
-  }
-
-  Resource_Files {
-    Valuetype
-  }
-
-  PIDL_Files {
-  }
-
-  Pkgconfig_Files {
-    Valuetype/TAO_Valuetype.pc.in
-  }
-}
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
deleted file mode 100644
index 86388f9095b..00000000000
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-// "$Id$"
-
-#include "AbstractBase.h"
-#include "ValueBase.h"
-#include "ValueFactory.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-# include "AbstractBase.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (Valuetype,
-           AbstractBase,
-           "$Id$")
-
-// ************************************************************
-// These are in CORBA namespace
-
-void
-CORBA::release (CORBA::AbstractBase_ptr obj)
-{
-  if (obj)
-    {
-      obj->_remove_ref ();
-    }
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::AbstractBase_ptr obj)
-{
-  return (obj == 0);
-}
-
-// ************************************************************
-
-CORBA::AbstractBase::AbstractBase (void)
-  : is_objref_ (0)
-  , concrete_stubobj_ (0)
-  , is_collocated_ (0)
-  , servant_ (0)
-  , is_local_ (0)
-  , equivalent_obj_ (0)
-{
-}
-
-CORBA::AbstractBase::AbstractBase (const CORBA::AbstractBase &rhs)
-  : is_objref_ (rhs.is_objref_)
-  , concrete_stubobj_ (rhs.concrete_stubobj_)
-  , is_collocated_ (rhs.is_collocated_)
-  , servant_ (rhs.servant_)
-  , is_local_ (rhs.is_local_)
-  , equivalent_obj_ (0)
-{
-  if (rhs.concrete_stubobj_ != 0)
-    {
-      (void) rhs.concrete_stubobj_->_incr_refcnt ();
-    }
-
-  if (!CORBA::is_nil (rhs.equivalent_obj_))
-    {
-      this->equivalent_obj_ =
-        CORBA::Object::_duplicate (rhs.equivalent_obj_);
-    }
-}
-
-CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy,
-                                   CORBA::Boolean collocated,
-                                   TAO_Abstract_ServantBase * servant)
-  : is_objref_ (1)
-  , concrete_stubobj_ (protocol_proxy)
-  , is_collocated_ (collocated)
-  , servant_ (servant)
-  , is_local_ (protocol_proxy == 0 ? 1 : 0)
-  , equivalent_obj_ (0)
-{
-  if (this->concrete_stubobj_ != 0)
-    {
-      TAO_Stub *stub = this->concrete_stubobj_;
-
-      (void) stub->_incr_refcnt ();
-
-      this->equivalent_obj_ =
-        stub->orb_core ()->create_object (stub);
-    }
-
-}
-
-CORBA::AbstractBase::~AbstractBase (void)
-{
-  if (this->concrete_stubobj_ != 0)
-    {
-      (void) this->concrete_stubobj_->_decr_refcnt ();
-    }
-}
-
-CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
-{
-  if (obj)
-    {
-      obj->_add_ref ();
-    }
-
-  if (!CORBA::is_nil (obj->equivalent_obj_.in ()))
-    {
-      obj->equivalent_obj_->_add_ref ();
-    }
-
-  return obj;
-}
-
-// These are non-pure virtual no-ops so we can instantiate the
-// class in the CDR extraction operator. The actual management
-// of the refcount will always be done in the derived class.
-void
-CORBA::AbstractBase::_add_ref (void)
-{
-}
-
-void
-CORBA::AbstractBase::_remove_ref (void)
-{
-}
-
-void
-CORBA::AbstractBase::_tao_any_destructor (void *x)
-{
-  CORBA::AbstractBase_ptr tmp = static_cast<CORBA::AbstractBase_ptr> (x);
-  CORBA::release (tmp);
-}
-
-CORBA::Object_ptr
-CORBA::AbstractBase::_to_object (void)
-{
-  if (!CORBA::is_nil (this->equivalent_obj_.in ()))
-    return CORBA::Object::_duplicate (this->equivalent_obj_.in ());
-
-  if (this->concrete_stubobj_ == 0)
-    {
-      return CORBA::Object::_nil ();
-    }
-
-  TAO_ORB_Core *orb_core = this->concrete_stubobj_->orb_core ();
-  this->concrete_stubobj_->_incr_refcnt ();
-
-  return orb_core->create_object (this->concrete_stubobj_);
-}
-
-CORBA::ValueBase *
-CORBA::AbstractBase::_to_value (void)
-{
-  if (this->is_objref_)
-    {
-      return 0;
-    }
-
-  CORBA::ValueBase *retval = this->_tao_to_value ();
-
-  if (retval == 0)
-    {
-      return retval;
-    }
-
-  retval->_add_ref ();
-  return retval;
-}
-
-CORBA::Boolean
-CORBA::AbstractBase::_is_a (const char *type_id
-                            ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return ! ACE_OS::strcmp (type_id,
-                           "IDL:omg.org/CORBA/AbstractBase:1.0");
-}
-
-const char *
-CORBA::AbstractBase::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AbstractBase:1.0";
-}
-
-const char *
-CORBA::AbstractBase::_tao_obv_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/AbstractBase:1.0";
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
-{
-  CORBA::Boolean discriminator = true;
-
-  // We marshal a null abstract interface ptr as a discriminator
-  // plus null object reference (see CORBA::Object::marshal()
-  // and operator << for CORBA::Object).
-  if (CORBA::is_nil (abs))
-    {
-      // Marshal discriminator, then empty type hint.
-      strm << ACE_OutputCDR::from_boolean (discriminator);
-      strm.write_ulong (1);
-      strm.write_char ('\0');
-      strm.write_ulong (0);
-      return (CORBA::Boolean) strm.good_bit ();
-    }
-
-  if (abs->_is_objref ())
-    {
-      if (strm << ACE_OutputCDR::from_boolean (discriminator))
-        {
-          TAO_Stub *stubobj = abs->_stubobj ();
-
-          if (stubobj == 0)
-            {
-              return false;
-            }
-
-          // STRING, a type ID hint
-          if ((strm << stubobj->type_id.in ()) == 0)
-            {
-              return false;
-            }
-
-          const TAO_MProfile& mprofile = stubobj->base_profiles ();
-
-          CORBA::ULong profile_count = mprofile.profile_count ();
-
-          if ((strm << profile_count) == 0)
-            {
-              return false;
-            }
-
-          // @@ The MProfile should be locked during this iteration, is there
-          // anyway to achieve that?
-          for (CORBA::ULong i = 0; i < profile_count; ++i)
-            {
-              const TAO_Profile *p = mprofile.get_profile (i);
-
-              if (p->encode (strm) == 0)
-                {
-                  return false;
-                }
-            }
-
-          return (CORBA::Boolean) strm.good_bit ();
-        }
-    }
-  else
-    {
-      discriminator = false;
-
-      if (strm << ACE_OutputCDR::from_boolean (discriminator))
-        {
-          CORBA::Boolean retval = true;
-
-          CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base
-                                   | TAO_OBV_GIOP_Flags::Type_info_single;
-
-          retval = strm.write_ulong (value_tag);
-
-          if (retval == 0)
-            {
-              return retval;
-            }
-
-          retval = strm << abs->_tao_obv_repository_id ();
-
-          if (retval == 0)
-            {
-              return retval;
-            }
-
-          return abs->_tao_marshal_v (strm);
-        }
-    }
-
-  return false;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
-{
-  abs = 0;
-  CORBA::Boolean discriminator = 0;
-  ACE_InputCDR::to_boolean tb (discriminator);
-  TAO_ORB_Core *orb_core = 0;
-
-  if (strm >> tb)
-    {
-      if (discriminator == 0)
-        {
-          CORBA::ULong value_tag;
-
-          if (!strm.read_ulong (value_tag))
-            {
-              return 0;
-            }
-
-          if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
-            {
-              // Ok, null reference unmarshaled.
-              return 1;
-            }
-
-          if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("operator>> CORBA::AbstractBase ")
-                          ACE_TEXT ("not value_tag\n")));
-              return 0;
-            }
-
-          CORBA::String_var repo_id_stream;
-
-          // It would be more efficient not to copy the string)
-          if (strm.read_string (repo_id_stream.inout ()) == 0)
-            {
-              return 0;
-            }
-
-          orb_core = strm.orb_core ();
-
-          if (orb_core == 0)
-            {
-              orb_core = TAO_ORB_Core_instance ();
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_WARNING,
-                              "TAO (%P|%t) WARNING: extracting "
-                              "valuetype using default ORB_Core\n"));
-                }
-            }
-
-          CORBA::ValueFactory_var factory =
-            orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
-
-          // We should throw an exception, if there were an appropriate one.
-          if (factory.in() == 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%N:%l): The following unknown type was received: `%s'."),
-                          repo_id_stream.in ()));
-              return 0;
-            }
-
-          abs = factory->create_for_unmarshal_abstract ();
-
-          return abs->_tao_unmarshal_v (strm);
-        }
-      else
-        {
-          CORBA::Object_var generic_objref;
-
-          if (strm >> generic_objref.inout ())
-            {
-              TAO_Stub *concrete_stubobj = generic_objref->_stubobj ();
-
-              CORBA::Boolean stores_orb =
-                ! CORBA::is_nil (concrete_stubobj->servant_orb_var ().ptr ());
-
-              if (stores_orb)
-                {
-                  orb_core =
-                    concrete_stubobj->servant_orb_var ()->orb_core ();
-                }
-
-              CORBA::Boolean collocated =
-                orb_core != 0
-                && orb_core->optimize_collocation_objects ()
-                && generic_objref->_is_collocated ();
-
-              ACE_NEW_RETURN (abs,
-                              CORBA::AbstractBase (
-                                concrete_stubobj,
-                                collocated,
-                                generic_objref->_servant ()),
-                              0);
-              return 1;
-            }
-        }
-    }
-
-  return 0;
-}
-
-CORBA::Boolean
-CORBA::AbstractBase::_tao_marshal_v (TAO_OutputCDR &) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-CORBA::AbstractBase::_tao_unmarshal_v (TAO_InputCDR &)
-{
-  return 0;
-}
-
-CORBA::ValueBase *
-CORBA::AbstractBase::_tao_to_value (void)
-{
-  return 0;
-}
-
-CORBA::Object_ptr
-CORBA::AbstractBase::equivalent_objref (void)
-{
-  if (CORBA::is_nil (this->equivalent_obj_.in ()))
-    {
-      if (this->concrete_stubobj_ != 0)
-        {
-          TAO_ORB_Core *orb_core =
-            this->concrete_stubobj_->orb_core ();
-
-          (void) this->concrete_stubobj_->_incr_refcnt ();
-
-          this->equivalent_obj_ =
-            orb_core->create_object (this->concrete_stubobj_);
-        }
-    }
-
-  return this->equivalent_obj_.in ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if 0
-template class TAO::Any_Impl_T<CORBA::AbstractBase>;
-template class TAO::Any_Impl_T<CORBA::ValueBase>;
-#endif
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Impl_T<CORBA::AbstractBase>
-#pragma instantiate TAO::Any_Impl_T<CORBA::ValueBase>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
deleted file mode 100644
index 4ca2a514c75..00000000000
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     AbstractBase.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons  <parsons@cs.wust.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ABSTRACTBASE_H
-#define TAO_ABSTRACTBASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "valuetype_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Valuetype/Value_CORBA_methods.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Object.h"  /* For CORBA::Object_var */
-#include "tao/Pseudo_VarOut_T.h"
-#include "ace/CORBA_macros.h"
-
-class TAO_Stub;
-class TAO_Abstract_ServantBase;
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Valuetype_Export
-
-namespace CORBA
-{
-  class ValueBase;
-
-  typedef TAO_Pseudo_Var_T<AbstractBase> AbstractBase_var;
-  typedef TAO_Pseudo_Out_T<AbstractBase, AbstractBase_var> AbstractBase_out;
-
-  /**
-   * @class AbstractBase
-   *
-   * @brief Abstract base class for Interfaces and Valuetypes
-   *
-   * Allows the determination of whether an object has been passed by
-   * reference or by value to be deferred until runtime.
-   */
-  class TAO_Valuetype_Export AbstractBase
-  {
-  public:
-
-    /// Constructor.
-    /**
-     * This constructor is only meant to be called by the
-     * corresponding CDR stream extraction operator.
-     */
-    AbstractBase (TAO_Stub *p,
-                  CORBA::Boolean collocated,
-                  TAO_Abstract_ServantBase *servant);
-
-    typedef CORBA::AbstractBase_ptr _ptr_type;
-    typedef CORBA::AbstractBase_var _var_type;
-
-    static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
-    static CORBA::AbstractBase_ptr _nil (void);
-
-    /// Used in the implementation of CORBA::Any
-    static void _tao_any_destructor (void*);
-
-    /// Spec required conversion operations
-    CORBA::Object_ptr _to_object (void);
-    CORBA::ValueBase *_to_value (void);
-
-    virtual CORBA::Boolean _is_a (const char *type_id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    virtual const char* _interface_repository_id (void) const;
-
-    /// TAO specific operation
-    virtual const char* _tao_obv_repository_id (void) const;
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const;
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
-
-    /// Memmory management operations
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-
-    CORBA::Boolean _is_objref (void) const;
-
-    /// Return the stub object
-    TAO_Stub *_stubobj (void) const;
-
-    /// Acessors
-    CORBA::Boolean _is_collocated (void) const;
-    TAO_Abstract_ServantBase *_servant (void) const;
-    CORBA::Boolean _is_local (void) const;
-
-    /// Return the equivalent object reference.
-    /**
-     * The object is not refcounted. The caler should not put this in
-     * a var or some such thing. The memory is owned by <this>
-     * object.
-     */
-    CORBA::Object_ptr equivalent_objref (void);
-
-  protected:
-
-    AbstractBase (void);
-    AbstractBase (const AbstractBase &);
-
-    virtual ~AbstractBase (void);
-
-  protected:
-
-    CORBA::Boolean is_objref_;
-
-
-  private:
-
-    AbstractBase & operator= (const AbstractBase &);
-
-    virtual CORBA::ValueBase *_tao_to_value (void);
-
-  private:
-
-    TAO_Stub *concrete_stubobj_;
-    CORBA::Boolean is_collocated_;
-    TAO_Abstract_ServantBase *servant_;
-    CORBA::Boolean is_local_;
-
-    /// Our equivalent CORBA::Object version
-    /// @todo We may at some point of time should probably cache a
-    /// version of  CORBA::ValueBase
-    CORBA::Object_var equivalent_obj_;
-  };
-}
-
-TAO_Valuetype_Export CORBA::Boolean
-operator<< (TAO_OutputCDR &, const CORBA::AbstractBase_ptr);
-
-TAO_Valuetype_Export CORBA::Boolean
-operator>> (TAO_InputCDR &, CORBA::AbstractBase_ptr &);
-
-/// Used in generated code if CORBA::AbstractBase is an argument or return type.
-namespace TAO
-{
-  template<>
-  class TAO_Valuetype_Export Arg_Traits<CORBA::AbstractBase>
-    : public Object_Arg_Traits_T<CORBA::AbstractBase_ptr,
-                                 CORBA::AbstractBase_var,
-                                 CORBA::AbstractBase_out,
-                                 TAO::Objref_Traits<CORBA::AbstractBase> >
-  {
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "AbstractBase.inl"
-#endif /* __ACE_INLINE__) */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ABSTRACTBASE_H */
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
deleted file mode 100644
index 8bc52ccfce3..00000000000
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ace/OS_NS_string.h"
-
-ACE_INLINE
-CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_nil (void)
-{
-  return (CORBA::AbstractBase_ptr)0;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
-                              ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return CORBA::AbstractBase::_duplicate (obj);
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractBase::_is_objref (void) const
-{
-  return this->is_objref_;
-}
-
-ACE_INLINE
-TAO_Stub *
-CORBA::AbstractBase::_stubobj (void) const
-{
-  return this->concrete_stubobj_;
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractBase::_is_collocated (void) const
-{
-  return this->is_collocated_;
-}
-
-ACE_INLINE
-TAO_Abstract_ServantBase *
-CORBA::AbstractBase::_servant (void) const
-{
-  return this->servant_;
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractBase::_is_local (void) const
-{
-  return this->is_local_;
-}
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
deleted file mode 100644
index b3c8bdba2b8..00000000000
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//$Id$
-#include "AbstractBase_Invocation_Adapter.h"
-#include "AbstractBase.h"
-
-ACE_RCSID (Valuetype,
-           AbstractBase_Invocation_Adapter,
-           "$Id$")
-
-namespace TAO
-{
-  AbstractBase_Invocation_Adapter::AbstractBase_Invocation_Adapter (
-      CORBA::AbstractBase_ptr target,
-      Argument **args,
-      int arg_number,
-      const char *operation,
-      int op_len,
-      Collocation_Proxy_Broker *p,
-      Invocation_Type type,
-      Invocation_Mode mode)
-    : Invocation_Adapter (target->equivalent_objref (),
-                          args,
-                          arg_number,
-                          operation,
-                          op_len,
-                          p,
-                          type,
-                          mode)
-  {
-  }
-} // End namespace TAO
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
deleted file mode 100644
index 82e27d51e29..00000000000
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    AbstractBase_Invocation_Adapter.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-#ifndef TAO_ABSTRACTBASE_INVOCATION_ADAPTER_H
-#define TAO_ABSTRACTBASE_INVOCATION_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "valuetype_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Invocation_Adapter.h"
-
-namespace CORBA
-{
-  class AbstractBase;
-
-  typedef AbstractBase *AbstractBase_ptr;
-}
-namespace TAO
-{
-  class Argument;
-
-  class Collocation_Proxy_Broker;
-  class Profile_Transport_Resolver;
-
-  /**
-   * @class AbstractBase_Invocation_Adapter
-   *
-   *
-   */
-  class TAO_Valuetype_Export AbstractBase_Invocation_Adapter
-    : public Invocation_Adapter
-  {
-  public:
-    AbstractBase_Invocation_Adapter (
-        CORBA::AbstractBase_ptr target,
-        Argument **args,
-        int arg_number,
-        const char *operation,
-        int op_len,
-        Collocation_Proxy_Broker *cpb,
-        TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION,
-        TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
-
-  private:
-    /// Dont allow default initializations
-    ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter (void))
-
-    ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter & operator= (
-        const AbstractBase_Invocation_Adapter &))
-  };
-} // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_INVOCATION_ADAPTER_H*/
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
deleted file mode 100644
index 03308da8ae6..00000000000
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-#ifndef TAO_ABSTRACT_BASE_T_C
-#define TAO_ABSTRACT_BASE_T_C
-
-#include "AbstractBase_T.h"
-#include "AbstractBase.h"
-#include "tao/Stub.h"
-
-ACE_RCSID (Valuetype,
-           Abstractbase_T,
-           "$Id$")
-namespace TAO
-{
-  template<typename T> T *
-  AbstractBase_Narrow_Utils<T>::narrow (
-      CORBA::AbstractBase_ptr obj,
-      const char *repo_id,
-      Proxy_Broker_Factory pbf
-      ACE_ENV_ARG_DECL)
-  {
-    if (CORBA::is_nil (obj))
-      {
-        return T::_nil ();
-      }
-
-    CORBA::Boolean is_it =
-      obj->_is_a (
-          repo_id
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_CHECK_RETURN (T::_nil ());
-
-    if (is_it == 0)
-      {
-        return T::_nil ();
-      }
-
-    return
-      AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj,
-                                                      repo_id,
-                                                      pbf
-                                                      ACE_ENV_ARG_PARAMETER);
-  }
-
-  template<typename T>  T *
-  AbstractBase_Narrow_Utils<T>::unchecked_narrow (
-      CORBA::AbstractBase_ptr obj,
-      Proxy_Broker_Factory pbf)
-  {
-    T *proxy = 0;
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-
-    ACE_TRY
-      {
-        proxy =
-          AbstractBase_Narrow_Utils<T>::unchecked_narrow (
-              obj,
-              0,
-              pbf
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-      }
-    ACE_CATCHANY
-      {
-        // Consume and return proxy
-        return proxy;
-      }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (proxy);
-
-    return proxy;
-  }
-
-  template<typename T>  T *
-  AbstractBase_Narrow_Utils<T>::unchecked_narrow (
-      CORBA::AbstractBase_ptr obj,
-      const char *,
-      Proxy_Broker_Factory pbf
-      ACE_ENV_ARG_DECL)
-  {
-    if (CORBA::is_nil (obj))
-      {
-        return T::_nil ();
-      }
-
-    T_ptr proxy = T::_nil ();
-
-    if (obj->_is_objref ())
-      {
-        TAO_Stub* stub = obj->_stubobj ();
-
-        bool collocated =
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ())
-          && stub->optimize_collocation_objects ()
-          && obj->_is_collocated ()
-          && pbf != 0;
-
-        ACE_NEW_THROW_EX (proxy,
-                          T (obj->_stubobj (),
-                             collocated ? 1 : 0,
-                             obj->_servant ()),
-                          CORBA::NO_MEMORY ());
-      }
-    else
-      {
-        proxy = dynamic_cast<T *> (obj);
-        proxy->_add_ref ();
-      }
-
-    return proxy;
-  }
-}
-
-#endif /*TAO_ABSTRACT_BASE_T_C*/
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
deleted file mode 100644
index e7ec925f828..00000000000
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     AbstractBase_T.h
- *
- *  $Id$
- *
- *  @author  Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ABSTRACTBASE_T_H
-#define TAO_ABSTRACTBASE_T_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Object_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-}
-
-namespace TAO
-{
-  template<typename T>
-  class AbstractBase_Narrow_Utils
-  {
-  public:
-    typedef T *T_ptr;
-
-    static T_ptr narrow (CORBA::AbstractBase_ptr,
-                         const char *repo_id,
-                         Proxy_Broker_Factory
-                         ACE_ENV_ARG_DECL);
-
-    static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
-                                   Proxy_Broker_Factory);
-
-    static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
-                                   const char *repo_id,
-                                   Proxy_Broker_Factory
-                                   ACE_ENV_ARG_DECL);
-  };
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "AbstractBase_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("AbstractBase_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_ABSTRACTBASE_T_H*/
diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
deleted file mode 100644
index bd13c67cf9e..00000000000
--- a/TAO/tao/Valuetype/Seq_Tmplinst.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Seq_Tmplinst.cpp
-//
-// = DESCRIPTION
-//   Explicit instantiation of the TAO sequence template classes for ValueBase
-//   and AbstractBase. These instantiations free us from having to
-//   generate them over and over with the IDL compiler.
-//
-// = AUTHOR
-//     Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
-#include "ace/config-all.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "tao/Sequence_T.h"
-#include "tao/Any.h"
-#include "ValueBase.h"
-#include "AbstractBase.h"
-#include "Sequence_T.h"
-#include "ValueFactory.h"
-#endif /*if ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-ACE_RCSID (Valuetype,
-           Seq_Tmplinst,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Valuetype_Manager<CORBA::ValueBase,
-                                     CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase,
-                                                CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase>;
-
-template class TAO_Value_Var_T <CORBA::ValueFactoryBase>;
-
-
-template class TAO_Value_Var_T <CORBA::ValueBase>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Valuetype_Manager<CORBA::ValueBase,
-                                          CORBA::ValueBase_var,
-                                          CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, \
-                                                     CORBA::ValueBase_var, \
-                                                     CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, \
-                                                  CORBA::AbstractBase_var>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueFactoryBase,
-                                      CORBA::tao_ValueFactoryBase_life>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueBase,
-                                      CORBA::tao_ValueBase_life>
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
deleted file mode 100644
index a7c0b243a3b..00000000000
--- a/TAO/tao/Valuetype/Sequence_T.cpp
+++ /dev/null
@@ -1,499 +0,0 @@
-// $Id$
-
-#ifndef TAO_VALUETYPE_SEQUENCE_T_C
-#define TAO_VALUETYPE_SEQUENCE_T_C
-
-#include "Sequence_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Sequence_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Valuetype,
-           Sequence_T,
-           "$Id$")
-
-// *************************************************************
-// class TAO_Valuetype_Manager
-// *************************************************************
-
-template <typename T, typename T_var>
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (
-    const TAO_Valuetype_Manager<T,T_var> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
-      *this->ptr_ = *rhs.ptr_;
-      TAO::Value_Traits<T>::add_ref (*this->ptr_);
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (T * p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    {
-      *this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we duplicate p's
-      // pointer before assigning it to the internal
-      // variable.
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_remove_ref ();
-        }
-
-      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
-      *this->ptr_ = p.in ();
-      TAO::Value_Traits<T>::add_ref (*this->ptr_);
-    }
-  else
-    {
-      *this->ptr_ = p.in ();
-    }
-
-  return *this;
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (maximum)
-      )
-{
-}
-
-template <typename T, typename T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
-    const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (
-            this->maximum_
-          );
-      T ** const tmp2 =
-        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          TAO::Value_Traits<T>::add_ref (tmp2[i]);
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence (
-    void
-  )
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var> &
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= (
-    const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          TAO::Value_Traits<T>::remove_ref (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T **ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      TAO::Value_Traits<T>::add_ref (tmp2[i]);
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var>
-T **
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [nelems],
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var>
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var>
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  T ** tmp =
-    TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T ** old = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          {
-            TAO::Value_Traits<T>::add_ref (tmp[i]);
-            tmp[i] = old[i];
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template <typename T, typename T_var>
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var>
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = static_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
-    void
-  )
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX)
-      )
-{
-}
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
-    const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX);
-
-      T ** const tmp2 =
-        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          TAO::Value_Traits<T>::add_ref (tmp2[i]);
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template<typename T, typename T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence (
-    void
-  )
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>&
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= (
-    const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          TAO::Value_Traits<T>::remove_ref (tmp[i]);
-          tmp[i] = 0;
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
-  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      TAO::Value_Traits<T>::add_ref (tmp2[i]);
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, size_t MAX>
-T **
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf,
-                  T * [MAX],
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          TAO::Value_Traits<T>::remove_ref (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (length);
-}
-
-template <typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-  TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = reinterpret_cast<T **> (this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      TAO::Value_Traits<T>::remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-#endif /* TAO_VALUETYPE_SEQUENCE_T_C */
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
deleted file mode 100644
index 47e9a8274ef..00000000000
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_VALUETYPE_SEQUENCE_T_H
-#define TAO_VALUETYPE_SEQUENCE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<typename T, typename T_var>
-class TAO_Unbounded_Valuetype_Sequence;
-
-  /**
-   * @class TAO_Valuetype_Manager
-   *
-   * @brief Manager for valuetypes.
-   *
-   * According to the spec., valuetypes are handled similarly to object
-   * references, so a manager class is needed.
-   *
-   * @see TAO_Object_Manager
-   */
-template<typename T, typename T_var>
-class TAO_Valuetype_Manager
-{
-  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Valuetype_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Valuetype_Manager (T **,
-                         CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Valuetype_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Valuetype_Manager<T,T_var> &operator= (
-      const TAO_Valuetype_Manager<T,T_var> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Valuetype_Manager<T,T_var> &operator= (T *);
-
-  /// Assignment from T_var.
-  TAO_Valuetype_Manager<T,T_var> &operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var() const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T * &out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for valuetypes
- *
- * @see TAO_Unbounded_Object_Sequence
- */
-template<typename T, typename T_var>
-class TAO_Unbounded_Valuetype_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Unbounded_Valuetype_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong maximum,
-                                    CORBA::ULong length,
-                                    T ** data,
-                                    CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Valuetype_Sequence (
-      const TAO_Unbounded_Valuetype_Sequence<T,T_var> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Valuetype_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Valuetype_Sequence<T,T_var> & operator= (
-      const TAO_Unbounded_Valuetype_Sequence <T,T_var> &
-    );
-
-  /// read-write accessor
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, size_t MAX>
-class TAO_Bounded_Valuetype_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Valuetype_Sequence (CORBA::ULong length,
-                                  T ** value,
-                                  CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Valuetype_Sequence (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &operator= (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-#if defined (__ACE_INLINE__)
-#include "Sequence_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Sequence_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sequence_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUETYPE_SEQUENCE_T_H */
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
deleted file mode 100644
index 4eb80326837..00000000000
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-#include "ace/Log_Msg.h" // for ACE_ASSERT
-
-
-// *************************************************************
-// Inline operations for class TAO_Valuetype_Manager
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager (
-    const TAO_Valuetype_Manager<T,T_var> & rhs
-  )
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager(
-    T ** buffer,
-    CORBA::Boolean release
-  )
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Valuetype_Manager<T,T_var>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator const T_var () const
-{
-  TAO::Value_Traits<T>::add_ref (*this->ptr_);
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator const T * () const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator T *& ()
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Valuetype_Manager<T,T_var>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Valuetype_Manager<T,T_var>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Valuetype_Manager<T,T_var>::out (void)
-{
-  TAO::Value_Traits<T>::remove_ref (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Valuetype_Manager<T,T_var>::_retn (void)
-{
-  T * temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
-
-// *************************************************************
-// class TAO_Unbounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
-    void
-  )
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Valuetype_Sequence
-// *************************************************************
-
-template<typename T, typename T_var, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
-    CORBA::ULong length,
-    T **value,
-    CORBA::Boolean release
-  )
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template<typename T, typename T_var, size_t MAX>
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
-}
diff --git a/TAO/tao/Valuetype/TAO_Valuetype.pc.in b/TAO/tao/Valuetype/TAO_Valuetype.pc.in
deleted file mode 100644
index 72418749b81..00000000000
--- a/TAO/tao/Valuetype/TAO_Valuetype.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_Valuetype
-Description: TAO Valuetype Library
-Requires: TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_Valuetype
-Cflags: -I${includedir}
diff --git a/TAO/tao/Valuetype/TAO_Valuetype.rc b/TAO/tao/Valuetype/TAO_Valuetype.rc
deleted file mode 100644
index fe7afb3c6f9..00000000000
--- a/TAO/tao/Valuetype/TAO_Valuetype.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "Valuetype\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAO_ValuetypeDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO_Valuetype.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
deleted file mode 100644
index 74e361b1277..00000000000
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-// $Id$
-
-#include "ValueBase.h"
-#include "ValueFactory.h"
-
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/CDR.h"
-
-#if !defined (__ACE_INLINE__)
-# include "ValueBase.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (Valuetype,
-           ValueBase,
-           "$Id$")
-
-
-// Static operations in namespace CORBA.
-
-void
-CORBA::add_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    {
-      val->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    {
-      val->_remove_ref ();
-    }
-}
-
-// ***********************************************************************
-
-CORBA::ValueBase::ValueBase (void)
-{
-}
-
-CORBA::ValueBase::ValueBase (const ValueBase&)
-{
-}
-
-CORBA::ValueBase::~ValueBase (void)
-{
-}
-
-CORBA::ValueBase*
-CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
-{
-  // Every vt is a CORBA::ValueBase :-).
-  return vt;
-}
-
-void
-CORBA::ValueBase::_tao_any_destructor (void *x)
-{
-  CORBA::ValueBase *tmp = static_cast<CORBA::ValueBase *> (x);
-  CORBA::remove_ref (tmp);
-}
-
-// OBV marshaling in principle:
-// _tao_marshal () is called from the CDR operator<< ()
-// to marshal a valuetype. To marshal the state
-// it calls (virtual) _tao_marshal_v () (IDL generated) on itself
-// which 'jumps' to the most derived valuetype class. This function
-// further calls (inline) _tao_marshal_state, which is generated from
-// IDL too and does the marshaling of state members and base classes
-// (before, if any) actually.
-// Fragmentation (chunking) needs some cooperation with the CDR stream.
-// It needs to keep track of the state we're in:
-// (outside chunk, beginning of chunk - no data, inside chunk and
-// the nesting level of valuetypes. (The chunks itself are not nested.))
-
-// (see CORBA 2.3 GIOP 15.3.4)
-
-CORBA::Boolean
-CORBA::ValueBase::_tao_marshal (TAO_OutputCDR &strm,
-                                const CORBA::ValueBase *this_,
-                                ptrdiff_t /* formal_type_id */)
-{
-  CORBA::Boolean retval = true;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Is 'this' yet marshalled ? (->1a)
-  //    If not then mark 'this' as marshalled. (->2) +++
-  //    Or is it null ? (write null_ref and return ok)
-  // 1a. Put indirection and return successfull.
-
-  if (this_ == 0)
-    {
-      retval = strm.write_ulong (0);
-      // write TAO_OBV_GIOP_Flags::Null_ref
-      return retval;
-    }
-
-  // 2. if (chunking) and we are in a chunk (look in strm),
-  //    end the chunk by writing its length at its start.
-  //    This is the responsibility of the CDR stream. +++
-  //    But if nothing is writtern in this chunk yet,
-  //    we want to overwrite the place of the dummy blocksize-tag
-  //    with our <value-tag>.
-  //    Increase the nesting level of valuetypes.
-
-  // 3. Build <value-tag>, which states if chunking is used
-  //    and if type information ((list of) repository id(s))
-  //    is provided. The latter is necessary if the formal_type_id
-  //    is unequal the 'true derived' type of this object. +++
-
-  CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base
-                           | TAO_OBV_GIOP_Flags::Type_info_single;
-
-  retval = strm.write_ulong (value_tag);
-
-  if (! retval)
-    {
-      return retval;
-    }
-
-  // 4. Marshal type information.
-
-  retval = strm.write_string (this_->_tao_obv_repository_id ());
-
-  if (! retval)
-    {
-      return retval;
-    }
-
-  // 5. if (chunking) let room for a blocksize-tag. (i.e. write ULong)
-
-  // 6. Now marshal state members. (%! Problem when state is empty
-  //    and chunked encoding is used.)
-
-  retval = this_->_tao_marshal_v (strm);
-
-  // 7. if (chunking) let strm overwrite the last blocksize tag
-  //    with its concrete value.                                 +++
-  // 8. if (chunking) write an end tag, or (optimization) let the CDR
-  //    care for collecting all end tags of nested values (e.g. linked
-  //    list), so that only one end tag at all must be written.  +++
-
-  return retval;
-}
-
-
-CORBA::Boolean
-CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
-                                  CORBA::ValueBase *&new_object)
-{
-  // This is for the special case only that one unmarshals in order
-  // to assign the newly created object directly to a ValueBase pointer.
-  // Implementation is like a specialized one (in TC.cpp, if T.idl is source).
-  // basically do:
-  //  ValueBase::_tao_unmarshal_pre ()
-  //    (Gets factory or possible a null or an existing object.
-  //     Then the job is done. On an existing (backreferenced) object
-  //     do a cast and a type check)
-  //  new_object = factory->create_for_unmarshal ()
-  //     (with apropriate cast)
-  //  new_object->_tao_unmarshal_v ()
-  //  new_object->_tao_unmarshal_post ()
-
-//  CORBA::ValueBase *base = 0;
-  CORBA::ValueFactory_var factory;
-  CORBA::Boolean retval =
-    CORBA::ValueBase::_tao_unmarshal_pre (strm,
-                                          factory.out (),
-                                          new_object,
-                                          0);
-
-  if (!retval)
-    {
-      return false;
-    }
-
-  if (factory.in () != 0)
-    {
-      new_object = factory->create_for_unmarshal ();
-
-      if (new_object == 0)
-        {
-          return 0;  // %! except.?
-        }
-
-      retval = new_object->_tao_unmarshal_v (strm);
-
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-//  new_object = CORBA::ValueBase::_downcast (base);
-  return retval;
-}
-
-
-CORBA::Boolean
-CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
-                                      CORBA::ValueFactory &factory,
-                                      CORBA::ValueBase *&valuetype,
-                                      const char * const repo_id)
-{ // %! dont leak on error case !
-  // %! postconditions
-  CORBA::Boolean retval = true;
-  factory = 0;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Get the <value-tag> (else it may be <indirection-tag> or <null-ref>).
-  //    Is object yet unmarshalled (<indirection-tag> is set) ? (->1a)
-  //    Is <null-ref> given ? Set 0 and return ok.
-  // 1a. Lookup the real address in memory, which should be aligned +++
-  //     to CORBA::ValueBase. Its possible at this point that worse
-  //     type mismatch gets by undetected, if the CDR stream fakes.
-  //     So the type should be checked ... +++
-
-  CORBA::ULong value_tag;
-
-  if (!strm.read_ulong (value_tag))
-    {
-      return false;
-    }
-
-  if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
-    {
-      valuetype = 0;
-      return 1;
-      // ok, null reference unmarshaled
-    }
-  // 2. Now at this point it must be a <value-tag> (error else).
-  //    if (chunking) check that any last chunk ends with matching
-  //    size. If not raise marshal exception.
-  //    Increase the nesting level of valuetypes.
-
-  if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("!CORBA::ValueBase::_tao_unmarshal_pre ")
-                  ACE_TEXT ("not value_tag\n")));
-      return false;
-    }
-
-  // 3. if (chunking) read and record the blocksize-tag.
-
-  // 4. Unmarshal type information and lookup factory.
-  //    If no type information is given in the CDR encoding, as told
-  //    from the <value-tag>, then use the repository id parameter
-  //    (it _must_ be right).
-
-  TAO_ORB_Core *orb_core = strm.orb_core ();
-
-  if (orb_core == 0)
-    {
-      orb_core = TAO_ORB_Core_instance ();
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      "TAO (%P|%t) WARNING: extracting valuetype using "
-                      "default ORB_Core\n"));
-        }
-    }
-
-  if (TAO_OBV_GIOP_Flags::has_no_type_info (value_tag))
-  {
-     factory = orb_core->orb ()->lookup_value_factory (repo_id);
-  }
-  else
-  {
-     CORBA::String_var repo_id_stream;
-
-     // It would be more efficient not to copy the string %!)
-     if (!strm.read_string (repo_id_stream.inout ()))
-     {
-        return false;
-     }
-
-     factory =
-      orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
-  }
-
-  if (factory == 0) // %! except.!
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  ACE_TEXT ("(%N:%l) OBV factory is null !!!\n")));
-      return false;
-    }
-
-  return retval;
-}
-
-CORBA::Boolean
-CORBA::ValueBase::_tao_unmarshal_post (TAO_InputCDR &)
-{
-  CORBA::Boolean retval = true;
-
-  // (... called from T::_tao_unmarshal)
-  // 7. if (chunking) check the last blocksize tag for correct value.  +++
-  //    And if we're gonna to truncate, skip all the state of the more
-  //    derived classes. (But it might need to be accessed again,
-  //    if there are embedded objects which are referenced later
-  //    in this CDR encoding stream.)
-
-  // 8. if (chunking) there must be some end tag. Let the CDR stream deal
-  //    with this (and decrease the nesting level of valuetypes).
-  //    Also the CDR stream must check for eventually outstanding end tags
-  //    at the end of the stream which have to cause a marshal
-  //    exception there.
-
-  return retval;
-}
-
-
-// ================== Typecode initializations ==================
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    char const tc_value_base_id[]   = "IDL:omg.org/CORBA/ValueBase:1.0";
-    char const tc_value_base_name[] = "ValueBase";
-    Value<char const *,
-          CORBA::TypeCode_ptr const *,
-          Value_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-          TAO::Null_RefCount_Policy> tc_ValueBase (CORBA::tk_value,
-                                                   tc_value_base_id,
-                                                   tc_value_base_name,
-                                                   CORBA::VM_NONE,
-                                                   &CORBA::_tc_null,
-                                                   0,  // Field array
-                                                   0); // Field count
-
-    char const tc_event_base_id[]   = "IDL:omg.org/CORBA/EventBase:1.0";
-    char const tc_event_base_name[] = "EventBase";
-    Value<char const *,
-          CORBA::TypeCode_ptr const *,
-          Value_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-          TAO::Null_RefCount_Policy> tc_EventBase (CORBA::tk_event,
-                                                   tc_event_base_id,
-                                                   tc_event_base_name,
-                                                   CORBA::VM_NONE,
-                                                   &CORBA::_tc_null,
-                                                   0,  // Field array
-                                                   0); // Field count
-
-    Alias<char const *,
-          CORBA::TypeCode_ptr const *,
-          TAO::Null_RefCount_Policy> tc_ValueModifier (
-      CORBA::tk_alias,
-     "IDL:omg.org/CORBA/ValueModifier:1.0",
-     "ValueModifier",
-     &CORBA::_tc_short);
-  }
-}
-
-namespace CORBA
-{
-  TypeCode_ptr const _tc_ValueBase     = &TAO::TypeCode::tc_ValueBase;
-  TypeCode_ptr const _tc_EventBase     = &TAO::TypeCode::tc_EventBase;
-  TypeCode_ptr const _tc_ValueModifier = &TAO::TypeCode::tc_ValueModifier;
-}
-
-// member functions for CORBA::DefaultValueRefCountBase ============
-
-// destructor
-CORBA::DefaultValueRefCountBase::~DefaultValueRefCountBase (void)
-{
-}
-
-void
-CORBA::DefaultValueRefCountBase::_add_ref (void)
-{
-  this->_tao_add_ref ();
-}
-
-void
-CORBA::DefaultValueRefCountBase::_remove_ref (void)
-{
-  this->_tao_remove_ref ();
-}
-
-CORBA::ULong
-CORBA::DefaultValueRefCountBase::_refcount_value (void)
-{
-  return this->_tao_refcount_value ();
-}
-
-// ===========================================================
-
-CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
-  : _tao_reference_count_ (1)
-{
-}
-
-
-void
-CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->_tao_reference_count_lock_);
-
-  ++this->_tao_reference_count_;
-}
-
-void
-CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX,
-               guard,
-               this->_tao_reference_count_lock_);
-
-    --this->_tao_reference_count_;
-
-    if (this->_tao_reference_count_ != 0)
-      {
-        return;
-      }
-  }
-
-  // The guard has been already given up, but this is no problem
-  // cause we have held the last reference, and this one we don't give
-  // away anymore, we do:
-  delete this;
-}
-
-CORBA::ULong
-CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->_tao_reference_count_lock_,
-                    0);
-
-  return _tao_reference_count_;
-}
-
-// ===========================================================
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm,
-            const CORBA::ValueBase *_tao_valuetype)
-{
-  return CORBA::ValueBase::_tao_marshal (
-             strm,
-             const_cast<CORBA::ValueBase *> (_tao_valuetype),
-             (ptrdiff_t) &CORBA::ValueBase::_downcast
-           );
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm,
-            CORBA::ValueBase *&_tao_valuetype)
-{
-  return CORBA::ValueBase::_tao_unmarshal (strm,
-                                           _tao_valuetype);
-}
-
-// =============== Template Specializations =====================
-namespace TAO
-{
-  void
-  Value_Traits<CORBA::ValueBase>::add_ref (
-      CORBA::ValueBase *p)
-  {
-    CORBA::add_ref (p);
-  }
-
-  void
-  Value_Traits<CORBA::ValueBase>::remove_ref (
-      CORBA::ValueBase * p)
-  {
-    CORBA::remove_ref (p);
-  }
-
-  void
-  Value_Traits<CORBA::ValueBase>::release (
-      CORBA::ValueBase * p)
-  {
-    CORBA::remove_ref (p);
-  }
-}
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
deleted file mode 100644
index 16470ba5c03..00000000000
--- a/TAO/tao/Valuetype/ValueBase.h
+++ /dev/null
@@ -1,242 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ValueBase.h
- *
- *  $Id$
- *
- *  @author  Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
-#ifndef TAO_VALUEBASE_H
-#define TAO_VALUEBASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Valuetype/valuetype_export.h"
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Valuetype/Value_CORBA_methods.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
-
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#include "ace/Basic_Types.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Valuetype_Export
-
-namespace CORBA
-{
-  class ValueFactoryBase;
-  typedef ValueFactoryBase *ValueFactory;
-
-  class ValueBase;
-
-  typedef TAO_Value_Var_T<ValueBase> ValueBase_var;
-  typedef TAO_Value_Out_T<ValueBase> ValueBase_out;
-
-  /**
-   * @class ValueBase
-   *
-   * @brief Abstract baseclass for Valuetypes
-   *
-   * @see CORBA 2.3 - Section 20.17.5
-   */
-  class TAO_Valuetype_Export ValueBase
-  {
-  public:
-    typedef ValueBase* _ptr_type;
-    typedef ValueBase_var _var_type;
-
-    // reference counting
-    /// %! virtual CORBA::ValueBase* _copy_value (void) = 0;
-    virtual void _add_ref (void) = 0;
-    virtual void _remove_ref (void) = 0;
-    virtual CORBA::ULong _refcount_value (void) = 0;
-
-    // dynamic casting
-    static CORBA::ValueBase* _downcast (CORBA::ValueBase *);
-
-    /// Used in the implementation of CORBA::Any
-    static void _tao_any_destructor (void *);
-
-    /// TAO extension
-    virtual const char* _tao_obv_repository_id (void) const = 0;
-
-    // TAO internal --------------------------
-
-    /// Marshal a valuetype (see operator<< in tao_idl generated file
-    /// how it is called)
-    static CORBA::Boolean _tao_marshal (TAO_OutputCDR &strm,
-                                        const ValueBase *_this,
-                                        ptrdiff_t formal_type_id = 0);
-
-    /// Unmarshal a valuetype, if formal type is a pointer to
-    /// ValueBase
-    static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &strm,
-                                          ValueBase *&new_object);
-
-    // static CORBA::Boolean
-    // T::_tao_unmarshal (TAO_InputCDR &, ValueBase *&_this)
-    // is typespecific for valuetype T and generated from tao_idl
-    // Use this for unmarshaling.
-
-    /// Both used internally and are called from T::_tao_unmarshal ()
-    static CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &strm,
-                                              ValueFactory &,
-                                              ValueBase *&,
-                                              const char * const repo_id);
-    CORBA::Boolean _tao_unmarshal_post (TAO_InputCDR &strm);
-
-  public:  // otherwise these cannot be called from a static function
-
-    /// during marshal jump to the most derived part
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const = 0;
-
-    /// called after obtaining the fresh object from create_for_unmarshal ()
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
-
-  protected:
-    ValueBase (void);
-    ValueBase (const ValueBase&);
-    virtual ~ValueBase (void);
-
-  private:
-    ValueBase & operator= (const ValueBase &);
-
-#ifdef SUN_CC_HAS_PVFC_BUG
-    // Need ugly fix for sun cc "pure virtual function called" bug.
-  private:
-    unsigned long tao_sun_cc_pvfc_bug_fix_;
-
-#endif /* SUN_CC_HAS_PVFC_BUG */
-
-  }; // ValueBase
-
-  /// Valuetype-related type codes.
-  extern TAO_Valuetype_Export TypeCode_ptr const _tc_ValueBase;
-  extern TAO_Valuetype_Export TypeCode_ptr const _tc_EventBase;
-  extern TAO_Valuetype_Export TypeCode_ptr const _tc_ValueModifier;
-
-  /**
-   * @class DefaultValueRefCountBase
-   *
-   * @brief Default mix-in for reference count of a valuetype.
-   *
-   * Default mix-in for reference count of a valuetype.
-   */
-  class TAO_Valuetype_Export DefaultValueRefCountBase
-    : public virtual ValueBase
-  {
-  public:
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-    virtual CORBA::ULong _refcount_value (void);
-
-    /// The _tao variants are inline for fast access from T_var
-    /// (if valuetype T is compiled with optimization for that.) %! (todo)
-    void _tao_add_ref (void);
-    void _tao_remove_ref (void);
-    CORBA::ULong _tao_refcount_value (void);
-
-  protected:
-    DefaultValueRefCountBase (void);
-    DefaultValueRefCountBase (const DefaultValueRefCountBase&);
-    virtual ~DefaultValueRefCountBase ();
-
-  private:
-    void operator= (const DefaultValueRefCountBase &);
-
-  private: // data
-    CORBA::ULong _tao_reference_count_;
-    ACE_SYNCH_MUTEX _tao_reference_count_lock_;
-  }; // DefaultValueRefCountBase
-
-  //  which lock has the lowest memory overhead ?
-  // %! todo refcountbase w/o locking (now memory overhead)
-  // $! todo: debug aids for refcounts
-
-}  // End CORBA namespace
-
-/**
- * @namespace TAO_OBV_GIOP_Flags
- *
- * @brief TAO_OBV_GIOP_Flags
- *
- * @see CORBA 2.3 -- Section 15.3.4
- */
-namespace TAO_OBV_GIOP_Flags
-{
-  const CORBA::ULong Value_tag_base    = 0x7fffff00L;
-  const CORBA::ULong Value_tag_sigbits = 0xffffff00L;
-  const CORBA::ULong Codebase_url      = 1;
-  const CORBA::ULong Type_info_sigbits = 0x00000006L;
-  const CORBA::ULong Type_info_none    = 0;
-  const CORBA::ULong Type_info_single  = 2;
-  const CORBA::ULong Type_info_list    = 6;
-
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_null_ref          (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_value_tag         (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_codebase_url     (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_no_type_info     (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_single_type_info (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_list_type_info   (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_chunked           (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection_tag   (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection       (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_block_size        (CORBA::ULong);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_end_tag           (CORBA::ULong);
-}
-
-TAO_Valuetype_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const CORBA::ValueBase *);
-
-TAO_Valuetype_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA::ValueBase *&);
-
-/// Used in generated code if CORBA::ValueBase is an argument or return type.
-namespace TAO
-{
-  template<>
-  class TAO_Valuetype_Export Arg_Traits<CORBA::ValueBase>
-    : public Object_Arg_Traits_T<CORBA::ValueBase *,
-                                 CORBA::ValueBase_var,
-                                 CORBA::ValueBase_out,
-                                 TAO::Value_Traits<CORBA::ValueBase> >
-  {
-  };
-
-
-  template<>
-  struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase>
-  {
-    static void add_ref (CORBA::ValueBase *);
-    static void remove_ref (CORBA::ValueBase *);
-
-    // For INOUT value type arguments, so they can use the same set
-    // of arg classes as interfaces.
-    static void release (CORBA::ValueBase *);
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "ValueBase.inl"
-#endif /* __ACE_INLINE__*/
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUEBASE_H */
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
deleted file mode 100644
index 3b7d66658b5..00000000000
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// Detection of flags in the CDR Stream
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
-{
-  return (tag == 0);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
-{
-  return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: has_codebase_url (CORBA::ULong tag)
-{
-  return (CORBA::Boolean) (tag & Codebase_url);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_none);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_single);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_list);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
-{
-  return (CORBA::Boolean) (tag & 8);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
-{
-  return (tag == 0xFFFFFFFFL);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
-{
-  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
-{
-  return (0 < value && value < 0x7FFFFF00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
-{
-  return (0x80000000L < tag);
-}
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
deleted file mode 100644
index 95b9b2c4912..00000000000
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "ValueFactory.h"
-#include "ace/Guard_T.h"
-
-ACE_RCSID (Valuetype,
-           ValueFactory,
-           "$Id$")
-
-// Static operations in namespace CORBA.
-
-void
-CORBA::add_ref (CORBA::ValueFactoryBase *val)
-{
-  if (val)
-    {
-      val->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (CORBA::ValueFactoryBase *val)
-{
-  if (val)
-    {
-      val->_remove_ref ();
-    }
-}
-
-// ===========================================================
-
-CORBA::ValueFactoryBase::ValueFactoryBase (void)
-  : _tao_reference_count_ (1)
-{
-}
-
-CORBA::ValueFactoryBase::~ValueFactoryBase (void)
-{
-}
-
-void
-CORBA::ValueFactoryBase::_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             guard,
-             this->_tao_reference_count_lock_);
-
-  ++this->_tao_reference_count_;
-}
-
-void
-CORBA::ValueFactoryBase::_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX,
-               guard,
-               this->_tao_reference_count_lock_);
-
-    --this->_tao_reference_count_;
-
-    if (this->_tao_reference_count_ != 0)
-      {
-        return;
-      }
-  }
-
-  delete this;
-}
-
-// No-op. This should never be called, but it can't be pure virtual.
-CORBA::AbstractBase *
-CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
-{
-  return 0;
-}
-
-// =============== Template Specializations =====================
-namespace TAO
-{
-  using namespace CORBA;
-
-  void
-  Value_Traits<ValueFactoryBase>::add_ref (ValueFactoryBase *p)
-  {
-    CORBA::add_ref (p);
-  }
-
-  void
-  Value_Traits<ValueFactoryBase>::remove_ref (ValueFactoryBase * p)
-  {
-    CORBA::remove_ref (p);
-  }
-
-  void
-  Value_Traits<ValueFactoryBase>::release (ValueFactoryBase * p)
-  {
-    CORBA::remove_ref (p);
-  }
-}
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
deleted file mode 100644
index 9d1274e8e57..00000000000
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ValueFactory.h
- *
- *  $Id$
- *
- *  @author  Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
-#ifndef TAO_VALUEFACTORY_H
-#define TAO_VALUEFACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "valuetype_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Value_VarOut_T.h"
-
-#include "tao/Basic_Types.h"
-#include "tao/orbconf.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-namespace CORBA
-{
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class ValueBase;
-
-  class ValueFactoryBase;
-
-  extern TAO_Valuetype_Export void add_ref (ValueFactoryBase *);
-  extern TAO_Valuetype_Export void remove_ref (ValueFactoryBase *);
-
-  typedef TAO_Value_Var_T<ValueFactoryBase>
-    ValueFactoryBase_var;
-
-  typedef ValueFactoryBase_var ValueFactory_var;
-
-
-  class TAO_Valuetype_Export ValueFactoryBase
-  {
-  public:
-    ValueFactoryBase (void);
-    virtual ~ValueFactoryBase (void);
-
-    // non-virtual is non-standard
-    void _add_ref (void);
-    void _remove_ref (void);
-
-    // private: %!
-    /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
-    /// (see at definition below)
-    virtual CORBA::ValueBase * create_for_unmarshal (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
-
-    // Not pure virtual because this will be overridden only by valuetypes
-    // that support an abstract interface.
-    virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void);
-
-  private:
-    CORBA::ULong _tao_reference_count_;
-    TAO_SYNCH_MUTEX _tao_reference_count_lock_;
-  };
-
-}  // End CORBA namespace
-
-namespace TAO
-{
-  /**
-   * @brief Specializations needed for using with Value_Var_T
-   */
-  template<>
-  struct TAO_Valuetype_Export Value_Traits<CORBA::ValueFactoryBase>
-  {
-    static void add_ref (CORBA::ValueFactoryBase *);
-    static void remove_ref (CORBA::ValueFactoryBase *);
-
-    // For INOUT value type arguments, so they can use the same set
-    // of arg classes as interfaces.
-    static void release (CORBA::ValueFactoryBase *);
-  };
-}
-// Use this macro for writing code that is independend from
-// the compiler support of covariant return types of pointers to
-// virtual inherited classes.
-// (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
-// (But it is TAO specific and at the moment the covariant case is not
-// elaborated --- its just a suggestion.)
-
-#ifdef TAO_HAS_OBV_COVARIANT_RETURN
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) TYPE *
-#else /*  TAO_HAS_OBV_COVARIANT_RETURN */
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) CORBA::ValueBase *
-#endif /* TAO_HAS_OBV_COVARIANT_RETURN */
-
-// (The obtaining of the repository id is currently not yet like the OMG way. %!)
-//
-// Macro for on the fly registration of a factory (with type Factory).
-// The repository id is taken from the static repository id of the
-// valuetype via tao_repository_id () of the specialized factory.
-// It forgets the pre-registered factory (if any) and the reference
-// to the newly created one. (A new reference could be obtained with
-// orb->lookup_value_factory (char * repo_id) .)
-
-#define TAO_OBV_REGISTER_FACTORY(FACTORY, VALUETYPE) \
-  { CORBA::ValueFactory factory = new FACTORY; \
-    CORBA::ValueFactory prev_factory = \
-    TAO_ORB_Core_instance ()->orb ()->register_value_factory (\
-      VALUETYPE::_tao_obv_static_repository_id (),\
-                                   factory); \
-    if (prev_factory) prev_factory->_remove_ref (); \
-    factory->_remove_ref (); }
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUEFACTORY_H */
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
deleted file mode 100644
index c7c894228af..00000000000
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-#include "ValueFactory_Map.h"
-#include "ValueFactory.h"
-#include "tao/CORBA_String.h"
-#include "tao/TAO_Singleton.h"
-
-
-ACE_RCSID (Valuetype,
-           ValueFactory_Map,
-           "$Id$")
-
-
-TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
-  : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
-{
-}
-
-TAO_ValueFactory_Map::~TAO_ValueFactory_Map (void)
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids and invoke
-  // _remove_ref () on the internal ids.
-  FACTORY_MAP_MANAGER::ITERATOR iterator (this->map_);
-
-  for (FACTORY_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_);
-      entry->ext_id_ = 0;
-      entry->int_id_->_remove_ref ();
-      entry->int_id_ = 0;
-    }
-}
-
-// %! Thread issues
-
-int
-TAO_ValueFactory_Map::rebind (const char *repo_id,
-                              CORBA::ValueFactory &factory)
-{
-//  ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard, map_->mutex(),-1);
-//   --- but must be recursive
-  const char *prev_repo_id = 0;
-  CORBA::ValueFactory prev_factory = 0;
-  int ret = 0;
-  ret = this->map_.rebind (CORBA::string_dup (repo_id),
-                           factory,
-                           prev_repo_id,
-                           prev_factory);
-
-  if (ret > -1)   // ok, no error
-    {
-      factory->_add_ref ();    // The map owns one reference.
-
-      if (ret == 1)    // there was a previous factory
-        {
-          factory = prev_factory;
-          CORBA::string_free (const_cast<char*> (prev_repo_id));
-        }
-    }
-
-  return ret;
-}
-
-int
-TAO_ValueFactory_Map::unbind (const char *repo_id,
-                              CORBA::ValueFactory &factory)
-{
-  FACTORY_MAP_MANAGER::ENTRY *prev_entry = 0;
-  int ret = 0;
-  ret = this->map_.find (repo_id,
-                         prev_entry);
-  if (ret == 0)    // there was a matching factory
-    {
-      // set factory to the previous factory,
-      factory = prev_entry->int_id_;
-      char *temp = const_cast<char *> (prev_entry->ext_id_);
-      ret = this->map_.unbind (prev_entry);
-
-      if (ret == 0)
-        {
-          CORBA::string_free (temp);
-        }
-    }
-
-  return ret;
-}
-
-// %! perhaps inline
-int
-TAO_ValueFactory_Map::find (const char *repo_id,
-                            CORBA::ValueFactory &factory)
-{
-  int ret = 0;
-  ret = this->map_.find (repo_id,
-                         factory);
-  // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
-  if (ret > -1)
-    {
-      factory->_add_ref ();    // The caller gets one reference as gift.
-    }
-
-  return ret;
-}
-
-TAO_ValueFactory_Map *
-TAO_ValueFactory_Map::instance (void)
-{
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
-
-  return
-    TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::instance ();
-}
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Entry<const char *, CORBA::ValueFactoryBase *>;
-template class TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA::ValueFactoryBase *>
-#pragma instantiate TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
deleted file mode 100644
index 715f41cb3b6..00000000000
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     ValueFactory_Map.h
- *
- *  $Id$
- *
- *  @author  Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
-
-#ifndef TAO_VALUEFACTORY_MAP_H
-#define TAO_VALUEFACTORY_MAP_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "valuetype_export.h"
-
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/RW_Thread_Mutex.h"
-
-
-namespace CORBA
-{
-  class ValueFactoryBase;
-  typedef ValueFactoryBase *ValueFactory;
-}
-
-class TAO_Valuetype_Export TAO_ValueFactory_Map
-{
-public:
-
-  TAO_ValueFactory_Map (void);
-  ~TAO_ValueFactory_Map (void);
-
-  /**
-   * Associate the factory (int_id) with the repo_id (ext_id).
-   * Invokes _add_ref () on the factory.
-   * If previous factory had been bind with this repo_id, this one is
-   * returned in factory (and the caller holds a reference).
-   * Returns -1 on failure, 0 on success and 1 if a previous factory
-   * is found (and returned in factory).
-   */
-  int rebind (const char *repo_id,
-              CORBA::ValueFactory &factory);
-
-  /// Removes entry for repo_id from the map and sets factory to
-  /// the tied one.
-  int unbind (const char *repo_id,
-              CORBA::ValueFactory &factory);
-
-  /**
-   * Lookup a matching factory for repo_id.
-   * Invokes _add_ref () on the factory if found.
-   * Returns -1 on failure and 0 on success.
-   */
-  int find (const char *repo_id,
-            CORBA::ValueFactory &factory);
-
-  void dump (void);
-
-  /// Return singleton instance of this class.
-  static TAO_ValueFactory_Map * instance (void);
-
-private:
-
-  /// The hash table data structure.
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  CORBA::ValueFactory,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  TAO_SYNCH_RW_MUTEX>
-          FACTORY_MAP_MANAGER;
-  FACTORY_MAP_MANAGER map_;
-}; /* TAO_ValueFactory_Map */
-
-
-// Currently the ValueFactory_Map is a singleton and not per ORB
-// as in the OMG spec.
-/**
- * @todo Remove this legacy ValueFactory_Map typedef.
- */
-typedef TAO_ValueFactory_Map TAO_VALUEFACTORY_MAP;
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h
deleted file mode 100644
index e54e1262de7..00000000000
--- a/TAO/tao/Valuetype/Value_CORBA_methods.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_CORBA_methods.h
- *
- *  $Id$
- *
- *  Declarations of common ValueType methods in the CORBA namespace.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUETYPE_CORBA_METHODS_H
-#define TAO_VALUETYPE_CORBA_METHODS_H
-
-#include /**/ "ace/pre.h"
-
-#include "valuetype_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Valuetype_Export
-
-namespace CORBA
-{
-  class ValueBase;
-
-  extern TAO_Valuetype_Export void add_ref (ValueBase *);
-  extern TAO_Valuetype_Export void remove_ref (ValueBase *);
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  extern TAO_Valuetype_Export Boolean is_nil (AbstractBase_ptr);
-  extern TAO_Valuetype_Export void release (AbstractBase_ptr);
-
-
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_VALUETYPE_CORBA_METHODS_H */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
deleted file mode 100644
index ccd2ffcf704..00000000000
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// $Id$
-
-#ifndef TAO_VALUE_VAROUT_T_CPP
-#define TAO_VALUE_VAROUT_T_CPP
-
-#include "tao/Valuetype/Value_VarOut_T.h"
-#include "tao/Valuetype/Value_CORBA_methods.h"
-
-
-template<typename T>
-void
-TAO::Value_Traits<T>::add_ref (T * p)
-{
-  CORBA::add_ref (p);
-}
-
-template<typename T>
-void
-TAO::Value_Traits<T>::remove_ref (T * p)
-{
-  CORBA::remove_ref (p);
-}
-
-template<typename T>
-void
-TAO::Value_Traits<T>::release (T * p)
-{
-  CORBA::remove_ref (p);
-}
-
-// ===============================================================
-
-template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (void)
-  : ptr_ (0)
-{}
-
-template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (T * p)
-  : ptr_ (p)
-{}
-
-template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (const T * p)
-  : ptr_ (const_cast<T *> (p))
-{}
-
-template <typename T>
-T *
-TAO_Value_Var_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-TAO_Value_Var_T<T>::TAO_Value_Var_T (const TAO_Value_Var_T<T> & p)
-  : TAO_Base_var ()
-{
-  TAO::Value_Traits<T>::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-template <typename T>
-TAO_Value_Var_T<T>::~TAO_Value_Var_T (void)
-{
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
-}
-
-template <typename T>
-TAO_Value_Var_T<T> &
-TAO_Value_Var_T<T>::operator= (T * p)
-{
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Var_T<T> &
-TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p)
-{
-  if (this != &p)
-  {
-    TAO::Value_Traits<T>::remove_ref (this->ptr_);
-    T * tmp = p.ptr ();
-    TAO::Value_Traits<T>::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Var_T<T>::operator const T * () const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-TAO_Value_Var_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Value_Var_T<T>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Value_Var_T<T>::in (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Value_Var_T<T>::inout (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Value_Var_T<T>::out (void)
-{
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Value_Var_T<T>::_retn (void)
-{
-  T * tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-// *************************************************************
-
-template <typename T>
-TAO_Value_Out_T<T>::TAO_Value_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template <typename T>
-TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p)
-  : ptr_ (p.out ())
-{
-  TAO::Value_Traits<T>::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-template <typename T>
-TAO_Value_Out_T<T>::TAO_Value_Out_T (const TAO_Value_Out_T<T> & p)
-  : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_)
-{}
-
-template <typename T>
-TAO_Value_Out_T<T> &
-TAO_Value_Out_T<T>::operator= (const TAO_Value_Out_T<T> & p)
-{
-  this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_;
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Out_T<T> &
-TAO_Value_Out_T<T>::operator= (const TAO_Value_Var_T<T> & p)
-{
-  T * tmp = p.ptr ();
-  TAO::Value_Traits<T>::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Out_T<T> &
-TAO_Value_Out_T<T>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-TAO_Value_Out_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *&
-TAO_Value_Out_T<T>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-T *
-TAO_Value_Out_T<T>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#endif /* TAO_VALUE_VAROUT_T_CPP */
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
deleted file mode 100644
index 9813e89452c..00000000000
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_VarOut_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_VAROUT_T_H
-#define TAO_VALUE_VAROUT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/varbase.h"
-
-namespace TAO
-{
-  /**
-   * struct Value_Traits
-   *
-   * @brief Specialized for each valuetype in generated code.
-   *
-   */
-  template<typename T>
-  struct Value_Traits
-  {
-    static void add_ref (T *);
-    static void remove_ref (T *);
-
-    // For INOUT value type arguments, so they can use the same set
-    // of arg classes as interfaces.
-    static void release (T *);
-  };
-}
-
-/**
- * @class TAO_Value_Var_T
- *
- * @brief Parametrized implementation of _var class for valuetypes.
- *
- */
-template <typename T>
-class TAO_Value_Var_T : private TAO_Base_var
-{
-public:
-  TAO_Value_Var_T (void);
-  TAO_Value_Var_T (T *);
-  TAO_Value_Var_T (const TAO_Value_Var_T<T> &);
-
-  // (TAO extension)
-  TAO_Value_Var_T (const T *);
-
-  ~TAO_Value_Var_T (void);
-
-  TAO_Value_Var_T &operator= (T *);
-  TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T> &);
-
-  T * operator-> (void) const;
-
-  operator const T * () const;
-  operator T *& ();
-
-  // in, inout, out, _retn
-  T * in (void) const;
-  T *& inout (void);
-  T *& out (void);
-  T * _retn (void);
-
-  // (TAO extension)
-  T * ptr (void) const;
-
-private:
-
-  // Prevent widening assignment.
-  TAO_Value_Var_T (const TAO_Base_var &);
-  void operator= (const TAO_Base_var &);
-
-private:
-
-  T * ptr_;
-
-};
-
-/**
- * @class TAO_Value_Var_T
- *
- * @brief Parametrized implementation of _out class for valuetypes.
- *
- */
-template <typename T>
-class TAO_Value_Out_T
-{
-public:
-  TAO_Value_Out_T (T *&);
-  TAO_Value_Out_T (TAO_Value_Var_T<T> &);
-  TAO_Value_Out_T (const TAO_Value_Out_T<T> &);
-
-  TAO_Value_Out_T &operator= (const TAO_Value_Out_T<T> &);
-  TAO_Value_Out_T &operator= (const TAO_Value_Var_T<T> &);
-  TAO_Value_Out_T &operator= (T *);
-
-  operator T *& ();
-  T *& ptr (void);
-
-  T * operator-> (void);
-
-private:
-  typedef TAO_Value_Out_T<T> THIS_OUT_TYPE;
-  T *& ptr_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Value_VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Value_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_VAROUT_T_H */
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
deleted file mode 100644
index 279d75c5fc3..00000000000
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-
-#include "Valuetype_Adapter_Impl.h"
-#include "AbstractBase.h"
-#include "ValueBase.h"
-#include "ValueFactory_Map.h"
-
-#include "tao/ORB_Core.h"
-
-
-ACE_RCSID (Valuetype,
-           Valuetype_Adapter_Impl,
-           "$Id$")
-
-
-TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void)
-{
-
-}
-
-TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
-{
-}
-
-CORBA::Object_ptr
-TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
-    CORBA::AbstractBase_ptr p
-  )
-{
-  return p->_to_object ();
-}
-
-CORBA::Boolean
-TAO_Valuetype_Adapter_Impl::stream_to_value (TAO_InputCDR &cdr,
-                                             CORBA::ValueBase *& val)
-{
-  return cdr >> val;
-}
-
-CORBA::Boolean
-TAO_Valuetype_Adapter_Impl::stream_to_abstract_base (
-    TAO_InputCDR &cdr,
-    CORBA::AbstractBase_ptr & obj
-  )
-{
-  return cdr >> obj;
-}
-
-CORBA::ULong
-TAO_Valuetype_Adapter_Impl::type_info_single (void) const
-{
-  return TAO_OBV_GIOP_Flags::Type_info_single;
-}
-
-int
-TAO_Valuetype_Adapter_Impl::vf_map_rebind (const char *repo_id,
-                                           CORBA::ValueFactory &factory)
-{
-  return TAO_VALUEFACTORY_MAP::instance ()->rebind (repo_id,
-                                                    factory);
-}
-
-int
-TAO_Valuetype_Adapter_Impl::vf_map_unbind (const char *repo_id)
-
-{
-  CORBA::ValueFactory fac;
-  return TAO_VALUEFACTORY_MAP::instance ()->unbind (repo_id,
-                                                    fac);
-}
-
-CORBA::ValueFactory
-TAO_Valuetype_Adapter_Impl::vf_map_find (const char *repo_id)
-{
-  CORBA::ValueFactory factory = 0;
-  (void) TAO_VALUEFACTORY_MAP::instance ()->find (repo_id,
-                                                  factory);
-
-  return factory;
-}
-
-// *********************************************************************
-
-// Initialization and registration of dynamic service object.
-
-int
-TAO_Valuetype_Adapter_Impl::Initializer (void)
-{
-  TAO_ORB_Core::valuetype_adapter_name (
-      "Concrete_Valuetype_Adapter"
-    );
-
-  return
-    ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_Valuetype_Adapter_Impl
-      );
-}
-
-ACE_STATIC_SVC_DEFINE (
-    TAO_Valuetype_Adapter_Impl,
-    ACE_TEXT ("Concrete_Valuetype_Adapter"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (TAO_Valuetype_Adapter_Impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
deleted file mode 100644
index f364ea7aa75..00000000000
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Valuetype_Adapter_Impl.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_VALUETYPE_ADAPTER_IMPL_H
-#define TAO_VALUETYPE_ADAPTER_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "valuetype_export.h"
-
-#include "tao/Valuetype_Adapter.h"
-
-/**
- * @class TAO_Valuetype_Adapter_Impl
- *
- * @brief TAO_Valuetype_Adapter_Impl.
- *
- * Class that adapts various functions involving the Valuetype,
- * ValueFactory and AbstractInterface classes. This is a concrete class
- * implementating the pure virtual methods of TAO_Valuetype_Adapter
- */
-class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl
-  : public TAO_Valuetype_Adapter
-{
-public:
-  TAO_Valuetype_Adapter_Impl (void);
-  virtual ~TAO_Valuetype_Adapter_Impl (void);
-
-  virtual CORBA::Object_ptr abstractbase_to_object (
-      CORBA::AbstractBase_ptr
-    );
-
-  virtual CORBA::Boolean stream_to_value (TAO_InputCDR &,
-                                          CORBA::ValueBase *&);
-
-  virtual CORBA::Boolean stream_to_abstract_base (
-      TAO_InputCDR &,
-      CORBA::AbstractBase_ptr &
-    );
-
-  virtual CORBA::ULong type_info_single (void) const;
-
-  virtual int vf_map_rebind (const char *,
-                             CORBA::ValueFactory &);
-
-  virtual int vf_map_unbind (const char *);
-
-  virtual CORBA::ValueFactory vf_map_find (const char *);
-
-  // Used to force the initialization of the ORB code.
-  static int Initializer (void);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
-
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Valuetype_Initializer =
-  &TAO_Valuetype_Adapter_Impl::Initializer;
-
-#else
-
-static int
-TAO_Requires_Valuetype_Initializer =
-  TAO_Valuetype_Adapter_Impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */
diff --git a/TAO/tao/Valuetype/valuetype_export.h b/TAO/tao/Valuetype/valuetype_export.h
deleted file mode 100644
index 851fa9a4ea2..00000000000
--- a/TAO/tao/Valuetype/valuetype_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_VAULETYPE_EXPORT_H
-#define TAO_VAULETYPE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_VALUETYPE_HAS_DLL)
-#    define TAO_VALUETYPE_HAS_DLL 0
-#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
-#else
-#  if !defined (TAO_VALUETYPE_HAS_DLL)
-#    define TAO_VALUETYPE_HAS_DLL 1
-#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
-#endif
-
-#if defined (TAO_VALUETYPE_HAS_DLL) && (TAO_VALUETYPE_HAS_DLL == 1)
-#  if defined (TAO_VALUETYPE_BUILD_DLL)
-#    define TAO_Valuetype_Export ACE_Proper_Export_Flag
-#    define TAO_VALUETYPE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_VALUETYPE_BUILD_DLL */
-#    define TAO_Valuetype_Export ACE_Proper_Import_Flag
-#    define TAO_VALUETYPE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_IORINTERCEPTOR_BUILD_DLL */
-#else /* TAO_VALUETYPE_HAS_DLL == 1 */
-#  define TAO_Valuetype_Export
-#  define TAO_VALUETYPE_SINGLETON_DECLARATION(T)
-#  define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_VALUETYPE_HAS_DLL == 1 */
-
-#endif /* TAO_VAULETYPE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
deleted file mode 100644
index 5c01ab2e031..00000000000
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// @(#) $Id$
-
-#include "tao/Valuetype_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Valuetype_Adapter, 
-           "$Id$")
-
-TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Valuetype_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Valuetype_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
deleted file mode 100644
index a0386ccf7e6..00000000000
--- a/TAO/tao/Valuetype_Adapter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Valuetype_Adapter.h
- *
- *  $Id$
- *
- *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUETYPE_ADAPTER_H
-#define TAO_VALUETYPE_ADAPTER_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class Object;
-  typedef Object *Object_ptr;
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class ValueBase;
-
-  class ValueFactoryBase;
-  typedef ValueFactoryBase *ValueFactory;
-}
-
-class TAO_InputCDR;
-
-/**
- * @class TAO_Valuetype_Adapter
- *
- * @brief TAO_Valuetype_Adapter.
- *
- * Class that adapts various functions involving the Valuetype,
- * ValueFactory and AbstractInterface classes. This is a base class for
- * the actual implementation in the TAO_Valuetype library.
- */
-class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_Valuetype_Adapter (void);
-
-  virtual CORBA::Object_ptr abstractbase_to_object (
-      CORBA::AbstractBase_ptr p
-    ) = 0;
-
-  virtual CORBA::Boolean stream_to_value (TAO_InputCDR &,
-                                          CORBA::ValueBase *&) = 0;
-
-  virtual CORBA::Boolean stream_to_abstract_base (
-      TAO_InputCDR &,
-      CORBA::AbstractBase_ptr &
-    ) = 0;
-
-  virtual CORBA::ULong type_info_single (void) const = 0;
-
-  virtual int vf_map_rebind (const char *,
-                             CORBA::ValueFactory &) = 0;
-
-  virtual int vf_map_unbind (const char *) = 0;
-
-
-  virtual CORBA::ValueFactory vf_map_find (const char *) = 0;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_VALUETYPE_ADAPTER_H */
diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp
deleted file mode 100644
index 618198edfad..00000000000
--- a/TAO/tao/VarOut_T.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-
-#ifndef TAO_VAROUT_T_C
-#define TAO_VAROUT_T_C
-
-#include "tao/VarOut_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           VarOut_T,
-           "$Id$")
-
-template<typename T>
-TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_,
-               T (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// *************************************************************
-
-template<typename T>
-TAO_Fixed_Var_T<T> &
-TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T * deep_copy = 0;
-          ACE_NEW_RETURN (deep_copy,
-                          T (*p.ptr_),
-                          *this);
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-// Fixed-size types only.
-template<typename T>
-TAO_Fixed_Var_T<T> &
-TAO_Fixed_Var_T<T>::operator= (const T & p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    T (p),
-                    *this);
-  }
-
-  return *this;
-}
-
-// *************************************************************
-
-template<typename T>
-TAO_Var_Var_T<T> &
-TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          T *deep_copy = 0;
-          ACE_NEW_RETURN (deep_copy,
-                          T (*p.ptr_),
-                          *this);
-
-          if (deep_copy != 0)
-            {
-              T * tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-
-  return *this;
-}
-
-#endif /* TAO_VAROUT_T_C */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
deleted file mode 100644
index 709f8ba5ddb..00000000000
--- a/TAO/tao/VarOut_T.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    VarOut_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_VAROUT_T_H
-#define TAO_VAROUT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/OS_Memory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-/**
- * @class TAO_Var_Base_T
- *
- * @brief Parametrized implementation of _var base class for structs,
- * unions and exceptions.
- *
- */
-template<typename T>
-class TAO_Var_Base_T
-{
-public:
-  TAO_Var_Base_T (void);
-  TAO_Var_Base_T (T *);
-  TAO_Var_Base_T (const TAO_Var_Base_T<T> &);
-
-  ~TAO_Var_Base_T (void);
-
-  T * operator-> (void);
-  const T * operator-> (void) const;
-
-  operator const T & () const;
-  operator T & ();
-  operator T & () const;
-
-  typedef const T &   _in_type;
-  typedef       T &   _inout_type;
-
-  // Common mapping for fixed and variable size types.
-  _in_type      in (void) const;
-  _inout_type   inout (void);
-
-  // TAO extension.
-  T * ptr (void) const;
-
-protected:
-  T * ptr_;
-};
-
-/**
- * @class TAO_Fixed_Var_T
- *
- * @brief Parametrized implementation of _var class for structs, unions,
- * and exceptions with members of fixed size.
- *
- */
-template<typename T>
-class TAO_Fixed_Var_T : public TAO_Var_Base_T<T>
-{
-public:
-  TAO_Fixed_Var_T (void);
-  TAO_Fixed_Var_T (T *);
-  TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &);
-
-  // Fixed-size types only.
-  TAO_Fixed_Var_T (const T &);
-
-  TAO_Fixed_Var_T & operator= (T *);
-  TAO_Fixed_Var_T & operator= (const TAO_Fixed_Var_T<T> &);
-
-  // Fixed-size types only.
-  TAO_Fixed_Var_T & operator= (const T &);
-
-  typedef T &   _out_type;
-  typedef T     _retn_type;
-
-  // Mapping for fixed size types.
-  _out_type     out (void);
-  _retn_type    _retn (void);
-};
-
-/**
- * @class TAO_Var_Var_T
- *
- * @brief Parametrized implementation of _var class for structs, unions,
- * and exceptions with members of variable size.
- *
- */
-template<typename T>
-class TAO_Var_Var_T : public TAO_Var_Base_T<T>
-{
-public:
-  TAO_Var_Var_T (void);
-  TAO_Var_Var_T (T *);
-  TAO_Var_Var_T (const TAO_Var_Var_T<T> &);
-
-  TAO_Var_Var_T & operator= (T *);
-  TAO_Var_Var_T & operator= (const TAO_Var_Var_T<T> &);
-
-  // Variable size types only.
-  operator T *& ();
-
-  typedef T *&  _out_type;
-  typedef T *   _retn_type;
-
-  // Mapping for variable size types.
-  _out_type     out (void);
-  _retn_type    _retn (void);
-};
-
-/**
- * @class TAO_Out_T
- *
- * @brief Parametrized implementation of _out class for structs, unions
- * and exceptions..
- *
- */
-template<typename T, typename T_var>
-class TAO_Out_T
-{
-public:
-  TAO_Out_T (T *&);
-  TAO_Out_T (T_var &);
-  TAO_Out_T (const TAO_Out_T<T,T_var> &);
-
-  TAO_Out_T &operator= (const TAO_Out_T<T,T_var> &);
-  TAO_Out_T &operator= (T *);
-
-  operator T *& ();
-  T *& ptr (void);
-
-  T * operator-> (void);
-
-private:
-  typedef TAO_Out_T<T,T_var> THIS_OUT_TYPE;
-  T *& ptr_;
-
-  // Assignment from T_var not allowed.
-  void operator= (const T_var &);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VAROUT_T_H */
diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl
deleted file mode 100644
index c1e7af81406..00000000000
--- a/TAO/tao/VarOut_T.inl
+++ /dev/null
@@ -1,261 +0,0 @@
-//$Id$
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::TAO_Var_Base_T (void)
-  : ptr_ (0)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::TAO_Var_Base_T (T * p)
-  : ptr_ (p)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::~TAO_Var_Base_T (void)
-{
-  delete this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-const T *
-TAO_Var_Base_T<T>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-T *
-TAO_Var_Base_T<T>::operator-> (void)
-{
-  return this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::operator const T & () const
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::operator T & () 
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Base_T<T>::operator T & () const
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-const T &
-TAO_Var_Base_T<T>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-T &
-TAO_Var_Base_T<T>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-T *
-TAO_Var_Base_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-template<typename T>
-ACE_INLINE
-TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (void)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (T * p)
-  : TAO_Var_Base_T<T> (p)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> & p)
-  : TAO_Var_Base_T<T> (p)
-{}
-
-// Fixed-size types only.
-template<typename T>
-ACE_INLINE
-TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (const T & p)
-{
-  ACE_NEW (this->ptr_, 
-           T (p));
-}
-
-template<typename T>
-ACE_INLINE
-TAO_Fixed_Var_T<T> &
-TAO_Fixed_Var_T<T>::operator= (T * p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-// Mapping for fixed size.
-template<typename T>
-ACE_INLINE 
-T &
-TAO_Fixed_Var_T<T>::out (void)
-{
-  return *this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE 
-T
-TAO_Fixed_Var_T<T>::_retn (void)
-{
-  return *this->ptr_;
-}
-
-// *************************************************************
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Var_T<T>::TAO_Var_Var_T (void)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Var_T<T>::TAO_Var_Var_T (T * p)
-  : TAO_Var_Base_T<T> (p)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Var_T<T>::TAO_Var_Var_T (const TAO_Var_Var_T<T> & p)
-  : TAO_Var_Base_T<T> (p)
-{}
-
-template<typename T>
-ACE_INLINE
-TAO_Var_Var_T<T> &
-TAO_Var_Var_T<T>::operator= (T * p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-// Variable-size types only.
-template<typename T>
-ACE_INLINE
-TAO_Var_Var_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-// Mapping for variable size.
-template<typename T>
-ACE_INLINE
-T *&
-TAO_Var_Var_T<T>::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template<typename T>
-ACE_INLINE
-T *
-TAO_Var_Var_T<T>::_retn (void)
-{
-  T * tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-// *************************************************************
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var>::TAO_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var>::TAO_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var>::TAO_Out_T (const TAO_Out_T<T,T_var> & p)
-  : ptr_ (p.ptr_)
-{}
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var> &
-TAO_Out_T<T,T_var>::operator= (const TAO_Out_T<T,T_var> & p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var> &
-TAO_Out_T<T,T_var>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-TAO_Out_T<T,T_var>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Out_T<T,T_var>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template<typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Out_T<T,T_var>::operator-> (void)
-{
-  return this->ptr_;
-}
-
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
deleted file mode 100644
index c6116ff80f1..00000000000
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-
-#ifndef TAO_VAR_ARRAY_ARGUMENT_T_C
-#define TAO_VAR_ARRAY_ARGUMENT_T_C
-
-#include "tao/Var_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Var_Array_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Var_Array_Argument_T,
-           "$Id$")
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
-    TAO_OutputCDR & cdr
-  )
-{
-  return cdr << this->x_;
-}
-
-template<typename S, typename S_slice, typename S_forany>
-CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  return cdr >> this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_slice, typename S_forany>
-void
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_out,
-         typename S_forany,
-         typename S_tag>
-CORBA::Boolean
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
-  ACE_ALLOCATOR_RETURN (this->x_,
-                        ARRAY_TRAITS::alloc (),
-                        0);
-  S_forany tmp (this->x_);
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_out,
-         typename S_forany,
-         typename S_tag>
-void
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
-interceptor_param (Dynamic::Parameter & p)
-{
-  S_forany tmp (this->x_);
-  p.argument <<= tmp;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-CORBA::Boolean
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
-    TAO_InputCDR & cdr
-  )
-{
-  typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS;
-  S_slice * tmp_ptr = 0;
-  ACE_ALLOCATOR_RETURN (tmp_ptr,
-                        ARRAY_TRAITS::alloc (),
-                        0);
-  this->x_ = tmp_ptr;
-  S_forany tmp (this->x_.ptr ());
-  return cdr >> tmp;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-void
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= S_forany (this->x_.ptr ());
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
deleted file mode 100644
index 0e411bf87dc..00000000000
--- a/TAO/tao/Var_Array_Argument_T.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Var_Array_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_VAR_ARRAY_ARGUMENT_T_H
-#define TAO_VAR_ARRAY_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Var_Array_Argument_T
-   *
-   * @brief IN stub argument of variable size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_Argument_T : public Argument
-  {
-  public:
-    In_Var_Array_Argument_T (const S_slice * x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice const * arg (void) const;
-
-  private:
-    S_forany x_;
-  };
-
-  /**
-   * @class Inout_Var_Array_Argument_T
-   *
-   * @brief INOUT stub argument of variable size element array.
-   *
-   */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_Argument_T : public Argument
-  {
-  public:
-    Inout_Var_Array_Argument_T (S_slice *&x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice * arg (void);
-
-  private:
-    S_forany x_;
-  };
-
-  /**
-   * @class Out_Var_Array_Argument_T
-   *
-   * @brief OUT stub argument of variable size element array.
-   *
-   */
-  template<typename S,
-           typename S_slice,
-           typename S_var,
-           typename S_out,
-           typename S_forany,
-           typename S_tag>
-  class Out_Var_Array_Argument_T : public Argument
-  {
-  public:
-    Out_Var_Array_Argument_T (S_out x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-  private:
-    S_slice *& x_;
-  };
-
-  /**
-   * @class Ret_Var_Array_Argument_T
-   *
-   * @brief Return stub value of variable size element array.
-   *
-   */
-  template<typename S,
-           typename S_slice,
-           typename S_var,
-           typename S_forany,
-           typename S_tag>
-  class Ret_Var_Array_Argument_T : public Argument
-  {
-  public:
-    Ret_Var_Array_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S_slice *& arg (void);
-
-    S_slice * excp (void);
-    S_slice * retn (void);
-
-  private:
-    S_var x_;
-  };
-
-  /**
-   * @struct Var_Array_Tag
-   *
-   * @brief Struct for variable size element array argument id tag.
-   *
-   */
-  struct TAO_Export Var_Array_Tag {};
-
-  /**
-   * @struct Var_Array_Arg_Traits_T
-   *
-   * @brief Argument traits of variable size element array.
-   *
-   */
-  template<typename T,
-           typename T_slice,
-           typename T_var,
-           typename T_out,
-           typename T_forany,
-           typename T_tag>
-  struct Var_Array_Arg_Traits_T
-  {
-    typedef T_slice *                                   ret_type;
-    typedef const T                                     in_type;
-    typedef T                                           inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_Var_Array_Argument_T<T,
-                                    T_slice,
-                                    T_forany>           in_arg_val;
-    typedef Inout_Var_Array_Argument_T<T,
-                                       T_slice,
-                                       T_forany>        inout_arg_val;
-    typedef Out_Var_Array_Argument_T<T,
-                                     T_slice,
-                                     T_var,
-                                     T_out,
-                                     T_forany,
-                                     T_tag>             out_arg_val;
-    typedef Ret_Var_Array_Argument_T<T,
-                                     T_slice,
-                                     T_var,
-                                     T_forany,
-                                     T_tag>             ret_val;
-
-    typedef Var_Array_Tag                               idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Var_Array_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Var_Array_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Array_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VAR_ARRAY_ARGUMENT_T_H */
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
deleted file mode 100644
index a189584da2e..00000000000
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::
-In_Var_Array_Argument_T (const S_slice * x)
-  : x_ (const_cast<S_slice *> (x))
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice const *
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
-{
-  return this->x_.in ();
-}
-
-// ==========================================================================
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::
-Inout_Var_Array_Argument_T (S_slice  *&x)
-  : x_ (x)
-{}
-
-template<typename S, typename S_slice, typename S_forany>
-ACE_INLINE
-S_slice *
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void)
-{
-  return this->x_.inout ();
-}
-
-// ==========================================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_out,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
-Out_Var_Array_Argument_T (S_out x)
-  : x_ (x.ptr ())
-{
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_out,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *&
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-Ret_Var_Array_Argument_T (void)
-{}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *&
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
-{
-  return this->x_.out ();
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S,
-         typename S_slice,
-         typename S_var,
-         typename S_forany,
-         typename S_tag>
-ACE_INLINE
-S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
-{
-  return this->x_._retn ();
-}
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
deleted file mode 100644
index 5d28dae9742..00000000000
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-#ifndef TAO_VAR_SIZE_ARGUMENT_T_C
-#define TAO_VAR_SIZE_ARGUMENT_T_C
-
-#include "tao/Var_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Var_Size_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Var_Size_Argument_T,
-           "$Id$")
-
-template<typename S>
-CORBA::Boolean
-TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << *this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ===========================================================
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
-{
-  return cdr << *this->x_;
-}
-
-template<typename S>
-CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
-{
-  return cdr >> *this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S>
-void
-TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
-{
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ==============================================================
-
-template<typename S, typename S_out>
-CORBA::Boolean
-TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
-{
-  this->x_ = new S;
-  return cdr >> *this->x_;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_out>
-void
-TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
-{
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_OUT;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// ============================================================
-
-template<typename S, typename S_var>
-CORBA::Boolean
-TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
-{
-  S * tmp = 0;
-  ACE_NEW_RETURN (tmp,
-                  S (),
-                  0);
-  this->x_ = tmp;
-  return cdr >> this->x_.inout ();
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-template<typename S, typename S_var>
-void
-TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
-{
-  (*any) <<= this->x_.in ();
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
deleted file mode 100644
index e417f5b72fe..00000000000
--- a/TAO/tao/Var_Size_Argument_T.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Var_Size_Argument_T.h
- *
- *  $Id$
- *
- *  @authors Jeff Parsons and Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_VAR_SIZE_ARGUMENT_T_H
-#define TAO_VAR_SIZE_ARGUMENT_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Argument.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class In_Var_Size_Argument_T
-   *
-   * @brief Template class for IN stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class In_Var_Size_Argument_T : public Argument
-  {
-  public:
-    In_Var_Size_Argument_T (S const & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S const & arg (void) const;
-
-  private:
-    const S * x_;
-  };
-
-  /**
-   * @class Inout_Var_Size_Argument_T
-   *
-   * @brief Template class for INOUT stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S>
-  class Inout_Var_Size_Argument_T : public Argument
-  {
-  public:
-    Inout_Var_Size_Argument_T (S & x);
-
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S & arg (void);
-
-  private:
-    S * x_;
-  };
-
-  /**
-   * @class Out_Var_Size_Argument_T
-   *
-   * @brief Template class for OUT stub argument of fixed size IDL types.
-   *
-   */
-  template<typename S, typename S_out>
-  class Out_Var_Size_Argument_T : public Argument
-  {
-  public:
-    Out_Var_Size_Argument_T (S_out x);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-  private:
-    S *& x_;
-  };
-
-  /**
-   * @class Ret_Var_Size_Argument_T
-   *
-   * @brief Template class for return stub value of fixed size IDL types.
-   *
-   */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_Argument_T : public Argument
-  {
-  public:
-    Ret_Var_Size_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-#if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-    S *& arg (void);
-
-    S * excp (void);
-    S * retn (void);
-
-  protected:
-    S_var x_;
-  };
-
-  /**
-   * @struct Basic_Tag
-   *
-   * @brief Struct for fixed size IDL type arguments id tag.
-   *
-   */
-  struct TAO_Export Var_Size_Tag {};
-
-  /**
-   * @struct Basic_Arg_Traits_T
-   *
-   * @brief Template class for stub argument traits of
-   *  variable size IDL types.
-   *
-   */
-  template<typename T, typename T_var, typename T_out>
-  struct Var_Size_Arg_Traits_T
-  {
-    typedef T *                                         ret_type;
-    typedef T const &                                   in_type;
-    typedef T &                                         inout_type;
-    typedef T_out                                       out_type;
-
-    typedef In_Var_Size_Argument_T<T>                   in_arg_val;
-    typedef Inout_Var_Size_Argument_T<T>                inout_arg_val;
-    typedef Out_Var_Size_Argument_T<T,T_out>            out_arg_val;
-    typedef Ret_Var_Size_Argument_T<T,T_var>            ret_val;
-
-    typedef Var_Size_Tag                                idl_tag;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "tao/Var_Size_Argument_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Var_Size_Argument_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Size_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VAR_SIZE_ARGUMENT_T_H */
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
deleted file mode 100644
index 59ad3bdbbfa..00000000000
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-template<typename S>
-ACE_INLINE
-TAO::In_Var_Size_Argument_T<S>::In_Var_Size_Argument_T (S const & x)
-  : x_ (&x)
-{}
-
-template<typename S>
-ACE_INLINE
-const S &
-TAO::In_Var_Size_Argument_T<S>::arg (void) const
-{
-  return *this->x_;
-}
-
-// ==========================================================================
-
-template<typename S>
-ACE_INLINE
-TAO::Inout_Var_Size_Argument_T<S>::Inout_Var_Size_Argument_T (S & x)
-  : x_ (&x)
-{}
-
-template<typename S>
-ACE_INLINE
-S &
-TAO::Inout_Var_Size_Argument_T<S>::arg (void)
-{
-  return *this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename S_out>
-ACE_INLINE
-TAO::Out_Var_Size_Argument_T<S,S_out>::Out_Var_Size_Argument_T (S_out x)
-  : x_ (x.ptr ())
-{}
-
-template<typename S, typename S_out>
-ACE_INLINE
-S *&
-TAO::Out_Var_Size_Argument_T<S,S_out>::arg (void)
-{
-  return this->x_;
-}
-
-// ==========================================================================
-
-template<typename S, typename S_var>
-ACE_INLINE
-TAO::Ret_Var_Size_Argument_T<S,S_var>::Ret_Var_Size_Argument_T (void)
-{}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *&
-TAO::Ret_Var_Size_Argument_T<S,S_var>::arg (void)
-{
-  return this->x_.out ();
-}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::excp (void)
-{
-  return this->x_.ptr ();
-}
-
-template<typename S, typename S_var>
-ACE_INLINE
-S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::retn (void)
-{
-  return this->x_._retn ();
-}
-
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
deleted file mode 100644
index 738cd06ca6e..00000000000
--- a/TAO/tao/Version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-// This is an automatically generated file.
-
-#define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 5
-#define TAO_VERSION "1.4.5"
diff --git a/TAO/tao/Visibility.pidl b/TAO/tao/Visibility.pidl
deleted file mode 100644
index 8148391aaeb..00000000000
--- a/TAO/tao/Visibility.pidl
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Visibility.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in VisibiltyC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Ge 1 -Sc -GA -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Visibilty.pidl
- */
-// ================================================================
-
-#ifndef TAO_VISIBILITY_PIDL
-#define TAO_VISIBILITY_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short Visibility;
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER = 1;
-};
-
-#endif /* TAO_VISIBILITY_PIDL */
diff --git a/TAO/tao/VisibilityA.cpp b/TAO/tao/VisibilityA.cpp
deleted file mode 100644
index 63a9d551f37..00000000000
--- a/TAO/tao/VisibilityA.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "VisibilityC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Visibility (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Visibility:1.0",
-    "Visibility",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Visibility =
-    &_tao_tc_CORBA_Visibility;
-}
-
-
diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/VisibilityC.cpp
deleted file mode 100644
index dbc285bb6af..00000000000
--- a/TAO/tao/VisibilityC.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "VisibilityC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/VisibilityC.h
deleted file mode 100644
index 86b69215c9e..00000000000
--- a/TAO/tao/VisibilityC.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_VISIBILITYC_H_
-#define _TAO_IDL_ORIG_VISIBILITYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short Visibility;
-  typedef CORBA::Short_out Visibility_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Visibility;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PRIVATE_MEMBER = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PUBLIC_MEMBER = 1;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/VisibilityS.h b/TAO/tao/VisibilityS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/VisibilityS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl
deleted file mode 100644
index 2a85796e8a0..00000000000
--- a/TAO/tao/WCharSeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in WCharSeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=TAO_Export.h
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          WCharSeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_WCHAR_SEQ_IDL
-#define TAO_CORBA_WCHAR_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<wchar> WCharSeq;
-};
-
-#endif  /* TAO_CORBA_WCHAR_SEQ_IDL */
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
deleted file mode 100644
index a1ecbfe3f50..00000000000
--- a/TAO/tao/WCharSeqA.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WCharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WCharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wchar,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WCharSeq_0 =
-      &CORBA_WCharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WCharSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WCharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WCharSeq:1.0",
-    "WCharSeq",
-    &TAO::TypeCode::tc_CORBA_WCharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WCharSeq =
-    &_tao_tc_CORBA_WCharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WCharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert_copy (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WCharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WCharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::extract (
-        _tao_any,
-        CORBA::WCharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WCharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
deleted file mode 100644
index 38d56e0a3ca..00000000000
--- a/TAO/tao/WCharSeqC.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "WCharSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_WCHARSEQ_CS_)
-#define _CORBA_WCHARSEQ_CS_
-
-CORBA::WCharSeq::WCharSeq (void)
-{}
-
-CORBA::WCharSeq::WCharSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::WChar
-      >
-    (max)
-{}
-
-CORBA::WCharSeq::WCharSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::WChar * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::WChar
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::WCharSeq::WCharSeq (
-    const WCharSeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::WChar
-      >
-    (seq)
-{}
-
-CORBA::WCharSeq::~WCharSeq (void)
-{}
-
-void CORBA::WCharSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  WCharSeq * _tao_tmp_pointer =
-    static_cast<WCharSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_WCharSeq_CPP_
-#define _TAO_CDR_OP_CORBA_WCharSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WCharSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::WCharSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */
diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h
deleted file mode 100644
index 66e272a3891..00000000000
--- a/TAO/tao/WCharSeqC.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_WCHARSEQC_H_
-#define _TAO_IDL_ORIG_WCHARSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_WCHARSEQ_CH_)
-#define _CORBA_WCHARSEQ_CH_
-  
-  class WCharSeq;
-  
-  typedef
-    TAO_FixedSeq_Var_T<
-        WCharSeq,
-        CORBA::WChar
-      >
-    WCharSeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        WCharSeq,
-        WCharSeq_var,
-        CORBA::WChar
-      >
-    WCharSeq_out;
-  
-  class TAO_Export WCharSeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::WChar
-          >
-  {
-  public:
-    WCharSeq (void);
-    WCharSeq (CORBA::ULong max);
-    WCharSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::WChar* buffer, 
-        CORBA::Boolean release = 0
-      );
-    WCharSeq (const WCharSeq &);
-    ~WCharSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef WCharSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WCharSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WCharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WCharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WCharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WCharSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_WCharSeq_H_
-#define _TAO_CDR_OP_CORBA_WCharSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::WCharSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::WCharSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/WCharSeqS.h b/TAO/tao/WCharSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/WCharSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl
deleted file mode 100644
index 56acf6508ae..00000000000
--- a/TAO/tao/WStringSeq.pidl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-//
-//   This file was used to generate the code in WStringSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//       -o orig -Ge 1 -GA -Sc -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          WStringSeq.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
-
-
-#ifndef TAO_CORBA_WSTRING_SEQ_IDL
-#define TAO_CORBA_WSTRING_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<wstring> WStringSeq;
-};
-
-#endif  /* TAO_CORBA_WSTRING_SEQ_IDL */
diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
deleted file mode 100644
index 4d8c289ee87..00000000000
--- a/TAO/tao/WStringSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WStringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WStringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wstring,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WStringSeq_0 =
-      &CORBA_WStringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WStringSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WStringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WStringSeq:1.0",
-    "WStringSeq",
-    &TAO::TypeCode::tc_CORBA_WStringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WStringSeq =
-    &_tao_tc_CORBA_WStringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WStringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WStringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WStringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
-        _tao_any,
-        CORBA::WStringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WStringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
deleted file mode 100644
index 81af095c52b..00000000000
--- a/TAO/tao/WStringSeqC.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "WStringSeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_WSTRINGSEQ_CS_)
-#define _CORBA_WSTRINGSEQ_CS_
-
-CORBA::WStringSeq::WStringSeq (void)
-{}
-
-CORBA::WStringSeq::WStringSeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_WString_Sequence
-    (max)
-{}
-
-CORBA::WStringSeq::WStringSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::WChar * * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_WString_Sequence
-    (max, length, buffer, release)
-{}
-
-CORBA::WStringSeq::WStringSeq (
-    const WStringSeq &seq
-  )
-  : TAO_Unbounded_WString_Sequence
-    (seq)
-{}
-
-CORBA::WStringSeq::~WStringSeq (void)
-{}
-
-void CORBA::WStringSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  WStringSeq * _tao_tmp_pointer =
-    static_cast<WStringSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_
-#define _TAO_CDR_OP_CORBA_WStringSeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WStringSeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::WStringSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        
-      }
-    
-    return _tao_marshal_flag;
-  
-  }
-
-return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h
deleted file mode 100644
index c73b0347014..00000000000
--- a/TAO/tao/WStringSeqC.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_WSTRINGSEQC_H_
-#define _TAO_IDL_ORIG_WSTRINGSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_WSTRINGSEQ_CH_)
-#define _CORBA_WSTRINGSEQ_CH_
-  
-  class WStringSeq;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        WStringSeq,
-        TAO_SeqElem_WString_Manager
-      >
-    WStringSeq_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        WStringSeq,
-        WStringSeq_var,
-        TAO_SeqElem_WString_Manager
-      >
-    WStringSeq_out;
-  
-  class TAO_Export WStringSeq
-    : public
-        TAO_Unbounded_WString_Sequence
-  {
-  public:
-    WStringSeq (void);
-    WStringSeq (CORBA::ULong max);
-    WStringSeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::WChar ** buffer, 
-        CORBA::Boolean release = 0
-      );
-    WStringSeq (const WStringSeq &);
-    ~WStringSeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef WStringSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WStringSeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
-#define _TAO_CDR_OP_CORBA_WStringSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::WStringSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::WStringSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/WStringSeqS.h b/TAO/tao/WStringSeqS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/WStringSeqS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
deleted file mode 100644
index cf06846b4e2..00000000000
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// $Id$
-
-#include "tao/Wait_On_LF_No_Upcall.h"
-
-#include "tao/Transport.h"
-#include "tao/ORB_Core.h"
-#include "debug.h"
-
-ACE_RCSID(tao,
-          Wait_On_LF_No_Upcall,
-          "$Id$")
-
-class TAO_Transport;
-namespace TAO
-{
-  /**
-   * @class Nested_Upcall_Guard
-   *
-   * @brief: Magic class that sets the status of the thread in the
-   * TSS.
-   *
-   */
-  class Nested_Upcall_Guard
-  {
-  public:
-    // Maybe we should instead just take in a ptr to
-    // TAO_ORB_Core_TSS_Resources?  Or at least ORB_Core*?
-    Nested_Upcall_Guard (TAO_Transport* t)
-      : t_ (t)
-    {
-      TAO_ORB_Core_TSS_Resources *tss =
-        t_->orb_core()->get_tss_resources ();
-
-      tss->upcalls_temporarily_suspended_on_this_thread_ = true;
-
-      if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                    "disabling upcalls on thread %t\n"));
-    }
-
-    ~Nested_Upcall_Guard (void)
-    {
-      TAO_ORB_Core_TSS_Resources *tss =
-        t_->orb_core()->get_tss_resources ();
-
-      tss->upcalls_temporarily_suspended_on_this_thread_ =
-        false;
-
-      if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                    "re-enabling upcalls on thread %t\n"));
-    }
-
-  private:
-
-    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (void))
-
-    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (
-                              const Nested_Upcall_Guard&))
-
-    /// Pointer to the transport that we plan to use.
-    TAO_Transport* t_;
-  };
-
-
-  //=================================================================
-
-  Wait_On_LF_No_Upcall::Wait_On_LF_No_Upcall (TAO_Transport *t)
-    : base (t)
-  {
-  }
-
-  Wait_On_LF_No_Upcall::~Wait_On_LF_No_Upcall (void)
-  {
-  }
-
-  int
-  Wait_On_LF_No_Upcall::wait (ACE_Time_Value *max_wait_time,
-                              TAO_Synch_Reply_Dispatcher &rd)
-  {
-    Nested_Upcall_Guard upcall_guard (this->transport_);
-
-    return base::wait (max_wait_time, rd);
-  }
-
-  bool
-  Wait_On_LF_No_Upcall::can_process_upcalls (void) const
-  {
-    TAO_ORB_Core_TSS_Resources *tss =
-      this->transport_->orb_core()->get_tss_resources ();
-
-    if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
-        (this->transport_->bidirectional_flag () == 0) &&
-        (tss->upcalls_temporarily_suspended_on_this_thread_ == true))
-      return false;
-
-    return true;
-  }
-}
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
deleted file mode 100644
index bfc9f56640e..00000000000
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Wait_On_LF_No_Upcall.h
- *
- *  $Id$
- *
- *  @author  Chris Cleeland <cleeland@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_WAIT_ON_LF_NO_UPCALL_H
-#define TAO_WAIT_ON_LF_NO_UPCALL_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Wait_On_Leader_Follower.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class TAO_Wait_On_LF_No_Upcall
-   *
-   * @brief Wait according to the Leader-Follower model (like
-   * TAO_Wait_On_Leader_Follower), but do not allow nested upcalls.
-   *
-   * This implementation sets a thread-specific flag on entering wait()
-   * that indicates that the thread is unavailable to service upcalls.
-   * Connection handler that are acting in a server role cooperate by
-   * checking this flag in their handle_input, and returning if they're
-   * in a thread that is currently suspending upcalls.  The flag gets
-   * reset once the reply is received.
-   */
-
-  class TAO_Export Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
-  {
-  public:
-
-    typedef TAO_Wait_On_Leader_Follower base;
-
-    Wait_On_LF_No_Upcall (TAO_Transport *t);
-
-    virtual ~Wait_On_LF_No_Upcall (void);
-
-    virtual int wait (ACE_Time_Value *max_wait_time,
-                      TAO_Synch_Reply_Dispatcher &rd);
-
-    virtual bool can_process_upcalls (void) const;
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_WAIT_ON_LF_NO_UPCALL_H */
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
deleted file mode 100644
index 393dacadef7..00000000000
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-
-#include "tao/Wait_On_Leader_Follower.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
-#include "tao/Transport.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-
-ACE_RCSID (tao,
-           Wait_On_Leader_Follower,
-           "$Id$")
-
-TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport)
-{
-}
-
-TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
-{
-}
-
-int
-TAO_Wait_On_Leader_Follower::register_handler (void)
-{
-  if (this->is_registered_ == 0)
-    {
-      return this->transport_->register_handler ();
-    }
-
-  return 1;
-}
-
-bool
-TAO_Wait_On_Leader_Follower::non_blocking (void) const
-{
-  return true;
-}
-
-int
-TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
-                                              int two_way)
-{
-  // Register the handler.
-  if (this->is_registered_ == 0)
-    {
-      this->transport_->register_handler ();
-    }
-
-  // Send the request.
-  return this->TAO_Wait_Strategy::sending_request (orb_core,
-                                                   two_way);
-}
-
-int
-TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
-                                   TAO_Synch_Reply_Dispatcher &rd)
-{
-  TAO_Leader_Follower& leader_follower =
-    this->transport_->orb_core ()->leader_follower ();
-  return leader_follower.wait_for_event (&rd,
-                                         this->transport_,
-                                         max_wait_time);
-}
-
-bool
-TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
-{
-  return true;
-}
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
deleted file mode 100644
index 367a7496d07..00000000000
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Wait_On_Leader_Follower.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_WAIT_ON_LEADER_FOLLOWER_H
-#define TAO_WAIT_ON_LEADER_FOLLOWER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Wait_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Wait_On_Leader_Follower
- *
- * @brief Wait according to the Leader-Follower model. Leader does the
- * event loop of the Reactor and the Followers wait on the
- * condition variable.
- *
- * This impelementation is to work with the Muxed Transport
- * Mechanism. Here the state variables such as <Condition
- * Variable> etc cannot be kept in the Wait Strategy, since the
- * Wait Strategy is per Transport object and here the Transport
- * is Muxed and hence there are multiple threads running in the
- * same Transport context.
- */
-class TAO_Export TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Wait_On_Leader_Follower (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Wait_On_Leader_Follower (void);
-
-  // = Documented in TAO_Wait_Strategy.
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
-  virtual int register_handler (void);
-  virtual bool non_blocking (void) const;
-  virtual bool can_process_upcalls (void) const;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_WAIT_ON_LEADER_FOLLOWER_H */
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
deleted file mode 100644
index 9168df03344..00000000000
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "tao/Wait_On_Reactor.h"
-#include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-
-#include "ace/Reactor.h"
-#include "ace/Countdown_Time.h"
-
-ACE_RCSID (tao,
-           Wait_On_Reactor,
-           "$Id$")
-
-TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport)
-{
-}
-
-TAO_Wait_On_Reactor::~TAO_Wait_On_Reactor (void)
-{
-}
-
-int
-TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
-                           TAO_Synch_Reply_Dispatcher &rd)
-{
-  // Start the count down timer to account for the time spent in this
-  // method.
-  ACE_Countdown_Time countdown (max_wait_time);
-
-  // Reactor does not change inside the loop.
-  ACE_Reactor* reactor =
-    this->transport_->orb_core ()->reactor ();
-
-  // Do the event loop, till we fully receive a reply.
-  int result = 0;
-
-  while (1)
-    {
-      // Run the event loop.
-      result = reactor->handle_events (max_wait_time);
-
-      // If we got our reply, no need to run the event loop any
-      // further.
-      if (!rd.keep_waiting ())
-        {
-          break;
-        }
-
-      // Did we timeout? If so, stop running the loop.
-      if (result == 0
-          && max_wait_time != 0
-          && *max_wait_time == ACE_Time_Value::zero)
-        {
-          break;
-        }
-
-      // Other errors? If so, stop running the loop.
-      if (result == -1)
-        {
-          break;
-        }
-
-      // Otherwise, keep going...
-    }
-
-  if (result == -1 || rd.error_detected ())
-    {
-      return -1;
-    }
-
-  // Return an error if there was a problem receiving the reply.
-  if (max_wait_time != 0)
-    {
-      if (rd.successful () && *max_wait_time == ACE_Time_Value::zero)
-        {
-          result = -1;
-          errno = ETIME;
-        }
-    }
-  else
-    {
-      result = 0;
-
-      if (rd.error_detected ())
-        {
-          result = -1;
-        }
-    }
-
-  return result;
-}
-
-// Register the handler with the Reactor.
-int
-TAO_Wait_On_Reactor::register_handler (void)
-{
-  if (this->is_registered_ == 0)
-    {
-      return this->transport_->register_handler ();
-    }
-
-  return 1;
-}
-
-bool
-TAO_Wait_On_Reactor::non_blocking (void) const
-{
-  return true;
-}
-
-bool
-TAO_Wait_On_Reactor::can_process_upcalls (void) const
-{
-  return true;
-}
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
deleted file mode 100644
index c8af5477fba..00000000000
--- a/TAO/tao/Wait_On_Reactor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Wait_On_Reactor.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_WAIT_ON_REACTOR_H
-#define TAO_WAIT_ON_REACTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Wait_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Wait_On_Reactor
- *
- * @brief Wait on the Reactor. Happens in s Single Threaded client
- * environment.
- *
- */
-class TAO_Export TAO_Wait_On_Reactor : public TAO_Wait_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Wait_On_Reactor (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Wait_On_Reactor (void);
-
-  // = Documented in TAO_Wait_Strategy.
-
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
-  virtual int register_handler (void);
-  virtual bool non_blocking (void) const;
-  virtual bool can_process_upcalls (void) const;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_WAIT_ON_REACTOR_H */
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
deleted file mode 100644
index 01dc3c8a4d0..00000000000
--- a/TAO/tao/Wait_On_Read.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "tao/Wait_On_Read.h"
-#include "tao/Transport.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-
-#include "ace/Countdown_Time.h"
-
-ACE_RCSID (tao,
-           Wait_On_Read,
-           "$Id$")
-
-// Constructor.
-TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport)
-  : TAO_Wait_Strategy (transport)
-{
-}
-
-// Destructor.
-TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
-{
-}
-
-// Wait on the read operation.
-int
-TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
-                        TAO_Synch_Reply_Dispatcher &rd)
-{
-  // Start the count down timer to account for the time spent in this
-  // method.
-  ACE_Countdown_Time countdown (max_wait_time);
-
-  rd.state_changed (TAO_LF_Event::LFS_ACTIVE);
-
-  // Do the same sort of looping that is done in other wait
-  // strategies.
-  int retval = 0;
-  TAO_Resume_Handle rh;
-  while (1)
-    {
-      retval =
-        this->transport_->handle_input (rh,
-                                        max_wait_time,
-                                        1);
-
-      // If we got our reply, no need to run the loop any
-      // further.
-      if (!rd.keep_waiting ())
-        break;
-
-      // @@ We are not checking for timeouts here...
-
-      // If we got an error just break
-      if (retval == -1)
-        break;
-    }
-
-  if (rd.error_detected () == -1 || retval == -1)
-    {
-      this->transport_->close_connection ();
-    }
-
-  if (rd.successful ())
-    return 0;
-
-  if (rd.error_detected ())
-    return -1;
-
-  return 1;
-}
-
-// No-op.
-int
-TAO_Wait_On_Read::register_handler (void)
-{
-  return 0;
-}
-
-bool
-TAO_Wait_On_Read::non_blocking (void) const
-{
-  return 0;
-}
-
-bool
-TAO_Wait_On_Read::can_process_upcalls (void) const
-{
-  return true;
-}
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
deleted file mode 100644
index d2de502871f..00000000000
--- a/TAO/tao/Wait_On_Read.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Wait_On_Read.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_WAIT_ON_READ_H
-#define TAO_WAIT_ON_READ_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Wait_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Wait_On_Read
- *
- *
- * Simply block on read() to wait for the reply.
- */
-class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Wait_On_Read (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Wait_On_Read (void);
-
-  // = Documented in TAO_Wait_Strategy.
-
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd);
-  virtual int register_handler (void);
-  virtual bool non_blocking (void) const;
-  virtual bool can_process_upcalls (void) const;
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_WAIT_ON_READ_H */
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
deleted file mode 100644
index f4a684bd6b1..00000000000
--- a/TAO/tao/Wait_Strategy.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "tao/Wait_Strategy.h"
-
-ACE_RCSID (tao, 
-           Wait_Strategy, 
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "Wait_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-// Constructor.
-TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
-  : transport_ (transport),
-    is_registered_ (0)
-
-{
-}
-
-// Destructor.
-TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
-{
-}
-
-int
-TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
-                                    int            /* two_way */)
-{
-  return 0;
-}
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
deleted file mode 100644
index b38dc77b7a9..00000000000
--- a/TAO/tao/Wait_Strategy.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Wait_Strategy.h
- *
- *  $Id$
- *
- *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_WAIT_STRATEGY_H
-#define TAO_WAIT_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Time_Value;
-class TAO_ORB_Core;
-class TAO_Transport;
-class TAO_Synch_Reply_Dispatcher;
-
-/**
- * @class TAO_Wait_Strategy
- *
- * @brief Strategy for waiting for the reply.
- *
- */
-class TAO_Export TAO_Wait_Strategy
-{
-
-public:
-  /// Constructor.
-  TAO_Wait_Strategy (TAO_Transport *transport);
-
-  /// Destructor.
-  virtual ~TAO_Wait_Strategy (void);
-
-  /**
-   * The user is going to send a request, prepare any internal
-   * variables because the reply may arrive *before* the user calls
-   * wait.
-   */
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
-
-  /// Base class virtual method. Wait till the @c reply_received flag is
-  /// true or the time expires.
-  virtual int wait (ACE_Time_Value *max_wait_time,
-                    TAO_Synch_Reply_Dispatcher &rd) = 0;
-
-  /// Register the handler needs with the reactor provided that it makes
-  /// sense for the  strategy.
-  virtual int register_handler (void) = 0;
-
-  /// Returns a value to indicate whether the transport needs to set
-  /// the socket on which it is waiting to non-blocking mode or not.
-  virtual bool non_blocking (void) const = 0;
-
-  /// Flag that indicates whether we can process requests while
-  /// waiting for the reply.
-  /**
-   * This flag is to check whether the thread can process upcalls
-   * while waiting for the reply. Some wait strategies, like
-   * Wait_On_LF_No_Upcall does not allow the client threads to process
-   * requests while waiting for the reply.
-   */
-  virtual bool can_process_upcalls (void) const = 0;
-
-  /// Get method for the flag
-  int is_registered (void);
-
-  /// Set method for the flag
-  void is_registered (int flag);
-
-protected:
-  /// Transport object.
-  TAO_Transport *transport_;
-
-  /// Flag to indicate whether the service handler that created the
-  /// above transport has been registered with the reactor or not. The
-  /// default is 0.
-  int is_registered_;
-};
-
-
-#if defined (__ACE_INLINE__)
-# include "Wait_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_WAIT_STRATEGY_H */
diff --git a/TAO/tao/Wait_Strategy.inl b/TAO/tao/Wait_Strategy.inl
deleted file mode 100644
index cdb275b9f12..00000000000
--- a/TAO/tao/Wait_Strategy.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-//$Id$
-
-ACE_INLINE int
-TAO_Wait_Strategy::is_registered (void)
-{
-  return this->is_registered_;
-}
-
-ACE_INLINE void
-TAO_Wait_Strategy::is_registered (int flag)
-{
-  this->is_registered_ = flag;
-}
-
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
deleted file mode 100644
index 47cc10c04c7..00000000000
--- a/TAO/tao/WrongTransaction.pidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @file WrongTransaction.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::WrongTransaction
- * exception.
- *
- * This file is used to generate WrongTransactionC.*, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        WrongTransaction.pidl
- *
- * and then:
- *
- * cp orig/WrongTransactionC.{h,inl,cpp} .
- *
- */
-#ifndef TAO_CORBA_WRONGTRANSACTION_PIDL
-#define TAO_CORBA_WRONGTRANSACTION_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  /**
-   * @exception WrongTransaction
-   *
-   * @brief UserException for DII requests.
-   *
-   * This exception is thrown if a CORBA Request is implicitly
-   * associated with a transaction and is found to have an
-   * error in its parameters when checked at runtime (invocation).
-   */
-  exception WrongTransaction {};
-};
-
-#endif /* TAO_CORBA_WRONGTRANSACTION_PIDL */
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
deleted file mode 100644
index 8f91a007042..00000000000
--- a/TAO/tao/WrongTransactionA.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WrongTransactionC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_WrongTransaction = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WrongTransaction (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/WrongTransaction:1.0",
-    "WrongTransaction",
-    _tao_fields_CORBA_WrongTransaction,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WrongTransaction =
-    &_tao_tc_CORBA_WrongTransaction;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WrongTransaction *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract (
-        _tao_any,
-        CORBA::WrongTransaction::_tao_any_destructor,
-        CORBA::_tc_WrongTransaction,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
deleted file mode 100644
index 4cce935470c..00000000000
--- a/TAO/tao/WrongTransactionC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "WrongTransactionC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::WrongTransaction::WrongTransaction (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/WrongTransaction:1.0",
-        "WrongTransaction"
-      )
-{
-}
-
-CORBA::WrongTransaction::~WrongTransaction (void)
-{
-}
-
-CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::WrongTransaction&
-CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer)
-{
-  WrongTransaction *_tao_tmp_pointer =
-    static_cast<WrongTransaction *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::WrongTransaction *
-CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<WrongTransaction *> (_tao_excp);
-}
-
-const CORBA::WrongTransaction *
-CORBA::WrongTransaction::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const WrongTransaction *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::WrongTransaction::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::WrongTransaction, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::WrongTransaction::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::WrongTransaction (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::WrongTransaction::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::WrongTransaction::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::WrongTransaction::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const
-{
-  return ::CORBA::_tc_WrongTransaction;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WrongTransaction &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::WrongTransaction&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
deleted file mode 100644
index b07be6725c3..00000000000
--- a/TAO/tao/WrongTransactionC.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
-#define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_CORBA_WRONGTRANSACTION_CH_)
-#define _CORBA_WRONGTRANSACTION_CH_
-  
-  class TAO_Export WrongTransaction : public CORBA::UserException
-  {
-  public:
-    
-    WrongTransaction (void);
-    WrongTransaction (const WrongTransaction &);
-    ~WrongTransaction (void);
-
-    WrongTransaction &operator= (const WrongTransaction &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static WrongTransaction *_downcast (CORBA::Exception *);
-    static const WrongTransaction *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WrongTransaction;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/XtResource.mpc b/TAO/tao/XtResource.mpc
deleted file mode 100644
index f309ee41a5a..00000000000
--- a/TAO/tao/XtResource.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-//  -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
-project(TAO_XtResource) : acelib, taolib, core, tao_output, taodefaults, ace_xtreactor {
-
-  sharedname   = TAO_XtResource
-  dynamicflags += TAO_XTRESOURCE_BUILD_DLL
-
-  Source_Files {
-    XtResource_Factory.cpp
-    XtResource_Loader.cpp
-  }
-
-  Header_Files {
-    XtResource_Factory.h
-    XtResource_Loader.h
-    TAO_XtResource_Export.h
-  }
-
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Resource_Files {
-  }
-
-  PIDL_Files {
-  }
-}
diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource_Factory.cpp
deleted file mode 100644
index 5ca19fba0f0..00000000000
--- a/TAO/tao/XtResource_Factory.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//$Id$
-
-#include "XtResource_Factory.h"
-#include "debug.h"
-#include "ace/XtReactor.h"
-
-ACE_RCSID( TAO_XtResource,
-           XtResource_Factory,
-           "$Id$");
-
-namespace TAO
-{
-
-  XtResource_Factory::XtResource_Factory (XtAppContext p_context):
-    reactor_impl_( 0 ),
-    context_( p_context )
-  {
-  }
-
-  ACE_Reactor_Impl *
-  XtResource_Factory::reactor_impl (void)
-  {
-    // synchronized by external locks
-    if (this->context_ == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("TAO (%P|%t) - XtAppContext is undefined.")
-                  ACE_TEXT(" Cannot create ACE_XtReactor \n")));
-      return 0;
-    }
-
-    if (!this->reactor_impl_)
-    {
-      ACE_NEW_RETURN (this->reactor_impl_,
-                      ACE_XtReactor (this->context_),
-                      0);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - ACE_XtReactor created \n"));
-    }
-
-    return this->reactor_impl_;
-  }
-}
diff --git a/TAO/tao/XtResource_Factory.h b/TAO/tao/XtResource_Factory.h
deleted file mode 100644
index 5498865a256..00000000000
--- a/TAO/tao/XtResource_Factory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   XtResource_Factory.h
- *
- *  $Id$
- *
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-#ifndef TAO_XTRESOURCE_FACTORY_H
-#define TAO_XTRESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-#include /**/ <X11/Intrinsic.h>
-#include "tao/TAO_XtResource_Export.h"
-#include "ace/XtReactor.h"
-#include "tao/GUIResource_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class XtResource_Factory
-   *
-   * @brief TAO_GUI_Resource_Factory for creating XtReactor.
-   *
-   * This factory is intended for creating XtReactor for ORB. This
-   * factory can be feed into ORB using
-   * TAO_ORB_Core::set_gui_resource_factory method which is usually
-   * done by TAO_XtResource_Loader.
-   */
-
-  class TAO_XtResource_Export XtResource_Factory : public GUIResource_Factory
-  {
-  public:
-    XtResource_Factory (XtAppContext context);
-
-    /// Create or obtain current reactor implementation
-    virtual ACE_Reactor_Impl *reactor_impl (void);
-
-  private:
-
-    /// Reactor created by this factory.
-    ACE_XtReactor *reactor_impl_;
-
-    /// Xt context for XtReactor
-    XtAppContext  context_;
-
-    /// for internal locking
-    TAO_SYNCH_MUTEX lock_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* TAO_XTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource_Loader.cpp
deleted file mode 100644
index d2350ddcc00..00000000000
--- a/TAO/tao/XtResource_Loader.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//$Id$
-#include "XtResource_Loader.h"
-#include "ORB_Core.h"
-#include "XtResource_Factory.h"
-
-ACE_RCSID( TAO_XtResource,
-           XtResource_Loader,
-           "$Id$");
-
-namespace TAO
-{
-
-  XtResource_Loader::XtResource_Loader (XtAppContext context)
-  {
-    XtResource_Factory *tmp = 0;
-
-    ACE_NEW (tmp,
-             XtResource_Factory (context));
-
-    TAO_ORB_Core::set_gui_resource_factory( tmp );
-  }
-
-  XtResource_Loader::~XtResource_Loader ()
-  {
-  }
-}
diff --git a/TAO/tao/XtResource_Loader.h b/TAO/tao/XtResource_Loader.h
deleted file mode 100644
index f3e809ab1ed..00000000000
--- a/TAO/tao/XtResource_Loader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   XtResource_Loader.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_XTRESOURCE_LOADER_H
-#define TAO_XTRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-#include /**/ <X11/Intrinsic.h>
-#include "tao/TAO_XtResource_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class XtResource_Loader
-   *
-   * @brief Loads TAO resources related with Xt.
-   *
-   * This class changes the default reactor implementation into
-   * ACE_XtReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
-   * User should create an instance of this class before ORB_init
-   * when the TAO server has has to be integrated within Xt event loop.
-   *
-   * Please notice, this class has to be created in the main Xt thread,
-   * because set_gui_resource_factory creates a variable in TSS. This way
-   * XtReactor is instantiated only in Xt event loop thread.
-   */
-  class TAO_XtResource_Export XtResource_Loader
-  {
-
-  public:
-    XtResource_Loader  (XtAppContext context);
-
-    virtual ~XtResource_Loader ();
-  };
-}
-#include /**/ "ace/post.h"
-#endif /* TAO_XTRESOURCE_LOADER_H */
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
deleted file mode 100644
index da48f4bb43f..00000000000
--- a/TAO/tao/append.cpp
+++ /dev/null
@@ -1,1318 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     append.cpp
-//
-// = DESCRIPTION
-//     Appends a CDR stream to another CDR stream. Due to the
-//     stringent alignment requirements, it is not possible to simply
-//     append or memcpy. Instead we go thru the same CDR encoding rules
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Environment.h"
-#include "tao/debug.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode_Constants.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           append,
-           "$Id$")
-
-// Encode instances of arbitrary data types based only on typecode.
-// "data" points to the data type; if it's not a primitve data type,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-
-TAO::traverse_status
-TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE; // status of encode operation
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_append = dest->append_short (*src);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_append = dest->append_long (*src);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_append = dest->append_double (*src);
-      break;
-    case CORBA::tk_boolean:
-      continue_append = dest->append_boolean (*src);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_append = dest->append_octet (*src);
-      break;
-    case CORBA::tk_longdouble:
-      continue_append = dest->append_longdouble (*src);
-      break;
-    case CORBA::tk_wchar:
-      continue_append = dest->append_wchar (*src);
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
-                         TAO_InputCDR *src,
-                         TAO_OutputCDR *dest
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  if (!(*src >> elem_tc.inout ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  if (!(*dest << elem_tc.in ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  // append the data
-  TAO::traverse_status retval =
-    TAO_Marshal_Object::perform_append (elem_tc.in (),
-                                        src,
-                                        dest
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval != TAO::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_Any::append detected error\n")));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  return retval;
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the src for further
-  // use. However, also write it back into the destination
-  continue_append = (CORBA::Boolean) (src->read_ulong (kind)
-                                      ? dest->write_ulong (kind)
-                                      : 0);
-
-  if (continue_append == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT)
-          || (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // nothing to de done
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // read and write the bounds
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level"
-            case ~0u:
-              {
-                // read and write the negative offset
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                // write the encapsulation i.e., octet sequence
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO_Marshal_TypeCode: ")
-                          ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_append == 1 && retval == TAO::TRAVERSE_CONTINUE)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  // write the octet sequence representing the Principal
-  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // First, append the type hint. This will be the type_id encoded in an
-  // object reference.
-  dest->append_string (*src);
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow. This will tell us the
-  // length of the sequence
-  continue_append = (CORBA::Boolean) (src->read_ulong (profiles)
-                                      ? dest->write_ulong (profiles)
-                                      : 0);
-
-  // No profiles means a NIL objref.
-  while (profiles-- != 0 && continue_append)
-    {
-      CORBA::ULong tag = 0;
-
-      // get the profile ID tag
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (tag)
-                                               ? dest->write_ulong (tag)
-                                               : 0))  == 0)
-        continue;
-
-      CORBA::ULong length = 0;
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (length)
-                              ? dest->write_ulong (length)
-                              : 0)) == 0)
-        continue;
-
-      // @@ This can be optimized! Pre-allocating on the destination
-      //    and then copying directly into that.
-      CORBA::Octet* body = 0;
-      ACE_NEW_RETURN (body,
-                      CORBA::Octet[length],
-                      TAO::TRAVERSE_STOP);
-      continue_append =
-        (CORBA::Boolean) (src->read_octet_array (body, length)
-                          ? dest->write_octet_array (body, length)
-                          : 0);
-      delete [] body;
-    }
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v)
-            || !dest->write_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v)
-            || !dest->write_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v)
-            || !dest->write_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v)
-            || !dest->write_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v)
-            || !dest->write_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v)
-            || !dest->write_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v)
-            || !dest->write_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v)
-            || !dest->write_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                                     src,
-                                                     dest
-                                                     ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without appending anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-  return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_string (*src);
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_append =
-    (CORBA::Boolean) (src->read_ulong (bounds)
-                      ? dest->write_ulong (bounds)
-                      : 0);
-
-  if (!continue_append)
-    {
-      ACE_DEBUG ((
-          LM_DEBUG,
-          ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")
-        ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  if (bounds == 0)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (continue_append)
-    {
-      // Get element typecode.
-      CORBA::TypeCode_var tc2 =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      TAO::traverse_status retval =
-        TAO::TRAVERSE_CONTINUE;
-
-      CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      switch (kind)
-        {
-        case CORBA::tk_octet:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_wchar:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_float:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_double:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulonglong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longdouble:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                              ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-              {
-                if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-
-        default:
-          while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-            {
-              retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                           src,
-                                                           dest
-                                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-            }
-          break;
-        }// end of switch
-
-      if (retval == TAO::TRAVERSE_CONTINUE)
-        return TAO::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Return status.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_boolean:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_char:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_short:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ushort:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_wchar:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_long:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_float:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_double:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longlong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulonglong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                          ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-          {
-            if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    default:
-      while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                       src,
-                                                       dest
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return retval;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_append = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                               src,
-                                               dest
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::append detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode_var param;
-
-  // first append the RepositoryID
-  continue_append = dest->append_string (*src);
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count
-         && retval == TAO::TRAVERSE_CONTINUE
-         && continue_append == 1;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_append (param.in (),
-                                                   src,
-                                                   dest
-                                                   ACE_ENV_ARG_PARAMETER);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *src,
-                             TAO_OutputCDR *dest
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_wstring (*src);
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // Use the same method to append our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested appends so that we won't attempt to
-  // append rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!src->read_ulong (value_tag) ||
-          !dest->write_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Append repository id which is of type string.
-          dest->append_string (*src);
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  CORBA::TypeCode_var param =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (param_kind != CORBA::tk_null)
-    {
-      retval = this->append (param.in (),
-                             src,
-                             dest
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
deleted file mode 100644
index b94dc564704..00000000000
--- a/TAO/tao/corba.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file corba.h
- *
- *  $Id$
- *
- *  Master header file for all TAO stubs.
- *
- *  @note This header should not be included in any core TAO library
- *        files.  Include the necessary individual headers instead.
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Chris Cleeland
- *  @author  Douglas C. Schmidt
- */
-//=============================================================================
-
-
-#ifndef TAO_MASTER_CORBA_H
-#define TAO_MASTER_CORBA_H
-
-#include /**/ "ace/pre.h"
-
-// ACE specific includes
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corbafwd.h"
-
-// The definitions are included in the same order as they are declared
-// in corbafwd.h
-#include "tao/TypeCode.h"
-
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/UserException.h"
-
-#include "tao/NVList.h"
-
-#include "tao/Object.h"
-#include "tao/LocalObject.h"
-#include "tao/Principal.h"
-#include "tao/ORB.h"
-
-#include "tao/CurrentC.h"
-#include "tao/BoundsC.h"
-#include "tao/PolicyC.h"
-#include "tao/ServicesC.h"
-#include "tao/DomainC.h"
-#include "tao/WrongTransactionC.h"
-
-#include "tao/ObjectIdListC.h"
-
-#include "tao/AnySeqC.h"
-#include "tao/BooleanSeqC.h"
-#include "tao/CharSeqC.h"
-#include "tao/DoubleSeqC.h"
-#include "tao/FloatSeqC.h"
-#include "tao/LongDoubleSeqC.h"
-#include "tao/LongLongSeqC.h"
-#include "tao/LongSeqC.h"
-#include "tao/OctetSeqC.h"
-#include "tao/ShortSeqC.h"
-#include "tao/StringSeqC.h"
-#include "tao/ULongLongSeqC.h"
-#include "tao/ULongSeqC.h"
-#include "tao/UShortSeqC.h"
-#include "tao/WCharSeqC.h"
-#include "tao/WStringSeqC.h"
-
-// TAO specific files, avoid them as much as possible.
-
-#include "tao/CDR.h"
-
-#include "tao/Managed_Types.h"
-#include "tao/Object_KeyC.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PortableInterceptorC.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_MASTER_CORBA_H */
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
deleted file mode 100644
index bb988ed34ba..00000000000
--- a/TAO/tao/corbafwd.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-#include "corbafwd.h"
-
-ACE_RCSID (tao,
-           corbafwd,
-           "$Id$")
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
deleted file mode 100644
index a15ee8c758b..00000000000
--- a/TAO/tao/corbafwd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   corbafwd.h
- *
- *  $Id$
- *
- * Forward declare the basic types used in the ORB
- * implementation. Regular users of the ORB should only include
- * tao/corba.h (generally through the stub/skeleton headers), but the
- * implementation of the ORB itself should include this file.  That
- * reduces interdependency and speeds up compilations and
- * recompilations.
- *
- *  @author Carlos O'Ryan
- *  @author Ossama Othman
- *  @author Chris Cleeland
- *  @author Douglas C. Schmidt
- */
-//=============================================================================
-
-#ifndef TAO_CORBAFWD_H
-#define TAO_CORBAFWD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB_Constants.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TC_Constants_Forward.h"
-#include "tao/CORBA_methods.h"
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
deleted file mode 100644
index d1cfdd93b16..00000000000
--- a/TAO/tao/debug.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// THREADING NOTE: the global values here  (debug_{level,filter,stream)
-// are assumed to be modified "safely", e.g. in the main thread as
-// part of process initialization.  They are treated as immutable
-// values through all of this debuging package.
-//
-// XXX on Windows, make it always use OutputDebugString () instead of stdio.
-
-#include "tao/debug.h"
-
-ACE_RCSID (tao,
-           debug,
-           "$Id$")
-
-TAO_Export unsigned int TAO_debug_level = 0;
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
deleted file mode 100644
index 1ca35af44d1..00000000000
--- a/TAO/tao/debug.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    debug.h
- *
- *  $Id$
- *
- *  @author  DOC Group - Wash U and UCI
- */
-//=============================================================================
-
-
-#ifndef TAO_DEBUG_H
-#define TAO_DEBUG_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// These are global to simplify is use by other code, very much in
-// particular by getopt and related argument-parsing code
-//
-// THREADING NOTE: don't set them except in an unthreaded environment
-// such as process initialization.  They're treated as immutable.
-
-// 0 to ??; higher == more
-extern TAO_Export unsigned int TAO_debug_level;
-
-// debug messages on (1) or off (0)
-extern TAO_Export unsigned int TAO_orbdebug;
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
deleted file mode 100644
index c70262d05df..00000000000
--- a/TAO/tao/default_client.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// $Id$
-
-#include "default_client.h"
-#include "Wait_On_Read.h"
-#include "Wait_On_Reactor.h"
-#include "Wait_On_Leader_Follower.h"
-#include "Wait_On_LF_No_Upcall.h"
-#include "Exclusive_TMS.h"
-#include "Muxed_TMS.h"
-#include "Blocked_Connect_Strategy.h"
-#include "Reactive_Connect_Strategy.h"
-#include "LF_Connect_Strategy.h"
-#include "orbconf.h"
-
-#include "ace/Lock_Adapter_T.h"
-#include "ace/Recursive_Thread_Mutex.h"
-
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           default_client,
-           "$Id$")
-
-
-TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-  : profile_lock_type_ (TAO_THREAD_LOCK)
-    , rd_table_size_ (TAO_RD_TABLE_SIZE)
-    , muxed_strategy_lock_type_ (TAO_THREAD_LOCK)
-{
-  // Use single thread client connection handler
-#if defined (TAO_USE_ST_CLIENT_CONNECTION_HANDLER)
-  this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-#else
-  this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-#endif /* TAO_USE_ST_CLIENT_CONNECTION_HANDLER */
-
-#if TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY == 1
-  this->transport_mux_strategy_ = TAO_MUXED_TMS;
-#else
-  this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
-#endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
-
-  // @@todo: will be changed when other strategies are implemented.
-  this->connect_strategy_ = TAO_LEADER_FOLLOWER_CONNECT;
-}
-
-TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-int
-TAO_Default_Client_Strategy_Factory::init (int argc, ACE_TCHAR* argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
-{
-  ACE_TRACE ("TAO_Default_Client_Strategy_Factory::parse_args");
-
-  int curarg;
-
-  for (curarg = 0; curarg < argc && argv[curarg]; ++curarg)
-    {
-      if (ACE_OS::strcasecmp (argv[curarg],
-                              ACE_TEXT("-ORBProfileLock")) == 0)
-        {
-        curarg++;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->profile_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              this->profile_lock_type_ = TAO_NULL_LOCK;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBProfileLock"), name);
-          }
-        }
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBIIOPProfileLock")) == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("WARNING: The -ORBIIOPProfileLock option")
-                      ACE_TEXT (" is deprecated and will be removed.\n")
-                      ACE_TEXT ("         Please use -ORBProfileLock instead\n")));
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("thread")) == 0)
-                this->profile_lock_type_ = TAO_THREAD_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("null")) == 0)
-                this->profile_lock_type_ = TAO_NULL_LOCK;
-            }
-        }
-
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBClientConnectionHandler")) == 0
-               ||
-               ACE_OS::strcasecmp (argv[curarg],
-                                   ACE_TEXT("-ORBWaitStrategy")) == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("MT")) == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("ST")) == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("RW")) == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_READ;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("MT_NOUPCALL")) == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_LF_NO_UPCALL;
-              else
-                this->report_option_value_error (ACE_TEXT("-ORBClientConnectionHandler"), name);
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg],
-                               ACE_TEXT("-ORBTransportMuxStrategy")) == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("MUXED")) == 0)
-                this->transport_mux_strategy_ = TAO_MUXED_TMS;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("EXCLUSIVE")) == 0)
-                this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
-              else
-                this->report_option_value_error (ACE_TEXT("-ORBTransportMuxStrategy"), name);
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg],
-                               ACE_TEXT("-ORBTransportMuxStrategyLock")) == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("null")) == 0)
-                this->muxed_strategy_lock_type_ = TAO_NULL_LOCK;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("thread")) == 0)
-                this->muxed_strategy_lock_type_ = TAO_THREAD_LOCK;
-              else
-                this->report_option_value_error (ACE_TEXT("-ORBTransportMuxStrategyLock"), name);
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg],
-                               ACE_TEXT("-ORBConnectStrategy")) == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              ACE_TCHAR* name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name,
-                                      ACE_TEXT("Blocked")) == 0)
-                this->connect_strategy_ = TAO_BLOCKED_CONNECT;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("Reactive")) == 0)
-                this->connect_strategy_ = TAO_REACTIVE_CONNECT;
-              else if (ACE_OS::strcasecmp (name,
-                                           ACE_TEXT("LF")) == 0)
-                this->connect_strategy_ = TAO_LEADER_FOLLOWER_CONNECT;
-              else
-                this->report_option_value_error (ACE_TEXT("-ORBConnectStrategy"), name);
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg],
-                                   ACE_TEXT("-ORBReplyDispatcherTableSize")) == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              this->rd_table_size_ = ACE_OS::atoi (argv[curarg]);
-            }
-        }
-      else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0)
-        {
-          // Can we assume there is an argument after the option?
-          // curarg++;
-          ACE_ERROR ((LM_ERROR,
-                      "Client_Strategy_Factory - "
-                      "unknown option <%s>\n",
-                      argv[curarg]));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Client_Strategy_Factory - "
-                      "ignoring option <%s>\n",
-                      argv[curarg]));
-        }
-
-
-    }
-  return 0;
-}
-
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_profile_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->profile_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (),
-                    0);
-
-  return the_lock;
-}
-
-// Create the correct client transport muxing strategy.
-TAO_Transport_Mux_Strategy *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *transport)
-{
-  TAO_Transport_Mux_Strategy *tms = 0;
-
-  if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
-    ACE_NEW_RETURN (tms,
-                    TAO_Muxed_TMS (transport),
-                    0);
-  else
-    ACE_NEW_RETURN (tms,
-                    TAO_Exclusive_TMS (transport),
-                    0);
-
-  return tms;
-}
-
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->muxed_strategy_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (),
-                    0);
-
-  return the_lock;
-}
-
-int
-TAO_Default_Client_Strategy_Factory::reply_dispatcher_table_size (void) const
-{
-  return this->rd_table_size_;
-}
-
-TAO_Wait_Strategy *
-TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transport)
-{
-  TAO_Wait_Strategy *ws = 0;
-
-  if (this->wait_strategy_ == TAO_WAIT_ON_READ)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Read (transport),
-                    0);
-  else if (this->wait_strategy_ == TAO_WAIT_ON_REACTOR)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Reactor (transport),
-                    0);
-  else if (this->wait_strategy_ == TAO_WAIT_ON_LF_NO_UPCALL)
-    ACE_NEW_RETURN (ws,
-                    TAO::Wait_On_LF_No_Upcall (transport),
-                    0);
-  else
-    {
-      // = Leader follower model.
-
-      ACE_NEW_RETURN (ws,
-                      TAO_Wait_On_Leader_Follower (transport),
-                      0);
-    }
-
-  return ws;
-}
-
-TAO_Connect_Strategy *
-TAO_Default_Client_Strategy_Factory::create_connect_strategy (TAO_ORB_Core *orb_core)
-{
-  TAO_Connect_Strategy *cs = 0;
-
-  if (this->connect_strategy_ == TAO_BLOCKED_CONNECT)
-    ACE_NEW_RETURN (cs,
-                    TAO_Blocked_Connect_Strategy (orb_core),
-                    0);
-  else if (this->connect_strategy_ == TAO_REACTIVE_CONNECT)
-    ACE_NEW_RETURN (cs,
-                    TAO_Reactive_Connect_Strategy (orb_core),
-                    0);
-  else
-    {
-      // = Leader follower model.
-
-      ACE_NEW_RETURN (cs,
-                      TAO_LF_Connect_Strategy (orb_core),
-                      0);
-    }
-
-  return cs;
-}
-
-
-int
-TAO_Default_Client_Strategy_Factory::allow_callback (void)
-{
-  return (this->wait_strategy_ != TAO_WAIT_ON_READ);
-}
-
-ACE_Lock *
-TAO_Default_Client_Strategy_Factory::create_ft_service_retention_id_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                  0);
-
-  return the_lock;
-}
-
-void
-TAO_Default_Client_Strategy_Factory::report_option_value_error (
-                                 const ACE_TCHAR* option_name,
-                                 const ACE_TCHAR* option_value)
-{
-  ACE_DEBUG((LM_DEBUG,
-             ACE_TEXT ("Client_Strategy_Factory - unknown argument")
-             ACE_TEXT (" <%s> for <%s>\n"),
-             option_value, option_name));
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
-                       ACE_TEXT ("Client_Strategy_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Client_Strategy_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
deleted file mode 100644
index 613eabecd0b..00000000000
--- a/TAO/tao/default_client.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     default_client.h
- *
- *  $Id$
- *
- *  @author  Chris Cleeland
- */
-//=============================================================================
-
-
-#ifndef TAO_DEFAULT_CLIENT_H
-#define TAO_DEFAULT_CLIENT_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Client_Strategy_Factory.h"
-
-/**
- * @class TAO_Default_Client_Strategy_Factory
- *
- * @brief This is the "default" client strategy factor for TAO.  It
- * includes strategies that are configured through command-line
- * options so that everything operates as if there were no
- * dynamically-linkable strategies.
- */
-class TAO_Export TAO_Default_Client_Strategy_Factory
-  : public TAO_Client_Strategy_Factory
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_Default_Client_Strategy_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  /// Parse svc.conf arguments
-  int parse_args (int argc, ACE_TCHAR* argv[]);
-
-  // = Check Client_Strategy_Factory.h for the documentation of the
-  //   following methods.
-  virtual ACE_Lock* create_profile_lock (void);
-  virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport);
-  virtual ACE_Lock *create_transport_mux_strategy_lock (void);
-  virtual int reply_dispatcher_table_size (void) const;
-  virtual int allow_callback (void);
-  virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport);
-  virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
-  virtual ACE_Lock *create_ft_service_retention_id_lock (void);
-
-protected:
-  void report_option_value_error (const ACE_TCHAR* option_name,
-                                  const ACE_TCHAR* option_value);
-
-private:
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  /// the lock type for forwarding IIOP Profile
-  Lock_Type profile_lock_type_;
-
-  enum Transport_Mux_Strategy
-  {
-    TAO_MUXED_TMS,
-    TAO_EXCLUSIVE_TMS
-  };
-
-  /// The client Request Mux Strategy.
-  Transport_Mux_Strategy transport_mux_strategy_;
-
-  enum Wait_Strategy
-  {
-    TAO_WAIT_ON_LEADER_FOLLOWER,
-    TAO_WAIT_ON_REACTOR,
-    TAO_WAIT_ON_READ,
-    TAO_WAIT_ON_LF_NO_UPCALL
-  };
-
-  /// The wait-for-reply strategy.
-  Wait_Strategy wait_strategy_;
-
-  enum Connect_Strategy
-  {
-    TAO_BLOCKED_CONNECT,
-    TAO_REACTIVE_CONNECT,
-    TAO_LEADER_FOLLOWER_CONNECT
-  };
-
-  /// The connection initiation strategy.
-  Connect_Strategy connect_strategy_;
-
-  /// Size of the reply dispatcher table
-  int rd_table_size_;
-
-  /// Type of lock for the muxed_strategy
-  Lock_Type muxed_strategy_lock_type_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h
deleted file mode 100644
index 45ded1f6f06..00000000000
--- a/TAO/tao/default_environment.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   default_environment.h
- *
- *  $Id$
- *
- * @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_ENVIRONMENT_H
-#define TAO_DEFAULT_ENVIRONMENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Environment;
-}
-
-/// Provide a simple function to access the TSS default
-/// environment. This will be used in TAO wherever we have a default
-/// environment.
-/**
- * @note We tried with CORBA::default_environment() and others.
- */
-TAO_Export CORBA::Environment& TAO_default_environment (void);
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_DEFAULT_ENVIRONMENT_H */
diff --git a/TAO/tao/default_ports.h b/TAO/tao/default_ports.h
deleted file mode 100644
index c9ef066ea64..00000000000
--- a/TAO/tao/default_ports.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     default_ports.h
- *
- *  $Id$
- *
- *  Port reservation details for all the services.
- *
- *  @author  Copyright 1995 by Sun Microsystems, Inc.
- *  @author  Chris Cleeland
- *  @author  Douglas C. Schmidt
- */
-//=============================================================================
-
-#ifndef TAO_DEFAULT_PORTS_H
-#define TAO_DEFAULT_PORTS_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-// The default UDP multicast port number for locating the TAO Naming
-// Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REQUEST_PORT 10013
-#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REPLY_PORT 10014
-#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO Trading
-// Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT 10016
-#endif /* TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Trading Service.
-#if !defined (TAO_DEFAULT_TRADING_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_TRADING_SERVER_REPLY_PORT 10017
-#endif /* TAO_DEFAULT_TRADING_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO
-// Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT 10018
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Implementation Repository Service.
-#if !defined (TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT 10019
-#endif /* TAO_DEFAULT_IMPLREPO_SERVER_REPLY_PORT */
-
-// The default UDP multicast port number for locating the TAO
-// Interface Repository Service.
-#if !defined (TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT 10020
-#endif /* TAO_DEFAULT_INTERFACEREPO_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Interface Repository Service.
-#if !defined (TAO_DEFAULT_INTERFACEREPO_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_INTERFACEREPO_SERVER_REPLY_PORT 10021
-#endif /* TAO_DEFAULT_INTERFACEREPO_SERVER_REPLY_PORT */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_DEFAULT_PORTS_H*/
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
deleted file mode 100644
index 38acaa51995..00000000000
--- a/TAO/tao/default_resource.cpp
+++ /dev/null
@@ -1,1089 +0,0 @@
-// $Id$
-
-#include "tao/default_resource.h"
-
-#include "tao/debug.h"
-#include "tao/IIOP_Factory.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Connector_Registry.h"
-#include "tao/Reactive_Flushing_Strategy.h"
-#include "tao/Block_Flushing_Strategy.h"
-#include "tao/Leader_Follower_Flushing_Strategy.h"
-#include "tao/LRU_Connection_Purging_Strategy.h"
-#include "tao/LF_Strategy_Complete.h"
-#include "tao/Codeset_Manager.h"
-
-#include "ace/TP_Reactor.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc.h"
-#include "ace/Codeset_Registry.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Reactor.h"
-
-ACE_RCSID (tao,
-           default_resource,
-           "$Id$")
-
-TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
-  : use_locked_data_blocks_ (1)
-  , parser_names_count_ (0)
-  , parser_names_ (0)
-  , protocol_factories_ ()
-  , connection_purging_type_ (TAO_CONNECTION_PURGING_STRATEGY)
-  , cache_maximum_ (TAO_CONNECTION_CACHE_MAXIMUM)
-  , purge_percentage_ (TAO_PURGE_PERCENT)
-  , max_muxed_connections_ (0)
-  , reactor_mask_signals_ (1)
-  , dynamically_allocated_reactor_ (0)
-  , options_processed_ (0)
-  , factory_disabled_ (0)
-  , cached_connection_lock_type_ (TAO_THREAD_LOCK)
-  , object_key_table_lock_type_ (TAO_THREAD_LOCK)
-  , corba_object_lock_type_ (TAO_THREAD_LOCK)
-  , flushing_strategy_type_ (TAO_LEADER_FOLLOWER_FLUSHING)
-  , codeset_manager_ (0)
-  , resource_usage_strategy_ (TAO_Resource_Factory::TAO_EAGER)
-  , drop_replies_ (true)
-{
-#if TAO_USE_LAZY_RESOURCE_USAGE_STRATEGY == 1
-  this->resource_usage_strategy_ =
-    TAO_Resource_Factory::TAO_LAZY;
-#endif /*TAO_USE_LAZY_RESOURCE_USAGE_STRATEGY*/
-}
-
-TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
-{
-  const TAO_ProtocolFactorySetItor end = this->protocol_factories_.end ();
-
-  for (TAO_ProtocolFactorySetItor iterator =
-         this->protocol_factories_.begin ();
-       iterator != end;
-       ++iterator)
-    {
-      delete *iterator;
-    }
-
-  this->protocol_factories_.reset ();
-
-  for (int i = 0; i < this->parser_names_count_; ++i)
-    CORBA::string_free (this->parser_names_[i]);
-
-  delete [] this->parser_names_;
-
-  delete this->codeset_manager_;
-}
-
-int
-TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
-{
-  ACE_TRACE ("TAO_Default_Resource_Factory::init");
-
-  // If this factory has already been disabled then
-  // print a warning and exit because any options
-  // are useless
-  if (this->factory_disabled_) {
-    ACE_DEBUG ((LM_WARNING,
-                ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n")
-                ACE_TEXT ("Default Resource Factory is disabled\n")));
-    return 0;
-  }
-  this->options_processed_ = 1;
-
-  this->parser_names_count_ = 0;
-
-  int curarg = 0;
-
-  for (curarg = 0; curarg < argc; ++curarg)
-    {
-    // Parse thro' and find the number of Parsers to be loaded.
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_TEXT("-ORBIORParser")) == 0)
-      ++this->parser_names_count_;
-
-    ++curarg;
-
-
-
-    if (curarg == (argc-1) && this->parser_names_count_ != 0)
-      {
-        // This is the last loop..
-        ACE_NEW_RETURN (this->parser_names_,
-                        char *[this->parser_names_count_],
-                        -1);
-
-        for (int i = 0;
-             i < this->parser_names_count_;
-             ++i)
-          this->parser_names_[i] = 0;
-
-        this->index_ = 0;
-      }
-  }
-
-  for (curarg = 0; curarg < argc; ++curarg)
-    {
-      if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBReactorMaskSignals")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, ACE_TEXT("0")) == 0)
-              this->reactor_mask_signals_ = 0;
-            else if (ACE_OS::strcasecmp (name, ACE_TEXT("1")) == 0)
-              this->reactor_mask_signals_= 1;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBReactorMaskSignals"), name);
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBProtocolFactory")) == 0)
-      {
-        TAO_ProtocolFactorySet *pset = this->get_protocol_factories ();
-        ++curarg;
-        if (curarg < argc)
-          {
-            TAO_Protocol_Item *item = 0;
-            ACE_NEW_RETURN (item,
-                            TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])),
-                            -1);
-            if (pset->insert (item) == -1)
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) Unable to add protocol factories for %s: %m\n"),
-                          argv[curarg]));
-          }
-      }
-
-    /// CodeSet Translators
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBNativeCharCodeSet")) == 0)
-    {
-        ++curarg;
-        CONV_FRAME::CodeSetId ncs;
-        if (ACE_Codeset_Registry::locale_to_registry (ACE_TEXT_ALWAYS_CHAR(argv[curarg]),
-                                                      ncs) == 0)
-          {
-            char **endPtr =0;
-            ncs = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(argv[curarg]),
-                                  endPtr, 0);
-          }
-
-        // Validate the CodesetId
-        if (ACE_Codeset_Registry::get_max_bytes(ncs) == 0)
-          {
-            if (TAO_debug_level > 0)
-              ACE_ERROR((LM_ERROR,
-                         ACE_TEXT("(%P|%t) Invalid NativeCharCodeSet, %x\n"),
-                         ncs));
-            return -1;
-          }
-        TAO_Codeset_Manager *csm = this->get_codeset_manager();
-        if (csm)
-          csm->set_ncs_c(ncs);
-    }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBNativeWCharCodeSet")) == 0)
-      {
-        ++curarg;
-        CONV_FRAME::CodeSetId ncs;
-        if (ACE_Codeset_Registry::locale_to_registry (ACE_TEXT_ALWAYS_CHAR (argv[curarg]),
-                                                      ncs) == 0)
-          {
-            char **endPtr = 0;
-            ncs = ACE_OS::strtoul (ACE_TEXT_ALWAYS_CHAR(argv[curarg]),
-                                  endPtr, 0);
-          }
-        // Validate the CodesetId
-        int mb = ACE_Codeset_Registry::get_max_bytes(ncs);
-        if (mb == 0 || static_cast<size_t> (mb) > sizeof (ACE_CDR::WChar))
-          {
-            if (TAO_debug_level > 0)
-              ACE_ERROR((LM_ERROR,
-                         ACE_TEXT("(%P|%t) Invalid NativeWCharCodeSet, %x\n"),
-                         ncs));
-            return -1;
-          }
-        TAO_Codeset_Manager *csm = this->get_codeset_manager();
-        if (csm)
-          csm->set_ncs_w(ncs,mb);
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBCharCodesetTranslator")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            TAO_Codeset_Manager *csm = this->get_codeset_manager();
-            if (csm)
-              if (csm->add_char_translator(ACE_TEXT_ALWAYS_CHAR (argv[curarg])) == -1)
-                return -1;
-          }
-      }
-
-  /// CodeSet Translators
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBWCharCodesetTranslator")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            TAO_Codeset_Manager *csm = this->get_codeset_manager();
-            if (csm)
-              if (csm->add_wchar_translator(ACE_TEXT_ALWAYS_CHAR(argv[curarg])) == -1)
-                return -1;
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBConnectionCachingStrategy")) == 0)
-      {
-        ++curarg;
-
-        // @@todo: This needs to be removed after a few betas. The
-        // note is being written during 1.2.3 timeframe.
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) This option would be deprecated \n")
-                    ACE_TEXT ("(%P|%t) Please use -ORBConnectionPurgingStrategy instead \n")));
-
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT ("lru")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LRU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("lfu")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LFU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("fifo")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::FIFO;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT ("null")) == 0)
-              this->connection_purging_type_ =
-                  TAO_Resource_Factory::NOOP;
-            else
-              this->report_option_value_error (ACE_TEXT ("-ORBConnectionCachingStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBConnectionPurgingStrategy")) == 0)
-      {
-        ++curarg;
-
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("lru")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LRU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("lfu")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::LFU;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("fifo")) == 0)
-              this->connection_purging_type_ =
-                TAO_Resource_Factory::FIFO;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              this->connection_purging_type_ =
-                  TAO_Resource_Factory::NOOP;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBConnectionPurgingStrategy"), name);
-          }
-      }
-   else if (ACE_OS::strcasecmp (argv[curarg],
-                                ACE_TEXT("-ORBConnectionCacheMax")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-            this->cache_maximum_ = ACE_OS::atoi (argv[curarg]);
-        else
-          this->report_option_value_error (ACE_TEXT("-ORBConnectionCacheMax"), argv[curarg]);
-      }
-
-   else if (ACE_OS::strcasecmp (argv[curarg],
-                                ACE_TEXT("-ORBConnectionCachePurgePercentage")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-            this->purge_percentage_ = ACE_OS::atoi (argv[curarg]);
-        else
-          this->report_option_value_error (ACE_TEXT("-ORBConnectionCachePurgePercentage"),
-                                           argv[curarg]);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBIORParser")) == 0)
-      {
-        ++curarg;
-
-        if (curarg < argc)
-          {
-            this->add_to_ior_parser_names (ACE_TEXT_ALWAYS_CHAR(argv[curarg]));
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBConnectionCacheLock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->cached_connection_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              {
-                // @@ Bug 940 :This is a sort of hack now. We need to put
-                // this in a common place once we get the common
-                // switch that is documented in bug 940...
-                this->use_locked_data_blocks_  = 0;
-                this->cached_connection_lock_type_ = TAO_NULL_LOCK;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBConnectionCacheLock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBObjectKeyTableLock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->object_key_table_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              {
-                // @@ Bug 940 :This is a sort of hack now. We need to put
-                // this in a common place once we get the common
-                // switch that is documented in bug 940...
-                this->object_key_table_lock_type_ = TAO_NULL_LOCK;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBObjectKeyTableLock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBCorbaObjectLock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->corba_object_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              {
-                // @@ Bug 940 :This is a sort of hack now. We need to put
-                // this in a common place once we get the common
-                // switch that is documented in bug 940...
-                this->corba_object_lock_type_ = TAO_NULL_LOCK;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBCorbaObjectLock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBResourceUsage")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("eager")) == 0)
-              this->resource_usage_strategy_ = TAO_EAGER;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("lazy")) == 0)
-              {
-                this->resource_usage_strategy_ = TAO_LAZY;
-              }
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBResourceUsage"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBFlushingStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("leader_follower")) == 0)
-              this->flushing_strategy_type_ = TAO_LEADER_FOLLOWER_FLUSHING;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("reactive")) == 0)
-              this->flushing_strategy_type_ = TAO_REACTIVE_FLUSHING;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("blocking")) == 0)
-              this->flushing_strategy_type_ = TAO_BLOCKING_FLUSHING;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBFlushingStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT ("-ORBMuxedConnectionMax")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-            this->max_muxed_connections_ =
-              ACE_OS::atoi (argv[curarg]);
-        else
-          this->report_option_value_error (ACE_TEXT("-ORBMuxedConnectionMax"),
-                                           argv[curarg]);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBDropRepliesDuringShutdown")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            int tmp = ACE_OS::atoi (argv[curarg]);
-
-            if (tmp == 0)
-              this->drop_replies_ = false;
-            else
-              this->drop_replies_ = true;
-          }
-        else
-          this->report_option_value_error (ACE_TEXT("-ORBDropRepliesDuringShutdown"),
-                                           argv[curarg]);
-      }
-    else if (ACE_OS::strncmp (argv[curarg],
-                              ACE_TEXT ("-ORB"),
-                              4) == 0)
-      {
-        // Can we assume there is an argument after the option?
-        // ++curarg;
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Default_Resource_Factory - ")
-                    ACE_TEXT ("unknown option <%s>\n"),
-                    argv[curarg]));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Default_Resource_Factory - ")
-                    ACE_TEXT ("ignoring option <%s>\n"),
-                    argv[curarg]));
-      }
-    }
-
-  TAO_Codeset_Manager *csm = this->get_codeset_manager();
-  if (csm)
-    csm->configure_codeset_factories();
-
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::get_parser_names (char **&names,
-                                                int &number_of_names)
-{
-  if (this->parser_names_count_ != 0)
-    {
-      // The user used some -ORBIORParser options, just return those.
-      names = this->parser_names_;
-      number_of_names = this->parser_names_count_;
-
-      return 0;
-    }
-
-  // OK fallback on the hardcoded ones....
-  this->parser_names_count_ = 5; // HOW MANY DO WE HAVE?
-  this->parser_names_ =
-    new char *[this->parser_names_count_];
-
-  CORBA::ULong index = 0;
-
-  this->parser_names_[index] = CORBA::string_dup ("DLL_Parser");
-  ++index;
-
-  this->parser_names_[index] = CORBA::string_dup ("FILE_Parser");
-  ++index;
-
-  this->parser_names_[index] = CORBA::string_dup ("CORBALOC_Parser");
-  ++index;
-
-  this->parser_names_[index] = CORBA::string_dup ("CORBANAME_Parser");
-  ++index;
-
-  this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser");
-  ++index;
-
-  names = this->parser_names_;
-
-  number_of_names = index;
-
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::add_to_ior_parser_names (const char *curarg)
-{
-  this->parser_names_[this->index_] = CORBA::string_dup (curarg);
-
-  ++this->index_;
-
-  return 0;
-}
-
-// This is virtual and protected...
-int
-TAO_Default_Resource_Factory::load_default_protocols (void)
-{
-      // If the user did not list any protocols in her svc.conf file
-      // then default to TAO's basic protocols.
-      // You do *NOT* need modify this code to add your own protocol,
-      // instead simply add the following to your svc.conf file:
-      //
-      // dynamic PP_Factory Service_Object * LIB:_make_PP_Protocol_Factory() ""
-      // static Resource_Factory "-ORBProtocolFactory PP_Factory"
-      //
-      // where "PP_Factory" is the name of your protocol, i.e. the
-      // second argument passed to the ACE_STATIC_SVC_DEFINE macro:
-      //
-      // ACE_STATIC_SVC_DEFINE (PP_Protocol_Factory,
-      //                        ACE_TEXT ("PP_Factory"), ...)
-      //
-      // "PP_Protocol_Factory" is the name of your protocol factory
-      // class.  A "_make_" is prepended to your protocol factory
-      // class name by the ACE_FACTORY_DECLARE macro.  The resulting
-      // factory function "_make_PP_Protocol_Factory()" is what should
-      // be used in the "dynamic" line in your svc.conf file.
-      //
-      // LIB is the base name of the shared library that implements
-      // the protocol.  The directory containing your library must be
-      // in your library search path, typically defined by the
-      // LD_LIBRARY_PATH environment variable on UNIX systems, and/or
-      // the `/etc/ld.so.conf' file on some UNIX systems.  Remember to
-      // run "ldconfig" if you modify `/etc/ld.so.conf'.
-
-      TAO_Protocol_Factory *protocol_factory = 0;
-      auto_ptr<TAO_Protocol_Factory> safe_protocol_factory;
-
-      TAO_Protocol_Item *item = 0;
-
-      // If a protocol factory is obtained from the Service
-      // Configurator then do not transfer ownership to the
-      // TAO_Protocol_Item.
-      int transfer_ownership = 0;
-
-      protocol_factory =
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("IIOP_Factory");
-
-      if (protocol_factory == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_WARNING,
-                        ACE_TEXT ("TAO (%P|%t) No %s found in ")
-                        ACE_TEXT ("Service Repository. ")
-                        ACE_TEXT ("Using default instance IIOP ")
-                        ACE_TEXT ("Protocol Factory.\n"),
-                        ACE_TEXT ("IIOP Protocol Factory")));
-
-          ACE_NEW_RETURN (protocol_factory,
-                          TAO_IIOP_Protocol_Factory,
-                          -1);
-
-          ACE_AUTO_PTR_RESET (safe_protocol_factory,
-                              protocol_factory,
-                              TAO_Protocol_Factory);
-
-          transfer_ownership = 1;
-        }
-      else
-        {
-          transfer_ownership = 0;
-        }
-
-      ACE_NEW_RETURN (item,
-                      TAO_Protocol_Item ("IIOP_Factory"),
-                      -1);
-      // If the TAO_Protocol_Item retains ownership of the
-      // TAO_Protocol_Factory then we used an auto_ptr<> above, so
-      // release the TAO_Protocol_Factory from it.  Otherwise, we
-      // obtained the TAO_Protocol_Factory from the Service
-      // Configurator so an auto_ptr<> wasn't used since the Service
-      // Configurator retains ownership, hence there was no need to
-      // use an auto_ptr<> in this method.
-      item->factory ((transfer_ownership ?
-                      safe_protocol_factory.release () :
-                      protocol_factory),
-                     transfer_ownership);
-
-      if (this->protocol_factories_.insert (item) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("TAO (%P|%t) Unable to add ")
-                      ACE_TEXT ("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ())));
-
-          delete item;
-
-          if (transfer_ownership == 0)
-            delete protocol_factory;
-
-          return -1;
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Loaded default ")
-                      ACE_TEXT ("protocol <IIOP_Factory>\n")));
-        }
-
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::init_protocol_factories (void)
-{
-  const TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
-  TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
-
-  if (factory == end)
-    {
-      return this->load_default_protocols ();
-    }
-
-  for (; factory != end; ++factory)
-    {
-      const ACE_CString &name = (*factory)->protocol_name ();
-      (*factory)->factory (
-        ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ()));
-      if ((*factory)->factory () == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("TAO (%P|%t) Unable to load ")
-                             ACE_TEXT ("protocol <%s>, %p\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()),
-                             ACE_TEXT ("")),
-                            -1);
-        }
-
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_Default_Resource_Factory::use_locked_data_blocks (void) const
-{
-  return this->use_locked_data_blocks_;
-}
-
-TAO_ProtocolFactorySet *
-TAO_Default_Resource_Factory::get_protocol_factories (void)
-{
-  return &protocol_factories_;
-}
-
-TAO_Acceptor_Registry *
-TAO_Default_Resource_Factory::get_acceptor_registry (void)
-{
-  TAO_Acceptor_Registry *ar = 0;
-
-  ACE_NEW_RETURN(ar,
-                 TAO_Acceptor_Registry,
-                 0);
-
-  return ar;
-}
-
-TAO_Connector_Registry *
-TAO_Default_Resource_Factory::get_connector_registry (void)
-{
-  TAO_Connector_Registry *cr = 0;
-
-  ACE_NEW_RETURN(cr,
-                 TAO_Connector_Registry,
-                 0);
-
-  return cr;
-}
-
-ACE_Reactor_Impl*
-TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
-{
-  ACE_Reactor_Impl *impl = 0;
-
-  ACE_NEW_RETURN (impl,
-                  ACE_TP_Reactor (ACE::max_handles (),
-                                  1,
-                                  (ACE_Sig_Handler*)0,
-                                  (ACE_Timer_Queue*)0,
-                                  this->reactor_mask_signals_,
-                                  ACE_Select_Reactor_Token::LIFO),
-                  0);
-  return impl;
-}
-
-ACE_Reactor *
-TAO_Default_Resource_Factory::get_reactor (void)
-{
-  ACE_Reactor *reactor = 0;
-  ACE_NEW_RETURN (reactor,
-                  ACE_Reactor (this->allocate_reactor_impl (), 1),
-                  0);
-
-  if (reactor->initialized () == 0)
-    {
-      delete reactor;
-      reactor = 0;
-    }
-  else
-    this->dynamically_allocated_reactor_ = 1;
-
-  return reactor;
-}
-
-void
-TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor)
-{
-  if (this->dynamically_allocated_reactor_ == 1)
-    delete reactor;
-}
-
-
-#if TAO_USE_LOCAL_MEMORY_POOL == 1
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC;
-typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
-#else
-typedef ACE_New_Allocator LOCKED_ALLOCATOR;
-#endif
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-
-  return allocator;
-}
-
-int
-TAO_Default_Resource_Factory::input_cdr_allocator_type_locked (void)
-{
-  return 1;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-  return allocator;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-  return allocator;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-  return allocator;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::amh_response_handler_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-  return allocator;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::ami_response_handler_allocator (void)
-{
-  ACE_Allocator *allocator = 0;
-  ACE_NEW_RETURN (allocator,
-                  LOCKED_ALLOCATOR,
-                  0);
-  return allocator;
-}
-
-int
-TAO_Default_Resource_Factory::cache_maximum (void) const
-{
-  return this->cache_maximum_;
-}
-
-int
-TAO_Default_Resource_Factory::purge_percentage (void) const
-{
-  return this->purge_percentage_;
-}
-
-int
-TAO_Default_Resource_Factory::max_muxed_connections (void) const
-{
-  return this->max_muxed_connections_;
-}
-
-
-ACE_Lock *
-TAO_Default_Resource_Factory::create_cached_connection_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->cached_connection_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-int
-TAO_Default_Resource_Factory::locked_transport_cache (void)
-{
-  if (this->cached_connection_lock_type_ == TAO_NULL_LOCK)
-    return 0;
-
-  return 1;
-}
-
-
-ACE_Lock *
-TAO_Default_Resource_Factory::create_object_key_table_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->object_key_table_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-ACE_Lock *
-TAO_Default_Resource_Factory::create_corba_object_lock (void)
-{
-  ACE_Lock *the_lock = 0;
-
-  if (this->corba_object_lock_type_ == TAO_NULL_LOCK)
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
-                    0);
-  else
-    ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<TAO_SYNCH_MUTEX>,
-                    0);
-
-  return the_lock;
-}
-
-TAO_Flushing_Strategy *
-TAO_Default_Resource_Factory::create_flushing_strategy (void)
-{
-  TAO_Flushing_Strategy *strategy = 0;
-  if (this->flushing_strategy_type_ == TAO_LEADER_FOLLOWER_FLUSHING)
-    ACE_NEW_RETURN (strategy,
-                    TAO_Leader_Follower_Flushing_Strategy,
-                    0);
-  else if (this->flushing_strategy_type_ == TAO_REACTIVE_FLUSHING)
-    ACE_NEW_RETURN (strategy,
-                    TAO_Reactive_Flushing_Strategy,
-                    0);
-  else
-    ACE_NEW_RETURN (strategy,
-                    TAO_Block_Flushing_Strategy,
-                    0);
-  return strategy;
-}
-
-TAO_Connection_Purging_Strategy *
-TAO_Default_Resource_Factory::create_purging_strategy (void)
-{
-  TAO_Connection_Purging_Strategy *strategy = 0;
-
-  if (this->connection_purging_type_ == TAO_Resource_Factory::LRU)
-    {
-      ACE_NEW_RETURN (strategy,
-                      TAO_LRU_Connection_Purging_Strategy (
-                          this->cache_maximum ()),
-                      0);
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("TAO (%P|%t) - ")
-                  ACE_TEXT ("no usable purging strategy ")
-                  ACE_TEXT ("was found.\n")));
-    }
-
-  return strategy;
-}
-
-TAO_LF_Strategy *
-TAO_Default_Resource_Factory::create_lf_strategy (void)
-{
-  TAO_LF_Strategy *strategy = 0;
-
-  ACE_NEW_RETURN (strategy,
-                  TAO_LF_Strategy_Complete,
-                  0);
-
-  return strategy;
-}
-
-void
-TAO_Default_Resource_Factory::report_option_value_error (
-                                 const ACE_TCHAR* option_name,
-                                 const ACE_TCHAR* option_value)
-{
-  ACE_DEBUG((LM_DEBUG,
-             ACE_TEXT ("Default_Resource_Factory - unknown argument")
-             ACE_TEXT (" <%s> for <%s>\n"),
-             option_value, option_name));
-}
-
-void
-TAO_Default_Resource_Factory::disable_factory (void)
-{
-  this->factory_disabled_ = 1;
-  if (this->options_processed_)
-    {
-      ACE_DEBUG ((LM_WARNING,
-                  ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n")
-                  ACE_TEXT ("Default Resource Factory is disabled\n")));
-    }
-}
-
-TAO_Codeset_Manager *
-TAO_Default_Resource_Factory::get_codeset_manager (void)
-{
-  if (this->codeset_manager_ == 0)
-    {
-      ACE_NEW_RETURN (this->codeset_manager_, TAO_Codeset_Manager, 0);
-    }
-
-  return this->codeset_manager_;
-}
-
-TAO_Resource_Factory::Resource_Usage
-TAO_Default_Resource_Factory::resource_usage_strategy (void) const
-{
-  return this->resource_usage_strategy_;
-}
-
-bool
-TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const
-{
-  return this->drop_replies_;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory,
-                       ACE_TEXT ("Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory)
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Protocol_Factory>;
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Protocol_Factory>
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
deleted file mode 100644
index 417554b818f..00000000000
--- a/TAO/tao/default_resource.h
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   default_resource.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_DEFAULT_RESOURCE_H
-#define TAO_DEFAULT_RESOURCE_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Resource_Factory.h"
-
-class TAO_Object_Adapter;
-class TAO_IOR_Parser;
-class TAO_LF_Strategy;
-
-class ACE_Reactor_Impl;
-
-/**
- * @class TAO_Default_Resource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- *
- * @note When using an ORB created by a dynamically loaded object, it
- *       is generally necessary to pre-load a "Resource_Factory" prior
- *       to initializing the ORB.  In the case of the
- *       TAO_Default_Resource_Factory, this can be done by adding the
- *       following Service Configurator directive to your `svc.conf'
- *       file before your the directive that loads the object that
- *       initialized your ORB:
- * @par
- *           static Resource_Factory ""
- * @par
- *       Alternatively, explicitly pre-load the Resource_Factory using
- *       the following in your code:
- * @par
- *           ACE_Service_Config::process_directive (
- *             ACE_TEXT ("static Resource_Factory \"\"") );
- * @par
- *       In both cases, place the appropriate resource factory
- *       arguments, if any, between the quotes immediately following
- *       "Resource_Factory."
- */
-class TAO_Export TAO_Default_Resource_Factory
-  : public TAO_Resource_Factory
-{
-public:
-
-  /// Constructor.
-  TAO_Default_Resource_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_Default_Resource_Factory (void);
-
-  /**
-   * @name Service Configurator Hooks
-   */
-  //@{
-  /// Dynamic linking hook
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// Parse svc.conf arguments
-  int parse_args (int argc, ACE_TCHAR* argv[]);
-  //@}
-
-  /**
-   * @name Member Accessors
-   */
-  //@{
-
-  int get_parser_names (char **&names,
-                        int &number_of_names);
-  enum
-  {
-    TAO_ALLOCATOR_THREAD_LOCK
-  };
-
-  /// Translator type
-  enum TRANSLATOR_TYPE
-  {
-    CHAR_TRANSLATOR,
-    WCHAR_TRANSLATOR
-  };
-
-  /// Modify and get the source for the CDR allocators
-  int cdr_allocator_source (void);
-
-  // = Resource Retrieval
-  virtual int use_locked_data_blocks (void) const;
-  virtual ACE_Reactor *get_reactor (void);
-  virtual void reclaim_reactor (ACE_Reactor *);
-  virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* input_cdr_msgblock_allocator (void);
-  virtual int input_cdr_allocator_type_locked (void);
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* output_cdr_msgblock_allocator (void);
-  virtual ACE_Allocator* amh_response_handler_allocator (void);
-  virtual ACE_Allocator* ami_response_handler_allocator (void);
-  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
-
-  virtual TAO_Codeset_Manager *get_codeset_manager ();
-
-  virtual int init_protocol_factories (void);
-
-  virtual int cache_maximum (void) const;
-  virtual int purge_percentage (void) const;
-  virtual int max_muxed_connections (void) const;
-  virtual ACE_Lock *create_cached_connection_lock (void);
-  virtual ACE_Lock *create_object_key_table_lock (void);
-  virtual ACE_Lock *create_corba_object_lock (void);
-  virtual int locked_transport_cache (void);
-  virtual TAO_Flushing_Strategy *create_flushing_strategy (void);
-  virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
-  TAO_Resource_Factory::Resource_Usage resource_usage_strategy (void) const;
-  virtual TAO_LF_Strategy *create_lf_strategy (void);
-
-  virtual void disable_factory (void);
-  virtual bool drop_replies_during_shutdown (void) const;
-  //@}
-
-protected:
-
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-  /// Add a Parser name to the list of Parser names.
-  int add_to_ior_parser_names (const char *);
-
-  void report_option_value_error (const ACE_TCHAR* option_name,
-                                  const ACE_TCHAR* option_value);
-
-protected:
-
-  /// The type of data blocks that the ORB should use
-  int use_locked_data_blocks_;
-
-  /// The number of the different types of Parsers.
-  int parser_names_count_;
-
-  /// Array consisting of the names of the parsers
-  char **parser_names_;
-
-  /// Index of the current element in the parser_names_ array
-  int index_;
-
-  /// list of loaded protocol factories.
-  TAO_ProtocolFactorySet protocol_factories_;
-
-  /// Specifies the typeof purging strategy we should use for cleaning
-  /// up unused connections
-  TAO_Resource_Factory::Purging_Strategy connection_purging_type_;
-
-  /// Specifies the maximum number of connections which should get cached
-  /// in the ORB.
-  int cache_maximum_;
-
-  /// Specifies the percentage of entries which should get purged on
-  /// demand.
-  int purge_percentage_;
-
-  /// Specifies the limit on the number of muxed connections
-  /// allowed per-property for the ORB. A value of 0 indicates no
-  /// limit
-  int max_muxed_connections_;
-
-  /// If <0> then we create reactors with signal handling disabled.
-  int reactor_mask_signals_;
-
-  /**
-   * Flag that is set to 1 if the reactor obtained from the
-   * get_reactor() method is dynamically allocated.  If this flag is
-   * set to 1, then the reclaim_reactor() method with call the delete
-   * operator on the given reactor.  This flag is necessary to make
-   * sure that a reactor not allocated by the default resource factory
-   * is not reclaimed by the default resource factory.  Such a
-   * situation can occur when a resource factory derived from the
-   * default one overrides the get_reactor() method but does not
-   * override the reclaim_reactor() method.
-   */
-  int dynamically_allocated_reactor_;
-
-  virtual int load_default_protocols (void);
-
-  /// This flag is used to determine whether options have been
-  /// processed via the init() function.  It is necessary to
-  /// properly report errors when the default factory is replaced.
-  int options_processed_;
-
-  /// This flag specifies whether the factory has been disabled.
-  /// If it has been disabled we should print warnings if options
-  /// were processed before (or later).
-  int factory_disabled_;
-
-private:
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  /// Type of lock used by the cached connector.
-  Lock_Type cached_connection_lock_type_;
-
-  /// Type of lock used by the corba object.
-  Lock_Type object_key_table_lock_type_;
-
-  /// Type of lock used by the corba object.
-  Lock_Type corba_object_lock_type_;
-
-  enum Flushing_Strategy_Type
-  {
-    TAO_LEADER_FOLLOWER_FLUSHING,
-    TAO_REACTIVE_FLUSHING,
-    TAO_BLOCKING_FLUSHING
-  };
-
-  /// Type of flushing strategy configured
-  Flushing_Strategy_Type flushing_strategy_type_;
-
-  TAO_Codeset_Manager *codeset_manager_;
-
-  /// Resource usage strategy
-  Resource_Usage resource_usage_strategy_;
-
-  /// Flag to indicate whether replies should be dropped during ORB
-  /// shutdown.
-  bool drop_replies_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
deleted file mode 100644
index c74c5065ef7..00000000000
--- a/TAO/tao/default_server.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-// $Id$
-
-#include "tao/default_server.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           default_server,
-           "$Id$")
-
-TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
-  : activate_server_connections_ (0),
-    thread_flags_ (THR_BOUND | THR_DETACHED),
-    poa_lock_type_ (TAO_THREAD_LOCK),
-    thread_per_connection_use_timeout_ (-1)
-{
-}
-
-TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
-{
-  // Perform appropriate cleanup.
-}
-
-int
-TAO_Default_Server_Strategy_Factory::enable_poa_locking (void)
-{
-  switch (this->poa_lock_type_)
-    {
-    case TAO_NULL_LOCK:
-      return 0;
-    case TAO_THREAD_LOCK:
-    default:
-      return 1;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::activate_server_connections (void)
-{
-  return this->activate_server_connections_;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::thread_per_connection_timeout (ACE_Time_Value &timeout)
-{
-  timeout = this->thread_per_connection_timeout_;
-  return this->thread_per_connection_use_timeout_;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_flags (void)
-{
-  return this->thread_flags_;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
-{
-  return 1;
-}
-
-// Evil macros b/c I'm lazy!
-#define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) \
-  else if (ACE_OS::strcmp (const_cast <const ACE_TCHAR *> ( flag), ACE_TEXT(#sym)) == 0) \
-  ACE_SET_BITS (this->thread_flags_, sym)
-#define TAO_ENDCHECK
-
-void
-TAO_Default_Server_Strategy_Factory::tokenize (ACE_TCHAR* flag_string)
-{
-  ACE_TCHAR* lasts = 0;
-
-  for (ACE_TCHAR* flag = ACE_OS::strtok_r (flag_string,
-                                      ACE_TEXT("|"),
-                                      &lasts);
-       flag != 0;
-       flag = ACE_OS::strtok_r (0,
-                                ACE_TEXT("|"),
-                                &lasts))
-    {
-      TAO_BEGINCHECK;
-      TAO_CHECKANDSET (THR_DETACHED);
-      TAO_CHECKANDSET (THR_BOUND);
-      TAO_CHECKANDSET (THR_NEW_LWP);
-      TAO_CHECKANDSET (THR_SUSPENDED);
-#if !defined (ACE_WIN32)
-      TAO_CHECKANDSET (THR_DAEMON);
-#endif /* ACE_WIN32 */
-      TAO_ENDCHECK;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::init (int argc, ACE_TCHAR* argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core *)
-{
-  return 0;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-
-  int curarg;
-
-  for (curarg = 0; curarg < argc && argv[curarg]; ++curarg)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_TEXT("-ORBConcurrency")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("reactive")) == 0)
-              this->activate_server_connections_ = 0;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("thread-per-connection")) == 0)
-              this->activate_server_connections_ = 1;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBConcurrency"), name);
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBThreadPerConnectionTimeout")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("infinite")) == 0)
-              {
-                this->thread_per_connection_use_timeout_ = 0;
-              }
-            else
-              {
-                this->thread_per_connection_use_timeout_ = 1;
-                int milliseconds = ACE_OS::atoi (name);
-                this->thread_per_connection_timeout_.set (0,
-                                                          1000 * milliseconds);
-              }
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBTableSize")) == 0
-             || ACE_OS::strcasecmp (argv[curarg],
-                                    ACE_TEXT("-ORBActiveObjectMapSize")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.active_object_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBPOAMapSize")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.poa_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBActiveHintInIds")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBActiveHintInPOANames")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBAllowReactivationOfSystemids")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ =
-              ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBUseridPolicyDemuxStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("dynamic")) == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_LINEAR;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBUseridPolicyDemuxStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBSystemidPolicyDemuxStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("dynamic")) == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("active")) == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_ACTIVE_DEMUX;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBSystemidPolicyDemuxStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBPersistentidPolicyDemuxStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("dynamic")) == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_LINEAR;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBPersistentidPolicyDemuxStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBTransientidPolicyDemuxStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("dynamic")) == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("active")) == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_ACTIVE_DEMUX;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBTransientidPolicyDemuxStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("dynamic")) == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("linear")) == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_LINEAR;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBUniqueidPolicyReverseDemuxStrategy"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBPOALock")) == 0)
-      {
-        ++curarg;
-        if (curarg < argc)
-          {
-            ACE_TCHAR* name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    ACE_TEXT("thread")) == 0)
-              this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         ACE_TEXT("null")) == 0)
-              this->poa_lock_type_ = TAO_NULL_LOCK;
-            else
-              this->report_option_value_error (ACE_TEXT("-ORBPOALock"), name);
-          }
-      }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 ACE_TEXT("-ORBThreadFlags")) == 0)
-      {
-        ++curarg;
-
-        if (curarg < argc)
-          this->tokenize (argv[curarg]);
-      }
-
-    else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0)
-      {
-        // Can we assume there is an argument after the option?
-        // ++curarg;
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT("Server_Strategy_Factory - ")
-                    ACE_TEXT("unknown option <%s>\n"),
-                    argv[curarg]));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("Server_Strategy_Factory - ")
-                    ACE_TEXT("ignoring option <%s>\n"),
-                    argv[curarg]));
-      }
-
-  return 0;
-}
-
-void
-TAO_Default_Server_Strategy_Factory::report_option_value_error (
-                                 const ACE_TCHAR* option_name,
-                                 const ACE_TCHAR* option_value)
-{
-  ACE_DEBUG((LM_DEBUG,
-             ACE_TEXT ("Server_Strategy_Factory - unknown argument")
-             ACE_TEXT (" <%s> for <%s>\n"),
-             option_value, option_name));
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory,
-                       ACE_TEXT ("Server_Strategy_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Server_Strategy_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
deleted file mode 100644
index d4c88f15aa2..00000000000
--- a/TAO/tao/default_server.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     default_server.h
- *
- *  $Id$
- *
- *  @author  Chris Cleeland
- */
-//=============================================================================
-
-
-#ifndef TAO_DEFAULT_SERVER_FACTORY_H
-#define TAO_DEFAULT_SERVER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Server_Strategy_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "ace/Time_Value.h"
-
-
-/**
- * @class TAO_Default_Server_Strategy_Factory
- *
- * @brief This is the default strategy factory for CORBA servers.  It
- * allows developers to choose strategies via argument flags.
- * This design gives substantial freedom for experimentation.
- *
- */
-class TAO_Export TAO_Default_Server_Strategy_Factory
-  : public TAO_Server_Strategy_Factory
-{
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, ACE_TCHAR* argv[]);
-
-  // = The TAO_Server_Strategy_Factory methods, please read the
-  //   documentation in "tao/Server_Strategy_Factory.h"
-  virtual int open (TAO_ORB_Core*);
-  virtual int enable_poa_locking (void);
-  virtual int activate_server_connections (void);
-  virtual int thread_per_connection_timeout (ACE_Time_Value &timeout);
-  virtual int server_connection_thread_flags (void);
-  virtual int server_connection_thread_count (void);
-
-  /// Parse the arguments, check the documentation in
-  /// $TAO_ROOT/docs/Options.html for details
-  int parse_args (int argc, ACE_TCHAR* argv[]);
-
-protected:
-  void tokenize (ACE_TCHAR* flag_string);
-
-  void report_option_value_error (const ACE_TCHAR* option_name,
-                                  const ACE_TCHAR* option_value);
-
-protected:
-  /// Should the server connection handlers run in their own thread?
-  int activate_server_connections_;
-
-  /// Default thread flags passed to thr_create().
-  u_long thread_flags_;
-
-  enum Lock_Type
-  {
-    TAO_NULL_LOCK,
-    TAO_THREAD_LOCK
-  };
-
-  /// The type of lock to be returned by <create_poa_lock()>.
-  Lock_Type poa_lock_type_;
-
-  /// The timeout flag and value for the thread-per-connection model
-  int thread_per_connection_use_timeout_;
-  ACE_Time_Value thread_per_connection_timeout_;
-};
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff
deleted file mode 100644
index 411a5e08b8d..00000000000
--- a/TAO/tao/diffs/Domain.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- orig/DomainC.cpp	2005-04-23 20:41:36.569843200 +0200
-+++ DomainC.cpp	2005-04-23 20:42:48.202846400 +0200
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -39,6 +39,10 @@
- #include "tao/Special_Basic_Arguments.h"
- #include "ace/OS_NS_string.h"
- 
-+#include "tao/ORB_Core.h"
-+#include "tao/IFR_Client_Adapter.h"
-+#include "ace/Dynamic_Service.h"
-+
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
-@@ -50,6 +54,48 @@
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-+// TAO specific stuff.
-+namespace CORBA
-+{
-+  class InterfaceDef;
-+  typedef InterfaceDef *InterfaceDef_ptr;
-+  typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var;
-+  typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out;
-+}
-+
-+namespace TAO
-+{
-+
-+#if TAO_HAS_INTERCEPTORS == 1
-+
-+  template<>
-+  void
-+  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
-+  {
-+    TAO_IFR_Client_Adapter *adapter =
-+      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-+          TAO_ORB_Core::ifr_client_adapter_name ()
-+        );
-+
-+    adapter->interfacedef_any_insert (p.argument, this->x_);
-+    p.mode = CORBA::PARAM_IN;
-+  }
-+
-+#endif /* TAO_HAS_INTERCEPTORS */
-+
-+  template<>
-+  CORBA::Boolean
-+  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
-+  {
-+    TAO_IFR_Client_Adapter *adapter =
-+      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-+          TAO_ORB_Core::ifr_client_adapter_name ()
-+        );
-+
-+    return adapter->interfacedef_cdr_insert (cdr, this->x_);
-+  }
-+}
-+
- // Arg traits specializations.
- namespace TAO
- {
---- orig/DomainC.h	2005-04-23 20:41:36.569843200 +0200
-+++ DomainC.h	2005-04-15 09:13:18.957705600 +0200
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -51,7 +51,6 @@
- #include "tao/Seq_Out_T.h"
- 
- #include "tao/PolicyC.h"
--#include "tao/InterfaceDefC.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
deleted file mode 100644
index 8d6a1c4ef59..00000000000
--- a/TAO/tao/diffs/Object_Key.diff
+++ /dev/null
@@ -1,192 +0,0 @@
---- orig/Object_KeyC.cpp	2005-04-08 10:17:40.978604800 +0200
-+++ Object_KeyC.cpp	2005-04-08 10:17:41.879900800 +0200
-@@ -37,6 +37,10 @@
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
- 
-+#include "ace/ACE.h"
-+#include "ace/OS_NS_string.h"
-+#include "ace/os_include/os_ctype.h"
-+
- // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:69
- 
-@@ -88,6 +92,150 @@
- TAO::ObjectKey::~ObjectKey (void)
- {}
- 
-+// Hand crafted.
-+
-+void
-+TAO::ObjectKey::encode_sequence_to_string (char * &str,
-+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-+{
-+  // We must allocate a buffer which is (gag) 3 times the length
-+  // of the sequence, which is the length required in the worst-case
-+  // scenario of all non-printable characters.
-+  //
-+  // There are two strategies here...we could allocate all that space here,
-+  // fill it up, then copy-allocate new space of just the right length.
-+  // OR, we could just return this space.  The classic time-space tradeoff,
-+  // and for now we'll let time win out, which means that we only do the
-+  // allocation once.
-+  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
-+  str = CORBA::string_alloc (len);
-+
-+  char *cp = str;
-+
-+  for (u_int i = 0;
-+       cp < (str + len) && i < seq.length();
-+       ++i)
-+    {
-+      u_char bt = seq[i];
-+      if (is_legal (bt))
-+        {
-+          *cp++ = (char) bt;
-+          continue;
-+        }
-+
-+      *cp++ = '%';
-+      *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f);
-+      *cp++ = ACE::nibble2hex (bt & 0x0f);
-+    }
-+  // Zero terminate
-+  *cp = '\0';
-+}
-+
-+int TAO::ObjectKey::is_legal (u_char & c)
-+{
-+  if (isalnum(c))
-+  {
-+    return 1;
-+  }
-+  else
-+  {
-+    return ( c == ';' || c == '/' ||c == ':' || c == '?' ||
-+             c == '@' || c == '&' ||c == '=' || c == '+' ||
-+             c == '$' || c == ',' ||c == '_' || c == '.' ||
-+             c == '!' || c == '~' ||c == '*' || c == '\'' ||
-+             c == '-' || c == '(' || c == ')' );
-+  }
-+}
-+
-+void
-+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-+                                           const char *str)
-+{
-+  if (str == 0)
-+    {
-+      seq.length (0);
-+      return;
-+    }
-+
-+  u_int length = ACE_OS::strlen (str);
-+  const char *eos = str + length;
-+  const char *cp = str;
-+
-+  // Set the length of the sequence to be as long as
-+  // we'll possibly need...we'll reset it to the actual
-+  // length later.
-+  seq.length (length);
-+
-+  u_int i = 0;
-+  for (;
-+       cp < eos && i < seq.length ();
-+       ++i)
-+    {
-+      if (*cp == '%' || *cp == '\\')
-+        {
-+          // This is an escaped non-printable,
-+          // so we decode the hex values into
-+          // the sequence's octet
-+          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-+          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-+          cp += 3;
-+        }
-+      else
-+        // Copy it in
-+        seq[i] = *cp++;
-+    }
-+
-+  // Set the length appropriately
-+  seq.length (i);
-+}
-+
-+/*static*/ CORBA::Boolean
-+TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
-+                               TAO_InputCDR &strm)
-+{
-+  CORBA::ULong _tao_seq_len;
-+
-+  if (strm >> _tao_seq_len)
-+    {
-+      // Add a check to the length of the sequence
-+      // to make sure it does not exceed the length
-+      // of the stream. (See bug 58.)
-+      if (_tao_seq_len > strm.length ())
-+        {
-+          return 0;
-+        }
-+
-+      // Set the length of the sequence.
-+      key.length (_tao_seq_len);
-+
-+      // If length is 0 we return true.
-+      if (0 >= _tao_seq_len)
-+        {
-+          return 1;
-+        }
-+
-+      // Retrieve all the elements.
-+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-+      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-+      ACE_Message_Block::DONT_DELETE))
-+      {
-+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-+          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
-+        oseq->replace (_tao_seq_len, strm.start ());
-+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-+        strm.skip_bytes (_tao_seq_len);
-+        return 1;
-+      }
-+      return strm.read_octet_array (key.get_buffer (),
-+                                    _tao_seq_len);
-+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-+      return strm.read_octet_array (key.get_buffer (), key.length ());
-+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-+
-+    }
-+  return 0;
-+}
-+
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
---- orig/Object_KeyC.h	2005-04-08 10:17:40.978604800 +0200
-+++ Object_KeyC.h	2005-04-08 10:17:41.879900800 +0200
-@@ -117,6 +117,25 @@
-       )
-       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
- #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-+
-+    // Hand crafted.
-+
-+    static void encode_sequence_to_string (
-+        char * &str,
-+        const TAO_Unbounded_Sequence<CORBA::Octet> &seq
-+      );
-+    static void decode_string_to_sequence (
-+        TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-+        const char *str
-+      );
-+    static int is_legal (u_char & c);
-+
-+    /// A special method that gives no regard to how the ORB has
-+    /// configured  the resource factory. This will be used only
-+    /// during Profile decoding and should be safe. This is a solution
-+    /// for the bug report [BUG 1616]
-+    static CORBA::Boolean demarshal_key (ObjectKey &key,
-+                                         TAO_InputCDR &cdr);
-   };
- 
- #endif /* end #if !defined */
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
deleted file mode 100644
index cbdbb910426..00000000000
--- a/TAO/tao/diffs/OctetSeq.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- orig/OctetSeqC.h	2005-04-08 10:17:34.108726400 +0200
-+++ OctetSeqC.h	2005-04-08 10:17:41.829828800 +0200
-@@ -141,6 +141,18 @@
- {
- }
- 
-+// Workaround for a Visual Studio .NET bug where this class is not
-+// properly imported by an application if typedef'd or subclassed,
-+// resulting in 'multiply defined' link errors. The export macro
-+// here forces an explicit import by the application. Please see
-+// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-+// The problem stems from use of the type below in PortableServer,
-+// but we put the instantiation here because the application will
-+// need to see it in *C.h to avoid the error.
-+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-+  template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
-+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_sequence/any_op_ch.cpp:52
- 
diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff
deleted file mode 100644
index 4f3efdfe6b9..00000000000
--- a/TAO/tao/diffs/Policy.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- orig/PolicyC.h	2005-04-08 10:17:37.633795200 +0200
-+++ PolicyC.h	2005-04-08 10:17:41.709656000 +0200
-@@ -331,6 +331,15 @@
-     
-     virtual const char* _interface_repository_id (void) const;
-     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-+
-+    // Handcrafted
-+    // ****************************************************************
-+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
-+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);
-+    virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-+    virtual TAO_Policy_Scope _tao_scope (void) const;
-+    // ****************************************************************
-+
-   private:
-     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-   
---- orig/PolicyC.cpp	2005-04-08 10:17:37.633795200 +0200
-+++ PolicyC.cpp	2005-04-08 10:17:41.719670400 +0200
-@@ -953,6 +953,34 @@
-   );
- }
- 
-+// Hand crafted.
-+//
-+// ****************************************************************
-+CORBA::Boolean
-+CORBA::Policy::_tao_encode (TAO_OutputCDR &)
-+{
-+  return 0;
-+}
-+
-+CORBA::Boolean
-+CORBA::Policy::_tao_decode (TAO_InputCDR &)
-+{
-+  return 0;
-+}
-+
-+TAO_Cached_Policy_Type
-+CORBA::Policy::_tao_cached_type (void) const
-+{
-+  return TAO_CACHED_POLICY_UNCACHED;
-+}
-+
-+TAO_Policy_Scope
-+CORBA::Policy::_tao_scope (void) const
-+{
-+  return TAO_POLICY_DEFAULT_SCOPE;
-+}
-+// ****************************************************************
-+
- // TAO_IDL - Generated from
- // be\be_visitor_interface/cdr_op_cs.cpp:63
- 
diff --git a/TAO/tao/diffs/PolicyFactory.diff b/TAO/tao/diffs/PolicyFactory.diff
deleted file mode 100644
index 5bf52e563b9..00000000000
--- a/TAO/tao/diffs/PolicyFactory.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- orig/PolicyFactoryC.h	2005-04-15 11:58:39.449555200 +0200
-+++ PolicyFactoryC.h	2005-04-15 12:22:48.683451200 +0200
-@@ -142,6 +142,16 @@
-         ::CORBA::PolicyError
-       )) = 0;
-     
-+    // Hand-crafted addition.
-+    virtual ::CORBA::Policy_ptr _create_policy (
-+        CORBA::PolicyType type
-+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+      )
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+        , CORBA::PolicyError
-+      ));
-+
-     // TAO_IDL - Generated from
-     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-     
---- orig/PolicyFactoryC.cpp	2005-04-15 11:58:39.489612800 +0200
-+++ PolicyFactoryC.cpp	2005-04-15 12:23:19.297472000 +0200
-@@ -186,3 +186,15 @@
- {
-   return false;
- }
-+
-+// Hand-crafted.
-+::CORBA::Policy_ptr
-+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-+                                                    ACE_ENV_ARG_DECL)
-+  ACE_THROW_SPEC ((CORBA::SystemException,
-+                   CORBA::PolicyError))
-+{
-+  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-+                    CORBA::Policy::_nil ());
-+}
-+
diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff
deleted file mode 100644
index 2d0e1822f84..00000000000
--- a/TAO/tao/diffs/Policy_Forward.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/Policy_ForwardC.h	2005-04-08 10:17:32.626595200 +0200
-+++ Policy_ForwardC.h	2005-04-08 10:17:41.859872000 +0200
-@@ -41,7 +41,6 @@
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "tao/TAO_Export.h"
--#include "tao/ORB.h"
- #include "tao/Environment.h"
- #include "tao/Sequence_T.h"
- #include "tao/Objref_VarOut_T.h"
diff --git a/TAO/tao/diffs/ServerRequestInterceptor.diff b/TAO/tao/diffs/ServerRequestInterceptor.diff
deleted file mode 100644
index f3fc423c81a..00000000000
--- a/TAO/tao/diffs/ServerRequestInterceptor.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- orig/ServerRequestInterceptorC.h	2005-05-17 13:50:41.646918400 +0200
-+++ ServerRequestInterceptorC.h	2005-05-17 14:00:40.237649600 +0200
-@@ -155,15 +155,19 @@
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-     
-+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-+
-     virtual void tao_ft_interception_point (
-         ::PortableInterceptor::ServerRequestInfo_ptr ri,
-         ::CORBA::OctetSeq_out os
--        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+        ACE_ENV_ARG_DECL_NOT_USED
-       )
-       ACE_THROW_SPEC ((
-         CORBA::SystemException,
-         ::PortableInterceptor::ForwardRequest
--      )) = 0;
-+      )) {}
-+
-+#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */
-     
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff
deleted file mode 100644
index 55d5c076583..00000000000
--- a/TAO/tao/diffs/Typecode_types.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- orig/Typecode_typesC.h	2005-04-08 10:17:37.123060800 +0200
-+++ Typecode_typesC.h	2005-04-08 10:17:41.739699200 +0200
-@@ -68,26 +68,6 @@
-   // TAO_IDL - Generated from
-   // be\be_interface.cpp:598
- 
--#if !defined (_CORBA_TYPECODE__VAR_OUT_CH_)
--#define _CORBA_TYPECODE__VAR_OUT_CH_
--  
--  class TypeCode;
--  typedef TypeCode *TypeCode_ptr;
--  
--  typedef
--    TAO_Objref_Var_T<
--        TypeCode
--      >
--    TypeCode_var;
--  
--  typedef
--    TAO_Objref_Out_T<
--        TypeCode
--      >
--    TypeCode_out;
--
--#endif /* end #if !defined */
--  
-   // TAO_IDL - Generated from
-   // be\be_visitor_enum/enum_ch.cpp:57
-   
-@@ -130,6 +110,11 @@
-     tk_component,
-     tk_home,
-     tk_event
-+
-+    // This symbol is not defined by CORBA 3.0.  It's used to speed up
-+    // dispatch based on TCKind values, and lets many important ones
-+    // just be table lookups.  It must always be the last enum value!!
-+    , TAO_TC_KIND_COUNT
-   };
-   
-   typedef TCKind &TCKind_out;
-@@ -148,13 +133,6 @@
- }
- 
- // TAO_IDL - Generated from
--// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
--
--TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeCode_ptr );
--TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCode_ptr &);
--
--
--// TAO_IDL - Generated from
- // be\be_visitor_enum/cdr_op_ch.cpp:50
- 
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::TCKind);
diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff
deleted file mode 100644
index 1938744506a..00000000000
--- a/TAO/tao/diffs/UShortSeq.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- orig/UShortSeqC.h	2005-04-08 10:17:34.909878400 +0200
-+++ UShortSeqC.h	2005-04-08 10:17:41.759728000 +0200
-@@ -133,6 +133,18 @@
- {
- }
- 
-+// Workaround for a Visual Studio .NET bug where this class is not
-+// properly imported by an application if typedef'd or subclassed,
-+// resulting in 'multiply defined' link errors. The export macro
-+// here forces an explicit import by the application. Please see
-+// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
-+// The problem stems from use of the type below in DsLogAdmin,
-+// but we put the instantiation here because the application will
-+// need to see it in *C.h to avoid the error.
-+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-+  template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>;
-+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
-+
- // TAO_IDL - Generated from
- // be\be_visitor_sequence/any_op_ch.cpp:52
- 
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
deleted file mode 100644
index e9d60aa6db1..00000000000
--- a/TAO/tao/extra_core.mpb
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-feature(!minimum_corba) {
-  Source_Files(TAO_COMPONENTS) {
-    ServicesC.cpp
-    NVList.cpp
-    Dynamic_Adapter.cpp
-  }
-}
-
-feature(corba_messaging) {
-  Source_Files(TAO_COMPONENTS) {
-    Policy_Manager.cpp
-    Buffering_Constraint_Policy.cpp
-    Messaging_PolicyValueC.cpp
-  }
-}
diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h
deleted file mode 100644
index 769479ac407..00000000000
--- a/TAO/tao/objectid.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     objectid.h
- *
- *  $Id$
- *
- *  ObjectIds redefined for TAO and recognized by CORBA
- *
- *  @author  Chris Cleeland
- *  @author  Douglas C. Schmidt
- */
-//=============================================================================
-
-#ifndef TAO_OBJECTID_H
-#define TAO_OBJECTID_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/*
- *
- * This file is a break away from orbconf.h. Basically orbconf.h is
- * going the OS.h way. Too many things cluttered in other than the
- * configuration details. Hence this breakway group.
- *
- * This file has the TAO specific objectid definitions for the
- * services that are recognized by resolve_initial_references (),
- * list_initiial_services () etc. They have no place in the ORB
- * configuration.
- */
-
-// ObjectIds recognized by CORBA::ORB::resolve_initial_references()...
-// of course, no guarantees are made that the call will return
-// something useful.
-#define TAO_OBJID_NAMESERVICE         "NameService"
-#define TAO_OBJID_TRADINGSERVICE      "TradingService"
-#define TAO_OBJID_IMPLREPOSERVICE     "ImplRepoService"
-#define TAO_OBJID_ROOTPOA             "RootPOA"
-#define TAO_OBJID_POACURRENT          "POACurrent"
-#define TAO_OBJID_INTERFACEREP        "InterfaceRepository"
-#define TAO_OBJID_POLICYMANAGER       "ORBPolicyManager"
-#define TAO_OBJID_POLICYCURRENT       "PolicyCurrent"
-#define TAO_OBJID_IORMANIPULATION     "IORManipulation"
-#define TAO_OBJID_IORTABLE            "IORTable"
-#define TAO_OBJID_DYNANYFACTORY       "DynAnyFactory"
-#define TAO_OBJID_TYPECODEFACTORY     "TypeCodeFactory"
-#define TAO_OBJID_RTORB               "RTORB"
-#define TAO_OBJID_RTCURRENT               "RTCurrent"
-#define TAO_OBJID_PRIORITYMAPPINGMANAGER  "PriorityMappingManager"
-#define TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER  "NetworkPriorityMappingManager"
-#define TAO_OBJID_SECURITYCURRENT     "SecurityCurrent"
-#define TAO_OBJID_SECURITYMANAGER     "SecurityManager"
-#define TAO_OBJID_TRANSACTIONCURRENT  "TransactionCurrent"
-#define TAO_OBJID_NOTIFICATIONSERVICE "NotificationService"
-#define TAO_OBJID_TYPEDNOTIFICATIONSERVICE "TypedNotificationService"
-#define TAO_OBJID_COMPONENTHOMEFINDER "ComponentHomeFinder"
-#define TAO_OBJID_PSS "PSS"
-#define TAO_OBJID_CODECFACTORY "CodecFactory"
-#define TAO_OBJID_PICurrent "PICurrent"
-
-// Comma separated list of the above ObjectIDs.
-// DO NOT include unimplemented services!
-// The CORBA::ORB::list_initial_services () method iterates through
-// this list to determine which initial services are available.
-#define TAO_LIST_OF_INITIAL_SERVICES \
-        TAO_OBJID_NAMESERVICE, \
-        TAO_OBJID_TRADINGSERVICE, \
-        TAO_OBJID_IMPLREPOSERVICE, \
-        TAO_OBJID_ROOTPOA, \
-        TAO_OBJID_POACURRENT, \
-        TAO_OBJID_INTERFACEREP, \
-        TAO_OBJID_POLICYMANAGER, \
-        TAO_OBJID_POLICYCURRENT, \
-        TAO_OBJID_IORMANIPULATION, \
-        TAO_OBJID_IORTABLE, \
-        TAO_OBJID_DYNANYFACTORY, \
-        TAO_OBJID_TYPECODEFACTORY
-// @@ Some initial references are added via other means, such as
-//    ORBInitInfo::register_initial_references().  Those should not be
-//    placed in the above list.  Ideally, we should no longer need the
-//    above list once the above services register their references
-//    dynamically.
-
-/// Service IDs for the services that are located through Multicast.
-enum TAO_MCAST_SERVICEID
-{
-  NAMESERVICE,
-  TRADINGSERVICE,
-  IMPLREPOSERVICE,
-  INTERFACEREPOSERVICE
-};
-
-/// No. of services locatable through multicast.
-#define TAO_NO_OF_MCAST_SERVICES 4
-
-
-
-
-#include /**/ "ace/post.h"
-#endif /*TAO_OBJECTID_H*/
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
deleted file mode 100644
index 24436535e49..00000000000
--- a/TAO/tao/operation_details.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//$Id$
-#include "operation_details.h"
-#include "Stub.h"
-#include "TypeCode.h"
-#include "ORB_Constants.h"
-#include "DynamicC.h"
-#include "Exception_Data.h"
-#include "SystemException.h"
-
-#include "ace/OS_NS_string.h"
-
-
-#if !defined (__ACE_INLINE__)
-# include "tao/operation_details.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           operation_details,
-           "$Id$")
-
-
-CORBA::Exception *
-TAO_Operation_Details::corba_exception (const char *id
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  for (CORBA::ULong i = 0; i != this->ex_count_; ++i)
-    {
-      if (ACE_OS::strcmp (id,
-                          this->ex_data_[i].id) != 0)
-        {
-          continue;
-        }
-
-      // Create an exception object
-      CORBA::Exception *exception =
-        this->ex_data_[i].alloc ();
-
-      if (exception == 0)
-        {
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (0,
-                                              CORBA::COMPLETED_YES),
-                            0);
-        }
-
-      // Return the exception object that we just created.
-      return exception;
-    }
-
-  // If there are no matches return an unknown exception.
-  ACE_THROW_RETURN (CORBA::UNKNOWN (0,
-                                    CORBA::COMPLETED_YES),
-                    0);
-}
-
-bool
-TAO_Operation_Details::marshal_args (TAO_OutputCDR &cdr)
-{
-  for (CORBA::ULong i = 0; i != this->num_args_; ++i)
-    {
-      if (!((*this->args_[i]).marshal (cdr)))
-        return false;
-    }
-
-  return true;
-}
-
-bool
-TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr)
-{
-  for (CORBA::ULong i = 0; i != this->num_args_; ++i)
-    {
-      if (!((*this->args_[i]).demarshal (cdr)))
-        return false;
-    }
-
-  return true;
-}
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::parameter_list (Dynamic::ParameterList &param_list)
-{
-  // Account for the return type that could be in the argument list.
-  param_list.length (this->num_args_ - 1);
-
-   for (CORBA::ULong i = 1; i != this->num_args_; ++i)
-     this->args_[i]->interceptor_param (param_list[i - 1]);
-
-   return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-bool
-TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list)
-{
-  if (this->ex_count_)
-    {
-      exception_list.length (this->ex_count_);
-
-      for (CORBA::ULong i = 0;
-           i != this->ex_count_;
-           ++i)
-        {
-          CORBA::TypeCode_ptr tcp = this->ex_data_[i].tc_ptr;
-          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-          exception_list[i] = tcp_object;
-        }
-    }
-  return true;
-}
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::result (CORBA::Any *any)
-{
-  for (CORBA::ULong i = 0; i != this->num_args_; ++i)
-    (*this->args_[i]).interceptor_result (any);
-
-  return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
deleted file mode 100644
index 57cc5de3b9b..00000000000
--- a/TAO/tao/operation_details.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//=============================================================================
-/**
- *  @file    operation_details.h
- *
- *  $Id$
- *
- *  @author Bala Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OPERATION_DETAILS_H
-#define TAO_OPERATION_DETAILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "SystemException.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Service_Context.h"
-#include "target_specification.h"
-
-
-/// Forward declarations
-namespace Dynamic
-{
-  class ParameterList;
-  class ExceptionList;
-}
-
-namespace TAO
-{
-  class Argument;
-  struct Exception_Data;
-}
-
-/**
- * @class TAO_Operation_Details
- *
- * @brief Class with operation details
- *
- * This class stores some of the "operation" details that would be
- * required by the invocation classes.  This class is in its
- * infancy now but I expect this one to grow as we come with
- * different varieties of use cases.
- *
- * @todo Put this in namespace TAO.
- */
-class TAO_Export TAO_Operation_Details
-{
-public:
-
-  /// Constructor
-  TAO_Operation_Details (const char *name,
-                         CORBA::ULong len,
-                         CORBA::Boolean argument_flag,
-                         TAO::Argument **args = 0,
-                         CORBA::ULong num_args = 0,
-                         TAO::Exception_Data *ex_data = 0,
-                         CORBA::Long ex_count = 0);
-
-  /// Operation name
-  const char* opname (void) const;
-
-  /// Length of the operation name
-  CORBA::ULong opname_len (void) const;
-
-  /// Return the flag that indicates whether the operation has any
-  /// arguments
-  CORBA::Boolean argument_flag (void) const;
-
-  /// Set the response flags
-  void response_flags (CORBA::Octet flags);
-
-  /// Get the response flags
-  CORBA::Octet response_flags (void);
-  CORBA::Octet response_flags (void) const;
-
-  /// Accessors for the service context list
-  IOP::ServiceContextList &request_service_info (void);
-  const IOP::ServiceContextList &request_service_info (void) const;
-  IOP::ServiceContextList &reply_service_info (void);
-  const IOP::ServiceContextList &reply_service_info (void) const;
-
-  /// Access the TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-  const TAO_Service_Context &request_service_context (void) const;
-  TAO_Service_Context &reply_service_context (void);
-  const TAO_Service_Context &reply_service_context (void) const;
-
-  /// Reset the contents of the service context lists that we
-  /// hold.
-  void reset_request_service_info (void);
-  void reset_reply_service_info (void);
-
-  /// Cache the request id.
-  void request_id (CORBA::ULong id);
-
-  /// Return the request ID associated with the operation
-  CORBA::ULong request_id (void) const;
-
-  /// Accessor method for the addressing mode
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void);
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const;
-
-  /// Set method for the addressing mode
-  void addressing_mode (CORBA::Short addr);
-
-  /// Creates and returns a CORBA::Exception object whose repository
-  /// id \a ex matches the exception list that this operation
-  /// specified.
-  /**
-   * This step is important to decode the exception that the client
-   * got from the server. If the exception received from the server
-   * is not found in the list of exceptions specified by the operation
-   * this call would raise an UNKNOWN exception.
-   */
-  CORBA::Exception *corba_exception (const char *ex
-                                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /**
-   * @name Helper methods used by the Invocation classes.
-   */
-  //@{
-
-  /// Marshals the list of <this->arg_> into the \a cdr.
-  bool marshal_args (TAO_OutputCDR &cdr);
-
-  /// Demarshals the list of <this->arg_> into the \a cdr.
-  bool demarshal_args (TAO_InputCDR &cdr);
-
-  /**
-   * The following methods are used by client interceptors to extract
-   * the list of parameters passed by the operation, exceptions
-   * declared for the operation, and the result when available.
-   */
-  bool exception_list (Dynamic::ExceptionList &);
-#if TAO_HAS_INTERCEPTORS == 1
-  bool parameter_list (Dynamic::ParameterList &);
-  bool result (CORBA::Any *);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-  //@}
-
-  /// Accessors for the argumet list
-  TAO::Argument ** args (void) const;
-  CORBA::ULong args_num (void) const ;
-
-private:
-
-  /// Name of the operation being invoked.
-  const char *opname_;
-
-  /// Precalculated length of opname_.
-  CORBA::ULong opname_len_;
-
-  /// Request ID of this operation.
-  CORBA::ULong request_id_;
-
-  /**
-   * Flag that indicates whether the operation has any arguments.  If
-   * there are any arguments the flag will have a value of 1, 0
-   * otherwise.
-   */
-  CORBA::Boolean argument_flag_;
-
-  /// Response flags
-  CORBA::Octet response_flags_;
-
-  /// The ServiceContextList sent to the server side. Only valid
-  /// when sending a request.
-  TAO_Service_Context request_service_info_;
-
-  /// The ServiceContextList received from the server side. Only
-  /// valid when sending a request.
-  TAO_Service_Context reply_service_info_;
-
-  /// Addressing  mode for this request.
-  TAO_Target_Specification::TAO_Target_Address addressing_mode_;
-
-  TAO::Argument **args_;
-
-  CORBA::ULong num_args_;
-
-  /// The type of exceptions that the operations can throw.
-  TAO::Exception_Data *ex_data_;
-
-  /// Count of the exceptions that operations can throw.
-  CORBA::ULong ex_count_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "operation_details.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_OPERATION_DETAILS_H */
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
deleted file mode 100644
index f1178f5bc87..00000000000
--- a/TAO/tao/operation_details.i
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-ACE_INLINE
-TAO_Operation_Details::TAO_Operation_Details (const char *name,
-                                              CORBA::ULong len,
-                                              CORBA::Boolean argument_flag,
-                                              TAO::Argument **args,
-                                              CORBA::ULong num,
-                                              TAO::Exception_Data *data,
-                                              CORBA::Long count)
-  : opname_ (name)
-    , opname_len_ (len)
-    , request_id_ (0)
-    , argument_flag_ (argument_flag)
-    , response_flags_ (0)
-    , addressing_mode_ (TAO_Target_Specification::Key_Addr)
-    , args_ (args)
-    , num_args_ (num)
-    , ex_data_ (data)
-    , ex_count_ (count)
-{
-}
-
-ACE_INLINE const char*
-TAO_Operation_Details::opname (void) const
-{
-  return this->opname_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Operation_Details::opname_len (void) const
-{
-  return this->opname_len_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_Operation_Details::argument_flag (void) const
-{
-  return this->argument_flag_;
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::request_service_context (void)
-{
-  return this->request_service_info_;
-}
-
-ACE_INLINE const TAO_Service_Context &
-TAO_Operation_Details::request_service_context (void) const
-{
-  return this->request_service_info_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::request_service_info (void)
-{
-  return this->request_service_context ().service_info ();
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-TAO_Operation_Details::request_service_info (void) const
-{
-  return this->request_service_context ().service_info ();
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::reply_service_context (void)
-{
-  return this->reply_service_info_;
-}
-
-ACE_INLINE const TAO_Service_Context &
-TAO_Operation_Details::reply_service_context (void) const
-{
-  return this->reply_service_info_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::reply_service_info (void)
-{
-  return this->reply_service_context ().service_info ();
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-TAO_Operation_Details::reply_service_info (void) const
-{
-  return this->reply_service_context ().service_info ();
-}
-
-ACE_INLINE void
-TAO_Operation_Details::reset_request_service_info (void)
-{
-  this->request_service_context ().service_info ()._deallocate_buffer ();
-}
-ACE_INLINE void
-TAO_Operation_Details::reset_reply_service_info (void)
-{
-  this->reply_service_context ().service_info ()._deallocate_buffer ();
-}
-
-ACE_INLINE void
-TAO_Operation_Details::request_id (CORBA::ULong id)
-{
-  this->request_id_ = id;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Operation_Details::request_id (void) const
-{
-  return this->request_id_;
-}
-
-ACE_INLINE void
-TAO_Operation_Details::response_flags (CORBA::Octet flags)
-{
-  this->response_flags_ = flags;
-}
-
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void)
-{
-  return this->response_flags_;
-}
-
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void) const
-{
-  return this->response_flags_;
-}
-
-ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Operation_Details::addressing_mode (void)
-{
-  return this->addressing_mode_;
-}
-
-ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Operation_Details::addressing_mode (void) const
-{
-  return this->addressing_mode_;
-}
-
-ACE_INLINE void
-TAO_Operation_Details::addressing_mode (CORBA::Short mode)
-{
-  if (mode == 0)
-    this->addressing_mode_ = TAO_Target_Specification::Key_Addr;
-  else if (mode == 1)
-    this->addressing_mode_ = TAO_Target_Specification::Profile_Addr;
-  else if (mode == 2)
-    this->addressing_mode_ = TAO_Target_Specification::Reference_Addr;
-}
-
-ACE_INLINE TAO::Argument **
-TAO_Operation_Details::args (void) const
-{
-  return this->args_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Operation_Details::args_num (void) const
-{
-  return this->num_args_;
-}
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
deleted file mode 100644
index 4d0e7a8fe94..00000000000
--- a/TAO/tao/orb.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- IDL -*-
-
-// $Id$
-
-// Included for compatibility with the CORBA 2 specification.
-
-#ifndef TAO_ORB_IDL
-#define TAO_ORB_IDL
-
-///FUZZ: disable check_for_include/
-#include <tao/AnySeq.pidl>
-#include <tao/BooleanSeq.pidl>
-#include <tao/CharSeq.pidl>
-#include <tao/DoubleSeq.pidl>
-#include <tao/FloatSeq.pidl>
-#include <tao/LongDoubleSeq.pidl>
-#include <tao/LongSeq.pidl>
-#include <tao/OctetSeq.pidl>
-#include <tao/ShortSeq.pidl>
-#include <tao/StringSeq.pidl>
-#include <tao/ULongSeq.pidl>
-#include <tao/UShortSeq.pidl>
-#include <tao/WCharSeq.pidl>
-#include <tao/WStringSeq.pidl>
-
-#if ! defined (ACE_LACKS_LONGLONG_T)
-#include <tao/LongLongSeq.pidl>
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-
-#if ! defined (ACE_LACKS_U_LONGLONG_T)
-#include <tao/ULongLongSeq.pidl>
-#endif /* ! defined (ACE_LACKS_U_LONGLONG_T) */
-
-#include <tao/Policy.pidl>
-#include <tao/Services.pidl>
-#include <tao/ParameterMode.pidl>
-#include <tao/orb_types.pidl>
-#include <tao/Typecode_types.pidl>
-#include <tao/Visibility.pidl>
-#include <tao/ValueModifier.pidl>
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  struct NamedValue
-  {
-    Identifier name;
-    any argument;
-    long len;
-    Flags arg_modes;
-  };
-
-  enum exception_type
-  {
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION
-  };
-};
-
-#endif /* TAO_ORB_IDL */
diff --git a/TAO/tao/orb_types.pidl b/TAO/tao/orb_types.pidl
deleted file mode 100644
index db680fcacf8..00000000000
--- a/TAO/tao/orb_types.pidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- IDL -*-
-
-// $Id$
-
-// Basic types
-
-#ifndef TAO_ORB_TYPES_IDL
-#define TAO_ORB_TYPES_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef string ORBid;
-  typedef unsigned long Flags;
-  typedef string Identifier;
-  typedef string RepositoryId;
-};
-
-#endif /* TAO_ORB_TYPES_IDL */
diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp
deleted file mode 100644
index a4f7d9d600d..00000000000
--- a/TAO/tao/orb_typesA.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "orb_typesC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORBid (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORBid:1.0",
-    "ORBid",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBid =
-    &_tao_tc_CORBA_ORBid;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Flags (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Flags:1.0",
-    "Flags",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Flags =
-    &_tao_tc_CORBA_Flags;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Identifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Identifier:1.0",
-    "Identifier",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Identifier =
-    &_tao_tc_CORBA_Identifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryId:1.0",
-    "RepositoryId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryId =
-    &_tao_tc_CORBA_RepositoryId;
-}
-
-
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
deleted file mode 100644
index 526c4eae23c..00000000000
--- a/TAO/tao/orb_typesC.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "orb_typesC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
deleted file mode 100644
index d598d6e8fc4..00000000000
--- a/TAO/tao/orb_typesC.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ORB_TYPESC_H_
-#define _TAO_IDL_ORIG_ORB_TYPESC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * ORBid;
-  typedef CORBA::String_var ORBid_var;
-  typedef CORBA::String_out ORBid_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBid;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong Flags;
-  typedef CORBA::ULong_out Flags_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Flags;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Identifier;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
-  
-  typedef char * RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RepositoryId;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/orb_typesS.h b/TAO/tao/orb_typesS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/orb_typesS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
deleted file mode 100644
index 74f89e9e568..00000000000
--- a/TAO/tao/orbconf.h
+++ /dev/null
@@ -1,860 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     orbconf.h
- *
- *  $Id$
- *
- *  Build configuration file.
- *
- *  @author  Copyright 1995 by Sun Microsystems, Inc.
- *  @author  Chris Cleeland
- *  @author  Douglas C. Schmidt
- */
-//=============================================================================
-
-#ifndef TAO_ORBCONF_H
-#define TAO_ORBCONF_H
-
-#include /**/ "ace/pre.h"
-
-// "ace/OS.h" is overkill.  "ace/Basic_Types.h" is enough.  In
-// particular, it is needed for the definition of ACE_LITTLE_ENDIAN.
-#include "ace/Basic_Types.h"
-#include "ace/Global_Macros.h"
-#include "ace/Synch_Traits.h"
-
-#define TAO_INVALID_PRIORITY -1
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (TAO_REACTOR)
-#define TAO_REACTOR ACE_Select_Reactor
-#endif /* TAO_REACTOR */
-
-#if !defined (TAO_NULL_LOCK_REACTOR)
-#define TAO_NULL_LOCK_REACTOR ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-#endif /* TAO_NULL_LOCK_REACTOR */
-
-// Define this to modify the default mutex type used throughout TAO.
-#if !defined (TAO_SYNCH_MUTEX)
-#define TAO_SYNCH_MUTEX ACE_SYNCH_MUTEX
-#endif /* TAO_SYNCH_MUTEX */
-
-#if !defined (TAO_SYNCH_RECURSIVE_MUTEX)
-#define TAO_SYNCH_RECURSIVE_MUTEX ACE_SYNCH_RECURSIVE_MUTEX
-#endif /* TAO_SYNCH_RECURSIVE_MUTEX */
-
-#if !defined (TAO_SYNCH_RW_MUTEX)
-#define TAO_SYNCH_RW_MUTEX ACE_SYNCH_RW_MUTEX
-#endif /* TAO_SYNCH_RW_MUTEX */
-
-#if !defined (TAO_SYNCH_CONDITION)
-#define TAO_SYNCH_CONDITION ACE_SYNCH_CONDITION
-#endif /* TAO_SYNCH_CONDITION */
-
-// Define this if you don't want POA timestamps in the IOR.  Remember,
-// without timestamps, transient and persistent POA cannot be
-// distinguished.
-#if !defined (POA_NO_TIMESTAMP)
-# define POA_NO_TIMESTAMP 0
-#endif /* POA_NO_TIMESTAMP */
-
-// If set the ORB will use dotted decimal addresses in the IIOP IORs
-// it exports.  This is useful for platforms or environments that
-// cannot depend on a DNS being available.  This macro only affects
-// the server side of a TAO-based CORBA application. If we are on Win32
-// the DNS is perenially broken. Set it to 1 regardless.
-#if !defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES) && defined (ACE_WIN32)
-# define TAO_USE_DOTTED_DECIMAL_ADDRESSES 1
-#endif /*TAO_USE_DOTTED_DECIMAL_ADDRESSES*/
-
-#if !defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES)
-# define TAO_USE_DOTTED_DECIMAL_ADDRESSES 0
-#endif /* TAO_USE_DOTTED_DECIMAL_ADDRESSES */
-
-// The default size of TAO's ORB table, i.e. the one used as the
-// underlying implementation for the CORBA::ORB_init() function.
-#if !defined (TAO_DEFAULT_ORB_TABLE_SIZE)
-const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16;
-#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
-
-// The default size of the reply dispatcher table, ie. if the reply
-// dispatcher strategy needs a table to maintain association between
-// request id's and reply dispatchers
-#if !defined (TAO_RD_TABLE_SIZE)
-const size_t TAO_RD_TABLE_SIZE = 16;
-#endif  /* !TAO_RD_TABLE_SIZE */
-
-// The default size of TAO's policy factory registry, i.e. the map
-// used as the underlying implementation for the
-// PortableInterceptor::ORBInitInfo::register_policy_factory() method.
-#if !defined (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
-const size_t TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE = 64;
-#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
-
-// The default size of TAO's initial object reference table, i.e. the
-// one used as the underlying implementation for the
-// CORBA::ORB::register_initial_reference() and
-// PortableInterceptor::ORBInitInfo::register_initial_reference()
-// methods.
-#if !defined (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
-const size_t TAO_DEFAULT_OBJECT_REF_TABLE_SIZE = 256;
-#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
-
-// The default size of TAO's ValueFactory table, i.e. the
-// one used as the underlying implementation for the
-// CORBA::ORB::register_value_factory() method.
-#if !defined (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
-const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
-#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
-
-
-// The default size of TAO's server active object map.
-#if !defined (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE)
-# if defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)
-//
-// TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE is deprecated. Please use
-// TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE.
-//
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE
-# else
-#  define TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE 64
-# endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
-#endif /* ! TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE */
-
-// The default size of TAO's server poa map.
-#if !defined (TAO_DEFAULT_SERVER_POA_MAP_SIZE)
-#  define TAO_DEFAULT_SERVER_POA_MAP_SIZE 24
-#endif /* ! TAO_DEFAULT_SERVER_POA_MAP_SIZE */
-
-// The default timeout receiving the location request to the TAO
-// Naming, Trading and other servicesService.
-#if !defined (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 10
-#endif /* TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT */
-
-// The default starting port number for TAO servers.
-// @@ This assumes we are using one or more protocols that will all
-// @@ 1) know what to do with a port number and
-// @@ 2) use the same default port number.
-// @@ This shou8ld go away!
-#if !defined (TAO_DEFAULT_SERVER_PORT)
-#define TAO_DEFAULT_SERVER_PORT 0
-#endif /* TAO_DEFAULT_SERVER_PORT */
-
-// TAO's max buffer size
-#if !defined (TAO_MAXBUFSIZE)
-#define TAO_MAXBUFSIZE 1024
-#endif /* TAO_MAXBUFSIZE */
-
-/*!
-
-  The number of times the transport will try to re-read before
-  returning control to the reactor when it has an uncompleted
-  message (see TAO_Transport::handle_input()).
-
-  The idea behind re-reading is that more data may have arrived
-  while the transport was busy deciding what to do with the bytes
-  it got, so we should probably try to re-read.
-
-  This value shouldn't be too large, lest the transport starve
-  out other transports while trying to complete its message.
-
-  When choosing a value, think of the type of this as 'unsigned int'.
- */
-#if !defined(TAO_MAX_TRANSPORT_REREAD_ATTEMPTS)
-#define TAO_MAX_TRANSPORT_REREAD_ATTEMPTS 2
-#endif
-
-// This controls the alignment for TAO structs.  It supports built-in
-// types up to and including 16 bytes (128 bits) in size.
-#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE)
-# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
-#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
-
-// @todo The connection caching strategy definition should probably
-// go.
-#if !defined (TAO_CONNECTION_CACHING_STRATEGY)
-# define TAO_CONNECTION_CACHING_STRATEGY TAO_Resource_Factory::LRU
-#endif /* TAO_CONNECTION_CACHING_STRATEGY */
-
-#if !defined (TAO_CONNECTION_PURGING_STRATEGY)
-# define TAO_CONNECTION_PURGING_STRATEGY TAO_Resource_Factory::LRU
-#endif /* TAO_CONNECTION_PURGING_STRATEGY */
-
-
-#if !defined (TAO_PURGE_PERCENT)
-# define TAO_PURGE_PERCENT 20
-#endif /* TAO_PURGE_PERCENT */
-
-#if !defined (TAO_CONNECTION_CACHE_MAXIMUM)
-# define TAO_CONNECTION_CACHE_MAXIMUM (ACE::max_handles () / 2)
-#endif /* TAO_CONNECTION_CACHE_MAXIMUM */
-
-
-// This definition theoretically is not required. Just leaving it here
-// for backward compatibility
-#define TAO_NAMESPACE_STORAGE_CLASS extern TAO_EXPORT_MACRO
-
-# if defined (_MSC_VER) && defined (__ACE_INLINE__)
-#   define TAO_NAMESPACE_INLINE_FUNCTION inline
-# else
-#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
-# endif
-
-// Instead of replacing this with the ACE macro
-// in 20+ files, define it conditionally.
-// The TAO_OutputCDR class uses the ACE macro, which
-// is defined by default.
-#if !defined(TAO_NO_COPY_OCTET_SEQUENCES)
-# define TAO_NO_COPY_OCTET_SEQUENCES 1
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-
-#if defined (ACE_HAS_EXCEPTIONS)
-# define TAO_HAS_EXCEPTIONS
-// TAO_USE_EXCEPTIONS is only here for backwards compatibility and
-// will go away shortly so don't use it...
-# define TAO_USE_EXCEPTIONS
-#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS)
-# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
-#endif /* TAO_HAS_EXCEPTIONS */
-
-// BC++ seems to have a different convention for detecting Win32 than
-// VC++.
-
-#if defined (__WIN32__)
-# if !defined(_WIN32)
-#   define _WIN32
-# endif /* !defined(_WIN32) */
-#endif /* __WIN32__ */
-
-// Define to `int' if <sys/types.h> doesn't define.
-/* #undef pid_t */
-
-// Define if your processor does not store words with the most significant
-// byte first.
-
-// @todo It seems to be that this definition of TAO_ENCAP_BYTE_ORDER
-// should be  removed. We have an equivalent ACE definition in
-// ACE_CDR_BYTE_ORDER. Today both of them are consistent. It would be
-// a havoc if oneday this consistency is gone..
-#if defined (ACE_LITTLE_ENDIAN)
-#  define TAO_ENCAP_BYTE_ORDER 1  /* little endian encapsulation byte order has
-                                     the value = 1 */
-#else  /* ! ACE_LITTLE_ENDIAN */
-#  define TAO_ENCAP_BYTE_ORDER 0  /* big endian encapsulation byte order has
-                                     the value = 0 */
-#endif /* ! ACE_LITTLE_ENDIAN */
-
-// Define as the return type of signal handlers (int or void).
-#define RETSIGTYPE void
-
-// Define if you don't have vprintf but do have _doprnt.
-/* #undef HAVE_DOPRNT */
-
-// Define if you have the vprintf function.
-#define HAVE_VPRINTF 1
-
-// Avoid namespace pollution that's common on older UNIXes...
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-#if defined (major)
-#undef major
-#endif /* major*/
-
-#if !defined (TAO_EXPORT_NESTED_CLASSES) \
-    && defined (ACE_EXPORT_NESTED_CLASSES)
-#define TAO_EXPORT_NESTED_CLASSES
-#endif /* !defined TAO_EXPORT_NESTED_CLASSES */
-
-#if !defined (TAO_EXPORT_NESTED_MACRO)
-#define TAO_EXPORT_NESTED_MACRO
-#endif /* !defined (TAO_EXPORT_NESTED_MACRO) */
-
-// Assume DOS/Windows if "configure" didn't get run.
-
-#if defined (_MSC_VER)
-// "C4355: 'this' : used in base member initializer list"
-#  pragma warning (disable:4355) /* disable C4355 warning */
-#endif /* defined (_MSC_VER) */
-
-// The IDL compiler can generate the classes corresponding to IDL
-// sequences in two ways:
-// + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<>
-// + Explicitly generate code for the sequence.
-//
-// The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>)
-// can be shared across multiple IDL files.
-// Unfortunately it is hard to manage the template instantiations on
-// platforms that do not automatically generate them, mainly because
-// it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most
-// applications.
-//
-// On platforms that support automatic template instantiation we use
-// the first approach.
-// On platforms that require explicit template instantiations we use
-// explicitly generated code for sequences if the platform does not.
-// If the application requires it (such as embedded systems) the
-// default can be changed, but then the application developer is
-// responsible for instantiating the templates.
-//
-#if defined (AIX) || \
-    (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-     (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-      (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS))))
-#define TAO_USE_SEQUENCE_TEMPLATES
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// The Root POA default name.
-#if !defined (TAO_DEFAULT_ROOTPOA_NAME)
-#define TAO_DEFAULT_ROOTPOA_NAME   "RootPOA"
-#endif /* TAO_DEFAULT_ROOTPOA_NAME */
-
-// The default lane name used when storing endpoints.
-#if !defined (TAO_DEFAULT_LANE)
-#define TAO_DEFAULT_LANE "default lane"
-#endif /* TAO_DEFAULT_LANE */
-
-// Minimum CORBA
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-# define TAO_HAS_MINIMUM_CORBA 0
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// Default DIOP settings
-#if !defined (TAO_HAS_DIOP)
-#    define TAO_HAS_DIOP 1
-#endif  /* !TAO_HAS_DIOP */
-
-// SCIOP is disabled by default (i.e. TAO_HAS_SCIOP is undef)
-// to enable SCIOP, make with sctp=openss7 option on command line.
-// See $ACE_ROOT/performance-tests/SCTP/README for more info.
-
-// Default SCIOP Settings
-#if !defined (TAO_HAS_SCIOP)
-#  if defined (ACE_HAS_SCTP)
-#    define TAO_HAS_SCIOP 1
-#    define TAO_DEF_SCIOP_MAJOR 1
-#    define TAO_DEF_SCIOP_MINOR 0
-#  else
-#    define TAO_HAS_SCIOP 0
-#  endif  /* ACE_HAS_SCTP */
-#endif  /* !TAO_HAS_SCIOP */
-
-// UIOP support is enabled by default if the platform supports UNIX
-// domain sockets, and TAO is not configured for minimum CORBA.
-// If TAO is configured for minimum CORBA, then UIOP will be disabled
-// by default.
-// To explicitly enable UIOP support uncomment the following
-// #define TAO_HAS_UIOP 1
-// To explicitly disable UIOP support uncomment the following
-// #define TAO_HAS_UIOP 0
-
-// Default UIOP settings
-#if !defined (TAO_HAS_UIOP)
-#  if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-#    define TAO_HAS_UIOP 0
-#  else
-#    define TAO_HAS_UIOP 1
-#  endif  /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-#endif  /* !TAO_HAS_UIOP */
-
-// NSKPW and NSKFS are Pluggable Protocols used on the Tandem
-// platform.  These are disabled by default.
-
-#if defined (TAO_HAS_NSKPW)
-#define TAO_DEF_NSKPW_MAJOR 1
-#define TAO_DEF_NSKPW_MINOR 2
-#endif
-
-#if defined (TAO_HAS_NSKFS)
-#define TAO_DEF_NSKFS_MAJOR 1
-#define TAO_DEF_NSKFS_MINOR 2
-#endif
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-# if !defined (TAO_HAS_SHMIOP)
-#   define TAO_HAS_SHMIOP 1
-# endif /* TAO_HAS_SHMIOP */
-#else
-# if defined (TAO_HAS_SHMIOP)
-#   undef TAO_HAS_SHMIOP
-# endif /* TAO_HAS_SHMIOP */
-# define TAO_HAS_SHMIOP 0
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
-// NAMED_RT_MUTEX support is disabled by default.
-// To explicitly enable NAMED_RT_MUTEX support uncomment the following
-// #define TAO_HAS_NAMED_RT_MUTEXES 1
-// To explicitly disable NAMED_RT_MUTEX support uncomment the following
-// #define TAO_HAS_NAMED_RT_MUTEXES 0
-
-// Default NAMED_RT_MUTEX settings
-#if !defined (TAO_HAS_NAMED_RT_MUTEXES)
-#  define TAO_HAS_NAMED_RT_MUTEXES 0
-#endif  /* !TAO_HAS_NAMED_RT_MUTEXES */
-
-// MINIMUM_POA support is disabled by default if TAO is not
-// configured for minimum CORBA.  If TAO is configured for minimum
-// CORBA, then MINIMUM_POA will be enabled by default.
-// To explicitly enable MINIMUM_POA support uncomment the following
-// #define TAO_HAS_MINIMUM_POA 1
-// To explicitly disable MINIMUM_POA support uncomment the following
-// #define TAO_HAS_MINIMUM_POA 0
-
-// Default MINIMUM_POA settings
-#if !defined (TAO_HAS_MINIMUM_POA)
-#  if (TAO_HAS_MINIMUM_CORBA == 1)
-#    define TAO_HAS_MINIMUM_POA 1
-#  else
-#    define TAO_HAS_MINIMUM_POA 0
-#  endif  /* TAO_HAS_MINIMUM_CORBA */
-#endif  /* !TAO_HAS_MINIMUM_POA */
-
-// MINIMUM_POA_MAPS support is disabled by default if TAO is not
-// configured for minimum POA.  If TAO is configured for minimum
-// POA, then MINIMUM_POA_MAPS will be enabled by default.
-// To explicitly enable MINIMUM_POA_MAPS support uncomment the following
-// #define TAO_HAS_MINIMUM_POA_MAPS 1
-// To explicitly disable MINIMUM_POA_MAPS support uncomment the following
-// #define TAO_HAS_MINIMUM_POA_MAPS 0
-
-// Default MINIMUM_POA_MAPS settings
-#if !defined (TAO_HAS_MINIMUM_POA_MAPS)
-#  if (TAO_HAS_MINIMUM_POA == 1)
-#    define TAO_HAS_MINIMUM_POA_MAPS 1
-#  else
-#    define TAO_HAS_MINIMUM_POA_MAPS 0
-#  endif  /* TAO_HAS_MINIMUM_POA */
-#endif  /* !TAO_HAS_MINIMUM_POA_MAPS */
-
-// CORBA_MESSAGING support is enabled by default if TAO is not
-// configured for minimum CORBA.  If TAO is configured for minimum
-// CORBA, then CORBA_MESSAGING will be disabled by default.
-// To explicitly enable CORBA_MESSAGING support uncomment the following
-// #define TAO_HAS_CORBA_MESSAGING 1
-// To explicitly disable CORBA_MESSAGING support uncomment the following
-// #define TAO_HAS_CORBA_MESSAGING 0
-
-// Default CORBA_MESSAGING settings
-#if !defined (TAO_HAS_CORBA_MESSAGING)
-#    define TAO_HAS_CORBA_MESSAGING 1
-#endif  /* !TAO_HAS_CORBA_MESSAGING */
-
-// For all the policies, support is enabled by default if TAO is
-// configured for CORBA Messaging.  If TAO is not configured for CORBA
-// Messaging, then policies cannot be enabled.  Default support can be
-// turned off by setting TAO_DISABLE_CORBA_MESSAGING_POLICIES to 1.
-
-#if !defined (TAO_DISABLE_CORBA_MESSAGING_POLICIES)
-# define TAO_DISABLE_CORBA_MESSAGING_POLICIES 0
-#endif  /* !TAO_DISABLE_CORBA_MESSAGING_POLICIES */
-
-// To explicitly disable REBIND_POLICY support uncomment the following
-// #define TAO_HAS_REBIND_POLICY 0
-
-// Default REBIND_POLICY settings
-#if !defined (TAO_HAS_REBIND_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_REBIND_POLICY 1
-#  else
-#    define TAO_HAS_REBIND_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_REBIND_POLICY */
-
-// To explicitly disable SYNC_SCOPE_POLICY support uncomment the following
-// #define TAO_HAS_SYNC_SCOPE_POLICY 0
-
-// Default SYNC_SCOPE_POLICY settings
-#if !defined (TAO_HAS_SYNC_SCOPE_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_SYNC_SCOPE_POLICY 1
-#  else
-#    define TAO_HAS_SYNC_SCOPE_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_SYNC_SCOPE_POLICY */
-
-// To explicitly disable PRIORITY_POLICIES support uncomment the following
-// #define TAO_HAS_PRIORITY_POLICIES 0
-
-// Default PRIORITY_POLICIES settings
-#if !defined (TAO_HAS_PRIORITY_POLICIES)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_PRIORITY_POLICIES 1
-#  else
-#    define TAO_HAS_PRIORITY_POLICIES 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_PRIORITY_POLICIES */
-
-// To explicitly disable REQUEST_START_TIME_POLICY support uncomment the following
-// #define TAO_HAS_REQUEST_START_TIME_POLICY 0
-
-// Default REQUEST_START_TIME_POLICY settings
-#if !defined (TAO_HAS_REQUEST_START_TIME_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_REQUEST_START_TIME_POLICY 1
-#  else
-#    define TAO_HAS_REQUEST_START_TIME_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_REQUEST_START_TIME_POLICY */
-
-// To explicitly disable REQUEST_END_TIME_POLICY support uncomment the following
-// #define TAO_HAS_REQUEST_END_TIME_POLICY 0
-
-// Default REQUEST_END_TIME_POLICY settings
-#if !defined (TAO_HAS_REQUEST_END_TIME_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_REQUEST_END_TIME_POLICY 1
-#  else
-#    define TAO_HAS_REQUEST_END_TIME_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_REQUEST_END_TIME_POLICY */
-
-// To explicitly disable REPLY_START_TIME_POLICY support uncomment the following
-// #define TAO_HAS_REPLY_START_TIME_POLICY 0
-
-// Default REPLY_START_TIME_POLICY settings
-#if !defined (TAO_HAS_REPLY_START_TIME_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_REPLY_START_TIME_POLICY 1
-#  else
-#    define TAO_HAS_REPLY_START_TIME_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_REPLY_START_TIME_POLICY */
-
-// To explicitly disable REPLY_END_TIME_POLICY support uncomment the following
-// #define TAO_HAS_REPLY_END_TIME_POLICY 0
-
-// Default REPLY_END_TIME_POLICY settings
-#if !defined (TAO_HAS_REPLY_END_TIME_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_REPLY_END_TIME_POLICY 1
-#  else
-#    define TAO_HAS_REPLY_END_TIME_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_REPLY_END_TIME_POLICY */
-
-// To explicitly disable RELATIVE_REQUEST_TIMEOUT_POLICY support uncomment the following
-// #define TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY 0
-
-// Default RELATIVE_REQUEST_TIMEOUT_POLICY settings
-#if !defined (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY 1
-#  else
-#    define TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY */
-
-// To explicitly disable RELATIVE_ROUNDTRIP_TIMEOUT_POLICY support uncomment the following
-// #define TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY 0
-
-// Default RELATIVE_ROUNDTRIP_TIMEOUT_POLICY settings
-#if !defined (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY 1
-#  else
-#    define TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY */
-
-// Default CONNECTION_TIMEOUT_POLICY settings. This is a proprietary
-// TAO policy.
-#if !defined (TAO_HAS_CONNECTION_TIMEOUT_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_CONNECTION_TIMEOUT_POLICY 1
-#  else
-#    define TAO_HAS_CONNECTION_TIMEOUT_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_CONNECTION_TIMEOUT_POLICY */
-
-
-// To explicitly disable ROUTING_POLICY support uncomment the following
-// #define TAO_HAS_ROUTING_POLICY 0
-
-// Default ROUTING_POLICY settings
-#if !defined (TAO_HAS_ROUTING_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_ROUTING_POLICY 1
-#  else
-#    define TAO_HAS_ROUTING_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_ROUTING_POLICY */
-
-// To explicitly disable MAX_HOPS_POLICY support uncomment the following
-// #define TAO_HAS_MAX_HOPS_POLICY 0
-
-// Default MAX_HOPS_POLICY settings
-#if !defined (TAO_HAS_MAX_HOPS_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_MAX_HOPS_POLICY 1
-#  else
-#    define TAO_HAS_MAX_HOPS_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_MAX_HOPS_POLICY */
-
-// To explicitly disable QUEUE_ORDER_POLICY support uncomment the following
-// #define TAO_HAS_QUEUE_ORDER_POLICY 0
-
-// Default QUEUE_ORDER_POLICY settings
-#if !defined (TAO_HAS_QUEUE_ORDER_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_QUEUE_ORDER_POLICY 1
-#  else
-#    define TAO_HAS_QUEUE_ORDER_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_QUEUE_ORDER_POLICY */
-
-// To explicitly disable BUFFERING_CONSTRAINT_POLICY support uncomment the following
-// #define TAO_HAS_BUFFERING_CONSTRAINT_POLICY 0
-
-// Default BUFFERING_CONSTRAINT_POLICY settings
-#if !defined (TAO_HAS_BUFFERING_CONSTRAINT_POLICY)
-#  if (TAO_HAS_CORBA_MESSAGING == 1) && \
-      (TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0)
-#    define TAO_HAS_BUFFERING_CONSTRAINT_POLICY 1
-#  else
-#    define TAO_HAS_BUFFERING_CONSTRAINT_POLICY 0
-#  endif  /* TAO_HAS_CORBA_MESSAGING == 1 &&
-             TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
-#endif  /* !TAO_HAS_BUFFERING_CONSTRAINT_POLICY */
-
-// AMI support is enabled by default, unless TAO is compiled with
-// Minimum CORBA.  In that case AMI is disabled by default.
-// If disabled you can also disable the CORBA MESSAGING support.
-// To explicitly enable AMI support uncomment the following
-// #define TAO_HAS_AMI 1
-// To explicitly disable AMI support uncomment the following
-// #define TAO_HAS_AMI 0
-
-// Default AMI settings
-#if !defined (TAO_HAS_AMI)
-#  if (TAO_HAS_MINIMUM_CORBA == 1)
-#    define TAO_HAS_AMI 0
-#  else
-#    define TAO_HAS_AMI 1
-#  endif  /* TAO_HAS_MINIMUM_CORBA */
-#else
-#  if (TAO_HAS_AMI == 1) && \
-      (TAO_HAS_CORBA_MESSAGING == 0)
-#  error "tao/orbconf.h: You need CORBA_MESSAGING for AMI support"
-#  endif /* TAO_HAS_AMI == 1 &&
-            TAO_HAS_CORBA_MESSAGING == 0 */
-#endif  /* !TAO_HAS_AMI */
-
-// We dont have AMI_POLLER support in TAO. Just prevent anyone from
-// using it.
-
-/***********************************************************/
-// All these are for future use. Commenting it..
-
-// #if !defined (TAO_HAS_AMI_POLLER)
-// #  if (TAO_HAS_AMI == 1)
-// #    define TAO_HAS_AMI_POLLER 1
-// #  else
-// #    define TAO_HAS_AMI_POLLER 0
-// #  endif  /* TAO_HAS_AMI == 1 */
-// #else
-// #  if (TAO_HAS_AMI_POLLER == 1) && (TAO_HAS_CORBA_MESSAGING == 0)
-// #  error "tao/orbconf.h: You need CORBA_MESSAGING for AMI support"
-// #  endif /* TAO_HAS_AMI_POLLER == 1 &&
-//             TAO_HAS_CORBA_MESSAGING == 0 */
-// #endif  /* !TAO_HAS_AMI_POLLER */
-/***********************************************************/
-
-// AMI_CALLBACK support is disabled by default if TAO is not
-// configured for AMI.  If TAO is configured for AMI, then
-// AMI_CALLBACK will be enabled by default. If enabled, it requires
-// CORBA_MESSAGING support.
-// To explicitly enable AMI_CALLBACK support uncomment the following
-// #define TAO_HAS_AMI_CALLBACK 1
-// To explicitly disable AMI_CALLBACK support uncomment the following
-// #define TAO_HAS_AMI_CALLBACK 0
-
-// Default AMI_CALLBACK settings
-#if !defined (TAO_HAS_AMI_CALLBACK)
-#  if (TAO_HAS_AMI == 1)
-#    define TAO_HAS_AMI_CALLBACK 1
-#  else
-#    define TAO_HAS_AMI_CALLBACK 0
-#  endif  /* TAO_HAS_AMI == 1 */
-#else
-#  if (TAO_HAS_AMI_CALLBACK == 1) && \
-      (TAO_HAS_CORBA_MESSAGING == 0)
-#  error "tao/orbconf.h: You need CORBA_MESSAGING for AMI support"
-#  endif /* TAO_HAS_AMI_CALLBACK == 1 &&
-            TAO_HAS_CORBA_MESSAGING == 0 */
-#endif  /* !TAO_HAS_AMI_CALLBACK */
-
-// Interceptors is supported by default if we are not building for
-// MinimumCORBA.
-#if !defined (TAO_HAS_INTERCEPTORS)
-# if (TAO_HAS_MINIMUM_CORBA == 1)
-#   define TAO_HAS_INTERCEPTORS 0
-# else
-#   define TAO_HAS_INTERCEPTORS 1
-# endif /* TAO_HAS_MINIMUM_CORBA */
-#endif
-
-// Proprietary FT interception-point support is disabled by default.
-#ifndef TAO_HAS_EXTENDED_FT_INTERCEPTORS
-# define TAO_HAS_EXTENDED_FT_INTERCEPTORS 0
-#endif  /* !TAO_HAS_EXTENEDED_FT_INTERCEPTORS */
-
-// This is needed for a check in the Policy Set; Should really not be
-// here though; We should find a different way to handle the check in
-// the Policy Set.
-#define TAO_RT_SERVER_PROTOCOL_POLICY_TYPE 42
-
-/// Policies that are accessed on the critical path and need to be
-/// incur minimal retrieval overhead.
-enum TAO_Cached_Policy_Type
-{
-  TAO_CACHED_POLICY_UNCACHED = -1,
-  TAO_CACHED_POLICY_PRIORITY_MODEL = 0,
-  TAO_CACHED_POLICY_THREADPOOL,
-  TAO_CACHED_POLICY_RT_SERVER_PROTOCOL,
-  TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL,
-  TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION,
-  TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION,
-
-  TAO_CACHED_POLICY_LIFESPAN,
-  TAO_CACHED_POLICY_ID_UNIQUENESS,
-  TAO_CACHED_POLICY_ID_ASSIGNMENT,
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-  TAO_CACHED_POLICY_THREAD,
-  TAO_CACHED_POLICY_IMPLICIT_ACTIVATION,
-  TAO_CACHED_POLICY_SERVANT_RETENTION,
-  TAO_CACHED_POLICY_REQUEST_PROCESSING,
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-  TAO_CACHED_POLICY_SYNC_SCOPE,
-#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
-
-#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-  TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT,
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-  TAO_CACHED_POLICY_BUFFERING_CONSTRAINT,
-#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-#if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
-  TAO_CACHED_POLICY_CONNECTION_TIMEOUT,
-#endif /* TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1 */
-
-  TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP,
-
-  TAO_CACHED_POLICY_MAX_CACHED
-};
-
-// This enum provides a mask that represent the scope at which a given
-// policy can be applied
-enum TAO_Policy_Scope
-{
-  TAO_POLICY_OBJECT_SCOPE   = 0x01,
-  TAO_POLICY_THREAD_SCOPE   = 0x02,
-  TAO_POLICY_ORB_SCOPE      = 0x04,
-  TAO_POLICY_POA_SCOPE      = 0x08,
-  TAO_POLICY_CLIENT_EXPOSED = 0x10
-};
-
-#define TAO_POLICY_DEFAULT_SCOPE \
-  (static_cast<TAO_Policy_Scope> ( \
-                   TAO_POLICY_OBJECT_SCOPE | \
-                   TAO_POLICY_THREAD_SCOPE | \
-                   TAO_POLICY_ORB_SCOPE | \
-                   TAO_POLICY_POA_SCOPE))
-
-// Control the default version of GIOP used by TAO.
-// The ORB is always able to communicate with 1.0, 1.1 and 1.2
-// servers, and it creates 1.2 endpoints (and profiles).  If you need
-// to talk to old clients that only understand 1.0 or 1.1 (and do not
-// attempt to use 1.0 or 1.1 with 1.2 servers), then change the values
-// below.
-#if !defined (TAO_DEF_GIOP_MAJOR)
-#define TAO_DEF_GIOP_MAJOR 1
-#endif /* TAO_DEF_GIOP_MAJOR */
-#if !defined (TAO_DEF_GIOP_MINOR)
-#define TAO_DEF_GIOP_MINOR 2
-#endif /* TAO_DEF_GIOP_MINOR */
-
-
-// @@todo this needs to be deprecated. Use TAO_MAXBUFSIZE instead.
-#if !defined (TAO_CONNECTION_HANDLER_STACK_BUF_SIZE)
-#   define TAO_CONNECTION_HANDLER_STACK_BUF_SIZE 1024
-#endif /*TAO_CONNECTION_HANDLER_STACK_BUF_SIZE */
-
-// By default TAO generate the OMG standard profile components
-// (ORB_TYPE and CODE_SETS)
-#define TAO_STD_PROFILE_COMPONENTS
-
-#if !defined (TAO_DEFAULT_IOR_SIZE)
-// This is the default size of the buffer used for processing IORs.
-#define TAO_DEFAULT_IOR_SIZE 1024
-#endif /* TAO_DEFAULT_IOR_SIZE */
-
-#if !defined (TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT)
-// The default timeout value for the thread-per-connection model, in
-// milliseconds. The "INFINITE" value is magic and means blocking forever.
-#define TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT "5000"
-#endif /* TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT */
-
-/// By default we use Muxed Transports
-#if !defined (TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY)
-#  define TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY 1
-#endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
-
-/// By default we use multicast lookup
-#if !defined(TAO_DEFAULT_INIT_REFERENCE_INITIALIZER)
-#  define TAO_DEFAULT_INIT_REFERENCE_INITIALIZER "mcast://:::"
-#endif /* TAO_DEFAULT_INIT_REFERENCE_INITIALIZER */
-
-/// By default we dont use lazy strategy
-#if !defined (TAO_USE_LAZY_RESOURCE_USAGE_STRATEGY)
-#  define TAO_USE_LAZY_RESOURCE_USAGE_STRATEGY 0
-#endif /* TAO_USE_LAZY_RESOURCE_USAGE_STRATEGY*/
-
-#if !defined (TAO_USE_LOCAL_MEMORY_POOL)
-#  define TAO_USE_LOCAL_MEMORY_POOL 1
-#endif /* TAO_USE_LOCAL_MEMORY_POOL */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_ORBCONF_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
deleted file mode 100644
index 0572dea4499..00000000000
--- a/TAO/tao/params.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-
-#include "tao/params.h"
-#include "tao/orbconf.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_Thread.h"
-
-
-ACE_RCSID (tao,
-           params,
-           "$Id$")
-
-
-TAO_ORB_Parameters::TAO_ORB_Parameters (void)
-  : endpoints_map_ (10)
-  , mcast_discovery_endpoint_ ()
-  , default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER)
-  , sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
-  , sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
-  , nodelay_ (1)
-  , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF)
-  , use_lite_protocol_ (0)
-  , use_dotted_decimal_addresses_ (0)
-  , linger_ (-1)
-  , std_profile_components_ (1)
-  , ace_sched_policy_ (ACE_SCHED_OTHER)
-  , sched_policy_ (THR_SCHED_DEFAULT)
-  , scope_policy_ (THR_SCOPE_PROCESS)
-  , single_read_optimization_ (1)
-  , pref_network_ ()
-  , disable_rt_collocation_resolver_ (false)
-  , enforce_preferred_interfaces_ (false)
-{
-  for (int i = 0; i != TAO_NO_OF_MCAST_SERVICES; ++i)
-    {
-      this->service_port_[i] = 0;
-    }
-}
-
-TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
-{
-}
-
-void
-TAO_ORB_Parameters::get_endpoint_set (const ACE_CString &lane,
-                                      TAO_EndpointSet &endpoint_set)
-{
-  ACE_CString endpoints;
-
-  // Look for the lane in the endpoints map.
-  int result =
-    this->endpoints_map_.find (lane, endpoints);
-
-  // If lane is not in the map, <endpoint_set> remains empty
-  if (result != 0)
-    return;
-
-  // At this point, the parsing should not fail since they have been
-  // parsed successfully before.
-  result =
-    this->parse_and_add_endpoints (endpoints,
-                                   endpoint_set);
-  ACE_ASSERT (result == 0);
-}
-
-int
-TAO_ORB_Parameters::add_endpoints (const ACE_CString &lane,
-                                   const ACE_CString &additional_endpoints)
-{
-  TAO_EndpointSet endpoint_set;
-
-  // Parse the additional endpoints.
-  int result =
-    this->parse_and_add_endpoints (additional_endpoints,
-                                   endpoint_set);
-
-  // Parse failure.
-  if (result != 0)
-    return result;
-
-  // Look for the lane in the endpoints map.
-  ACE_CString existing_endpoints;
-  result =
-    this->endpoints_map_.find (lane, existing_endpoints);
-
-  // Create the resultant endpoints string.
-  ACE_CString new_endpoints;
-  if (result == 0)
-    new_endpoints =
-      existing_endpoints +
-      ";" +
-      additional_endpoints;
-  else
-    new_endpoints =
-      additional_endpoints;
-
-  result =
-    this->endpoints_map_.rebind (lane,
-                                 new_endpoints);
-
-  if (result == -1)
-    return result;
-
-  return 0;
-}
-
-int
-TAO_ORB_Parameters::parse_and_add_endpoints (const ACE_CString &endpoints,
-                                             TAO_EndpointSet &endpoint_set)
-{
-  // Parse the string into seperate endpoints, where `endpoints' is of
-  // the form:
-  //
-  //    protocol1://V,v@addr1,...,addrN;protocol2://addr1,...,W.w@addrN;...
-  //
-  // A single endpoint, instead of several, can be added just as well.
-
-  int status = 0;
-  // Return code:  0 = success,  -1 = failure
-
-  const char endpoints_delimiter = ';';
-
-  size_t length = endpoints.length ();
-
-  if (endpoints[0] == endpoints_delimiter ||
-      endpoints[length - 1] == endpoints_delimiter)
-    {
-      return -1;
-      // Failure: endpoints string has an empty endpoint at the
-      // beginning or the end of the string
-      // (e.g. ";uiop://foo;iiop://1.3@bar")
-    }
-
-  if (length > 0)
-    {
-      int endpoints_count = 1;
-
-      for (size_t j = 0; j != length; ++j)
-        {
-          if (endpoints[j] == endpoints_delimiter)
-            {
-              endpoints_count++;
-            }
-        }
-
-      int begin = 0;
-      int end = endpoints.find (endpoints_delimiter);
-
-      for (int i = 0; i < endpoints_count; ++i)
-        {
-          if (end == 0)
-            {
-              // Handle case where two consecutive endpoints `;;'
-              // delimiters are found within the endpoints set.
-              //
-              // Is it enough to just skip over it or should we return an
-              // error?
-              continue;
-            }
-
-          ACE_CString endpt = endpoints.substring (begin, end - begin);
-          // The substring call will work even if `end' is equal to
-          // ACE_CString::npos since that will just extract the substring
-          // from the offset `begin' to the end of the string.
-
-          // Check for a valid URL style endpoint set
-          int check_offset = endpt.find ("://");
-
-          if (check_offset > 0 &&
-              check_offset != endpt.npos)
-            {
-              endpoint_set.enqueue_tail (endpt);
-              // Insert endpoint into list
-            }
-          else
-            {
-              status = -1;  // Error: invalid URL style endpoint set
-            }
-
-          begin = end + 1;
-          end = endpoints.find (endpoints_delimiter, begin);
-        }
-    }
-  else
-    {
-      status = -1;
-      // Failure:  Empty string
-    }
-
-  return status;
-}
-
-bool
-TAO_ORB_Parameters::preferred_interfaces (const char *s)
-{
-  // Validates that s contains one or more comma separated
-  // interfaces each consisting of a string with a single
-  // assignment separator ('=' or ':')
-  // Any other char is legal, although '*' and '?' will be
-  // treated as wildcards.
-  const char* p = s;
-  bool expect_assign = false;
-  bool expect_comma = false;
-  bool expect_char = true;
-  bool expect_wild = true;
-  bool found_remote = false;
-  while (*p != 0)
-  {
-    switch (*p)
-    {
-    case ':':
-    case '=':
-      if (! expect_assign)
-        return false;
-      found_remote = true;
-      expect_assign = false;
-      expect_char = true;
-      expect_comma = false;
-      expect_wild = true;
-      break;
-    case ',':
-      if (! expect_comma)
-        return false;
-      found_remote = false;
-      expect_assign = false;
-      expect_char = true;
-      expect_comma = false;
-      expect_wild = true;
-      break;
-    case '*':
-    case '?':
-      if (! expect_wild)
-        return false;
-      expect_assign = ! found_remote;
-      expect_char = true;
-      expect_comma = found_remote;
-      expect_wild = false;
-      break;
-    default:
-      if (! expect_char)
-        return false;
-      expect_assign = ! found_remote;
-      expect_char = true;
-      expect_comma = found_remote;
-      expect_wild = true;
-      break;
-    }
-    ++p;
-    }
-  if (!expect_comma || expect_assign)
-    return false;
-
-  this->pref_network_ = s;
-
-  return true;
-}
-
-const char *
-TAO_ORB_Parameters::preferred_interfaces (void) const
-{
-  return this->pref_network_.c_str ();
-}
-
-void
-TAO_ORB_Parameters::enforce_pref_interfaces (bool p)
-{
-  this->enforce_preferred_interfaces_ = p;
-}
-
-bool
-TAO_ORB_Parameters::enforce_pref_interfaces (void) const
-{
-  return this->enforce_preferred_interfaces_;
-}
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
deleted file mode 100644
index 286b7ad7e3e..00000000000
--- a/TAO/tao/params.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- C++ -*- */
-
-
-//=============================================================================
-/**
- *  @file    params.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland
- */
-//=============================================================================
-
-#ifndef TAO_PARAMS_H
-#define TAO_PARAMS_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SString.h"
-
-#include "objectid.h"
-#include "CORBA_String.h"
-
-// Forward decls.
-
-class TAO_Active_Object_Map_Impl;
-class TAO_Reverse_Active_Object_Map_Impl;
-
-// @@ Using an ACE_Unbounded_Queue to contain the endpoints and
-//    preconnects may not be the best container to use.  However, it
-//    will only be used during ORB bootstrapping.  Also, a template
-//    instantiation of ACE_Unbounded_Queue<ACE_CString> already exists
-//    in ACE so we do not have to worry about increasing TAO's
-//    footprint by using this container.
-typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet;
-typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
-typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                ACE_CString,
-                                ACE_Hash<ACE_CString>,
-                                ACE_Equal_To<ACE_CString>,
-                                ACE_Null_Mutex>
-  TAO_EndpointMap;
-
-
-// -------------------------------------------------------------------
-
-/**
- * @class TAO_ORB_Parameters
- *
- * @brief Parameters that are specific to the ORB.  These parameters can
- * be for the client, the server, or for both.
- *
- * @note
- * Some of the functions have inline definitions in the class header
- * below.  Please do not move them back to the .i file.
- * cygnus-2.7.2-960126, distributed with Tornado 1.0.1, can't deal
- * with returing a const reference here.  It raises an internal
- * compiler error at ace/Svc_Handler.cpp:46, of all places.
- */
-class TAO_Export TAO_ORB_Parameters
-{
-public:
-  /// Constructor.
-  TAO_ORB_Parameters (void);
-
-  /// Destructor.
-  ~TAO_ORB_Parameters (void);
-
-  /// Specifies the endpoints on which this server is willing to
-  /// listen for requests.
-  int add_endpoints (const ACE_CString &lane,
-                     const ACE_CString &endpoints);
-  void get_endpoint_set (const ACE_CString &lane,
-                         TAO_EndpointSet &endpoint_set);
-
-  /// Set/Get the port of services locatable through multicast.
-  CORBA::UShort service_port (TAO_MCAST_SERVICEID service_id) const;
-  void service_port (TAO_MCAST_SERVICEID service_id, CORBA::UShort port);
-
-  /// Get/Set address:port for Multicast Discovery Protocol for
-  /// the Naming Service.
-  const char *mcast_discovery_endpoint (void) const;
-  void mcast_discovery_endpoint (const char *mde);
-
-  /// Set/Get the size to be used for a socket's receive buffer.
-  int sock_rcvbuf_size (void) const;
-  void sock_rcvbuf_size (int);
-
-  /// Set/Get the size to be used for a socket's send buffer.
-  int sock_sndbuf_size (void) const;
-  void sock_sndbuf_size (int);
-
-  /// Set/Get the status of whether to use TCP_NODELAY or not.
-  int nodelay (void) const;
-  void nodelay (int);
-
-  /**
-   * Octet sequences are marshalled without doing any copies, we
-   * simply append a block to the CDR message block chain. When the
-   * octet sequence is small enough and there is room in the current
-   * message block it is more efficient just to copy the buffer.
-   */
-  int cdr_memcpy_tradeoff (void) const;
-  void cdr_memcpy_tradeoff (int);
-
-  /// The ORB will use the dotted decimal notation for addresses. By
-  /// default we use the full ascii names.
-  int use_dotted_decimal_addresses (void) const;
-  void use_dotted_decimal_addresses (int);
-
-  /// The ORB will turn off SO_LINGER if this is zero.
-  int linger (void) const;
-  void linger (int);
-
-  /// Set/Get the Init Reference of an arbitrary ObjectID.
-  char *default_init_ref (void) const;
-  void default_init_ref (const char *default_init_ref);
-
-  /// Disable the OMG standard profile components, useful for
-  /// homogenous environments.
-  int std_profile_components (void) const;
-  void std_profile_components (int x);
-
-  /// Scheduling policy.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by
-   * functions like ACE_OS::thr_setprio() and
-   * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
-   * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
-   */
-  int ace_sched_policy (void) const;
-  void ace_sched_policy (int x);
-
-  /// Scheduling policy flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCHED_RR,
-   * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
-   */
-  long sched_policy (void) const;
-  void sched_policy (long x);
-
-  /// Scheduling scope flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBScopePolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
-   * THR_SCOPE_PROCESS.
-   */
-  long scope_policy (void) const;
-  void scope_policy (long x);
-
-  /// Thread creation flags.
-  /**
-   * Shorthand for OR'ing together the scope_policy and sched_policy.
-   */
-  long thread_creation_flags (void) const;
-
-  /// Single read optimization.
-  int single_read_optimization (void) const;
-  void single_read_optimization (int x);
-
-  /// Mutators and accessors for rt_collocation_resolver
-  bool disable_rt_collocation_resolver (void) const;
-  void disable_rt_collocation_resolver (bool);
-
-  /// Accepts the list of preferred interfaces and does a simple
-  /// semantic check on the string
-  bool preferred_interfaces (const char *s);
-  const char *preferred_interfaces (void) const;
-
-  void enforce_pref_interfaces (bool p);
-  bool enforce_pref_interfaces (void) const;
-private:
-  // Each "endpoint" is of the form:
-  //
-  //   protocol://V.v@addr1,...,W.w@addrN/
-  //
-  // or:
-  //
-  //   protocol://addr1,addr2,...,addrN/
-  //
-  // where "V.v" and "W.w" are optional versions.
-  //
-  // Multiple sets of endpoints may be seperated by a semi-colon `;'.
-  // For example:
-  //
-  //   iiop://space:2001,odyssey:2010;uiop://foo,bar
-  //
-  // All preconnect or endpoint strings should be of the above form(s).
-  int parse_and_add_endpoints (const ACE_CString &endpoints,
-                               TAO_EndpointSet &endpoint_set);
-
-  /// List of endpoints used to pre-establish connections.
-  // TAO_EndpointSet preconnects_list_;
-
-  /// Map of endpoints this server is willing to accept requests on.
-  TAO_EndpointMap endpoints_map_;
-
-  /// Port numbers of the configured services.
-  CORBA::UShort service_port_[TAO_NO_OF_MCAST_SERVICES];
-
-  /// address:port for Multicast Discovery Protocol for the Naming
-  /// Service.
-  CORBA::String_var mcast_discovery_endpoint_;
-
-  /// List of comma separated prefixes from ORBDefaultInitRef.
-  ACE_CString default_init_ref_;
-
-  /// Size to be used for a socket's receive buffer.
-  int sock_rcvbuf_size_;
-
-  /// Size to be used for a socket's send buffer.
-  int sock_sndbuf_size_;
-
-  /// 1 if we're using TCP_NODELAY and 0 otherwise.
-  int nodelay_;
-
-  /// Control the strategy for copying vs. appeding octet sequences in
-  /// CDR streams.
-  int cdr_memcpy_tradeoff_;
-
-  /// For selecting a liteweight version of the GIOP protocol.
-  int use_lite_protocol_;
-
-  /// For selecting a address notation
-  int use_dotted_decimal_addresses_;
-
-  /// For setting the SO_LINGER option
-  int linger_;
-
-  /// If true then the standard OMG components are not generated.
-  int std_profile_components_;
-
-  /// Scheduling policy.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by
-   * functions like ACE_OS::thr_setprio() and
-   * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
-   * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
-   */
-  int ace_sched_policy_;
-
-  /// Scheduling policy flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBSchedPolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCHED_RR,
-   * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
-   */
-  long sched_policy_;
-
-  /// Scheduling scope flag.
-  /**
-   * Scheduling policy specified by the user through the
-   * -ORBScopePolicy option.  This value is typically used by ACE
-   * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
-   * THR_SCOPE_PROCESS.
-   */
-  long scope_policy_;
-
-  /// Single read optimization.
-  int single_read_optimization_;
-
-  /// Preferred network interfaces as a string
-  ACE_CString pref_network_;
-
-  /// Default collocation resolver
-  /**
-   * The vanilla ORB has only one collocation resolver. But if the
-   * RTORB is in place, the RTORB can get in a new collocation
-   * resolver. There are some applications that would like to use the
-   * default collocation resolver with the RTORB. This boolean is the
-   * value of the option that the application passes in to enable/disable
-   * the use of RT collocation resolver with the RTORB. The default value
-   * is false to indicate that the RT_Collocation_Resolver will be
-   * loaded if the RTORB is used.
-   */
-  bool disable_rt_collocation_resolver_;
-
-  bool enforce_preferred_interfaces_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/params.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PARAMS_H */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
deleted file mode 100644
index bcf7579dc83..00000000000
--- a/TAO/tao/params.i
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-// $Id$
-ACE_INLINE int
-TAO_ORB_Parameters::sock_rcvbuf_size (void) const
-{
-  return sock_rcvbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_rcvbuf_size (int s)
-{
-  sock_rcvbuf_size_ = s;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::sock_sndbuf_size (void) const
-{
-  return sock_sndbuf_size_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_sndbuf_size (int s)
-{
-  sock_sndbuf_size_ = s;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::cdr_memcpy_tradeoff (void) const
-{
-  return this->cdr_memcpy_tradeoff_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::cdr_memcpy_tradeoff (int x)
-{
-  this->cdr_memcpy_tradeoff_ = x;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::use_dotted_decimal_addresses (void) const
-{
-  return this->use_dotted_decimal_addresses_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::use_dotted_decimal_addresses (int x)
-{
-  this->use_dotted_decimal_addresses_ = x;
-}
-
-
-ACE_INLINE int
-TAO_ORB_Parameters::linger (void) const
-{
-  return this->linger_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::linger (int x)
-{
-  this->linger_ = x;
-}
-
-
-ACE_INLINE void
-TAO_ORB_Parameters::service_port (TAO_MCAST_SERVICEID service_id,
-                                  CORBA::UShort port)
-{
-  this->service_port_[service_id] = port;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_ORB_Parameters::service_port (TAO_MCAST_SERVICEID service_id) const
-{
-  return this->service_port_[service_id];
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::mcast_discovery_endpoint (const char *mde)
-{
-  this->mcast_discovery_endpoint_ = CORBA::string_dup (mde);
-}
-
-ACE_INLINE const char *
-TAO_ORB_Parameters::mcast_discovery_endpoint (void) const
-{
-  return this->mcast_discovery_endpoint_.in ();
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::default_init_ref (const char *default_init_ref)
-{
-  this->default_init_ref_ = default_init_ref;
-}
-
-ACE_INLINE char *
-TAO_ORB_Parameters::default_init_ref (void) const
-{
-  return CORBA::string_dup (this->default_init_ref_.c_str ());
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::std_profile_components (void) const
-{
-  return this->std_profile_components_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::std_profile_components (int x)
-{
-  this->std_profile_components_ = x;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::nodelay (void) const
-{
-  return this->nodelay_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::nodelay (int x)
-{
-  this->nodelay_ = x;
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::ace_sched_policy (void) const
-{
-  return this->ace_sched_policy_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::ace_sched_policy (int x)
-{
-  this->ace_sched_policy_ = x;
-}
-
-ACE_INLINE long
-TAO_ORB_Parameters::sched_policy (void) const
-{
-  return this->sched_policy_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sched_policy (long x)
-{
-  this->sched_policy_ = x;
-}
-
-ACE_INLINE long
-TAO_ORB_Parameters::scope_policy (void) const
-{
-  return this->scope_policy_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::scope_policy (long x)
-{
-  this->scope_policy_ = x;
-}
-
-ACE_INLINE long
-TAO_ORB_Parameters::thread_creation_flags (void) const
-{
-  return
-    this->scope_policy () |
-    this->sched_policy ();
-}
-
-ACE_INLINE int
-TAO_ORB_Parameters::single_read_optimization (void) const
-{
-  return this->single_read_optimization_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::single_read_optimization (int x)
-{
-  this->single_read_optimization_ = x;
-}
-
-ACE_INLINE bool
-TAO_ORB_Parameters::disable_rt_collocation_resolver (void) const
-{
-  return this->disable_rt_collocation_resolver_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::disable_rt_collocation_resolver (bool x)
-{
-  this->disable_rt_collocation_resolver_ = x;
-}
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
deleted file mode 100644
index 828891c1973..00000000000
--- a/TAO/tao/skip.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     skip.cpp
-//
-// = DESCRIPTION
-//     Code for skipping different data types
-//
-//     Data types encoded as CDR streams need to be skipped when they
-//     are part of an Any.
-//
-// = AUTHOR
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "Marshal.h"
-#include "debug.h"
-#include "Valuetype_Adapter.h"
-#include "ORB_Core.h"
-#include "TypeCode.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "SystemException.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           skip,
-           "$Id$")
-
-TAO::traverse_status
-TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of skip operation.
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_skipping = stream->skip_short ();
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_skipping = stream->skip_long ();
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_skipping = stream->skip_longlong ();
-      break;
-    case CORBA::tk_boolean:
-      continue_skipping = stream->skip_boolean ();
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_skipping = stream->skip_char ();
-      break;
-    case CORBA::tk_longdouble:
-      continue_skipping = stream->skip_longdouble ();
-      break;
-    case CORBA::tk_wchar:
-      continue_skipping = stream->skip_wchar ();
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                       TAO_InputCDR *stream
-                       ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Status of encode operation.
-  if (!(*stream >> elem_tc.inout ()))
-    return TAO::TRAVERSE_STOP;
-
-  return TAO_Marshal_Object::perform_skip (elem_tc.in (),
-                                           stream
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Typecode kind.
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the stream.
-  continue_skipping = stream->read_ulong (kind);
-
-  if (continue_skipping == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT) ||
-          (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // simple typecodes, nothing to do
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // skip the bounds
-                continue_skipping = stream->skip_ulong ();
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level".
-            case ~0u:
-              {
-                // skip the long indicating the encapsulation offset,
-                continue_skipping = stream->skip_long ();
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                CORBA::ULong length;
-
-                // get the encapsulation length
-                continue_skipping = stream->read_ulong (length);
-                if (!continue_skipping)
-                  break;
-                // skip the encapsulation
-                continue_skipping = stream->skip_bytes (length);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO_Marshal_TypeCode::skip: ")
-                        ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // specifies the number of bytes in the Principal
-  CORBA::ULong len;
-
-  continue_skipping = stream->read_ulong (len);
-  if (len > 0 && continue_skipping)
-    {
-      continue_skipping = stream->skip_bytes (len);
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // return status
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // First, skip the type hint. This will be the type_id encoded in an
-  // object reference.
-  stream->skip_string ();
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow
-  continue_skipping = stream->read_ulong (profiles);
-
-  while (profiles-- != 0 && continue_skipping)
-      {
-        CORBA::ULong tag;
-
-        // get the profile ID tag
-        if ( (continue_skipping = stream->read_ulong (tag)) == 0)
-          continue;
-
-        CORBA::ULong encap_len;
-        // ProfileData is encoded as a sequence of octet. So first get
-        // the length of the sequence.
-        // Create the decoding stream from the encapsulation in the
-        // buffer, and skip the encapsulation.
-        if ( (continue_skipping = stream->read_ulong (encap_len)) == 0)
-          continue;
-
-        continue_skipping = stream->skip_bytes (encap_len);
-      }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *src
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                                   src
-                                                   ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without skipping anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                           src
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_skipping = stream->skip_string ();
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_String::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_skipping =
-    stream->read_ulong (bounds);
-
-  if (!continue_skipping)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  // No point decoding an empty sequence.
-  if (bounds == 0)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // Get element typecode.
-  CORBA::TypeCode_var tc2 =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          continue_skipping =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          int stop =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          if (stop == TAO::TRAVERSE_STOP)
-            continue_skipping = 0;
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_skip (tc2.in (),
-                                             stream
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  //  tc2->_decr_refcnt ();
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // skip the Repository ID
-  if (!stream->skip_string ())
-    return TAO::TRAVERSE_STOP;
-
-  // Number of fields in the exception
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// decode wstring
-TAO::traverse_status
-TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
-                           TAO_InputCDR *stream
-                           ACE_ENV_ARG_DECL)
-{
-  ACE_CDR::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  // "zero length" wstrings are legal in GIOP 1.2.
-
-  continue_skipping = stream->skip_wstring ();
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::skip detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Use the same method to skip over our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested skips so that we won't attempt to
-  // skip rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!stream->read_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Skip a single repository id which is of type string.
-          stream->skip_string ();
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (k != CORBA::tk_null)
-    {
-      retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the valuetype.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
deleted file mode 100644
index 92f6ac1d274..00000000000
--- a/TAO/tao/tao.mpc
+++ /dev/null
@@ -1,740 +0,0 @@
-//$Id$
-project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
-  sharedname   = TAO
-  dynamicflags = TAO_BUILD_DLL
-
-  // It is no longer necessary to override IDL_Files since it is a
-  // custom build type and comes from the taoidldefaults base project.
-
-  Source_Files(TAO_COMPONENTS) {
-    Abstract_Servant_Base.cpp
-    Acceptor_Filter.cpp
-    Acceptor_Registry.cpp
-    Adapter.cpp
-    Adapter_Factory.cpp
-    Adapter_Registry.cpp
-    Alias_TypeCode_Static.cpp
-    Any.cpp
-    Any_Basic_Impl.cpp
-    Any_Impl.cpp
-    Any_SystemException.cpp
-    Any_Unknown_IDL_Type.cpp
-    AnySeqA.cpp
-    AnySeqC.cpp
-    append.cpp
-    Argument.cpp
-    Asynch_Queued_Message.cpp
-    Asynch_Reply_Dispatcher_Base.cpp
-    Base_Transport_Property.cpp
-    Basic_Arguments.cpp
-    BiDir_Adapter.cpp
-    Bind_Dispatcher_Guard.cpp
-    Block_Flushing_Strategy.cpp
-    Blocked_Connect_Strategy.cpp
-    BooleanSeqA.cpp
-    BooleanSeqC.cpp
-    BoundsA.cpp
-    BoundsC.cpp
-    Cache_Entries.cpp
-    CDR.cpp
-    CDR_Encaps_Codec.cpp
-    CharSeqA.cpp
-    CharSeqC.cpp
-    Cleanup_Func_Registry.cpp
-    Client_Strategy_Factory.cpp
-    ClientRequestInfo.cpp
-    ClientRequestInfoA.cpp
-    ClientRequestInfoC.cpp
-    ClientRequestInfo_i.cpp
-    ClientRequestInterceptor_Adapter.cpp
-    ClientRequestInterceptorA.cpp
-    ClientRequestInterceptorC.cpp
-    CodecFactory.cpp
-    CodecFactory_ORBInitializer.cpp
-    Codeset_Manager.cpp
-    Codeset_Translator_Factory.cpp
-    Collocated_Invocation.cpp
-    Collocation_Resolver.cpp
-    Connect_Strategy.cpp
-    Connection_Handler.cpp
-    Connection_Purging_Strategy.cpp
-    Connector_Registry.cpp
-    CONV_FRAMEA.cpp
-    CONV_FRAMEC.cpp
-    CORBA_String.cpp
-    CORBALOC_Parser.cpp
-    CORBANAME_Parser.cpp
-    CurrentA.cpp
-    CurrentC.cpp
-    debug.cpp
-    default_client.cpp
-    Default_Collocation_Resolver.cpp
-    Default_Endpoint_Selector_Factory.cpp
-    Default_Protocols_Hooks.cpp
-    default_resource.cpp
-    default_server.cpp
-    Default_Stub_Factory.cpp
-    Default_Thread_Lane_Resources_Manager.cpp
-    DLL_Parser.cpp
-    DomainA.cpp
-    DomainC.cpp
-    DoubleSeqA.cpp
-    DoubleSeqC.cpp
-    Dynamic_Adapter.cpp
-    Dynamic_ParameterA.cpp
-    Dynamic_ParameterC.cpp
-    DynamicA.cpp
-    DynamicC.cpp
-    Empty_Param_TypeCode.cpp
-    Encodable.cpp
-    Endpoint.cpp
-    Endpoint_Selector_Factory.cpp
-    Enum_TypeCode_Static.cpp
-    Environment.cpp
-    Exception.cpp
-    Exclusive_TMS.cpp
-    Fault_Tolerance_Service.cpp
-    FILE_Parser.cpp
-    FloatSeqA.cpp
-    FloatSeqC.cpp
-    Flushing_Strategy.cpp
-    GIOP_Message_Base.cpp
-    GIOP_Message_Generator_Parser.cpp
-    GIOP_Message_Generator_Parser_10.cpp
-    GIOP_Message_Generator_Parser_11.cpp
-    GIOP_Message_Generator_Parser_12.cpp
-    GIOP_Message_Generator_Parser_Impl.cpp
-    GIOP_Message_Lite.cpp
-    GIOP_Message_Locate_Header.cpp
-    GIOP_Message_State.cpp
-    GIOP_Message_Version.cpp
-    GIOP_Utils.cpp
-    GIOPA.cpp
-    GIOPC.cpp
-    IFR_Client_Adapter.cpp
-    IIOP_Acceptor.cpp
-    IIOP_Connection_Handler.cpp
-    IIOP_Connector.cpp
-    IIOP_Endpoint.cpp
-    IIOP_EndpointsA.cpp
-    IIOP_EndpointsC.cpp
-    IIOP_Factory.cpp
-    IIOP_Lite_Factory.cpp
-    IIOP_Profile.cpp
-    IIOP_Transport.cpp
-    IIOPA.cpp
-    IIOPC.cpp
-    Incoming_Message_Queue.cpp
-    InterceptorA.cpp
-    InterceptorC.cpp
-    InvalidSlotA.cpp
-    InvalidSlotC.cpp
-    Invocation_Adapter.cpp
-    Invocation_Base.cpp
-    Invocation_Endpoint_Selectors.cpp
-    IOP_CodecA.cpp
-    IOP_CodecC.cpp
-    IOP_IORA.cpp
-    IOP_IORC.cpp
-    IOPC.cpp
-    IOR_Parser.cpp
-    IORInterceptor_Adapter.cpp
-    IORInterceptor_Adapter_Factory.cpp
-    Leader_Follower.cpp
-    Leader_Follower_Flushing_Strategy.cpp
-    LF_CH_Event.cpp
-    LF_Connect_Strategy.cpp
-    LF_Event.cpp
-    LF_Event_Binder.cpp
-    LF_Event_Loop_Thread_Helper.cpp
-    LF_Follower.cpp
-    LF_Follower_Auto_Adder.cpp
-    LF_Follower_Auto_Ptr.cpp
-    LF_Invocation_Event.cpp
-    LF_Strategy.cpp
-    LF_Strategy_Complete.cpp
-    LocalObject.cpp
-    LocateRequest_Invocation.cpp
-    LocateRequest_Invocation_Adapter.cpp
-    LongDoubleSeqA.cpp
-    LongDoubleSeqC.cpp
-    LongLongSeqA.cpp
-    LongLongSeqC.cpp
-    LongSeqA.cpp
-    LongSeqC.cpp
-    LRU_Connection_Purging_Strategy.cpp
-    Managed_Types.cpp
-    Marshal.cpp
-    MCAST_Parser.cpp
-    Messaging_SyncScopeC.cpp
-    MProfile.cpp
-    Muxed_TMS.cpp
-    NVList.cpp
-    Object.cpp
-    Object_KeyC.cpp
-    Object_Loader.cpp
-    Object_Proxy_Broker.cpp
-    Object_Proxy_Impl.cpp
-    Object_Ref_Table.cpp
-    ObjectIdListA.cpp
-    ObjectIdListC.cpp
-    ObjectKey_Table.cpp
-    Objref_TypeCode_Static.cpp
-    OctetSeqA.cpp
-    OctetSeqC.cpp
-    operation_details.cpp
-    ORB.cpp
-    orb_typesA.cpp
-    orb_typesC.cpp
-    ORB_Core.cpp
-    ORB_Core_Auto_Ptr.cpp
-    ORB_Table.cpp
-    ORBInitializer_Registry.cpp
-    ORBInitializerA.cpp
-    ORBInitializerC.cpp
-    ORBInitInfo.cpp
-    ORBInitInfoA.cpp
-    ORBInitInfoC.cpp
-    ParameterModeA.cpp
-    ParameterModeC.cpp
-    params.cpp
-    Parser_Registry.cpp
-    PI_ForwardC.cpp
-    PICurrent.cpp
-    PICurrent_Copy_Callback.cpp
-    PICurrent_ORBInitializer.cpp
-    PIForwardRequestA.cpp
-    PIForwardRequestC.cpp
-    Pluggable_Messaging.cpp
-    Pluggable_Messaging_Utils.cpp
-    Policy_ForwardA.cpp
-    Policy_ForwardC.cpp
-    Policy_Set.cpp
-    Policy_Validator.cpp
-    PolicyA.cpp
-    PolicyC.cpp
-    PolicyFactoryA.cpp
-    PolicyFactoryC.cpp
-    PolicyFactory_Registry.cpp
-    PollableC.cpp
-    PortableInterceptorA.cpp
-    PortableInterceptorC.cpp
-    PredefinedType_Seq_Tmplinst.cpp
-    Principal.cpp
-    Profile.cpp
-    Profile_Transport_Resolver.cpp
-    Protocol_Factory.cpp
-    Protocols_Hooks.cpp
-    Queued_Message.cpp
-    Reactive_Connect_Strategy.cpp
-    Reactive_Flushing_Strategy.cpp
-    Refcounted_ObjectKey.cpp
-    Remote_Invocation.cpp
-    Remote_Object_Proxy_Broker.cpp
-    Reply_Dispatcher.cpp
-    Request_Dispatcher.cpp
-    RequestInfoA.cpp
-    RequestInfoC.cpp
-    RequestInfo_Util.cpp
-    Resource_Factory.cpp
-    Resume_Handle.cpp
-    Sequence.cpp
-    Sequence_TypeCode_Static.cpp
-    Server_Strategy_Factory.cpp
-    ServerRequestInfoA.cpp
-    ServerRequestInfoC.cpp
-    ServerRequestInterceptorA.cpp
-    ServerRequestInterceptorC.cpp
-    Service_Callbacks.cpp
-    Service_Context.cpp
-    Services_Activate.cpp
-    ShortSeqA.cpp
-    ShortSeqC.cpp
-    skip.cpp
-    Special_Basic_Arguments.cpp
-    String_TypeCode_Static.cpp
-    StringSeqA.cpp
-    StringSeqC.cpp
-    Struct_TypeCode_Static.cpp
-    Stub.cpp
-    Stub_Factory.cpp
-    Sync_Strategies.cpp
-    Synch_Invocation.cpp
-    Synch_Queued_Message.cpp
-    Synch_Refcountable.cpp
-    Synch_Reply_Dispatcher.cpp
-    SystemException.cpp
-    SystemExceptionA.cpp
-    Tagged_Components.cpp
-    Tagged_Profile.cpp
-    TAO_Internal.cpp
-    TAO_Server_Request.cpp
-    TAO_Singleton_Manager.cpp
-    TAOA.cpp
-    TAOC.cpp
-    target_specification.cpp
-    Thread_Lane_Resources.cpp
-    Thread_Lane_Resources_Manager.cpp
-    Thread_Per_Connection_Handler.cpp
-    TimeBaseA.cpp
-    TimeBaseC.cpp
-    Transport.cpp
-    Transport_Acceptor.cpp
-    Transport_Cache_Manager.cpp
-    Transport_Connector.cpp
-    Transport_Descriptor_Interface.cpp
-    Transport_Mux_Strategy.cpp
-    Transport_Timer.cpp
-    True_RefCount_Policy.cpp
-    TSS_Resources.cpp
-    TypeCode.cpp
-    TypeCodeA.cpp
-    Typecode_typesC.cpp
-    TypeCode_CDR_Extraction.cpp
-    TypeCode_Constants.cpp
-    TypeCodeFactory_Adapter.cpp
-    ULongLongSeqA.cpp
-    ULongLongSeqC.cpp
-    ULongSeqA.cpp
-    ULongSeqC.cpp
-    Union_TypeCode_Static.cpp
-    UserException.cpp
-    UShortSeqA.cpp
-    UShortSeqC.cpp
-    UTF16_BOM_Factory.cpp
-    UTF16_BOM_Translator.cpp
-    Value_TypeCode_Static.cpp
-    Valuetype_Adapter.cpp
-    ValueModifierC.cpp
-    VisibilityA.cpp
-    VisibilityC.cpp
-    Wait_On_Leader_Follower.cpp
-    Wait_On_LF_No_Upcall.cpp
-    Wait_On_Reactor.cpp
-    Wait_On_Read.cpp
-    Wait_Strategy.cpp
-    WCharSeqA.cpp
-    WCharSeqC.cpp
-    WrongTransactionA.cpp
-    WrongTransactionC.cpp
-    WStringSeqA.cpp
-    WStringSeqC.cpp
-    GUIResource_Factory.cpp
-  }
-
-  Header_Files {
-    Abstract_Servant_Base.h
-    Acceptor_Filter.h
-    Acceptor_Impl.h
-    Acceptor_Registry.h
-    Adapter_Factory.h
-    Adapter.h
-    Adapter_Registry.h
-    Alias_TypeCode.h
-    Alias_TypeCode_Static.h
-    Allocator.h
-    Any_Arg_Traits.h
-    Any_Array_Impl_T.h
-    Any_Basic_Impl.h
-    Any_Basic_Impl_T.h
-    Any_Dual_Impl_T.h
-    Any.h
-    Any_Impl.h
-    Any_Impl_T.h
-    AnySeqC.h
-    AnySeqS.h
-    Any_Special_Impl_T.h
-    Any_SystemException.h
-    Any_Unknown_IDL_Type.h
-    Arg_Traits_T.h
-    Argument.h
-    Array_VarOut_T.h
-    Asynch_Queued_Message.h
-    Asynch_Reply_Dispatcher_Base.h
-    Auto_Functor.h
-    Base_Transport_Property.h
-    Basic_Arguments.h
-    Basic_Argument_T.h
-    Basic_Types.h
-    BD_String_Argument_T.h
-    BiDir_Adapter.h
-    Bind_Dispatcher_Guard.h
-    Blocked_Connect_Strategy.h
-    Block_Flushing_Strategy.h
-    BooleanSeqC.h
-    BooleanSeqS.h
-    BoundsC.h
-    Buffer_Allocator_T.h
-    Buffering_Constraint_Policy.h
-    Cache_Entries.h
-    CDR_Encaps_Codec.h
-    CDR.h
-    CharSeqC.h
-    CharSeqS.h
-    Cleanup_Func_Registry.h
-    ClientRequestInfo.h
-    ClientRequestInfoC.h
-    ClientRequestInfoS.h
-    ClientRequestInfo_i.h
-    ClientRequestInterceptor_Adapter.h
-    ClientRequestInterceptorC.h
-    ClientRequestInterceptorS.h
-    Client_Strategy_Factory.h
-    CodecFactory.h
-    CodecFactory_ORBInitializer.h
-    Codeset_Manager.h
-    Codeset_Translator_Factory.h
-    Codeset_Translator_Factory_T.h
-    Collocated_Invocation.h
-    Collocation_Proxy_Broker.h
-    Collocation_Resolver.h
-    Collocation_Strategy.h
-    Condition.h
-    Connection_Handler.h
-    Connection_Purging_Strategy.h
-    Connector_Impl.h
-    Connector_Registry.h
-    Connect_Strategy.h
-    CONV_FRAMEC.h
-    CONV_FRAMES.h
-    CONV_FRAMES_T.h
-    corbafwd.h
-    corba.h
-    CORBALOC_Parser.h
-    CORBA_methods.h
-    CORBANAME_Parser.h
-    CORBA_String.h
-    CurrentC.h
-    CurrentS.h
-    debug.h
-    default_client.h
-    Default_Collocation_Resolver.h
-    Default_Endpoint_Selector_Factory.h
-    default_environment.h
-    default_ports.h
-    Default_Protocols_Hooks.h
-    default_resource.h
-    default_server.h
-    Default_Stub_Factory.h
-    Default_Thread_Lane_Resources_Manager.h
-    DLL_Parser.h
-    DomainC.h
-    DoubleSeqC.h
-    DoubleSeqS.h
-    Dynamic_Adapter.h
-    DynamicC.h
-    DynamicS.h
-    Dynamic_ParameterC.h
-    Encodable.h
-    Endpoint.h
-    Endpoint_Selector_Factory.h
-    Enum_TypeCode.h
-    Enum_TypeCode_Static.h
-    Environment.h
-    Exception_Data.h
-    Exception.h
-    Exclusive_TMS.h
-    Fault_Tolerance_Service.h
-    FILE_Parser.h
-    Fixed_Array_Argument_T.h
-    Fixed_Size_Argument_T.h
-    Fixed_TypeCode.h
-    FloatSeqC.h
-    FloatSeqS.h
-    Flushing_Strategy.h
-    GIOPC.h
-    GIOP_Message_Base.h
-    GIOP_Message_Generator_Parser_10.h
-    GIOP_Message_Generator_Parser_11.h
-    GIOP_Message_Generator_Parser_12.h
-    GIOP_Message_Generator_Parser.h
-    GIOP_Message_Generator_Parser_Impl.h
-    GIOP_Message_Lite.h
-    GIOP_Message_Locate_Header.h
-    GIOP_Message_State.h
-    GIOP_Message_Version.h
-    GIOPS.h
-    GIOPS_T.h
-    GIOP_Utils.h
-    GUIResource_Factory.h
-    IFR_Client_Adapter.h
-    IIOP_Acceptor.h
-    IIOPC.h
-    IIOP_Connection_Handler.h
-    IIOP_Connector.h
-    IIOP_Endpoint.h
-    IIOP_EndpointsC.h
-    IIOP_Factory.h
-    IIOP_Lite_Factory.h
-    IIOP_Profile.h
-    IIOP_Transport.h
-    Incoming_Message_Queue.h
-    InterceptorC.h
-    InterceptorS.h
-    Interceptor_List.h
-    InvalidSlotC.h
-    InvalidSlotS.h
-    Invocation_Adapter.h
-    Invocation_Base.h
-    Invocation_Endpoint_Selectors.h
-    Invocation_Utils.h
-    IOPC.h
-    IOP_CodecC.h
-    IOP_IORC.h
-    IOPS.h
-    IOPS_T.h
-    IORInterceptor_Adapter_Factory.h
-    IORInterceptor_Adapter.h
-    IOR_Parser.h
-    Leader_Follower_Flushing_Strategy.h
-    Leader_Follower.h
-    LF_CH_Event.h
-    LF_Connect_Strategy.h
-    LF_Event_Binder.h
-    LF_Event.h
-    LF_Event_Loop_Thread_Helper.h
-    LF_Follower_Auto_Adder.h
-    LF_Follower_Auto_Ptr.h
-    LF_Follower.h
-    LF_Invocation_Event.h
-    LF_Strategy_Complete.h
-    LF_Strategy.h
-    LocalObject.h
-    LocateRequest_Invocation_Adapter.h
-    LocateRequest_Invocation.h
-    LongDoubleSeqC.h
-    LongDoubleSeqS.h
-    LongLongSeqC.h
-    LongLongSeqS.h
-    LongSeqC.h
-    LongSeqS.h
-    LRU_Connection_Purging_Strategy.h
-    Managed_Types.h
-    Marshal.h
-    MCAST_Parser.h
-    Messaging_PolicyValueC.h
-    Messaging_SyncScopeC.h
-    MProfile.h
-    Muxed_TMS.h
-    New_Leader_Generator.h
-    Null_RefCount_Policy.h
-    NVList.h
-    Object_Argument_T.h
-    Object.h
-    objectid.h
-    ObjectIdListC.h
-    Object_KeyC.h
-    ObjectKey_Table.h
-    Object_Loader.h
-    Object_Proxy_Broker.h
-    Object_Proxy_Impl.h
-    Object_Ref_Table.h
-    Object_T.h
-    Objref_TypeCode.h
-    Objref_TypeCode_Static.h
-    Objref_VarOut_T.h
-    OctetSeqC.h
-    OctetSeqS.h
-    operation_details.h
-    orbconf.h
-    ORB_Constants.h
-    ORB_Core_Auto_Ptr.h
-    ORB_Core.h
-    ORB.h
-    ORBInitializer_Registry.h
-    ORBInitializerC.h
-    ORBInitializerS.h
-    ORBInitInfo.h
-    ORBInitInfoS.h
-    ORB_Table.h
-    orb_typesC.h
-    orb_typesS.h
-    ParameterModeC.h
-    ParameterModeS.h
-    params.h
-    Parser_Registry.h
-    PICurrent_Copy_Callback.h
-    PICurrent.h
-    PICurrent_ORBInitializer.h
-    PIForwardRequestC.h
-    PIForwardRequestS.h
-    PI_ForwardC.h
-    Pluggable_Messaging.h
-    Pluggable_Messaging_Utils.h
-    PolicyC.h
-    PolicyFactory_Registry.h
-    PolicyFactoryS.h
-    Policy_ForwardC.h
-    Policy_ForwardS.h
-    Policy_Manager.h
-    Policy_Set.h
-    PolicyS.h
-    Policy_Validator.h
-    PollableC.h
-    PollableS.h
-    PortableInterceptorC.h
-    PortableInterceptor.h
-    PortableInterceptorS.h
-    Principal.h
-    Profile.h
-    Profile_Transport_Resolver.h
-    Protocol_Factory.h
-    Protocols_Hooks.h
-    Pseudo_VarOut_T.h
-    Queued_Message.h
-    Reactive_Connect_Strategy.h
-    Reactive_Flushing_Strategy.h
-    Recursive_Type_TypeCode.h
-    RefCount_Policy_Traits.h
-    Refcounted_ObjectKey.h
-    Remote_Invocation.h
-    Remote_Object_Proxy_Broker.h
-    Reply_Dispatcher.h
-    Request_Dispatcher.h
-    RequestInfo_Util.h
-    RequestInfoC.h
-    RequestInfoS.h
-    Resource_Factory.h
-    Resume_Handle.h
-    Seq_Out_T.h
-    Sequence.h
-    Sequence_T.h
-    Sequence_TypeCode.h
-    Sequence_TypeCode_Static.h
-    Seq_Var_T.h
-    Server_Strategy_Factory.h
-    ServerRequestInfoC.h
-    ServerRequestInfoS.h
-    ServerRequestInterceptorC.h
-    ServerRequestInterceptorS.h
-    Service_Callbacks.h
-    Service_Context.h
-    Services_Activate.h
-    ServicesC.h
-    ServicesS.h
-    ServicesS_T.h
-    ShortSeqC.h
-    ShortSeqS.h
-    Special_Basic_Arguments.h
-    Special_Basic_Argument_T.h
-    StringSeqC.h
-    StringSeqS.h
-    String_TypeCode.h
-    String_TypeCode_Static.h
-    String_TypeCode_Traits.h
-    Struct_TypeCode.h
-    Struct_TypeCode_Static.h
-    Stub_Factory.h
-    Stub.h
-    Synch_Invocation.h
-    Synch_Queued_Message.h
-    Synch_Refcountable.h
-    Synch_Reply_Dispatcher.h
-    Sync_Strategies.h
-    SystemException.h
-    Tagged_Components.h
-    Tagged_Profile.h
-    TAOC.h
-    TAO_Export.h
-    TAO_Internal.h
-    TAO_Server_Request.h
-    TAOS.h
-    TAO_Singleton.h
-    TAO_Singleton_Manager.h
-    target_specification.h
-    TC_Constants_Forward.h
-    Thread_Lane_Resources.h
-    Thread_Lane_Resources_Manager.h
-    Thread_Per_Connection_Handler.h
-    TimeBaseC.h
-    TimeBaseS.h
-    Timeprobe.h
-    Transport_Acceptor.h
-    Transport_Cache_Manager.h
-    Transport_Connector.h
-    Transport_Descriptor_Interface.h
-    Transport.h
-    Transport_Mux_Strategy.h
-    Transport_Timer.h
-    True_RefCount_Policy.h
-    TSS_Resources.h
-    TypeCode_CDR_Extraction.h
-    TypeCode_Constants.h
-    TypeCode_Case.h
-    TypeCode_Case_T.h
-    TypeCode_Struct_Field.h
-    TypeCode_Traits.h
-    TypeCode_Value_Field.h
-    TypeCode.h
-    TypeCodeFactory_Adapter.h
-    Typecode_typesC.h
-    Typecode_typesS.h
-    UB_String_Arguments.h
-    UB_String_Argument_T.h
-    ULongLongSeqC.h
-    ULongLongSeqS.h
-    ULongSeqC.h
-    ULongSeqS.h
-    Union_TypeCode.h
-    Union_TypeCode_Static.h
-    UserException.h
-    UShortSeqC.h
-    UShortSeqS.h
-    UTF16_BOM_Factory.h
-    UTF16_BOM_Translator.h
-    Value_TypeCode.h
-    Value_TypeCode_Static.h
-    Valuetype_Adapter.h
-    Var_Array_Argument_T.h
-    varbase.h
-    VarOut_T.h
-    Var_Size_Argument_T.h
-    Version.h
-    VisibilityC.h
-    VisibilityS.h
-    ValueModifierC.h
-    ValueModifierS.h
-    Wait_On_Leader_Follower.h
-    Wait_On_LF_No_Upcall.h
-    Wait_On_Reactor.h
-    Wait_On_Read.h
-    Wait_Strategy.h
-    WCharSeqC.h
-    WCharSeqS.h
-    WrongTransactionC.h
-    WStringSeqC.h
-    WStringSeqS.h
-  }
-
-  Inline_Files {
-    *.i
-    *.inl
-  }
-
-  Template_Files {
-    *_T.cpp
-    Acceptor_Impl.cpp
-    Alias_TypeCode.cpp
-    Condition.cpp
-    Connector_Impl.cpp
-    Enum_TypeCode.cpp
-    Interceptor_List.cpp
-    Fixed_TypeCode.cpp
-    Objref_TypeCode.cpp
-    Recursive_Type_TypeCode.cpp
-    Sequence_TypeCode.cpp
-    String_TypeCode.cpp
-    Struct_TypeCode.cpp
-    TAO_Singleton.cpp
-    TypeCode_Base_Attributes.cpp
-    TypeCode_Case.cpp
-    TypeCode_Case_T.cpp
-    Union_TypeCode.cpp
-    Value_TypeCode.cpp
-    orb.idl
-  }
-
-  Pkgconfig_Files {
-    TAO.pc.in
-  }
-}
diff --git a/TAO/tao/tao.mwc b/TAO/tao/tao.mwc
deleted file mode 100644
index 01faf104b82..00000000000
--- a/TAO/tao/tao.mwc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-}
-
diff --git a/TAO/tao/tao.rc b/TAO/tao/tao.rc
deleted file mode 100644
index 998e9157f92..00000000000
--- a/TAO/tao/tao.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "TAO\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "TAODLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAO.DLL\0"
-            VALUE "ProductName", "TAO\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp
deleted file mode 100644
index d72faa3c200..00000000000
--- a/TAO/tao/target_specification.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-//$Id$
-
-#include "tao/target_specification.h"
-
-#if !defined (__ACE_INLINE__)
-#include "target_specification.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID (tao, 
-           target_specification, 
-           "$Id$")
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
deleted file mode 100644
index 4a352a6b333..00000000000
--- a/TAO/tao/target_specification.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    target_specification.h
- *
- *  $Id$
- *
- *  A class that encapsulates the target identification details.
- *
- *  @author  Balachandran  Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TARGET_SPECIFICATION_H
-#define TAO_TARGET_SPECIFICATION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (HPUX) && defined (IOR)
-   /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
-      and we don't want that definition.  See IOP_IORC.h. */
-# undef IOR
-#endif /* HPUX && IOR */
-
-
-namespace IOP
-{
-  struct IOR;
-  struct TaggedProfile;
-}
-
-namespace TAO
-{
-  class ObjectKey;
-}
-
-/**
- * @class TAO_Target_Specification
- *
- * @brief A class to encapsulate all the ways of specifying targets.
- *
- */
-class TAO_Export TAO_Target_Specification
-{
-public:
-
-  /// Ctor
-  TAO_Target_Specification (void);
-  enum TAO_Target_Address
-  {
-    // Note that this could be extended for other protocols
-    Key_Addr = 0,
-    Profile_Addr,
-    Reference_Addr
-  };
-
-  // Note: Please do not pass in a identifiers that is allocated on
-  // stack. These methods does not make a copy but holds the pointer
-  // passed in.
-  /// Set the target specification by giving the object key.
-  void target_specifier (const TAO::ObjectKey &key);
-
-
-  /// Set the target specification by passing in an IOP::TaggedProfile.
-  void target_specifier (IOP::TaggedProfile &profile);
-
-  /**
-   * Specify the target by passing in the IOP::IOR with a profile
-   * index. Please see the header file IOPC.h on why a profile index
-   * is required.
-   */
-  void target_specifier (IOP::IOR &ior,
-                         CORBA::ULong prof_index);
-
-
-  /**
-   * Returns the object key after a check of the stored specifier. If
-   * the stored specifier is not of the right type then this would
-   * return a NULL
-   */
-  const TAO::ObjectKey* object_key (void);
-
-  /**
-   * Returns the IOP::TaggedProfile after a check of the stored specifier. If
-   * the stored specifier is not of the right type then this would
-   * return a NULL
-   */
-  const IOP::TaggedProfile *profile (void);
-
-  /**
-   * Returns a  pointer to IOP::IOR through the parameters and the
-   * index of the selected profile as a return parameter after a check
-   * of the stored specifier. If the stored specifier is not of the
-   * right type then this would return a NULL.
-   */
-  CORBA::ULong iop_ior (IOP::IOR *&ior);
-
-  /// Access the TArget_Address specifier
-  TAO_Target_Address specifier (void);
-
-private:
-  /// The union of all the possibilities
-  union
-  {
-    TAO::ObjectKey *object_key_;
-    IOP::TaggedProfile *profile_;
-    IOP::IOR *ior_;
-  } u_;
-
-  /// The enum identifier
-  TAO_Target_Address specifier_;
-
-  /// The profile index
-  CORBA::ULong profile_index_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "target_specification.i"
-#endif /* defined INLINE */
-
-#include /**/ "ace/post.h"
-
-#endif /*TAO_TARGET_SPECIFICATION_H*/
diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i
deleted file mode 100644
index e427b1dd9be..00000000000
--- a/TAO/tao/target_specification.i
+++ /dev/null
@@ -1,83 +0,0 @@
-//-*- C++ -*-
-//$Id$
-
-
-ACE_INLINE
-TAO_Target_Specification::TAO_Target_Specification (void)
-  :specifier_ (TAO_Target_Specification::Key_Addr),
-   profile_index_ (0)
-{
-  //no-op
-}
-
-ACE_INLINE void
-TAO_Target_Specification::target_specifier (const TAO::ObjectKey &key)
-{
-  this->specifier_ = TAO_Target_Specification::Key_Addr;
-  // @@ Bala: this is a good recipe for a crash, if the <key> was on
-  //    the stack or is otherwise destroyed then you are in big
-  //    trouble.
-  // @@ Carlos: As suggested by you I have documented that in the
-  //    headerfile.
-  // @@ Bala: beware, documentation is good, code that works in
-  // general is better....  but you are probably right in this case, i
-  // suspect this stuff goes right in the critical path, right? So
-  // making a copy of the object key would be too expensive..
-  this->u_.object_key_ = const_cast<TAO::ObjectKey *> (&key);
-}
-
-ACE_INLINE void
-TAO_Target_Specification::target_specifier (IOP::TaggedProfile &profile)
-
-{
-  this->specifier_ = TAO_Target_Specification::Profile_Addr;
-  this->u_.profile_ = const_cast<IOP::TaggedProfile *> (&profile);
-
-}
-
-ACE_INLINE void
-TAO_Target_Specification::target_specifier (IOP::IOR &ior,
-                                            CORBA::ULong prof_index)
-{
-  this->specifier_ = TAO_Target_Specification::Reference_Addr;
-  this->u_.ior_ = const_cast<IOP::IOR *> (&ior);
-  this->profile_index_ = prof_index;
-
-}
-
-ACE_INLINE const TAO::ObjectKey*
-TAO_Target_Specification::object_key (void)
-{
-  if (this->specifier_ == TAO_Target_Specification::Key_Addr)
-    return this->u_.object_key_;
-
-  return 0;
-}
-
-ACE_INLINE const IOP::TaggedProfile *
-TAO_Target_Specification::profile (void)
-{
-  if (this->specifier_ == TAO_Target_Specification::Profile_Addr)
-    return this->u_.profile_;
-
-  return 0;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Target_Specification::iop_ior (IOP::IOR *& ior)
-{
-  if (this->specifier_ == TAO_Target_Specification::Reference_Addr)
-    {
-      ior = this->u_.ior_;
-      return this->profile_index_;
-    }
-
-  ior = 0;
-  return 0;
-}
-
-ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Target_Specification::specifier (void)
-{
-  return this->specifier_;
-}
diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h
deleted file mode 100644
index f2ba8aea77f..00000000000
--- a/TAO/tao/varbase.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     varbase.h
- *
- *  $Id$
- *
- *   Contains a base class for the object _var classes.
- *
- *
- *  @author  Jeff Parsons.
- */
-//=============================================================================
-
-#ifndef TAO_VARBASE_H
-#define TAO_VARBASE_H
-#include /**/ "ace/pre.h"
-
-/**
- * @class TAO_Base_var
- *
- * @brief TAO_Base_var
- *
- * Base class for object _var classes. Used to prevent the
- * _var class of a CORBA interface from accepting the _var
- * of a more derived interface in its copy constructor or
- * assignment operator.
- */
-class TAO_Base_var
-{
-public:
-  TAO_Base_var (void) {}
-
-private:
-
-  TAO_Base_var (const TAO_Base_var &);
-  TAO_Base_var & operator= (const TAO_Base_var &);
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* TAO_VARBASE_H */